on xenial help sign in
merge trunk
commitf75e1d0cfff6a99968f412c79574808a2d5a1a44 authorJosh Arenson <joshua.arenson@canonical.com> dateFri 25 Mar 2016, 12:51 (11 years ago) parenta8b44f5bce0a33
361 files changed+46665−22878
CMakeLists.txt+2−1 CODING+2 debian/changelog+49 debian/control+9−7 libs/UbuntuGestures/Timer.h+5 libs/UbuntuGestures/TouchRegistry.cpp+15−10 plugins/AccountsService/AccountsService.cpp+69−3 plugins/AccountsService/AccountsService.h+21−3 plugins/AccountsService/AccountsService.qmltypes+5 plugins/AccountsService/com.canonical.unity.AccountsService.xml+5 plugins/Cursor/Cursor.qmltypes+78 plugins/Dash/ScopeStyle.qml+1−1 plugins/GlobalShortcut/GlobalShortcut.qmltypes+31 plugins/ScreenGrabber/screengrabber.cpp−2 plugins/Ubuntu/Gestures/CMakeLists.txt+1 plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+43−5 plugins/Ubuntu/Gestures/DirectionalDragArea.h+8 plugins/Ubuntu/Gestures/DirectionalDragArea_p.h+2 plugins/Ubuntu/Gestures/Gestures.qmltypes+86−45 plugins/Ubuntu/Gestures/TouchGestureArea.cpp+875 plugins/Ubuntu/Gestures/TouchGestureArea.h+229 plugins/Ubuntu/Gestures/plugin.cpp+3 plugins/Unity/Indicators/indicatorsmanager.cpp+3−5 plugins/Unity/InputInfo/InputInfo.qmltypes+71 plugins/Unity/Platform/Platform.qmltypes+20 plugins/Unity/Session/dbusunitysessionservice.cpp+4−1 plugins/Utils/CMakeLists.txt+2−1 plugins/Utils/Utils.qmltypes+2−2 plugins/Utils/globalfunctions.cpp+56 plugins/Utils/globalfunctions.h+42 plugins/Utils/plugin.cpp+11−2 plugins/Utils/timezoneFormatter.cpp+10 plugins/Utils/timezoneFormatter.h+1 plugins/Utils/windowkeysfilter.cpp → plugins/Utils/windowinputfilter.cpp+14−16 plugins/Utils/windowkeysfilter.h → plugins/Utils/windowinputfilter.h+11−11 plugins/Utils/windowstatestorage.cpp+36−4 plugins/Utils/windowstatestorage.h+3 plugins/Wizard/CMakeLists.txt+7−1 plugins/Wizard/LocalePlugin.cpp+291 plugins/Wizard/LocalePlugin.h+58 plugins/Wizard/PageList.cpp+4−4 plugins/Wizard/Status.cpp+143 plugins/Wizard/Status.h+60 plugins/Wizard/System.cpp+5−4 plugins/Wizard/System.h+3−2 plugins/Wizard/plugin.cpp+7−8 plugins/Wizard/plugin.h+1−2 plugins/Wizard/timezonemodel.cpp+244 plugins/Wizard/timezonemodel.h+80 po/aa.po+290−184 po/am.po+493−249 po/ar.po+455−227 po/ast.po+486−247 po/az.po+261−180 po/be.po+475−236 po/bg.po+258−180 po/bn.po+339−198 po/br.po+485−245 po/bs.po+476−234 po/ca.po+477−240 po/ca@valencia.po+384−217 po/ce.po+258−180 po/ckb.po+258−180 po/cs.po+476−234 po/cy.po+476−231 po/da.po+477−232 po/de.po+485−246 po/el.po+479−237 po/en_AU.po+476−244 po/en_GB.po+489−246 po/eo.po+303−191 po/es.po+481−220 po/eu.po+476−234 po/fa.po+486−246 po/fi.po+486−247 po/fo.po+258−180 po/fr.po+493−252 po/ga.po+461−232 po/gd.po+492−249 po/gl.po+490−247 po/gv.po+261−183 po/he.po+401−212 po/hi.po+258−180 po/hr.po+489−242 po/hu.po+485−223 po/hy.po+261−183 po/ia.po+488−239 po/id.po+261−183 po/is.po+261−183 po/it.po+490−240 po/ja.po+273−183 po/km.po+333−197 po/kn.po+258−180 po/ko.po+485−242 po/ku.po+261−180 po/ky.po+258−180 po/lo.po+258−180 po/lt.po+258−180 po/lv.po+474−232 po/ml.po+258−180 po/mr.po+258−180 po/ms.po+476−237 po/my.po+266−181 po/nb.po+486−247 po/ne.po+258−180 po/nl.po+497−241 po/nn.po+258−180 po/oc.po+258−180 po/or.po+258−180 po/pa.po+476−234 po/pl.po+492−251 po/pt.po+495−251 po/pt_BR.po+476−234 po/ro.po+478−236 po/ru.po+476−239 po/shn.po+258−180 po/si.po+261−183 po/sk.po+488−234 po/sl.po+477−247 po/sq.po+395−210 po/sr.po+500−249 po/sv.po+497−253 po/sw.po+409−214 po/ta.po+258−180 po/te.po+258−180 po/th.po+258−180 po/tr.po+477−235 po/ug.po+458−230 po/uk.po+491−247 po/unity8.pot+256−178 po/ur.po+258−180 po/uz.po+258−180 po/vi.po+258−180 po/wo.po+476−234 po/xh.po+258−180 po/zh_CN.po+483−237 po/zh_HK.po+258−180 po/zh_TW.po+484−236 qml/Components/Dialogs.qml+6−47 qml/Components/InputMethod.qml+4−1 qml/Components/Showable.qml+10 qml/Components/Unity8Settings.qml−50 qml/Dash/DashContent.qml+2−2 qml/Dash/DashNavigation.qml+159−78 qml/Dash/DashNavigationButton.qml−233 qml/Dash/DashNavigationHeader.qml+73 qml/Dash/DashNavigationList.qml+33−85 qml/Dash/DashPageHeader.qml+140−131 qml/Dash/Filters/FilterOptionSelector.qml+91 qml/Dash/Filters/FilterRangeInput.qml+136 qml/Dash/Filters/FilterValueSlider.qml+87 qml/Dash/Filters/FilterWidget.qml+29 qml/Dash/Filters/FilterWidgetFactory.qml+80 qml/Dash/FiltersPopover.qml+105 qml/Dash/GenericScopeView.qml+77−47 qml/Dash/PageHeaderExtraPanel.qml+176 qml/Greeter/Greeter.qml+17−6 qml/Launcher/Launcher.qml+2−3 qml/OrientedShell.qml+27−17 qml/Panel/IndicatorItemRow.qml+5−2 qml/Panel/Indicators/MenuItemFactory.qml+16−3 qml/Panel/IndicatorsMenu.qml−2 qml/Shell.qml+84−53 qml/Stages/AbstractStage.qml+5−1 qml/Stages/ApplicationWindow.qml+7−3 qml/Stages/DesktopStage.qml+75−12 qml/Stages/PhoneStage.qml+15−6 qml/Stages/SideStage.qml+118 qml/Stages/SpreadDelegate.qml+11−1 qml/Stages/StagedFullscreenPolicy.qml+58 qml/Stages/SurfaceContainer.qml+14 qml/Stages/TabletSideStageTouchGesture.qml+154 qml/Stages/TabletStage.qml+405−172 qml/Stages/TransformedTabletSpreadDelegate.qml+84−56 qml/Stages/WindowResizeArea.qml+2−2 qml/Stages/WindowedFullscreenPolicy.qml+41 qml/Stages/graphics/sidestage_drag.svg+207 qml/Stages/graphics/sidestage_open.svg+181 qml/Tutorial/Arrow.qml−56 qml/Tutorial/InactivityTimer.qml+62 qml/Tutorial/Slider.qml−123 qml/Tutorial/Tutorial.qml+39−14 qml/Tutorial/TutorialBottom.qml+86−66 qml/Tutorial/TutorialBottomFinish.qml−41 qml/Tutorial/TutorialContent.qml+227−55 qml/Tutorial/TutorialLeft.qml+21−68 qml/Tutorial/TutorialLeftLong.qml+54 qml/Tutorial/TutorialPage.qml+62−186 qml/Tutorial/TutorialRight.qml+30−192 qml/Tutorial/TutorialTop.qml+61 qml/Tutorial/graphics/arrow.svg+19 qml/Tutorial/graphics/background1.png qml/Tutorial/graphics/background2.png qml/Tutorial/graphics/camera.png qml/Tutorial/graphics/chevron.png qml/Tutorial/graphics/dialer.png qml/Tutorial/graphics/facebook.png qml/Tutorial/graphics/gallery.png qml/Tutorial/graphics/tick.png qml/Wizard/CheckableSetting.qml+11−3 qml/Wizard/Page.qml+261−44 qml/Wizard/Pages.qml+75−31 qml/Wizard/Pages/10-welcome.qml+128−48 qml/Wizard/Pages/20-sim.qml−77 qml/Wizard/Pages/30-passwd-type.qml−140 qml/Wizard/Pages/30-wifi.qml+210 qml/Wizard/Pages/40-location.qml+290 qml/Wizard/Pages/40-wifi.qml−219 qml/Wizard/Pages/50-location.qml−150 qml/Wizard/Pages/50-timezone.qml+275 qml/Wizard/Pages/60-reporting.qml → qml/Wizard/Pages/60-account.qml+30−20 qml/Wizard/Pages/70-passwd-type.qml+166 qml/Wizard/Pages/75-report-check.qml+91 qml/Wizard/Pages/80-finished.qml+94−16 qml/Wizard/Pages/data/Desktop_header_bkg.png qml/Wizard/Pages/data/Desktop_splash_screen_bkg.png qml/Wizard/Pages/data/Phone_header_bkg.png qml/Wizard/Pages/data/Phone_splash_screen_bkg.png qml/Wizard/Pages/data/Tick@30.png qml/Wizard/Pages/data/meet_ubuntu_simcard@30.png qml/Wizard/Pages/data/timezonemap/map.png qml/Wizard/Pages/data/timezonemap/pin.png qml/Wizard/Pages/data/timezonemap/timezone_-1.png qml/Wizard/Pages/data/timezonemap/timezone_-10.png qml/Wizard/Pages/data/timezonemap/timezone_-11.png qml/Wizard/Pages/data/timezonemap/timezone_-2.png qml/Wizard/Pages/data/timezonemap/timezone_-3.5.png qml/Wizard/Pages/data/timezonemap/timezone_-3.png qml/Wizard/Pages/data/timezonemap/timezone_-4.5.png qml/Wizard/Pages/data/timezonemap/timezone_-4.png qml/Wizard/Pages/data/timezonemap/timezone_-5.png qml/Wizard/Pages/data/timezonemap/timezone_-6.png qml/Wizard/Pages/data/timezonemap/timezone_-7.png qml/Wizard/Pages/data/timezonemap/timezone_-8.png qml/Wizard/Pages/data/timezonemap/timezone_-9.5.png qml/Wizard/Pages/data/timezonemap/timezone_-9.png qml/Wizard/Pages/data/timezonemap/timezone_0.png qml/Wizard/Pages/data/timezonemap/timezone_1.png qml/Wizard/Pages/data/timezonemap/timezone_10.5.png qml/Wizard/Pages/data/timezonemap/timezone_10.png qml/Wizard/Pages/data/timezonemap/timezone_11.png qml/Wizard/Pages/data/timezonemap/timezone_12.75.png qml/Wizard/Pages/data/timezonemap/timezone_12.png qml/Wizard/Pages/data/timezonemap/timezone_13.png qml/Wizard/Pages/data/timezonemap/timezone_2.png qml/Wizard/Pages/data/timezonemap/timezone_3.5.png qml/Wizard/Pages/data/timezonemap/timezone_3.png qml/Wizard/Pages/data/timezonemap/timezone_4.5.png qml/Wizard/Pages/data/timezonemap/timezone_4.png qml/Wizard/Pages/data/timezonemap/timezone_5.5.png qml/Wizard/Pages/data/timezonemap/timezone_5.75.png qml/Wizard/Pages/data/timezonemap/timezone_5.png qml/Wizard/Pages/data/timezonemap/timezone_6.5.png qml/Wizard/Pages/data/timezonemap/timezone_6.png qml/Wizard/Pages/data/timezonemap/timezone_7.png qml/Wizard/Pages/data/timezonemap/timezone_8.5.png qml/Wizard/Pages/data/timezonemap/timezone_8.png qml/Wizard/Pages/data/timezonemap/timezone_9.5.png qml/Wizard/Pages/data/timezonemap/timezone_9.png qml/Wizard/Pages/here-terms.qml+71−66 qml/Wizard/Pages/passwd-confirm.qml → qml/Wizard/Pages/passcode-confirm.qml+13−30 qml/Wizard/Pages/passcode-desktop.qml+132 qml/Wizard/Pages/passwd-set.qml → qml/Wizard/Pages/passcode-set.qml+13−29 qml/Wizard/Pages/password-set.qml+149 qml/Wizard/Pages/sim.qml+108 qml/Wizard/PasswordMeter.qml+106 qml/Wizard/StackButton.qml+7−12 qml/Wizard/Wizard.qml−9 qml/Tutorial/TutorialLeftFinish.qml → qml/Wizard/WizardTextField.qml+5−21 src/MouseTouchAdaptor.cpp+53−9 src/MouseTouchAdaptor.h+5−3 tests/autopilot/unity8/shell/emulators.py−2 tests/autopilot/unity8/shell/tests/test_tutorial.py−57 tests/autopilot/unity8/tutorial.py−73 tests/libs/UbuntuGestures/tst_TouchRegistry.cpp+59 tests/mocks/AccountsService/AccountsService.cpp+60−3 tests/mocks/AccountsService/AccountsService.h+30−5 tests/mocks/AccountsService/AccountsService.qmltypes+5 tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml+1 tests/mocks/QMenuModel/QDBusActionGroup.qml+5−5 tests/mocks/Ubuntu/Connectivity/plugin.cpp+1 tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt+2 tests/mocks/Ubuntu/SystemSettings/Diagnostics/CMakeLists.txt+1 qml/Tutorial/Tick.qml → tests/mocks/Ubuntu/SystemSettings/Diagnostics/MockDiagnostics.qml+4−9 tests/mocks/Ubuntu/SystemSettings/Diagnostics/qmldir+2 tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockKeyboardPlugin.qml+21 tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml+2−2 tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/qmldir+1 tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp+1−1 tests/mocks/Ubuntu/SystemSettings/TimeDate/CMakeLists.txt+1 tests/mocks/Ubuntu/SystemSettings/TimeDate/MockTimeDate.qml+25 tests/mocks/Ubuntu/SystemSettings/TimeDate/qmldir+2 tests/mocks/Unity/Application/ApplicationInfo.cpp+21−3 tests/mocks/Unity/Application/ApplicationInfo.h+6−2 tests/mocks/Unity/Application/ApplicationManager.cpp+13−26 tests/mocks/Unity/Application/ApplicationManager.h−8 tests/mocks/Unity/Application/MirSurface.cpp+32 tests/mocks/Unity/Application/MirSurface.h+10−3 tests/mocks/Unity/Application/MirSurfaceItem.cpp+28−5 tests/mocks/Unity/Application/MirSurfaceItem.h+2 tests/mocks/Unity/Application/Session.cpp+26−1 tests/mocks/Unity/Application/Session.h+7 tests/mocks/Unity/Application/resources/MirSurfaceItem.qml+59 tests/mocks/Unity/CMakeLists.txt+14−1 tests/mocks/Unity/Indicators/ModelActionRootState.qml+26−4 tests/mocks/Unity/fake_filters.cpp+125 tests/mocks/Unity/fake_filters.h+46 tests/mocks/Unity/fake_navigation.cpp+9−10 tests/mocks/Unity/fake_optionselectorfilter.cpp+65 tests/mocks/Unity/fake_optionselectorfilter.h+52 tests/mocks/Unity/fake_optionselectoroptions.cpp+77 tests/mocks/Unity/fake_optionselectoroptions.h+47 tests/mocks/Unity/fake_rangeinputfilter.cpp+167 tests/mocks/Unity/fake_rangeinputfilter.h+79 tests/mocks/Unity/fake_scope.cpp+52−27 tests/mocks/Unity/fake_scope.h+20−7 tests/mocks/Unity/fake_unity_plugin.cpp+7 tests/mocks/Unity/fake_valuesliderfilter.cpp+84 tests/mocks/Unity/fake_valuesliderfilter.h+55 tests/mocks/Unity/fake_valueslidervalues.cpp+51 tests/mocks/Unity/fake_valueslidervalues.h+36 tests/mocks/Utils/CMakeLists.txt+3−2 tests/mocks/Utils/Utils.qmltypes+2−2 tests/mocks/Utils/plugin.cpp+14−2 tests/mocks/Utils/windowstatestorage.cpp+13 tests/mocks/Utils/windowstatestorage.h+4 tests/mocks/Wizard/CMakeLists.txt+6−1 tests/mocks/Wizard/MockSystem.cpp+4−2 tests/mocks/Wizard/MockSystem.h+2−2 tests/mocks/Wizard/mockplugin.cpp+7−8 tests/plugins/AccountsService/PropertiesServer.cpp+10 tests/plugins/AccountsService/PropertiesServer.h−1 tests/plugins/AccountsService/client.cpp+67 tests/plugins/Dash/tst_ScopeStyle.qml+1−1 tests/plugins/Ubuntu/Gestures/CMakeLists.txt+7−1 tests/plugins/Ubuntu/Gestures/GestureTest.cpp+44 tests/plugins/Ubuntu/Gestures/GestureTest.h+13−1 tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp−56 tests/plugins/Ubuntu/Gestures/tst_TouchGestureArea.cpp+270 tests/plugins/Ubuntu/Gestures/tst_TouchGestureArea.qml+90 tests/plugins/Unity/Launcher/launchermodeltest.cpp+1 tests/qmltests/CMakeLists.txt+4 tests/qmltests/Components/tst_PhysicalKeysMapper.qml+3−3 tests/qmltests/Dash/Filters/tst_FilterOptionSelector.qml+96 tests/qmltests/Dash/Filters/tst_FilterRangeInput.qml+247 tests/qmltests/Dash/Filters/tst_FilterValueSlider.qml+101 tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qml+58 tests/qmltests/Dash/Previews/tst_Preview.qml+1 tests/qmltests/Dash/tst_DashContent.qml+165−152 tests/qmltests/Dash/tst_DashPageHeader.qml+24−15 tests/qmltests/Dash/tst_GenericScopeView.qml+3−3 tests/qmltests/Greeter/tst_Greeter.qml+7−1 tests/qmltests/Stages/tst_DesktopStage.qml−2 tests/qmltests/Stages/tst_TabletStage.qml+143 tests/qmltests/Stages/tst_WindowResizeArea.qml+7 tests/qmltests/Tutorial/tst_Tutorial.qml+611−193 tests/qmltests/Wizard/tst_Wizard.qml+126−214 tests/qmltests/tst_OrientedShell.qml+126−15 tests/qmltests/tst_Shell.qml+129−8 tests/qmltests/tst_ShellWithPin.qml−22 tests/utils/modules/Unity/Test/UnityTestCase.qml+67−11
CMakeLists.txt+2−1
@@ -57,7 +57,8 @@ find_package(Qt5DBus 5.4 REQUIRED)
5757find_package(Qt5Concurrent 5.4 REQUIRED)
5858find_package(Qt5Sql 5.4 REQUIRED)
5959
60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=13)
60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=14)
61+pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
6162pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
6263pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
6364pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
CODING+2
@@ -54,6 +54,8 @@ $ ./run.sh -p OR -k
5454Notes
5555-----
5656- to navigate, utilize the mouse left button as you would your finger
57+- a three point drag (for side stage operations) can be performed by using
58+ the Shift+Control+Alt (all together) keyboard modifiers while using the mouse.
5759- to get the translations work, currently you have to do make install to
5860 put the *.mo files into correct structure. We'll look for a better solution
5961 later.
debian/changelog+49
@@ -1,3 +1,52 @@
1+unity8 (8.12+16.04.20160323.2-0ubuntu1) xenial; urgency=medium
2+
3+ [ Michael Terry ]
4+ *
5+ * Fix setting OSK layout in OOBE wizard
6+ * Stop the left edge tutorial from being shown when the bottom edge
7+ tutorial wants to be shown after receiving a call.
8+
9+ [ Albert Astals Cid ]
10+ * Filter implementation with Option Selector filter as the only filter
11+ * Get the engine from the parent context
12+ * Implement the API changes due to filters
13+ * Match design visuals for the new dash navigation/page header popup
14+ * New Dash Navigation UX
15+ * Range Input filter
16+ * Value slider filter
17+ * Workaround SDK ListItem bug
18+
19+ [ Albert Astals Cid, Lukáš Tinkl ]
20+ * Fix various tests
21+
22+ [ CI Train Bot ]
23+ * Resync trunk.
24+ * Update translation template
25+
26+ [ Lukáš Tinkl, Michael Terry ]
27+ * New first-run wizard for the phone (part of the OOBE effort) (LP:
28+ #1536688, #1536617, #1543790, #1555222)
29+
30+ [ Lukáš Tinkl, Michał Sawicz ]
31+ * Keymap switching support (LP: #1524400, #1412492, #1491340)
32+
33+ [ Michael Terry, Michael Zanetti ]
34+ * Redesign the first-boot edge tutorial
35+
36+ [ Michael Zanetti ]
37+ * disabling some tests that are flaky in adt but can't be made fail on
38+ our machines
39+
40+ [ Michael Zanetti, Michał Sawicz ]
41+ * Change the behavior alond with the switch in indicator-display (LP:
42+ #1538591)
43+
44+ [ Michael Zanetti, Michał Sawicz, Nick Dedekind ]
45+ * Add support for low shell chrome. (LP: #1535397)
46+ * Sidestage load/unload redesign (LP: #1544479)
47+
48+ -- Michael Zanetti <michael.zanetti@canonical.com> Wed, 23 Mar 2016 09:53:17 +0000
49+
150unity8 (8.11+16.04.20160318.1-0ubuntu1) xenial; urgency=medium
251
352 [ CI Train Bot ]
debian/control+9−7
@@ -8,13 +8,14 @@ Build-Depends: cmake,
88 doxyqml,
99# To allow cross-compiling to work, we also must append :native
1010# to g++ so we don't try to run armhf g++
11−# on an x86 CPU for eaxmple, when cross-compiling.
11+# on an x86 CPU for example, when cross-compiling.
1212 g++:native,
1313 libandroid-properties-dev,
1414 graphviz,
1515 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
1616 libconnectivity-qt1-dev (>= 0.7.1),
1717 libevdev-dev,
18+ libgeonames-dev (>= 0.2),
1819 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
1920 libgl1-mesa-dri,
2021 libgles2-mesa-dev[armhf],
@@ -30,7 +31,7 @@ Build-Depends: cmake,
3031 libqt5xmlpatterns5-dev,
3132 libsystemsettings-dev,
3233 libudev-dev,
33− libunity-api-dev (>= 7.107),
34+ libunity-api-dev (>= 7.108),
3435 libusermetricsoutput1-dev,
3536# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
3637 libx11-dev[!armhf],
@@ -113,7 +114,7 @@ Depends: dmz-cursor-theme,
113114 qml-module-qt-labs-folderlistmodel,
114115 qml-module-qtquick-xmllistmodel,
115116 qml-module-qtsysteminfo,
116− qtdeclarative5-qtmir-plugin (>= 0.4.5),
117+ qtdeclarative5-qtmir-plugin (>= 0.4.8),
117118 qtdeclarative5-ubuntu-telephony0.1,
118119 qtdeclarative5-ubuntu-web-plugin,
119120 ubuntu-system-settings,
@@ -123,7 +124,8 @@ Depends: dmz-cursor-theme,
123124 unity8-private | unity-launcher-impl,
124125 ${misc:Depends},
125126 ${shlibs:Depends},
126−Recommends: unity-scope-click,
127+Recommends: indicator-session,
128+ unity-scope-click,
127129 unity-scope-mediascanner2,
128130Breaks: indicator-network (<< 0.5.1+14.10.20141014),
129131 ubuntu-touch-session (<< 0.107),
@@ -142,10 +144,10 @@ Depends: qml-module-qtquick-layouts,
142144 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
143145 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
144146 ubuntu-thumbnailer-impl-0,
145− unity-application-impl-13,
147+ unity-application-impl-14,
146148 unity-notifications-impl-3,
147149 unity-plugin-scopes | unity-scopes-impl,
148− unity-scopes-impl-10,
150+ unity-scopes-impl-11,
149151 unity8-fake-env | unity-application-impl,
150152 ${misc:Depends},
151153Breaks: unity8 (<< 7.86),
@@ -188,7 +190,7 @@ Pre-Depends: ${misc:Pre-Depends},
188190Depends: ${misc:Depends},
189191 ${shlibs:Depends},
190192Provides: unity-application-impl,
191− unity-application-impl-13,
193+ unity-application-impl-14,
192194Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
193195Description: Fake environment for running Unity 8 shell
194196 Provides fake implementations of some QML modules used by Unity 8 shell
libs/UbuntuGestures/Timer.h+5
@@ -35,6 +35,11 @@ public:
3535 virtual int interval() const = 0;
3636 virtual void setInterval(int msecs) = 0;
3737 virtual void start() { m_isRunning = true; }
38+ virtual void start(int msecs)
39+ {
40+ setInterval(msecs);
41+ start();
42+ }
3843 virtual void stop() { m_isRunning = false; }
3944 bool isRunning() const { return m_isRunning; }
4045 virtual bool isSingleShot() const = 0;
libs/UbuntuGestures/TouchRegistry.cpp+15−10
@@ -359,10 +359,6 @@ void TouchRegistry::removeCandidateOwnerForTouchByIndex(Pool<TouchRegistry::Touc
359359
360360void TouchRegistry::requestTouchOwnership(int id, QQuickItem *candidate)
361361{
362− #if TOUCHREGISTRY_DEBUG
363− UG_DEBUG << "requestTouchOwnership id " << id << "candidate" << candidate;
364− #endif
365−
366362 Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
367363 if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
368364
@@ -379,6 +375,9 @@ void TouchRegistry::requestTouchOwnership(int id, QQuickItem *candidate)
379375 break;
380376 }
381377 }
378+ #if TOUCHREGISTRY_DEBUG
379+ UG_DEBUG << "requestTouchOwnership id " << id << "candidate" << candidate << "index: " << candidateIndex;
380+ #endif
382381
383382 // add it as a candidate if not present yet
384383 if (candidateIndex < 0) {
@@ -533,16 +532,22 @@ void TouchRegistry::TouchInfo::notifyCandidatesOfOwnershipResolution()
533532 << " gained) to candidate" << candidates[0].item;
534533 #endif
535534
536− TouchOwnershipEvent gainedOwnershipEvent(id, true /*gained*/);
537− QCoreApplication::sendEvent(candidates[0].item, &gainedOwnershipEvent);
535+ // need to take a copy of the item list in case
536+ // we call back in to remove candidate during the lost ownership event.
537+ QList<QPointer<QQuickItem>> items;
538+ Q_FOREACH(const CandidateInfo& info, candidates) {
539+ items << info.item;
540+ }
538541
542+ TouchOwnershipEvent gainedOwnershipEvent(id, true /*gained*/);
543+ QCoreApplication::sendEvent(items[0], &gainedOwnershipEvent);
539544
540545 TouchOwnershipEvent lostOwnershipEvent(id, false /*gained*/);
541− for (int i = 1; i < candidates.count(); ++i) {
546+ for (int i = 1; i < items.count(); ++i) {
542547 #if TOUCHREGISTRY_DEBUG
543− UG_DEBUG << "sending TouchWonershipEvent(id =" << id << " lost) to candidate"
544− << candidates[i].item;
548+ UG_DEBUG << "sending TouchOwnershipEvent(id =" << id << " lost) to candidate"
549+ << items[i];
545550 #endif
546− QCoreApplication::sendEvent(candidates[i].item, &lostOwnershipEvent);
551+ QCoreApplication::sendEvent(items[i], &lostOwnershipEvent);
547552 }
548553}
plugins/AccountsService/AccountsService.cpp+69−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013, 2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Author: Michael Terry <michael.terry@canonical.com>
1715 */
1816
1917#include "AccountsService.h"
@@ -34,9 +32,12 @@
3432
3533#define PROP_BACKGROUND_FILE QStringLiteral("BackgroundFile")
3634#define PROP_DEMO_EDGES QStringLiteral("demo-edges")
35+#define PROP_DEMO_EDGES_COMPLETED QStringLiteral("DemoEdgesCompleted")
36+#define PROP_EMAIL QStringLiteral("Email")
3737#define PROP_ENABLE_INDICATORS_WHILE_LOCKED QStringLiteral("EnableIndicatorsWhileLocked")
3838#define PROP_ENABLE_LAUNCHER_WHILE_LOCKED QStringLiteral("EnableLauncherWhileLocked")
3939#define PROP_FAILED_LOGINS QStringLiteral("FailedLogins")
40+#define PROP_INPUT_SOURCES QStringLiteral("InputSources")
4041#define PROP_LICENSE_ACCEPTED QStringLiteral("LicenseAccepted")
4142#define PROP_LICENSE_BASE_PATH QStringLiteral("LicenseBasePath")
4243#define PROP_MOUSE_CURSOR_SPEED QStringLiteral("MouseCursorSpeed")
@@ -44,6 +45,7 @@
4445#define PROP_MOUSE_PRIMARY_BUTTON QStringLiteral("MousePrimaryButton")
4546#define PROP_MOUSE_SCROLL_SPEED QStringLiteral("MouseScrollSpeed")
4647#define PROP_PASSWORD_DISPLAY_HINT QStringLiteral("PasswordDisplayHint")
48+#define PROP_REAL_NAME QStringLiteral("RealName")
4749#define PROP_STATS_WELCOME_SCREEN QStringLiteral("StatsWelcomeScreen")
4850#define PROP_TOUCHPAD_CURSOR_SPEED QStringLiteral("TouchpadCursorSpeed")
4951#define PROP_TOUCHPAD_DISABLE_WHILE_TYPING QStringLiteral("TouchpadDisableWhileTyping")
@@ -54,6 +56,10 @@
5456#define PROP_TOUCHPAD_TAP_TO_CLICK QStringLiteral("TouchpadTapToClick")
5557#define PROP_TOUCHPAD_TWO_FINGER_SCROLL QStringLiteral("TouchpadTwoFingerScroll")
5658
59+using StringMap = QMap<QString,QString>;
60+using StringMapList = QList<StringMap>;
61+Q_DECLARE_METATYPE(StringMapList)
62+
5763
5864QVariant primaryButtonConverter(const QVariant &value)
5965{
@@ -80,6 +86,9 @@ AccountsService::AccountsService(QObject* parent, const QString &user)
8086 connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged, this, &AccountsService::onMaybeChanged);
8187
8288 registerProperty(IFACE_ACCOUNTS_USER, PROP_BACKGROUND_FILE, QStringLiteral("backgroundFileChanged"));
89+ registerProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, QStringLiteral("emailChanged"));
90+ registerProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, QStringLiteral("realNameChanged"));
91+ registerProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QStringLiteral("keymapsChanged"));
8392 registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, QStringLiteral("hereEnabledChanged"));
8493 registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH, QStringLiteral("hereLicensePathChanged"));
8594 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));
@@ -87,6 +96,7 @@ AccountsService::AccountsService(QObject* parent, const QString &user)
8796 registerProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT, QStringLiteral("passwordDisplayHintChanged"));
8897 registerProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN, QStringLiteral("statsWelcomeScreenChanged"));
8998 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES, QStringLiteral("demoEdgesChanged"));
99+ registerProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, QStringLiteral("demoEdgesCompletedChanged"));
90100 registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, QStringLiteral("failedLoginsChanged"));
91101
92102 registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_CURSOR_SPEED,
@@ -150,6 +160,20 @@ void AccountsService::setDemoEdges(bool demoEdges)
150160 setProperty(IFACE_UNITY, PROP_DEMO_EDGES, demoEdges);
151161}
152162
163+QStringList AccountsService::demoEdgesCompleted() const
164+{
165+ auto value = getProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED);
166+ return value.toStringList();
167+}
168+
169+void AccountsService::markDemoEdgeCompleted(const QString &edge)
170+{
171+ auto currentList = demoEdgesCompleted();
172+ if (!currentList.contains(edge)) {
173+ setProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, currentList << edge);
174+ }
175+}
176+
153177bool AccountsService::enableLauncherWhileLocked() const
154178{
155179 auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED);
@@ -206,6 +230,48 @@ bool AccountsService::hereLicensePathValid() const
206230 return !value.toString().isNull();
207231}
208232
233+QString AccountsService::realName() const
234+{
235+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME);
236+ return value.toString();
237+}
238+
239+void AccountsService::setRealName(const QString &realName)
240+{
241+ setProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, realName);
242+}
243+
244+QString AccountsService::email() const
245+{
246+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL);
247+ return value.toString();
248+}
249+
250+void AccountsService::setEmail(const QString &email)
251+{
252+ setProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, email);
253+}
254+
255+QStringList AccountsService::keymaps() const
256+{
257+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES);
258+ QDBusArgument arg = value.value<QDBusArgument>();
259+ StringMapList maps = qdbus_cast<StringMapList>(arg);
260+ QStringList simplifiedMaps;
261+
262+ Q_FOREACH(const StringMap &map, maps) {
263+ Q_FOREACH(const QString &entry, map) {
264+ simplifiedMaps.append(entry);
265+ }
266+ }
267+
268+ if (!simplifiedMaps.isEmpty()) {
269+ return simplifiedMaps;
270+ }
271+
272+ return {QStringLiteral("us")};
273+}
274+
209275uint AccountsService::failedLogins() const
210276{
211277 return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();
plugins/AccountsService/AccountsService.h+21−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013, 2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors: Michael Terry <michael.terry@canonical.com>
1715 */
1816
1917#ifndef UNITY_ACCOUNTSSERVICE_H
@@ -22,6 +20,7 @@
2220#include <QHash>
2321#include <QObject>
2422#include <QString>
23+#include <QStringList>
2524#include <QVariant>
2625
2726class AccountsServiceDBusAdaptor;
@@ -39,6 +38,9 @@ class AccountsService: public QObject
3938 READ demoEdges
4039 WRITE setDemoEdges
4140 NOTIFY demoEdgesChanged)
41+ Q_PROPERTY (QStringList demoEdgesCompleted
42+ READ demoEdgesCompleted
43+ NOTIFY demoEdgesCompletedChanged)
4244 Q_PROPERTY (bool enableLauncherWhileLocked
4345 READ enableLauncherWhileLocked
4446 NOTIFY enableLauncherWhileLockedChanged)
@@ -68,6 +70,11 @@ class AccountsService: public QObject
6870 Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that
6971 READ hereLicensePathValid
7072 NOTIFY hereLicensePathChanged)
73+ Q_PROPERTY(QString realName READ realName WRITE setRealName NOTIFY realNameChanged)
74+ Q_PROPERTY(QString email READ email WRITE setEmail NOTIFY emailChanged)
75+ Q_PROPERTY(QStringList keymaps
76+ READ keymaps
77+ NOTIFY keymapsChanged)
7178
7279public:
7380 enum PasswordDisplayHint {
@@ -82,6 +89,8 @@ public:
8289 void setUser(const QString &user);
8390 bool demoEdges() const;
8491 void setDemoEdges(bool demoEdges);
92+ QStringList demoEdgesCompleted() const;
93+ Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);
8594 bool enableLauncherWhileLocked() const;
8695 bool enableIndicatorsWhileLocked() const;
8796 QString backgroundFile() const;
@@ -93,10 +102,16 @@ public:
93102 void setHereEnabled(bool enabled);
94103 QString hereLicensePath() const;
95104 bool hereLicensePathValid() const;
105+ QString realName() const;
106+ void setRealName(const QString &realName);
107+ QString email() const;
108+ void setEmail(const QString &email);
109+ QStringList keymaps() const;
96110
97111Q_SIGNALS:
98112 void userChanged();
99113 void demoEdgesChanged();
114+ void demoEdgesCompletedChanged();
100115 void enableLauncherWhileLockedChanged();
101116 void enableIndicatorsWhileLockedChanged();
102117 void backgroundFileChanged();
@@ -105,6 +120,9 @@ Q_SIGNALS:
105120 void failedLoginsChanged();
106121 void hereEnabledChanged();
107122 void hereLicensePathChanged();
123+ void realNameChanged();
124+ void emailChanged();
125+ void keymapsChanged();
108126
109127private Q_SLOTS:
110128 void onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
plugins/AccountsService/AccountsService.qmltypes+5
@@ -23,6 +23,7 @@ Module {
2323 }
2424 Property { name: "user"; type: "string" }
2525 Property { name: "demoEdges"; type: "bool" }
26+ Property { name: "demoEdgesCompleted"; type: "QStringList"; isReadonly: true }
2627 Property { name: "enableLauncherWhileLocked"; type: "bool"; isReadonly: true }
2728 Property { name: "enableIndicatorsWhileLocked"; type: "bool"; isReadonly: true }
2829 Property { name: "backgroundFile"; type: "string"; isReadonly: true }
@@ -32,5 +33,9 @@ Module {
3233 Property { name: "hereEnabled"; type: "bool" }
3334 Property { name: "hereLicensePath"; type: "string"; isReadonly: true }
3435 Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }
36+ Method {
37+ name: "markDemoEdgeCompleted"
38+ Parameter { name: "edge"; type: "string" }
39+ }
3540 }
3641}
plugins/AccountsService/com.canonical.unity.AccountsService.xml+5
@@ -14,6 +14,11 @@
1414 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
1515 </property>
1616
17+ <!-- List of tutorial pages that have been completed by the user -->
18+ <property name="DemoEdgesCompleted" type="as" access="readwrite">
19+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="[]"/>
20+ </property>
21+
1722 <property name="LauncherItems" type="aa{sv}" access="readwrite">
1823 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
1924 </property>
plugins/Cursor/Cursor.qmltypesnew file+78
@@ -0,0 +1,78 @@
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 Cursor 1.0 plugins'
8+
9+Module {
10+ Component {
11+ name: "MirMousePointerInterface"
12+ defaultProperty: "data"
13+ prototype: "QQuickItem"
14+ Property { name: "cursorName"; type: "string"; isReadonly: true }
15+ Property { name: "themeName"; type: "string"; isReadonly: true }
16+ Property { name: "hotspotX"; type: "double"; isReadonly: true }
17+ Property { name: "hotspotY"; type: "double"; isReadonly: true }
18+ Signal {
19+ name: "cursorNameChanged"
20+ Parameter { name: "name"; type: "string" }
21+ }
22+ Signal {
23+ name: "themeNameChanged"
24+ Parameter { name: "name"; type: "string" }
25+ }
26+ Signal {
27+ name: "hotspotXChanged"
28+ Parameter { name: "value"; type: "double" }
29+ }
30+ Signal {
31+ name: "hotspotYChanged"
32+ Parameter { name: "value"; type: "double" }
33+ }
34+ Method {
35+ name: "handleMouseEvent"
36+ Parameter { name: "timestamp"; type: "ulong" }
37+ Parameter { name: "movement"; type: "QPointF" }
38+ Parameter { name: "buttons"; type: "Qt::MouseButtons" }
39+ Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
40+ }
41+ Method {
42+ name: "handleWheelEvent"
43+ Parameter { name: "timestamp"; type: "ulong" }
44+ Parameter { name: "angleDelta"; type: "QPoint" }
45+ Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
46+ }
47+ }
48+ Component {
49+ name: "MousePointer"
50+ defaultProperty: "data"
51+ prototype: "MirMousePointerInterface"
52+ exports: ["Cursor/MousePointer 1.0"]
53+ exportMetaObjectRevisions: [0]
54+ Signal {
55+ name: "pushedLeftBoundary"
56+ Parameter { name: "amount"; type: "double" }
57+ Parameter { name: "buttons"; type: "Qt::MouseButtons" }
58+ }
59+ Signal {
60+ name: "pushedRightBoundary"
61+ Parameter { name: "amount"; type: "double" }
62+ Parameter { name: "buttons"; type: "Qt::MouseButtons" }
63+ }
64+ Method {
65+ name: "handleMouseEvent"
66+ Parameter { name: "timestamp"; type: "ulong" }
67+ Parameter { name: "movement"; type: "QPointF" }
68+ Parameter { name: "buttons"; type: "Qt::MouseButtons" }
69+ Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
70+ }
71+ Method {
72+ name: "handleWheelEvent"
73+ Parameter { name: "timestamp"; type: "ulong" }
74+ Parameter { name: "angleDelta"; type: "QPoint" }
75+ Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
76+ }
77+ }
78+}
plugins/Dash/ScopeStyle.qml+1−1
@@ -58,7 +58,7 @@ QtObject {
5858 readonly property url headerLogo: "logo" in d.headerStyle ? d.headerStyle["logo"] : ""
5959
6060 /// Background style for the header
61− readonly property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : "color:///#f5f5f5"
61+ readonly property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : "color:///#ffffff"
6262
6363 /// Foreground color for the header
6464 readonly property color headerForeground: "foreground-color" in d.headerStyle ? d.headerStyle["foreground-color"] : foreground
plugins/GlobalShortcut/GlobalShortcut.qmltypesnew file+31
@@ -0,0 +1,31 @@
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 GlobalShortcut 1.0 plugins'
8+
9+Module {
10+ Component {
11+ name: "GlobalShortcut"
12+ defaultProperty: "data"
13+ prototype: "QQuickItem"
14+ exports: ["GlobalShortcut/GlobalShortcut 1.0"]
15+ exportMetaObjectRevisions: [0]
16+ Property { name: "shortcut"; type: "QVariant" }
17+ Property { name: "active"; type: "bool" }
18+ Signal {
19+ name: "shortcutChanged"
20+ Parameter { name: "shortcut"; type: "QVariant" }
21+ }
22+ Signal {
23+ name: "triggered"
24+ Parameter { name: "shortcut"; type: "string" }
25+ }
26+ Signal {
27+ name: "activeChanged"
28+ Parameter { name: "active"; type: "bool" }
29+ }
30+ }
31+}
plugins/ScreenGrabber/screengrabber.cpp−2
@@ -46,12 +46,10 @@ ScreenGrabber::ScreenGrabber(QObject *parent)
4646
4747 QDir screenshotsDir;
4848 if (qEnvironmentVariableIsSet("UNITY_TESTING")) {
49− qDebug() << "Using test environment";
5049 QTemporaryDir tDir;
5150 tDir.setAutoRemove(false);
5251 screenshotsDir = tDir.path();
5352 } else {
54− qDebug() << "Using real environment";
5553 screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
5654 }
5755 screenshotsDir.mkpath(QStringLiteral("Screenshots"));
plugins/Ubuntu/Gestures/CMakeLists.txt+1
@@ -11,6 +11,7 @@ set(UbuntuGesturesQml_SOURCES
1111 PressedOutsideNotifier.cpp
1212 TouchDispatcher.cpp
1313 TouchGate.cpp
14+ TouchGestureArea.cpp
1415)
1516
1617add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+43−5
@@ -194,6 +194,26 @@ void DirectionalDragArea::setImmediateRecognition(bool enabled)
194194 }
195195}
196196
197+bool DirectionalDragArea::monitorOnly() const
198+{
199+ return d->monitorOnly;
200+}
201+
202+void DirectionalDragArea::setMonitorOnly(bool monitorOnly)
203+{
204+ if (d->monitorOnly != monitorOnly) {
205+ d->monitorOnly = monitorOnly;
206+
207+ if (monitorOnly && d->status == DirectionalDragAreaPrivate::Undecided) {
208+ TouchRegistry::instance()->removeCandidateOwnerForTouch(d->touchId, this);
209+ // We still wanna know when it ends for keeping the composition time window up-to-date
210+ TouchRegistry::instance()->addTouchWatcher(d->touchId, this);
211+ }
212+
213+ Q_EMIT monitorOnlyChanged(monitorOnly);
214+ }
215+}
216+
197217void DirectionalDragArea::removeTimeConstraints()
198218{
199219 d->setMaxTime(60 * 60 * 1000);
@@ -260,7 +280,10 @@ void DirectionalDragAreaPrivate::unownedTouchEvent(UnownedTouchEvent *unownedTou
260280 unownedTouchEvent_undecided(unownedTouchEvent);
261281 break;
262282 default: // Recognized:
263− // do nothing
283+ if (monitorOnly) {
284+ // Treat unowned event as if we owned it, but we are really just watching it
285+ touchEvent_recognized(event);
286+ }
264287 break;
265288 }
266289
@@ -311,7 +334,9 @@ void DirectionalDragAreaPrivate::unownedTouchEvent_undecided(UnownedTouchEvent *
311334 }
312335
313336 if (movedFarEnoughAlongGestureAxis()) {
314− TouchRegistry::instance()->requestTouchOwnership(touchId, q);
337+ if (!monitorOnly) {
338+ TouchRegistry::instance()->requestTouchOwnership(touchId, q);
339+ }
315340 setStatus(Recognized);
316341 setPublicPos(touchPoint->pos());
317342 setPublicScenePos(touchScenePos);
@@ -411,12 +436,21 @@ void DirectionalDragAreaPrivate::touchEvent_absent(QTouchEvent *event)
411436 if (recognitionIsDisabled()) {
412437 // Behave like a dumb TouchArea
413438 ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");
414− TouchRegistry::instance()->requestTouchOwnership(touchId, q);
415439 setStatus(Recognized);
416− event->accept();
440+ if (monitorOnly) {
441+ watchPressedTouchPoints(touchPoints);
442+ event->ignore();
443+ } else {
444+ TouchRegistry::instance()->requestTouchOwnership(touchId, q);
445+ event->accept();
446+ }
417447 } else {
418448 // just monitor the touch points for now.
419− TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
449+ if (monitorOnly) {
450+ watchPressedTouchPoints(touchPoints);
451+ } else {
452+ TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
453+ }
420454
421455 setStatus(Undecided);
422456 // Let the item below have it. We will monitor it and grab it later if a gesture
@@ -606,6 +640,9 @@ void DirectionalDragAreaPrivate::setStatus(Status newStatus)
606640 Q_EMIT q->pressedChanged(true);
607641 break;
608642 case Recognized:
643+ if (oldStatus == WaitingForTouch) { // for immediate recognition
644+ Q_EMIT q->pressedChanged(true);
645+ }
609646 Q_EMIT q->draggingChanged(true);
610647 break;
611648 default:
@@ -890,5 +927,6 @@ DirectionalDragAreaPrivate::DirectionalDragAreaPrivate(DirectionalDragArea *q)
890927 , recognitionTimer(nullptr)
891928 , timeSource(new RealTimeSource)
892929 , activeTouches(timeSource)
930+ , monitorOnly(false)
893931{
894932}
plugins/Ubuntu/Gestures/DirectionalDragArea.h+8
@@ -77,6 +77,10 @@ class UBUNTUGESTURESQML_EXPORT DirectionalDragArea : public QQuickItem {
7777 WRITE setImmediateRecognition
7878 NOTIFY immediateRecognitionChanged)
7979
80+ // Whether we are merely monitoring touch events (in which case, we don't
81+ // claim ownership of the touch).
82+ Q_PROPERTY(bool monitorOnly READ monitorOnly WRITE setMonitorOnly NOTIFY monitorOnlyChanged)
83+
8084 Q_ENUMS(Direction)
8185public:
8286 DirectionalDragArea(QQuickItem *parent = 0);
@@ -100,6 +104,9 @@ public:
100104 bool immediateRecognition() const;
101105 void setImmediateRecognition(bool enabled);
102106
107+ bool monitorOnly() const;
108+ void setMonitorOnly(bool monitorOnly);
109+
103110 bool event(QEvent *e) override;
104111
105112 /*
@@ -123,6 +130,7 @@ Q_SIGNALS:
123130 void touchSceneXChanged(qreal value);
124131 void touchSceneYChanged(qreal value);
125132 void immediateRecognitionChanged(bool value);
133+ void monitorOnlyChanged(bool value);
126134
127135protected:
128136 void touchEvent(QTouchEvent *event) override;
plugins/Ubuntu/Gestures/DirectionalDragArea_p.h+2
@@ -160,6 +160,8 @@ public:
160160
161161 ActiveTouchesInfo activeTouches;
162162
163+ bool monitorOnly;
164+
163165Q_SIGNALS:
164166 void statusChanged(Status value);
165167};
plugins/Ubuntu/Gestures/Gestures.qmltypes+86−45
@@ -34,7 +34,8 @@ Module {
3434 "Leftwards": 1,
3535 "Downwards": 2,
3636 "Upwards": 3,
37− "Horizontal": 4
37+ "Horizontal": 4,
38+ "Vertical": 5
3839 }
3940 }
4041 Method {
@@ -59,14 +60,6 @@ Module {
5960 prototype: "QQuickItem"
6061 exports: ["Ubuntu.Gestures/DirectionalDragArea 0.1"]
6162 exportMetaObjectRevisions: [0]
62− Enum {
63− name: "Status"
64− values: {
65− "WaitingForTouch": 0,
66− "Undecided": 1,
67− "Recognized": 2
68− }
69− }
7063 Property { name: "direction"; type: "Direction::Type" }
7164 Property { name: "distance"; type: "double"; isReadonly: true }
7265 Property { name: "sceneDistance"; type: "double"; isReadonly: true }
@@ -74,24 +67,19 @@ Module {
7467 Property { name: "touchY"; type: "double"; isReadonly: true }
7568 Property { name: "touchSceneX"; type: "double"; isReadonly: true }
7669 Property { name: "touchSceneY"; type: "double"; isReadonly: true }
77− Property { name: "status"; type: "Status"; isReadonly: true }
7870 Property { name: "dragging"; type: "bool"; isReadonly: true }
79− Property { name: "maxDeviation"; type: "double" }
80− Property { name: "wideningAngle"; type: "double" }
81− Property { name: "distanceThreshold"; type: "double" }
82− Property { name: "minSpeed"; type: "double" }
83− Property { name: "maxSilenceTime"; type: "int" }
84− Property { name: "compositionTime"; type: "int" }
71+ Property { name: "pressed"; type: "bool"; isReadonly: true }
72+ Property { name: "immediateRecognition"; type: "bool" }
8573 Signal {
8674 name: "directionChanged"
8775 Parameter { name: "direction"; type: "Direction::Type" }
8876 }
8977 Signal {
90− name: "statusChanged"
91− Parameter { name: "value"; type: "Status" }
78+ name: "draggingChanged"
79+ Parameter { name: "value"; type: "bool" }
9280 }
9381 Signal {
94− name: "draggingChanged"
82+ name: "pressedChanged"
9583 Parameter { name: "value"; type: "bool" }
9684 }
9785 Signal {
@@ -102,30 +90,6 @@ Module {
10290 name: "sceneDistanceChanged"
10391 Parameter { name: "value"; type: "double" }
10492 }
105− Signal {
106− name: "maxDeviationChanged"
107− Parameter { name: "value"; type: "double" }
108− }
109− Signal {
110− name: "wideningAngleChanged"
111− Parameter { name: "value"; type: "double" }
112− }
113− Signal {
114− name: "distanceThresholdChanged"
115− Parameter { name: "value"; type: "double" }
116− }
117− Signal {
118− name: "minSpeedChanged"
119− Parameter { name: "value"; type: "double" }
120− }
121− Signal {
122− name: "maxSilenceTimeChanged"
123− Parameter { name: "value"; type: "int" }
124− }
125− Signal {
126− name: "compositionTimeChanged"
127− Parameter { name: "value"; type: "int" }
128− }
12993 Signal {
13094 name: "touchXChanged"
13195 Parameter { name: "value"; type: "double" }
@@ -142,7 +106,35 @@ Module {
142106 name: "touchSceneYChanged"
143107 Parameter { name: "value"; type: "double" }
144108 }
145− Signal { name: "tapped" }
109+ Signal {
110+ name: "immediateRecognitionChanged"
111+ Parameter { name: "value"; type: "bool" }
112+ }
113+ Method { name: "removeTimeConstraints" }
114+ }
115+ Component {
116+ name: "FloatingFlickable"
117+ defaultProperty: "data"
118+ prototype: "QQuickItem"
119+ exports: ["Ubuntu.Gestures/FloatingFlickable 0.1"]
120+ exportMetaObjectRevisions: [0]
121+ Property { name: "contentWidth"; type: "double" }
122+ Property { name: "contentHeight"; type: "double" }
123+ Property { name: "contentX"; type: "double" }
124+ Property { name: "contentY"; type: "double" }
125+ Property { name: "direction"; type: "Direction::Type" }
126+ }
127+ Component {
128+ name: "GestureTouchPoint"
129+ prototype: "QObject"
130+ exports: ["Ubuntu.Gestures/GestureTouchPoint 0.1"]
131+ isCreatable: false
132+ exportMetaObjectRevisions: [0]
133+ Property { name: "pointId"; type: "int"; isReadonly: true }
134+ Property { name: "pressed"; type: "bool"; isReadonly: true }
135+ Property { name: "x"; type: "double"; isReadonly: true }
136+ Property { name: "y"; type: "double"; isReadonly: true }
137+ Property { name: "dragging"; type: "bool"; isReadonly: true }
146138 }
147139 Component {
148140 name: "PressedOutsideNotifier"
@@ -163,6 +155,55 @@ Module {
163155 name: "targetItemChanged"
164156 Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
165157 }
166− Signal { name: "pressed" }
158+ }
159+ Component {
160+ name: "TouchGestureArea"
161+ defaultProperty: "data"
162+ prototype: "QQuickItem"
163+ exports: ["Ubuntu.Gestures/TouchGestureArea 0.1"]
164+ exportMetaObjectRevisions: [0]
165+ Enum {
166+ name: "Status"
167+ values: {
168+ "WaitingForTouch": 0,
169+ "Undecided": 1,
170+ "Recognized": 2,
171+ "Rejected": 3
172+ }
173+ }
174+ Property { name: "touchPoints"; type: "GestureTouchPoint"; isList: true; isReadonly: true }
175+ Property { name: "dragging"; type: "bool"; isReadonly: true }
176+ Property { name: "minimumTouchPoints"; type: "int" }
177+ Property { name: "maximumTouchPoints"; type: "int" }
178+ Signal {
179+ name: "statusChanged"
180+ Parameter { name: "status"; type: "Status" }
181+ }
182+ Signal { name: "touchPointsUpdated" }
183+ Signal {
184+ name: "draggingChanged"
185+ Parameter { name: "dragging"; type: "bool" }
186+ }
187+ Signal {
188+ name: "minimumTouchPointsChanged"
189+ Parameter { name: "value"; type: "bool" }
190+ }
191+ Signal {
192+ name: "maximumTouchPointsChanged"
193+ Parameter { name: "value"; type: "bool" }
194+ }
195+ Signal {
196+ name: "pressed"
197+ Parameter { name: "points"; type: "QList<QObject*>" }
198+ }
199+ Signal {
200+ name: "released"
201+ Parameter { name: "points"; type: "QList<QObject*>" }
202+ }
203+ Signal {
204+ name: "updated"
205+ Parameter { name: "points"; type: "QList<QObject*>" }
206+ }
207+ Signal { name: "clicked" }
167208 }
168209}
plugins/Ubuntu/Gestures/TouchGestureArea.cppnew file+875
@@ -0,0 +1,875 @@
1+/*
2+ * Copyright (C) 2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "TouchGestureArea.h"
18+
19+// local
20+#include "TouchOwnershipEvent.h"
21+#include "TouchRegistry.h"
22+#include "UnownedTouchEvent.h"
23+
24+#include <QGuiApplication>
25+#include <QStyleHints>
26+#include <private/qquickwindow_p.h>
27+
28+#define TOUCHGESTUREAREA_DEBUG 0
29+
30+// TODO - understand more about why we lose touch event releases.
31+// Workaround for now is to monitor all the touch points from first touch till
32+// all have been released; no matter if we've rejected the gesture.
33+
34+namespace {
35+
36+struct InternalStatus {
37+ enum Status {
38+ WaitingForTouch,
39+ WaitingForMoreTouches,
40+ WaitingForOwnership, //Recognizing,
41+ Recognized,
42+ WaitingForRejection,
43+ Rejected
44+ };
45+};
46+
47+TouchGestureArea::Status internalStatusToGestureStatus(int internalStatus) {
48+ switch (internalStatus) {
49+ case InternalStatus::WaitingForTouch: return TouchGestureArea::WaitingForTouch;
50+ case InternalStatus::WaitingForMoreTouches: return TouchGestureArea::Undecided;
51+ case InternalStatus::WaitingForOwnership: return TouchGestureArea::Undecided;
52+ case InternalStatus::Recognized: return TouchGestureArea::Recognized;
53+ case InternalStatus::WaitingForRejection: return TouchGestureArea::Recognized;
54+ case InternalStatus::Rejected: return TouchGestureArea::Rejected;
55+ }
56+ return TouchGestureArea::WaitingForTouch;
57+}
58+
59+}
60+
61+#if TOUCHGESTUREAREA_DEBUG
62+#define tgaDebug(params) qDebug().nospace() << "[TGA(" << qPrintable(objectName()) << ")] " << params
63+#include "DebugHelpers.h"
64+
65+namespace {
66+
67+const char *statusToString(int status)
68+{
69+ if (status == InternalStatus::WaitingForTouch) {
70+ return "WaitingForTouch";
71+ } else if (status == InternalStatus::WaitingForMoreTouches) {
72+ return "WaitingForMoreTouches";
73+ } else if (status == InternalStatus::WaitingForOwnership) {
74+ return "WaitingForOwnership";
75+ } else if (status == InternalStatus::Rejected) {
76+ return "Rejected";
77+ } else if (status == InternalStatus::WaitingForRejection) {
78+ return "WaitingForRejection";
79+ } else {
80+ return "Recognized";
81+ }
82+ return "Unknown";
83+}
84+
85+QString touchState(Qt::TouchPointState state) {
86+ switch (state) {
87+ case Qt::TouchPointPressed: return "pressed";
88+ case Qt::TouchPointMoved: return "moved";
89+ case Qt::TouchPointStationary: return "stationary";
90+ case Qt::TouchPointReleased: return "released";
91+ break;
92+ }
93+ return "unknown";
94+}
95+
96+QString touchesString(const QList<QObject*> touches) {
97+ QString str;
98+ Q_FOREACH(QObject* object, touches) {
99+ GestureTouchPoint* touchPoint = qobject_cast<GestureTouchPoint*>(object);
100+ if (touchPoint) {
101+ str += QStringLiteral("[%1 @ (%2, %3)], ").arg(touchPoint->id())
102+ .arg(touchPoint->x())
103+ .arg(touchPoint->y());
104+ }
105+ }
106+ return str;
107+}
108+
109+QString touchEventString(QTouchEvent* event) {
110+ if (!event) return QString();
111+ QString str;
112+ Q_FOREACH(const auto& touchPoint, event->touchPoints()) {
113+ str += QStringLiteral("[%1:%2 @ (%3, %4)], ").arg(touchPoint.id())
114+ .arg(touchState(touchPoint.state()))
115+ .arg(touchPoint.pos().x())
116+ .arg(touchPoint.pos().y());
117+ }
118+ return str;
119+}
120+
121+
122+} // namespace {
123+#else // TOUCHGESTUREAREA_DEBUG
124+#define tgaDebug(params) ((void)0)
125+#endif // TOUCHGESTUREAREA_DEBUG
126+
127+TouchGestureArea::TouchGestureArea(QQuickItem* parent)
128+ : QQuickItem(parent)
129+ , m_status(WaitingForTouch)
130+ , m_recognitionTimer(nullptr)
131+ , m_dragging(false)
132+ , m_minimumTouchPoints(1)
133+ , m_maximumTouchPoints(INT_MAX)
134+ , m_recognitionPeriod(50)
135+ , m_releaseRejectPeriod(100)
136+{
137+ setRecognitionTimer(new UbuntuGestures::Timer(this));
138+ m_recognitionTimer->setInterval(m_recognitionPeriod);
139+ m_recognitionTimer->setSingleShot(true);
140+}
141+
142+TouchGestureArea::~TouchGestureArea()
143+{
144+ clearTouchLists();
145+ qDeleteAll(m_liveTouchPoints);
146+ m_liveTouchPoints.clear();
147+ qDeleteAll(m_cachedTouchPoints);
148+ m_cachedTouchPoints.clear();
149+}
150+
151+bool TouchGestureArea::event(QEvent *event)
152+{
153+ // Process unowned touch events (handles update/release for incomplete gestures)
154+ if (event->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
155+ touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(event));
156+ return true;
157+ } else if (event->type() == UnownedTouchEvent::unownedTouchEventType()) {
158+ unownedTouchEvent(static_cast<UnownedTouchEvent *>(event)->touchEvent());
159+ return true;
160+ }
161+
162+ return QQuickItem::event(event);
163+}
164+
165+void TouchGestureArea::touchOwnershipEvent(TouchOwnershipEvent *event)
166+{
167+ int touchId = event->touchId();
168+ tgaDebug("touchOwnershipEvent - id:" << touchId << ", gained:" << event->gained());
169+
170+ if (event->gained()) {
171+ grabTouchPoints(QVector<int>() << touchId);
172+ m_candidateTouches.remove(touchId);
173+ TouchRegistry::instance()->addTouchWatcher(touchId, this);
174+ m_watchedTouches.insert(touchId);
175+
176+ if (m_watchedTouches.count() >= m_minimumTouchPoints) {
177+ setInternalStatus(InternalStatus::Recognized);
178+ }
179+ } else {
180+ rejectGesture();
181+ }
182+}
183+
184+void TouchGestureArea::touchEvent(QTouchEvent *event)
185+{
186+ if (!isEnabled() || !isVisible()) {
187+ tgaDebug(QString("NOT ENABLED touchEvent(%1) %2").arg(statusToString(m_status)).arg(touchEventString(event)));
188+ QQuickItem::touchEvent(event);
189+ return;
190+ }
191+
192+ tgaDebug(QString("touchEvent(%1) %2").arg(statusToString(m_status)).arg(touchEventString(event)));
193+
194+ switch (m_status) {
195+ case InternalStatus::WaitingForTouch:
196+ touchEvent_waitingForTouch(event);
197+ break;
198+ case InternalStatus::WaitingForMoreTouches:
199+ touchEvent_waitingForMoreTouches(event);
200+ break;
201+ case InternalStatus::WaitingForOwnership:
202+ touchEvent_waitingForOwnership(event);
203+ break;
204+ case InternalStatus::Recognized:
205+ case InternalStatus::WaitingForRejection:
206+ touchEvent_recognized(event);
207+ break;
208+ case InternalStatus::Rejected:
209+ touchEvent_rejected(event);
210+ break;
211+ default: // Recognized:
212+ break;
213+ }
214+
215+ updateTouchPoints(event);
216+}
217+
218+void TouchGestureArea::touchEvent_waitingForTouch(QTouchEvent *event)
219+{
220+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
221+ Qt::TouchPointState touchPointState = touchPoint.state();
222+ int touchId = touchPoint.id();
223+
224+ if (touchPointState == Qt::TouchPointPressed) {
225+ if (!m_candidateTouches.contains(touchId)) {
226+ TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, this);
227+ m_candidateTouches.insert(touchId);
228+ }
229+ }
230+ }
231+ event->ignore();
232+
233+ if (m_candidateTouches.count() > m_maximumTouchPoints) {
234+ rejectGesture();
235+ } else if (m_candidateTouches.count() >= m_minimumTouchPoints) {
236+ setInternalStatus(InternalStatus::WaitingForOwnership);
237+
238+ QSet<int> tmpCandidates(m_candidateTouches);
239+ Q_FOREACH(int candidateTouchId, tmpCandidates) {
240+ TouchRegistry::instance()->requestTouchOwnership(candidateTouchId, this);
241+ }
242+ // We accept the gesture; so don't pass to lower items
243+ event->accept();
244+ } else if (m_candidateTouches.count() > 0) {
245+ setInternalStatus(InternalStatus::WaitingForMoreTouches);
246+ }
247+}
248+
249+void TouchGestureArea::touchEvent_waitingForMoreTouches(QTouchEvent *event)
250+{
251+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
252+ Qt::TouchPointState touchPointState = touchPoint.state();
253+ int touchId = touchPoint.id();
254+
255+ if (touchPointState == Qt::TouchPointPressed) {
256+ if (!m_candidateTouches.contains(touchId)) {
257+ TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, this);
258+ m_candidateTouches.insert(touchId);
259+ }
260+ }
261+ }
262+ event->ignore();
263+
264+ if (m_candidateTouches.count() > m_maximumTouchPoints) {
265+ rejectGesture();
266+ } else if (m_candidateTouches.count() >= m_minimumTouchPoints) {
267+ setInternalStatus(InternalStatus::WaitingForOwnership);
268+
269+ QSet<int> tmpCandidates(m_candidateTouches);
270+ Q_FOREACH(int candidateTouchId, tmpCandidates) {
271+ TouchRegistry::instance()->requestTouchOwnership(candidateTouchId, this);
272+ }
273+ // We accept the gesture; so don't pass to lower items
274+ event->accept();
275+ }
276+}
277+
278+void TouchGestureArea::touchEvent_waitingForOwnership(QTouchEvent *event)
279+{
280+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
281+ Qt::TouchPointState touchPointState = touchPoint.state();
282+ int touchId = touchPoint.id();
283+
284+ if (touchPointState == Qt::TouchPointPressed) {
285+ if (!m_watchedTouches.contains(touchId)) {
286+ TouchRegistry::instance()->addTouchWatcher(touchId, this);
287+ m_watchedTouches.insert(touchId);
288+ }
289+ }
290+ }
291+}
292+
293+void TouchGestureArea::touchEvent_recognized(QTouchEvent *event)
294+{
295+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
296+ Qt::TouchPointState touchPointState = touchPoint.state();
297+ int touchId = touchPoint.id();
298+
299+ if (touchPointState == Qt::TouchPointPressed) {
300+ if (!m_watchedTouches.contains(touchId)) {
301+ TouchRegistry::instance()->addTouchWatcher(touchId, this);
302+ m_watchedTouches.insert(touchId);
303+ }
304+ }
305+ }
306+
307+ if (m_watchedTouches.count() > m_maximumTouchPoints) {
308+ rejectGesture();
309+ } else if (m_watchedTouches.count() >= m_minimumTouchPoints &&
310+ m_status==InternalStatus::WaitingForRejection) {
311+ setInternalStatus(InternalStatus::Recognized);
312+ }
313+}
314+
315+void TouchGestureArea::touchEvent_rejected(QTouchEvent *event)
316+{
317+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
318+ Qt::TouchPointState touchPointState = touchPoint.state();
319+ int touchId = touchPoint.id();
320+
321+ if (touchPointState == Qt::TouchPointPressed) {
322+ if (!m_watchedTouches.contains(touchId)) {
323+ TouchRegistry::instance()->addTouchWatcher(touchId, this);
324+ m_watchedTouches.insert(touchId);
325+ }
326+ }
327+ }
328+}
329+
330+void TouchGestureArea::unownedTouchEvent(QTouchEvent *unownedTouchEvent)
331+{
332+ tgaDebug(QString("unownedTouchEvent(%1) %2").arg(statusToString(m_status)).arg(touchEventString(unownedTouchEvent)));
333+
334+ // Only monitor unowned touch events for presses/releases
335+ if ((unownedTouchEvent->touchPointStates() & (Qt::TouchPointPressed|Qt::TouchPointReleased)) == 0) {
336+ return;
337+ }
338+
339+ switch (m_status) {
340+ case InternalStatus::WaitingForTouch:
341+ break;
342+ case InternalStatus::WaitingForMoreTouches:
343+ unownedTouchEvent_waitingForMoreTouches(unownedTouchEvent);
344+ // do nothing
345+ break;
346+ case InternalStatus::WaitingForOwnership:
347+ unownedTouchEvent_waitingForOwnership(unownedTouchEvent);
348+ break;
349+ case InternalStatus::Recognized:
350+ case InternalStatus::WaitingForRejection:
351+ unownedTouchEvent_recognised(unownedTouchEvent);
352+ break;
353+ case InternalStatus::Rejected:
354+ unownedTouchEvent_rejected(unownedTouchEvent);
355+ break;
356+ default:
357+ break;
358+ }
359+
360+ updateTouchPoints(unownedTouchEvent);
361+}
362+
363+void TouchGestureArea::unownedTouchEvent_waitingForMoreTouches(QTouchEvent *event)
364+{
365+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
366+ Qt::TouchPointState touchPointState = touchPoint.state();
367+ int touchId = touchPoint.id();
368+
369+ if (touchPointState == Qt::TouchPointReleased) {
370+ if (m_candidateTouches.contains(touchId)) {
371+ TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, this);
372+ m_candidateTouches.remove(touchId);
373+ }
374+ }
375+ }
376+
377+ if (m_candidateTouches.count() == 0) {
378+ setInternalStatus(InternalStatus::WaitingForTouch);
379+ }
380+}
381+
382+void TouchGestureArea::unownedTouchEvent_waitingForOwnership(QTouchEvent *event)
383+{
384+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
385+ Qt::TouchPointState touchPointState = touchPoint.state();
386+ int touchId = touchPoint.id();
387+
388+ if (touchPointState == Qt::TouchPointReleased) {
389+ if (m_candidateTouches.contains(touchId)) {
390+ TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, this);
391+ m_candidateTouches.remove(touchId);
392+ }
393+ if (m_watchedTouches.contains(touchId)) {
394+ m_watchedTouches.remove(touchId);
395+ }
396+ }
397+ }
398+
399+ if (m_candidateTouches.count() + m_watchedTouches.count() == 0) {
400+ setInternalStatus(InternalStatus::WaitingForTouch);
401+ }
402+}
403+
404+void TouchGestureArea::unownedTouchEvent_recognised(QTouchEvent *event)
405+{
406+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
407+ Qt::TouchPointState touchPointState = touchPoint.state();
408+ int touchId = touchPoint.id();
409+
410+ if (touchPointState == Qt::TouchPointReleased) {
411+ if (m_watchedTouches.contains(touchId)) {
412+ m_watchedTouches.remove(touchId);
413+ }
414+ }
415+ }
416+
417+ if (m_watchedTouches.count() < m_minimumTouchPoints && m_status==InternalStatus::Recognized) {
418+ setInternalStatus(InternalStatus::WaitingForRejection);
419+ }
420+}
421+
422+void TouchGestureArea::unownedTouchEvent_rejected(QTouchEvent *event)
423+{
424+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
425+ Qt::TouchPointState touchPointState = touchPoint.state();
426+ int touchId = touchPoint.id();
427+
428+ if (touchPointState == Qt::TouchPointPressed) {
429+ if (!m_watchedTouches.contains(touchId)) {
430+ TouchRegistry::instance()->addTouchWatcher(touchId, this);
431+ m_watchedTouches.insert(touchId);
432+ }
433+ }
434+ if (touchPointState == Qt::TouchPointReleased) {
435+ if (m_watchedTouches.contains(touchId)) {
436+ m_watchedTouches.remove(touchId);
437+ }
438+ }
439+ }
440+
441+ if (m_watchedTouches.count() == 0) {
442+ setInternalStatus(InternalStatus::WaitingForTouch);
443+ }
444+}
445+
446+void TouchGestureArea::updateTouchPoints(QTouchEvent *touchEvent)
447+{
448+ bool added = false;
449+ bool ended = false;
450+ bool moved = false;
451+
452+ const int dragThreshold = qApp->styleHints()->startDragDistance();
453+ const int dragVelocity = qApp->styleHints()->startDragVelocity();
454+
455+ clearTouchLists();
456+ bool updateable = m_status != InternalStatus::WaitingForRejection;
457+
458+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, touchEvent->touchPoints()) {
459+ Qt::TouchPointState touchPointState = touchPoint.state();
460+ int touchId = touchPoint.id();
461+
462+ if (touchPointState & Qt::TouchPointReleased) {
463+ GestureTouchPoint* gtp = m_liveTouchPoints.value(touchId);
464+ if (!gtp) continue;
465+
466+ gtp->setPos(touchPoint.pos());
467+ gtp->setPressed(false);
468+ m_releasedTouchPoints.append(gtp);
469+ m_liveTouchPoints.remove(touchId);
470+
471+ if (updateable) {
472+ if (m_cachedTouchPoints.contains(touchId)) {
473+ GestureTouchPoint* cachedPoint = m_cachedTouchPoints.take(touchId);
474+ cachedPoint->deleteLater();
475+ }
476+ }
477+ ended = true;
478+ } else {
479+ GestureTouchPoint* gtp = m_liveTouchPoints.value(touchPoint.id(), nullptr);
480+ if (!gtp) {
481+ gtp = addTouchPoint(&touchPoint);
482+ m_pressedTouchPoints.append(gtp);
483+
484+ if (updateable) {
485+ if (m_cachedTouchPoints.contains(touchId)) {
486+ m_cachedTouchPoints[touchId]->setPos(touchPoint.pos());
487+ } else {
488+ m_cachedTouchPoints[touchId] = new GestureTouchPoint(*gtp);
489+ }
490+ }
491+ added = true;
492+ } else if (touchPointState & Qt::TouchPointMoved) {
493+ gtp->setPos(touchPoint.pos());
494+ m_movedTouchPoints.append(gtp);
495+ moved = true;
496+
497+ const QPointF &currentPos = touchPoint.scenePos();
498+ const QPointF &startPos = touchPoint.startScenePos();
499+
500+ bool overDragThreshold = false;
501+ bool supportsVelocity = (touchEvent->device()->capabilities() & QTouchDevice::Velocity) && dragVelocity;
502+ overDragThreshold |= qAbs(currentPos.x() - startPos.x()) > dragThreshold ||
503+ qAbs(currentPos.y() - startPos.y()) > dragThreshold;
504+ if (supportsVelocity) {
505+ QVector2D velocityVec = touchPoint.velocity();
506+ overDragThreshold |= qAbs(velocityVec.x()) > dragVelocity;
507+ overDragThreshold |= qAbs(velocityVec.y()) > dragVelocity;
508+ }
509+
510+ if (overDragThreshold) {
511+ gtp->setDragging(true);
512+ }
513+
514+ if (updateable) {
515+ if (m_cachedTouchPoints.contains(touchId)) {
516+ m_cachedTouchPoints[touchId]->setPos(touchPoint.pos());
517+ if (overDragThreshold) {
518+ m_cachedTouchPoints[touchId]->setDragging(true);
519+ }
520+ }
521+ }
522+ }
523+ }
524+ }
525+
526+ if (updateable) {
527+ if (!dragging() && m_status == InternalStatus::Recognized) {
528+ bool allWantDrag = !m_liveTouchPoints.isEmpty();
529+ Q_FOREACH(auto point, m_liveTouchPoints) {
530+ allWantDrag &= point->dragging();
531+ }
532+ // only dragging if all points are dragging.
533+ if (allWantDrag) {
534+ setDragging(true);
535+ }
536+ }
537+
538+ if (ended) {
539+ if (m_liveTouchPoints.isEmpty()) {
540+ if (!dragging()) Q_EMIT clicked();
541+ setDragging(false);
542+ }
543+ tgaDebug("Released " << touchesString(m_releasedTouchPoints));
544+ Q_EMIT released(m_releasedTouchPoints);
545+ }
546+ if (added) {
547+ tgaDebug("Pressed " << touchesString(m_pressedTouchPoints));
548+ Q_EMIT pressed(m_pressedTouchPoints);
549+ }
550+ if (moved) {
551+ tgaDebug("Updated " << touchesString(m_movedTouchPoints));
552+ Q_EMIT updated(m_movedTouchPoints);
553+ }
554+ if (added || ended || moved) {
555+ Q_EMIT touchPointsUpdated();
556+ }
557+ }
558+}
559+
560+void TouchGestureArea::clearTouchLists()
561+{
562+ Q_FOREACH (QObject *gtp, m_releasedTouchPoints) {
563+ delete gtp;
564+ }
565+ m_releasedTouchPoints.clear();
566+ m_pressedTouchPoints.clear();
567+ m_movedTouchPoints.clear();
568+}
569+
570+void TouchGestureArea::setInternalStatus(uint newStatus)
571+{
572+ if (newStatus == m_status)
573+ return;
574+
575+ uint oldStatus = m_status;
576+
577+ m_status = newStatus;
578+ Q_EMIT statusChanged(status());
579+
580+ if (oldStatus == InternalStatus::WaitingForMoreTouches || oldStatus == InternalStatus::WaitingForRejection) {
581+ m_recognitionTimer->stop();
582+ }
583+
584+ tgaDebug(statusToString(oldStatus) << " -> " << statusToString(newStatus));
585+
586+ switch (newStatus) {
587+ case InternalStatus::WaitingForTouch:
588+ resyncCachedTouchPoints();
589+ break;
590+ case InternalStatus::WaitingForMoreTouches:
591+ m_recognitionTimer->start(m_recognitionPeriod);
592+ break;
593+ case InternalStatus::Recognized:
594+ resyncCachedTouchPoints();
595+ break;
596+ case InternalStatus::WaitingForRejection:
597+ m_recognitionTimer->start(m_releaseRejectPeriod);
598+ break;
599+ case InternalStatus::Rejected:
600+ resyncCachedTouchPoints();
601+ break;
602+ default:
603+ // no-op
604+ break;
605+ }
606+}
607+
608+void TouchGestureArea::setRecognitionTimer(UbuntuGestures::AbstractTimer *timer)
609+{
610+ int interval = 0;
611+ bool timerWasRunning = false;
612+ bool wasSingleShot = false;
613+
614+ // can be null when called from the constructor
615+ if (m_recognitionTimer) {
616+ interval = m_recognitionTimer->interval();
617+ timerWasRunning = m_recognitionTimer->isRunning();
618+ if (m_recognitionTimer->parent() == this) {
619+ delete m_recognitionTimer;
620+ }
621+ }
622+
623+ m_recognitionTimer = timer;
624+ timer->setInterval(interval);
625+ timer->setSingleShot(wasSingleShot);
626+ connect(timer, SIGNAL(timeout()),
627+ this, SLOT(rejectGesture()));
628+ if (timerWasRunning) {
629+ m_recognitionTimer->start();
630+ }
631+}
632+
633+int TouchGestureArea::status() const
634+{
635+ return internalStatusToGestureStatus(m_status);
636+}
637+
638+bool TouchGestureArea::dragging() const
639+{
640+ return m_dragging;
641+}
642+
643+QQmlListProperty<GestureTouchPoint> TouchGestureArea::touchPoints()
644+{
645+ return QQmlListProperty<GestureTouchPoint>(this,
646+ 0,
647+ nullptr,
648+ TouchGestureArea::touchPoint_count,
649+ TouchGestureArea::touchPoint_at,
650+ 0);
651+}
652+
653+int TouchGestureArea::minimumTouchPoints() const
654+{
655+ return m_minimumTouchPoints;
656+}
657+
658+void TouchGestureArea::setMinimumTouchPoints(int value)
659+{
660+ if (m_minimumTouchPoints != value) {
661+ m_minimumTouchPoints = value;
662+ Q_EMIT minimumTouchPointsChanged(value);
663+ }
664+}
665+
666+int TouchGestureArea::maximumTouchPoints() const
667+{
668+ return m_maximumTouchPoints;
669+}
670+
671+void TouchGestureArea::setMaximumTouchPoints(int value)
672+{
673+ if (m_maximumTouchPoints != value) {
674+ m_maximumTouchPoints = value;
675+ Q_EMIT maximumTouchPointsChanged(value);
676+ }
677+}
678+
679+int TouchGestureArea::recognitionPeriod() const
680+{
681+ return m_recognitionPeriod;
682+}
683+
684+void TouchGestureArea::setRecognitionPeriod(int value)
685+{
686+ if (value != m_recognitionPeriod) {
687+ m_recognitionPeriod = value;
688+ Q_EMIT recognitionPeriodChanged(value);
689+ }
690+}
691+
692+int TouchGestureArea::releaseRejectPeriod() const
693+{
694+ return m_releaseRejectPeriod;
695+}
696+
697+void TouchGestureArea::setReleaseRejectPeriod(int value)
698+{
699+ if (value != m_releaseRejectPeriod) {
700+ m_releaseRejectPeriod = value;
701+ Q_EMIT releaseRejectPeriodChanged(value);
702+ }
703+}
704+
705+void TouchGestureArea::rejectGesture()
706+{
707+ tgaDebug("rejectGesture");
708+ ungrabTouchPoints();
709+
710+ Q_FOREACH(int touchId, m_candidateTouches) {
711+ TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, this);
712+ }
713+
714+ // Monitor the candidates
715+ Q_FOREACH(int touchId, m_candidateTouches) {
716+ TouchRegistry::instance()->addTouchWatcher(touchId, this);
717+ m_watchedTouches.insert(touchId);
718+ }
719+ m_candidateTouches.clear();
720+
721+ if (m_watchedTouches.count() == 0) {
722+ setInternalStatus(InternalStatus::WaitingForTouch);
723+ } else {
724+ setInternalStatus(InternalStatus::Rejected);
725+ }
726+}
727+
728+void TouchGestureArea::resyncCachedTouchPoints()
729+{
730+ clearTouchLists();
731+
732+ bool added = false;
733+ bool ended = false;
734+ bool moved = false;
735+ bool wantsDrag = false;
736+
737+ // list of deletes
738+ QMutableHashIterator<int, GestureTouchPoint*> removeIter(m_cachedTouchPoints);
739+ while(removeIter.hasNext()) {
740+ removeIter.next();
741+ if (!m_liveTouchPoints.contains(removeIter.key())) {
742+ m_releasedTouchPoints.append(removeIter.value());
743+ removeIter.remove();
744+ ended = true;
745+ }
746+ }
747+
748+ // list of adds/moves
749+ Q_FOREACH(GestureTouchPoint* touchPoint, m_liveTouchPoints) {
750+ if (m_cachedTouchPoints.contains(touchPoint->id())) {
751+ GestureTouchPoint* cachedPoint = m_cachedTouchPoints[touchPoint->id()];
752+
753+ if (*cachedPoint != *touchPoint) {
754+ *cachedPoint = *touchPoint;
755+ m_movedTouchPoints.append(touchPoint);
756+ moved = true;
757+ }
758+ } else {
759+ m_cachedTouchPoints.insert(touchPoint->id(), new GestureTouchPoint(*touchPoint));
760+ m_pressedTouchPoints.append(touchPoint);
761+ added = true;
762+ }
763+ }
764+
765+ if (wantsDrag && !dragging()) {
766+ setDragging(true);
767+ }
768+
769+ if (ended) {
770+ if (m_cachedTouchPoints.isEmpty()) {
771+ if (!dragging()) Q_EMIT clicked();
772+ setDragging(false);
773+ }
774+ tgaDebug("Cached Release " << touchesString(m_releasedTouchPoints));
775+ Q_EMIT released(m_releasedTouchPoints);
776+ }
777+ if (added) {
778+ tgaDebug("Cached Press " << touchesString(m_pressedTouchPoints));
779+ Q_EMIT pressed(m_pressedTouchPoints);
780+ }
781+ if (moved) {
782+ tgaDebug("Cached Update " << touchesString(m_movedTouchPoints));
783+ Q_EMIT updated(m_movedTouchPoints);
784+ }
785+ if (added || ended || moved) Q_EMIT touchPointsUpdated();
786+}
787+
788+int TouchGestureArea::touchPoint_count(QQmlListProperty<GestureTouchPoint> *list)
789+{
790+ TouchGestureArea *q = static_cast<TouchGestureArea*>(list->object);
791+ return q->m_cachedTouchPoints.count();
792+}
793+
794+GestureTouchPoint *TouchGestureArea::touchPoint_at(QQmlListProperty<GestureTouchPoint> *list, int index)
795+{
796+ TouchGestureArea *q = static_cast<TouchGestureArea*>(list->object);
797+ return (q->m_cachedTouchPoints.begin()+index).value();
798+}
799+
800+GestureTouchPoint* TouchGestureArea::addTouchPoint(QTouchEvent::TouchPoint const* tp)
801+{
802+ GestureTouchPoint* gtp = new GestureTouchPoint();
803+ gtp->setId(tp->id());
804+ gtp->setPressed(true);
805+ gtp->setPos(tp->pos());
806+ m_liveTouchPoints.insert(tp->id(), gtp);
807+ return gtp;
808+}
809+
810+void TouchGestureArea::itemChange(ItemChange change, const ItemChangeData &value)
811+{
812+ if (change == QQuickItem::ItemSceneChange) {
813+ if (value.window != nullptr) {
814+ value.window->installEventFilter(TouchRegistry::instance());
815+ }
816+ }
817+}
818+
819+void TouchGestureArea::setDragging(bool dragging)
820+{
821+ if (m_dragging == dragging)
822+ return;
823+
824+ tgaDebug("setDragging " << dragging);
825+
826+ m_dragging = dragging;
827+ Q_EMIT draggingChanged(m_dragging);
828+}
829+
830+void GestureTouchPoint::setId(int id)
831+{
832+ if (m_id == id)
833+ return;
834+ m_id = id;
835+ Q_EMIT idChanged();
836+}
837+
838+void GestureTouchPoint::setPressed(bool pressed)
839+{
840+ if (m_pressed == pressed)
841+ return;
842+ m_pressed = pressed;
843+ Q_EMIT pressedChanged();
844+}
845+
846+void GestureTouchPoint::setX(qreal x)
847+{
848+ if (m_x == x)
849+ return;
850+ m_x = x;
851+ Q_EMIT xChanged();
852+}
853+
854+void GestureTouchPoint::setY(qreal y)
855+{
856+ if (m_y == y)
857+ return;
858+ m_y = y;
859+ Q_EMIT yChanged();
860+}
861+
862+void GestureTouchPoint::setDragging(bool dragging)
863+{
864+ if (m_dragging == dragging)
865+ return;
866+
867+ m_dragging = dragging;
868+ Q_EMIT draggingChanged();
869+}
870+
871+void GestureTouchPoint::setPos(const QPointF &pos)
872+{
873+ setX(pos.x());
874+ setY(pos.y());
875+}
plugins/Ubuntu/Gestures/TouchGestureArea.hnew file+229
@@ -0,0 +1,229 @@
1+/*
2+ * Copyright (C) 2016 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 TOUCHGESTUREAREA_H
18+#define TOUCHGESTUREAREA_H
19+
20+#include "UbuntuGesturesQmlGlobal.h"
21+
22+#include <QQuickItem>
23+
24+// lib UbuntuGestures
25+#include <Timer.h>
26+
27+class TouchOwnershipEvent;
28+class UnownedTouchEvent;
29+
30+class GestureTouchPoint : public QObject
31+{
32+ Q_OBJECT
33+ Q_PROPERTY(int id READ id NOTIFY idChanged)
34+ Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
35+ Q_PROPERTY(qreal x READ x NOTIFY xChanged)
36+ Q_PROPERTY(qreal y READ y NOTIFY yChanged)
37+ Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
38+public:
39+ GestureTouchPoint()
40+ : m_id(-1)
41+ , m_pressed(false)
42+ , m_x(0)
43+ , m_y(0)
44+ , m_dragging(false)
45+ {
46+ }
47+
48+ GestureTouchPoint(const GestureTouchPoint& other)
49+ : QObject(nullptr)
50+ {
51+ operator=(other);
52+ }
53+
54+ int id() const { return m_id; }
55+ void setId(int id);
56+
57+ bool pressed() const { return m_pressed; }
58+ void setPressed(bool pressed);
59+
60+ qreal x() const { return m_x; }
61+ void setX(qreal x);
62+
63+ qreal y() const { return m_y; }
64+ void setY(qreal y);
65+
66+ bool dragging() const { return m_dragging; }
67+ void setDragging(bool dragging);
68+
69+ GestureTouchPoint& operator=(const GestureTouchPoint& rhs) {
70+ if (&rhs == this) return *this;
71+ m_id = rhs.m_id;
72+ m_pressed = rhs.m_pressed;
73+ m_x = rhs.m_x;
74+ m_y = rhs.m_y;
75+ m_dragging = rhs.m_dragging;
76+ return *this;
77+ }
78+
79+ bool operator=(const GestureTouchPoint& rhs) const {
80+ if (&rhs == this) return true;
81+ return m_id == rhs.m_id &&
82+ m_pressed == rhs.m_pressed &&
83+ m_x == rhs.m_x &&
84+ m_y == rhs.m_y &&
85+ m_dragging == rhs.m_dragging;
86+ }
87+ bool operator!=(const GestureTouchPoint& rhs) const { return !operator=(rhs); }
88+
89+ void setPos(const QPointF &pos);
90+
91+Q_SIGNALS:
92+ void idChanged();
93+ void pressedChanged();
94+ void xChanged();
95+ void yChanged();
96+ void draggingChanged();
97+
98+private:
99+ int m_id;
100+ bool m_pressed;
101+ qreal m_x;
102+ qreal m_y;
103+ bool m_dragging;
104+};
105+
106+/*
107+ An area that detects multi-finger gestures.
108+
109+ We can use this to detect gestures contstrained by a minimim and/or maximum number of touch points.
110+ This components uses the touch registry to apply for ownership of touch points.
111+ This way we can use the component in conjuntion with the directional drag area to compete for ownwership
112+ or gestures; unlike the MultiPointTouchArea.
113+ */
114+class UBUNTUGESTURESQML_EXPORT TouchGestureArea : public QQuickItem
115+{
116+ Q_OBJECT
117+ Q_ENUMS(Status)
118+
119+ Q_PROPERTY(int status READ status NOTIFY statusChanged)
120+ Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
121+ Q_PROPERTY(QQmlListProperty<GestureTouchPoint> touchPoints READ touchPoints NOTIFY touchPointsUpdated)
122+
123+ Q_PROPERTY(int minimumTouchPoints READ minimumTouchPoints WRITE setMinimumTouchPoints NOTIFY minimumTouchPointsChanged)
124+ Q_PROPERTY(int maximumTouchPoints READ maximumTouchPoints WRITE setMaximumTouchPoints NOTIFY maximumTouchPointsChanged)
125+
126+ // Time(ms) the component will wait for after receiving an initial touch to recognise a gesutre before rejecting it.
127+ Q_PROPERTY(int recognitionPeriod READ recognitionPeriod WRITE setRecognitionPeriod NOTIFY recognitionPeriodChanged)
128+ // Time(ms) the component will allow a recognised gesture to intermitently release a touch point before rejecting the gesture.
129+ // This is so we will not immediately reject a gesture if there are fleeting touch point releases while dragging.
130+ Q_PROPERTY(int releaseRejectPeriod READ releaseRejectPeriod WRITE setReleaseRejectPeriod NOTIFY releaseRejectPeriodChanged)
131+
132+public:
133+ // Describes the state of the touch gesture area.
134+ enum Status {
135+ WaitingForTouch,
136+ Undecided,
137+ Recognized,
138+ Rejected
139+ };
140+ TouchGestureArea(QQuickItem* parent = NULL);
141+ ~TouchGestureArea();
142+
143+ bool event(QEvent *e) override;
144+
145+ void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);
146+
147+ int status() const;
148+ bool dragging() const;
149+ QQmlListProperty<GestureTouchPoint> touchPoints();
150+
151+ int minimumTouchPoints() const;
152+ void setMinimumTouchPoints(int value);
153+
154+ int maximumTouchPoints() const;
155+ void setMaximumTouchPoints(int value);
156+
157+ int recognitionPeriod() const;
158+ void setRecognitionPeriod(int value);
159+
160+ int releaseRejectPeriod() const;
161+ void setReleaseRejectPeriod(int value);
162+
163+Q_SIGNALS:
164+ void statusChanged(int status);
165+
166+ void touchPointsUpdated();
167+ void draggingChanged(bool dragging);
168+ void minimumTouchPointsChanged(bool value);
169+ void maximumTouchPointsChanged(bool value);
170+ void recognitionPeriodChanged(bool value);
171+ void releaseRejectPeriodChanged(bool value);
172+
173+ void pressed(const QList<QObject*>& points);
174+ void released(const QList<QObject*>& points);
175+ void updated(const QList<QObject*>& points);
176+ void clicked();
177+
178+protected:
179+ void itemChange(ItemChange change, const ItemChangeData &value);
180+
181+private Q_SLOTS:
182+ void rejectGesture();
183+
184+private:
185+ void touchEvent(QTouchEvent *event) override;
186+ void touchEvent_waitingForTouch(QTouchEvent *event);
187+ void touchEvent_waitingForMoreTouches(QTouchEvent *event);
188+ void touchEvent_waitingForOwnership(QTouchEvent *event);
189+ void touchEvent_recognized(QTouchEvent *event);
190+ void touchEvent_rejected(QTouchEvent *event);
191+
192+ void unownedTouchEvent(QTouchEvent *unownedTouchEvent);
193+ void unownedTouchEvent_waitingForMoreTouches(QTouchEvent *unownedTouchEvent);
194+ void unownedTouchEvent_waitingForOwnership(QTouchEvent *unownedTouchEvent);
195+ void unownedTouchEvent_recognised(QTouchEvent *unownedTouchEvent);
196+ void unownedTouchEvent_rejected(QTouchEvent *unownedTouchEvent);
197+
198+ void touchOwnershipEvent(TouchOwnershipEvent *event);
199+ void updateTouchPoints(QTouchEvent *event);
200+
201+ GestureTouchPoint* addTouchPoint(const QTouchEvent::TouchPoint *tp);
202+ void clearTouchLists();
203+ void setDragging(bool dragging);
204+ void setInternalStatus(uint status);
205+ void resyncCachedTouchPoints();
206+
207+ static int touchPoint_count(QQmlListProperty<GestureTouchPoint> *list);
208+ static GestureTouchPoint* touchPoint_at(QQmlListProperty<GestureTouchPoint> *list, int index);
209+
210+ uint m_status;
211+ QSet<int> m_candidateTouches;
212+ QSet<int> m_watchedTouches;
213+ UbuntuGestures::AbstractTimer *m_recognitionTimer;
214+
215+ bool m_dragging;
216+ QHash<int, GestureTouchPoint*> m_liveTouchPoints;
217+ QHash<int, GestureTouchPoint*> m_cachedTouchPoints;
218+ QList<QObject*> m_releasedTouchPoints;
219+ QList<QObject*> m_pressedTouchPoints;
220+ QList<QObject*> m_movedTouchPoints;
221+ int m_minimumTouchPoints;
222+ int m_maximumTouchPoints;
223+ int m_recognitionPeriod;
224+ int m_releaseRejectPeriod;
225+};
226+
227+QML_DECLARE_TYPE(GestureTouchPoint)
228+
229+#endif // TOUCHGESTUREAREA_H
plugins/Ubuntu/Gestures/plugin.cpp+3
@@ -21,6 +21,7 @@
2121#include "FloatingFlickable.h"
2222#include "PressedOutsideNotifier.h"
2323#include "TouchGate.h"
24+#include "TouchGestureArea.h"
2425
2526#include <qqml.h>
2627
@@ -38,4 +39,6 @@ void UbuntuGesturesQmlPlugin::registerTypes(const char *uri)
3839 qmlRegisterType<FloatingFlickable>(uri, 0, 1, "FloatingFlickable");
3940 qmlRegisterType<PressedOutsideNotifier>(uri, 0, 1, "PressedOutsideNotifier");
4041 qmlRegisterType<TouchGate>(uri, 0, 1, "TouchGate");
42+ qmlRegisterType<TouchGestureArea>(uri, 0, 1, "TouchGestureArea");
43+ qmlRegisterUncreatableType<GestureTouchPoint>(uri, 0, 1, "GestureTouchPoint", "Cannot create GestureTouchPoints");
4144}
plugins/Unity/Indicators/indicatorsmanager.cpp+3−5
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Author: Nick Dedekind <nick.dedekind@canonical.com>
1715 */
1816
1917#include "indicatorsmanager.h"
@@ -286,12 +284,12 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
286284 new_indicator->init(data->m_fileInfo.fileName(), settings);
287285
288286 // convergence:
289− // 1) enable session indicator conditionally, typically when running in a multisession/multiuser environment
287+ // 1) enable session indicator
290288 // 2) on a PC, switch the battery/power indicator to desktop mode,
291289 // can't control brightness for now and phone-on-desktop broken (FIXME)
292290 //
293291 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
294− if ((new_indicator->identifier() == QStringLiteral("indicator-session") && m_platform.isMultiSession())
292+ if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
295293 || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
296294 new_indicator->setProfile(QStringLiteral("desktop"));
297295 } else {
plugins/Unity/InputInfo/InputInfo.qmltypesnew file+71
@@ -0,0 +1,71 @@
1+import QtQuick.tooling 1.1
2+
3+// This file describes the plugin-supplied types contained in the library.
4+// It is used for QML tooling purposes only.
5+//
6+// This file was auto-generated by:
7+// 'qmlplugindump -notrelocatable Unity.InputInfo 0.1 plugins'
8+
9+Module {
10+ Component {
11+ name: "QDeclarativeInputDeviceModel"
12+ prototype: "QAbstractListModel"
13+ exports: ["Unity.InputInfo/InputDeviceModel 0.1"]
14+ exportMetaObjectRevisions: [0]
15+ Property { name: "deviceFilter"; type: "QInputDevice::InputType" }
16+ Property { name: "count"; type: "int"; isReadonly: true }
17+ Signal {
18+ name: "deviceAdded"
19+ Parameter { name: "devicePath"; type: "string" }
20+ }
21+ Signal {
22+ name: "deviceRemoved"
23+ Parameter { name: "devicePath"; type: "string" }
24+ }
25+ Signal {
26+ name: "deviceFilterChanged"
27+ Parameter { name: "filter"; type: "QInputDevice::InputType" }
28+ }
29+ Method { name: "updateDeviceList" }
30+ Method {
31+ name: "indexOf"
32+ type: "int"
33+ Parameter { name: "devicePath"; type: "string" }
34+ }
35+ Method {
36+ name: "get"
37+ type: "QInputDevice*"
38+ Parameter { name: "index"; type: "int" }
39+ }
40+ }
41+ Component {
42+ name: "QInputDevice"
43+ prototype: "QObject"
44+ exports: ["Unity.InputInfo/InputInfo 0.1"]
45+ exportMetaObjectRevisions: [0]
46+ Enum {
47+ name: "InputType"
48+ values: {
49+ "Unknown": 0,
50+ "Button": 1,
51+ "Mouse": 2,
52+ "TouchPad": 4,
53+ "TouchScreen": 8,
54+ "Keyboard": 16,
55+ "Switch": 32
56+ }
57+ }
58+ Enum {
59+ name: "InputTypeFlags"
60+ values: {
61+ "Unknown": 0,
62+ "Button": 1,
63+ "Mouse": 2,
64+ "TouchPad": 4,
65+ "TouchScreen": 8,
66+ "Keyboard": 16,
67+ "Switch": 32
68+ }
69+ }
70+ }
71+}
plugins/Unity/Platform/Platform.qmltypesnew file+20
@@ -0,0 +1,20 @@
1+import QtQuick.tooling 1.1
2+
3+// This file describes the plugin-supplied types contained in the library.
4+// It is used for QML tooling purposes only.
5+//
6+// This file was auto-generated by:
7+// 'qmlplugindump -notrelocatable Unity.Platform 1.0 plugins'
8+
9+Module {
10+ Component {
11+ name: "Platform"
12+ prototype: "QObject"
13+ exports: ["Unity.Platform/Platform 1.0"]
14+ isCreatable: false
15+ isSingleton: true
16+ exportMetaObjectRevisions: [0]
17+ Property { name: "chassis"; type: "string"; isReadonly: true }
18+ Property { name: "isPC"; type: "bool"; isReadonly: true }
19+ }
20+}
plugins/Unity/Session/dbusunitysessionservice.cpp+4−1
@@ -336,6 +336,9 @@ void DBusUnitySessionService::PromptLock()
336336
337337void DBusUnitySessionService::Lock()
338338{
339+ // signal u8 to show the lockscreen/greeter
340+ PromptLock();
341+
339342 // lock the session using the org.freedesktop.DisplayManager system DBUS service
340343 const QString sessionPath = QString::fromLocal8Bit(qgetenv("XDG_SESSION_PATH"));
341344 QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DisplayManager"),
@@ -348,7 +351,7 @@ void DBusUnitySessionService::Lock()
348351 connect(watcher, &QDBusPendingCallWatcher::finished,
349352 this, [this](QDBusPendingCallWatcher* watcher) {
350353
351− QDBusPendingReply<QVariant> reply = *watcher;
354+ QDBusPendingReply<void> reply = *watcher;
352355 watcher->deleteLater();
353356 if (reply.isError()) {
354357 qWarning() << "Lock call failed" << reply.error().message();
plugins/Utils/CMakeLists.txt+2−1
@@ -17,13 +17,14 @@ set(QMLPLUGIN_SRC
1717 unitysortfilterproxymodelqml.cpp
1818 Timer.cpp
1919 unitymenumodelpaths.cpp
20− windowkeysfilter.cpp
20+ windowinputfilter.cpp
2121 windowscreenshotprovider.cpp
2222 easingcurve.cpp
2323 windowstatestorage.cpp
2424 timezoneFormatter.cpp
2525 inputeventgenerator.cpp
2626 deviceconfigparser.cpp
27+ globalfunctions.cpp
2728 plugin.cpp
2829 )
2930
plugins/Utils/Utils.qmltypes+2−2
@@ -147,10 +147,10 @@ Module {
147147 }
148148 }
149149 Component {
150− name: "WindowKeysFilter"
150+ name: "WindowInputFilter"
151151 defaultProperty: "data"
152152 prototype: "QQuickItem"
153− exports: ["Utils/WindowKeysFilter 0.1"]
153+ exports: ["Utils/WindowInputFilter 0.1"]
154154 exportMetaObjectRevisions: [0]
155155 }
156156 Component {
plugins/Utils/globalfunctions.cppnew file+56
@@ -0,0 +1,56 @@
1+/*
2+ * Copyright 2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+*/
16+
17+#include "globalfunctions.h"
18+
19+#pragma GCC diagnostic push
20+#pragma GCC diagnostic ignored "-pedantic"
21+#include <private/qquickitem_p.h>
22+#pragma GCC diagnostic pop
23+#include <QQmlEngine>
24+
25+GlobalFunctions::GlobalFunctions(QObject *parent)
26+ : QObject(parent)
27+{
28+}
29+
30+QQuickItem *GlobalFunctions::itemAt(QQuickItem* parent, int x, int y, QJSValue matcher)
31+{
32+ if (!parent) return nullptr;
33+ QList<QQuickItem *> children = QQuickItemPrivate::get(parent)->paintOrderChildItems();
34+
35+ for (int i = children.count() - 1; i >= 0; --i) {
36+ QQuickItem *child = children.at(i);
37+
38+ // Map coordinates to the child element's coordinate space
39+ QPointF point = parent->mapToItem(child, QPointF(x, y));
40+ if (child->isVisible() && point.x() >= 0
41+ && child->width() >= point.x()
42+ && point.y() >= 0
43+ && child->height() >= point.y()) {
44+ if (!matcher.isCallable()) return child;
45+
46+ QQmlEngine* engine = qmlEngine(child);
47+ if (!engine) return child;
48+
49+ QJSValue newObj = engine->newQObject(child);
50+ if (matcher.call(QJSValueList() << newObj).toBool()) {
51+ return child;
52+ }
53+ }
54+ }
55+ return nullptr;
56+}
plugins/Utils/globalfunctions.hnew file+42
@@ -0,0 +1,42 @@
1+/*
2+ * Copyright 2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+*/
16+
17+#ifndef GLOBALFUNCTIONS_H
18+#define GLOBALFUNCTIONS_H
19+
20+#include <QObject>
21+#include <QJSValue>
22+class QQuickItem;
23+
24+/**
25+ * @brief The GlobalFunctions class
26+ *
27+ * This singleton class exposes utility functions to QML
28+ *
29+ */
30+class GlobalFunctions : public QObject
31+{
32+ Q_OBJECT
33+public:
34+ explicit GlobalFunctions(QObject *parent = 0);
35+
36+ static Q_INVOKABLE QQuickItem* itemAt(QQuickItem* parent,
37+ int x,
38+ int y,
39+ QJSValue matcher);
40+};
41+
42+#endif // GLOBALFUNCTIONS_H
plugins/Utils/plugin.cpp+11−2
@@ -30,7 +30,7 @@
3030#include "qlimitproxymodelqml.h"
3131#include "unitysortfilterproxymodelqml.h"
3232#include "unitymenumodelpaths.h"
33−#include "windowkeysfilter.h"
33+#include "windowinputfilter.h"
3434#include "windowscreenshotprovider.h"
3535#include "windowstatestorage.h"
3636#include "constants.h"
@@ -38,6 +38,7 @@
3838#include "applicationsfiltermodel.h"
3939#include "inputeventgenerator.h"
4040#include "deviceconfigparser.h"
41+#include "globalfunctions.h"
4142
4243static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
4344{
@@ -53,6 +54,13 @@ static QObject *createConstants(QQmlEngine *engine, QJSEngine *scriptEngine)
5354 return new Constants();
5455}
5556
57+static QObject *createGlobalFunctions(QQmlEngine *engine, QJSEngine *scriptEngine)
58+{
59+ Q_UNUSED(engine)
60+ Q_UNUSED(scriptEngine)
61+ return new GlobalFunctions();
62+}
63+
5664void UtilsPlugin::registerTypes(const char *uri)
5765{
5866 Q_ASSERT(uri == QLatin1String("Utils"));
@@ -61,7 +69,7 @@ void UtilsPlugin::registerTypes(const char *uri)
6169 qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
6270 qmlRegisterType<UnitySortFilterProxyModelQML>(uri, 0, 1, "UnitySortFilterProxyModel");
6371 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
64− qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");
72+ qmlRegisterType<WindowInputFilter>(uri, 0, 1, "WindowInputFilter");
6573 qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
6674 qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "WindowStateStorage", createWindowStateStorage);
6775 qmlRegisterType<InputWatcher>(uri, 0, 1, "InputWatcher");
@@ -72,6 +80,7 @@ void UtilsPlugin::registerTypes(const char *uri)
7280 qmlRegisterType<ApplicationsFilterModel>(uri, 0, 1, "ApplicationsFilterModel");
7381 qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
7482 qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
83+ qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
7584}
7685
7786void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
plugins/Utils/timezoneFormatter.cpp+10
@@ -33,3 +33,13 @@ QString TimezoneFormatter::currentTimeInTimezone(const QVariant &tzId) const
3333 }
3434 return QString();
3535}
36+
37+QString TimezoneFormatter::currentTimeInTimezoneWithAbbrev(const QVariant &tzId) const
38+{
39+ QTimeZone tz(tzId.toByteArray());
40+ if (tz.isValid()) {
41+ const QDateTime now = QDateTime::currentDateTime().toTimeZone(tz);
42+ return QStringLiteral("%1 %2").arg(now.time().toString(QStringLiteral("h:mm"))).arg(tz.abbreviation(now));
43+ }
44+ return QString();
45+}
plugins/Utils/timezoneFormatter.h+1
@@ -27,6 +27,7 @@ public:
2727 ~TimezoneFormatter() = default;
2828
2929 Q_INVOKABLE QString currentTimeInTimezone(const QVariant &tzId) const;
30+ Q_INVOKABLE QString currentTimeInTimezoneWithAbbrev(const QVariant &tzId) const;
3031};
3132
3233#endif
plugins/Utils/windowkeysfilter.cpp → plugins/Utils/windowinputfilter.cpprenamed+14−16
@@ -16,36 +16,34 @@
1616 * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
1717 */
1818
19−#include "windowkeysfilter.h"
19+#include "windowinputfilter.h"
2020
2121#include <QQuickWindow>
2222
23−WindowKeysFilter::WindowKeysFilter(QQuickItem *parent)
23+WindowInputFilter::WindowInputFilter(QQuickItem *parent)
2424 : QQuickItem(parent),
25− m_currentEventTimestamp(0)
25+ m_lastInputTimestamp(0)
2626{
2727 connect(this, &QQuickItem::windowChanged,
28− this, &WindowKeysFilter::setupFilterOnWindow);
28+ this, &WindowInputFilter::setupFilterOnWindow);
2929}
3030
31−bool WindowKeysFilter::eventFilter(QObject *watched, QEvent *event)
31+bool WindowInputFilter::eventFilter(QObject *watched, QEvent *event)
3232{
3333 Q_ASSERT(!m_filteredWindow.isNull());
3434 Q_ASSERT(watched == static_cast<QObject*>(m_filteredWindow.data()));
3535 Q_UNUSED(watched);
3636
37+ QInputEvent *inputEvent = dynamic_cast<QInputEvent*>(event);
38+ if (inputEvent) {
39+ m_lastInputTimestamp = inputEvent->timestamp();
40+ Q_EMIT lastInputTimestampChanged();
41+ }
42+
3743 if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
3844 // Let QML see this event and decide if it does not want it
3945 event->accept();
40−
41− m_currentEventTimestamp = static_cast<QInputEvent*>(event)->timestamp();
42− Q_EMIT currentEventTimestampChanged();
43−
4446 QCoreApplication::sendEvent(this, event);
45−
46− m_currentEventTimestamp = 0;
47− Q_EMIT currentEventTimestampChanged();
48−
4947 return event->isAccepted();
5048 } else {
5149 // Not interested
@@ -53,7 +51,7 @@ bool WindowKeysFilter::eventFilter(QObject *watched, QEvent *event)
5351 }
5452}
5553
56−void WindowKeysFilter::setupFilterOnWindow(QQuickWindow *window)
54+void WindowInputFilter::setupFilterOnWindow(QQuickWindow *window)
5755{
5856 if (!m_filteredWindow.isNull()) {
5957 m_filteredWindow->removeEventFilter(this);
@@ -66,7 +64,7 @@ void WindowKeysFilter::setupFilterOnWindow(QQuickWindow *window)
6664 }
6765}
6866
69−ulong WindowKeysFilter::currentEventTimestamp() const
67+ulong WindowInputFilter::lastInputTimestamp() const
7068{
71− return m_currentEventTimestamp;
69+ return m_lastInputTimestamp;
7270}
plugins/Utils/windowkeysfilter.h → plugins/Utils/windowinputfilter.hrenamed+11−11
@@ -16,8 +16,8 @@
1616 * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
1717 */
1818
19−#ifndef UNITY_WINDOWKEYSFILTER_H
20−#define UNITY_WINDOWKEYSFILTER_H
19+#ifndef UNITY_WINDOWINPUTFILTER_H
20+#define UNITY_WINDOWINPUTFILTER_H
2121
2222#include <QQuickItem>
2323#include <QPointer>
@@ -29,30 +29,30 @@
2929 accepted ones will be filtered out. Events are accepted by default, so make sure you reject
3030 the keys you're not interested in.
3131
32− If more than one WindowKeysFilter exist in the same QML scene (and thus in the same QQuickWindow)
32+ If more than one WindowInputFilter exist in the same QML scene (and thus in the same QQuickWindow)
3333 they will be called in the order of creation, which can be tricky to assess. So the best practice
34− is to have at most one WindowKeysFilter per QML scene.
34+ is to have at most one WindowInputFilter per QML scene.
3535 */
36−class WindowKeysFilter : public QQuickItem
36+class WindowInputFilter : public QQuickItem
3737{
3838 Q_OBJECT
39− Q_PROPERTY(ulong currentEventTimestamp READ currentEventTimestamp NOTIFY currentEventTimestampChanged)
39+ Q_PROPERTY(ulong lastInputTimestamp READ lastInputTimestamp NOTIFY lastInputTimestampChanged)
4040public:
41− WindowKeysFilter(QQuickItem *parent = 0);
41+ WindowInputFilter(QQuickItem *parent = 0);
4242
4343 bool eventFilter(QObject *watched, QEvent *event) override;
4444
45− ulong currentEventTimestamp() const;
45+ ulong lastInputTimestamp() const;
4646
4747Q_SIGNALS:
48− void currentEventTimestampChanged();
48+ void lastInputTimestampChanged();
4949
5050private Q_SLOTS:
5151 void setupFilterOnWindow(QQuickWindow *window);
5252
5353private:
5454 QPointer<QQuickWindow> m_filteredWindow;
55− ulong m_currentEventTimestamp;
55+ ulong m_lastInputTimestamp;
5656};
5757
58−#endif // UNITY_WINDOWKEYSFILTER_H
58+#endif // UNITY_WINDOWINPUTFILTER_H
plugins/Utils/windowstatestorage.cpp+36−4
@@ -23,9 +23,14 @@
2323#include <QSqlError>
2424#include <QSqlResult>
2525#include <QRect>
26+#include <unity/shell/application/ApplicationInfoInterface.h>
2627
2728QMutex WindowStateStorage::s_mutex;
2829
30+inline QString sanitiseString(QString string) {
31+ return string.remove("\"").remove("'").remove("\\");
32+}
33+
2934WindowStateStorage::WindowStateStorage(QObject *parent):
3035 QObject(parent)
3136{
@@ -50,7 +55,7 @@ WindowStateStorage::~WindowStateStorage()
5055void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::WindowState state)
5156{
5257 const QString queryString = QStringLiteral("INSERT OR REPLACE INTO state (windowId, state) values ('%1', '%2');")
53− .arg(windowId)
58+ .arg(sanitiseString(windowId))
5459 .arg((int)state);
5560
5661 saveValue(queryString);
@@ -59,7 +64,7 @@ void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::
5964WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const
6065{
6166 const QString queryString = QStringLiteral("SELECT * FROM state WHERE windowId = '%1';")
62− .arg(windowId);
67+ .arg(sanitiseString(windowId));
6368
6469 QSqlQuery query = getValue(queryString);
6570
@@ -72,7 +77,7 @@ WindowStateStorage::WindowState WindowStateStorage::getState(const QString &wind
7277void WindowStateStorage::saveGeometry(const QString &windowId, const QRect rect)
7378{
7479 const QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")
75− .arg(windowId)
80+ .arg(sanitiseString(windowId))
7681 .arg(rect.x())
7782 .arg(rect.y())
7883 .arg(rect.width())
@@ -81,6 +86,28 @@ void WindowStateStorage::saveGeometry(const QString &windowId, const QRect rect)
8186 saveValue(queryString);
8287}
8388
89+void WindowStateStorage::saveStage(const QString &appId, int stage)
90+{
91+ const QString queryString = QStringLiteral("INSERT OR REPLACE INTO stage (appId, stage) values ('%1', '%2');")
92+ .arg(sanitiseString(appId))
93+ .arg((int)stage);
94+
95+ saveValue(queryString);
96+}
97+
98+int WindowStateStorage::getStage(const QString &appId) const
99+{
100+ const QString queryString = QStringLiteral("SELECT * FROM stage WHERE appId = '%1';")
101+ .arg(sanitiseString(appId));
102+
103+ QSqlQuery query = getValue(queryString);
104+
105+ if (!query.first()) {
106+ return unity::shell::application::ApplicationInfoInterface::MainStage;
107+ }
108+ return query.value("stage").toInt();
109+}
110+
84111void WindowStateStorage::executeAsyncQuery(const QString &queryString)
85112{
86113 QMutexLocker l(&s_mutex);
@@ -97,7 +124,7 @@ void WindowStateStorage::executeAsyncQuery(const QString &queryString)
97124QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect defaultValue) const
98125{
99126 QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")
100− .arg(windowId);
127+ .arg(sanitiseString(windowId));
101128
102129 QSqlQuery query = getValue(queryString);
103130
@@ -124,6 +151,11 @@ void WindowStateStorage::initdb()
124151 QSqlQuery query;
125152 query.exec(QStringLiteral("CREATE TABLE state(windowId TEXT UNIQUE, state INTEGER);"));
126153 }
154+
155+ if (!m_db.tables().contains(QStringLiteral("stage"))) {
156+ QSqlQuery query;
157+ query.exec(QStringLiteral("CREATE TABLE stage(appId TEXT UNIQUE, stage INTEGER);"));
158+ }
127159}
128160
129161void WindowStateStorage::saveValue(const QString &queryString)
plugins/Utils/windowstatestorage.h+3
@@ -38,6 +38,9 @@ public:
3838 Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect rect);
3939 Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect defaultValue) const;
4040
41+ Q_INVOKABLE void saveStage(const QString &appId, int stage);
42+ Q_INVOKABLE int getStage(const QString &appId) const;
43+
4144private:
4245 void initdb();
4346
plugins/Wizard/CMakeLists.txt+7−1
@@ -1,10 +1,16 @@
1+include_directories(${GLIB_INCLUDE_DIRS} ${GEONAMES_INCLUDE_DIRS})
2+
13add_library(Wizard-qml MODULE
24 plugin.cpp
35 PageList.cpp
46 System.cpp
7+ LocalePlugin.cpp
8+ timezonemodel.cpp
9+ Status.cpp
510)
611
7−qt5_use_modules(Wizard-qml DBus Qml)
12+qt5_use_modules(Wizard-qml DBus Qml Concurrent)
13+target_link_libraries(Wizard-qml ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})
814add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
915
1016set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
plugins/Wizard/LocalePlugin.cppnew file+291
@@ -0,0 +1,291 @@
1+/*
2+ * Copyright (C) 2015 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 <QLocale>
18+#include <QStringList>
19+
20+#include <libintl.h>
21+
22+#include "LocalePlugin.h"
23+
24+class LocalePrivate {
25+public:
26+ LocalePrivate() {
27+ m_mccCodes = QHash<int, QString>
28+ ({{202,"gr"},
29+ {204,"nl"},
30+ {206,"be"},
31+ {208,"fr"},
32+ {212,"mc"},
33+ {213,"ad"},
34+ {214,"es"},
35+ {216,"hu"},
36+ {218,"ba"},
37+ {219,"hr"},
38+ {220,"rs"},
39+ {222,"it"},
40+ {226,"ro"},
41+ {228,"ch"},
42+ {230,"cz"},
43+ {231,"sk"},
44+ {232,"at"},
45+ {234,"gb"},
46+ {235,"gb"},
47+ {238,"dk"},
48+ {240,"se"},
49+ {242,"no"},
50+ {244,"fi"},
51+ {246,"lt"},
52+ {247,"lv"},
53+ {248,"ee"},
54+ {250,"ru"},
55+ {255,"ua"},
56+ {257,"by"},
57+ {259,"md"},
58+ {260,"pl"},
59+ {262,"de"},
60+ {266,"gi"},
61+ {268,"pt"},
62+ {270,"lu"},
63+ {272,"ie"},
64+ {274,"is"},
65+ {276,"al"},
66+ {278,"mt"},
67+ {280,"cy"},
68+ {282,"ge"},
69+ {283,"am"},
70+ {284,"bg"},
71+ {286,"tr"},
72+ {288,"fo"},
73+ {289,"ge"},
74+ {290,"gl"},
75+ {292,"sm"},
76+ {293,"si"},
77+ {294,"mk"},
78+ {295,"li"},
79+ {297,"me"},
80+ {302,"ca"},
81+ {308,"pm"},
82+ {310,"gu"},
83+ {310,"us"},
84+ {311,"gu"},
85+ {311,"us"},
86+ {312,"us"},
87+ {316,"us"},
88+ {330,"pr"},
89+ {334,"mx"},
90+ {338,"jm"},
91+ {340,"fg"},
92+ {340,"gp"},
93+ {340,"mq"},
94+ {342,"bb"},
95+ {344,"ag"},
96+ {346,"ky"},
97+ {348,"vg"},
98+ {350,"bm"},
99+ {352,"gd"},
100+ {354,"ms"},
101+ {356,"kn"},
102+ {358,"lc"},
103+ {360,"vc"},
104+ {362,"an"},
105+ {362,"cw"},
106+ {363,"aw"},
107+ {364,"bs"},
108+ {365,"ai"},
109+ {366,"dm"},
110+ {368,"cu"},
111+ {370,"do"},
112+ {372,"ht"},
113+ {374,"tt"},
114+ {376,"tc"},
115+ {376,"vi"},
116+ {400,"az"},
117+ {401,"kz"},
118+ {402,"bt"},
119+ {404,"in"},
120+ {405,"in"},
121+ {410,"pk"},
122+ {412,"af"},
123+ {413,"lk"},
124+ {414,"mm"},
125+ {415,"lb"},
126+ {416,"jo"},
127+ {417,"sy"},
128+ {418,"iq"},
129+ {419,"kw"},
130+ {420,"sa"},
131+ {421,"ye"},
132+ {422,"om"},
133+ {424,"ae"},
134+ {425,"il"},
135+ {425,"ps"},
136+ {426,"bh"},
137+ {427,"qa"},
138+ {428,"mn"},
139+ {429,"np"},
140+ {430,"ae"},
141+ {431,"ae"},
142+ {432,"ir"},
143+ {434,"uz"},
144+ {436,"tk"},
145+ {437,"kg"},
146+ {438,"tm"},
147+ {440,"jp"},
148+ {441,"jp"},
149+ {450,"kr"},
150+ {452,"vn"},
151+ {454,"hk"},
152+ {455,"mo"},
153+ {456,"kh"},
154+ {457,"la"},
155+ {460,"cn"},
156+ {466,"tw"},
157+ {467,"kp"},
158+ {470,"bd"},
159+ {472,"mv"},
160+ {502,"my"},
161+ {505,"au"},
162+ {510,"id"},
163+ {514,"tp"},
164+ {515,"ph"},
165+ {520,"th"},
166+ {525,"sg"},
167+ {528,"bn"},
168+ {530,"nz"},
169+ {537,"pg"},
170+ {539,"to"},
171+ {540,"sb"},
172+ {541,"vu"},
173+ {542,"fj"},
174+ {544,"as"},
175+ {545,"ki"},
176+ {546,"nc"},
177+ {547,"pf"},
178+ {548,"ck"},
179+ {549,"ws"},
180+ {550,"fm"},
181+ {552,"pw"},
182+ {553,"tv"},
183+ {555,"nu"},
184+ {602,"eg"},
185+ {603,"dz"},
186+ {604,"ma"},
187+ {605,"tn"},
188+ {606,"ly"},
189+ {607,"gm"},
190+ {608,"sn"},
191+ {609,"mr"},
192+ {610,"ml"},
193+ {611,"gn"},
194+ {612,"ci"},
195+ {613,"bf"},
196+ {614,"ne"},
197+ {615,"tg"},
198+ {616,"bj"},
199+ {617,"mu"},
200+ {618,"lr"},
201+ {619,"sl"},
202+ {620,"gh"},
203+ {621,"ng"},
204+ {622,"td"},
205+ {623,"cf"},
206+ {624,"cm"},
207+ {625,"cv"},
208+ {626,"st"},
209+ {627,"gq"},
210+ {628,"ga"},
211+ {629,"cg"},
212+ {630,"cd"},
213+ {631,"ao"},
214+ {632,"gw"},
215+ {633,"sc"},
216+ {634,"sd"},
217+ {635,"rw"},
218+ {636,"et"},
219+ {637,"so"},
220+ {638,"dj"},
221+ {639,"ke"},
222+ {640,"tz"},
223+ {641,"ug"},
224+ {642,"bi"},
225+ {643,"mz"},
226+ {645,"zm"},
227+ {646,"mg"},
228+ {647,"re"},
229+ {648,"zw"},
230+ {649,"na"},
231+ {650,"mw"},
232+ {651,"ls"},
233+ {652,"bw"},
234+ {653,"sz"},
235+ {654,"km"},
236+ {655,"za"},
237+ {657,"er"},
238+ {659,"ss"},
239+ {702,"bz"},
240+ {704,"gt"},
241+ {706,"sv"},
242+ {708,"hn"},
243+ {710,"ni"},
244+ {712,"cr"},
245+ {714,"pa"},
246+ {716,"pe"},
247+ {722,"ar"},
248+ {724,"br"},
249+ {730,"cl"},
250+ {732,"co"},
251+ {734,"ve"},
252+ {736,"bo"},
253+ {738,"gy"},
254+ {740,"ec"},
255+ {744,"py"},
256+ {746,"sr"},
257+ {748,"uy"},
258+ {750,"fk"}}
259+ );
260+ }
261+
262+ QString mccToCountryCode(int mcc) const {
263+ return m_mccCodes.value(mcc, "us").toUpper();
264+ }
265+
266+private:
267+ // MCC = Mobile Country Code, see https://en.wikipedia.org/wiki/Mobile_country_code
268+ QHash<int,QString> m_mccCodes;
269+};
270+
271+Q_GLOBAL_STATIC(LocalePrivate, d)
272+
273+LocaleAttached::LocaleAttached(QObject* parent)
274+ : QObject(parent)
275+{
276+}
277+
278+QString LocaleAttached::mccToCountryCode(int mcc) const
279+{
280+ return d->mccToCountryCode(mcc);
281+}
282+
283+LocalePlugin::LocalePlugin(QObject* parent)
284+ : QObject(parent)
285+{
286+}
287+
288+LocaleAttached* LocalePlugin::qmlAttachedProperties(QObject* parent)
289+{
290+ return new LocaleAttached(parent);
291+}
plugins/Wizard/LocalePlugin.hnew file+58
@@ -0,0 +1,58 @@
1+/*
2+ * Copyright (C) 2015 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify 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 LOCALE_PLUGIN_H
18+#define LOCALE_PLUGIN_H
19+
20+#include <QObject>
21+#include <QString>
22+#include <QJsonObject>
23+#include <QtQml>
24+
25+class LocaleAttached: public QObject
26+{
27+ Q_OBJECT
28+protected:
29+ explicit LocaleAttached(QObject *parent = 0);
30+
31+public:
32+ Q_INVOKABLE QString mccToCountryCode(int mcc) const;
33+
34+ friend class LocalePlugin;
35+};
36+
37+/**
38+ * A simplified wrapper around QLocale.
39+ *
40+ * The wrapper is implemented as an attached property, which makes it possible
41+ * to use it as if its methods were static:
42+ *
43+ * @code
44+ * var langs = LocalePlugin.languages();
45+ * @endcode
46+ */
47+class LocalePlugin: public QObject
48+{
49+ Q_OBJECT
50+public:
51+ explicit LocalePlugin(QObject *parent = 0);
52+
53+ static LocaleAttached* qmlAttachedProperties(QObject *parent);
54+};
55+
56+QML_DECLARE_TYPEINFO(LocalePlugin, QML_HAS_ATTACHED_PROPERTIES)
57+
58+#endif // LOCALE_PLUGIN_H
plugins/Wizard/PageList.cpp+4−4
@@ -40,20 +40,20 @@ PageList::PageList(QObject *parent)
4040 m_index(-1),
4141 m_pages()
4242{
43− QString qmlSuffix = QStringLiteral(".qml");
44− QString disabledSuffix = QStringLiteral(".disabled");
43+ const QString qmlSuffix = QStringLiteral(".qml");
44+ const QString disabledSuffix = QStringLiteral(".disabled");
4545 QSet<QString> disabledPages;
4646 QStringList dataDirs;
4747
4848 if (!isRunningInstalled() && getenv("WIZARD_TESTING") == nullptr) {
49− dataDirs = QStringList() << qmlDirectory();
49+ dataDirs << qmlDirectory();
5050 } else {
5151 dataDirs = shellDataDirs();
5252 }
5353
5454 Q_FOREACH(const QString &dataDir, dataDirs) {
5555 QDir dir(dataDir + "/Wizard/Pages");
56− QStringList entries = dir.entryList(QStringList(QStringLiteral("[0-9]*")), QDir::Files | QDir::Readable);
56+ const QStringList entries = dir.entryList(QStringList(QStringLiteral("[0-9]*")), QDir::Files | QDir::Readable);
5757 Q_FOREACH(const QString &entry, entries) {
5858 if (!m_pages.contains(entry) && entry.endsWith(qmlSuffix))
5959 m_pages.insert(entry, dir.absoluteFilePath(entry));
plugins/Wizard/Status.cppnew file+143
@@ -0,0 +1,143 @@
1+/*
2+ * Copyright (C) 2015 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 <QDebug>
18+#include <QDBusConnection>
19+
20+#include "Status.h"
21+
22+Status::Status()
23+{
24+ initNM();
25+ initUPower();
26+}
27+
28+void Status::initNM()
29+{
30+ m_nmIface = new QDBusInterface("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager", "org.freedesktop.NetworkManager",
31+ QDBusConnection::systemBus(), this);
32+
33+ QDBusConnection::systemBus().connect("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager", "org.freedesktop.NetworkManager", "PropertiesChanged",
34+ this, SLOT(onNMPropertiesChanged(QVariantMap)));
35+}
36+
37+void Status::onNMPropertiesChanged(const QVariantMap &changedProps)
38+{
39+ if (changedProps.contains("State") || changedProps.contains("Connectivity")) {
40+ Q_EMIT onlineChanged();
41+ Q_EMIT networkIconChanged();
42+ }
43+
44+ if (changedProps.contains("PrimaryConnection") || changedProps.contains("SpecificObject") || changedProps.contains("Strength")) {
45+ Q_EMIT networkIconChanged();
46+ }
47+}
48+
49+bool Status::online() const
50+{
51+ if (!m_nmIface->isValid())
52+ return false;
53+
54+ return m_nmIface->property("State").toUInt() == 70;
55+}
56+
57+QString Status::networkIcon()
58+{
59+ QString iconName = QStringLiteral("nm-no-connection");
60+
61+ if (!online()) {
62+ return iconName;
63+ }
64+
65+ const QString primaryConn = m_nmIface->property("PrimaryConnection").value<QDBusObjectPath>().path();
66+ const QString primaryConnType = m_nmIface->property("PrimaryConnectionType").toString();
67+
68+ if (primaryConn.isEmpty()) {
69+ qWarning() << "Empty primary connection";
70+ return iconName;
71+ }
72+
73+ if (primaryConnType == "802-11-wireless") {
74+ QDBusInterface activeConn("org.freedesktop.NetworkManager", primaryConn, "org.freedesktop.NetworkManager.Connection.Active", QDBusConnection::systemBus());
75+
76+ if (activeConn.isValid()) {
77+ const QString apPath = activeConn.property("SpecificObject").value<QDBusObjectPath>().path();
78+
79+ if (apPath.isEmpty()) {
80+ qWarning() << "No AP path";
81+ return iconName;
82+ }
83+
84+ QDBusConnection::systemBus().connect("org.freedesktop.NetworkManager", primaryConn, "org.freedesktop.NetworkManager.Connection.Active", "PropertiesChanged",
85+ this, SLOT(onNMPropertiesChanged(QVariantMap)));
86+
87+ QDBusInterface ap("org.freedesktop.NetworkManager", apPath, "org.freedesktop.NetworkManager.AccessPoint", QDBusConnection::systemBus());
88+
89+ if (!ap.isValid()) {
90+ qWarning() << "Invalid AP";
91+ return iconName;
92+ }
93+
94+ QDBusConnection::systemBus().connect("org.freedesktop.NetworkManager", apPath, "org.freedesktop.NetworkManager.AccessPoint", "PropertiesChanged",
95+ this, SLOT(onNMPropertiesChanged(QVariantMap)));
96+
97+ const uint strength = ap.property("Strength").toUInt();
98+ const uint flags = ap.property("Flags").toUInt();
99+
100+ if (strength == 0) {
101+ iconName = "nm-signal-00";
102+ } else if (strength <= 25) {
103+ iconName = "nm-signal-25";
104+ } else if (strength <= 50) {
105+ iconName = "nm-signal-50";
106+ } else if (strength <= 75) {
107+ iconName = "nm-signal-75";
108+ } else if (strength <= 100) {
109+ iconName = "nm-signal-100";
110+ }
111+
112+ if (flags >= 1) {
113+ iconName += "-secure";
114+ }
115+ }
116+ }
117+
118+ return iconName;
119+}
120+
121+void Status::initUPower()
122+{
123+ m_upowerIface = new QDBusInterface("org.freedesktop.UPower", "/org/freedesktop/UPower/devices/DisplayDevice", "org.freedesktop.UPower.Device",
124+ QDBusConnection::systemBus(), this);
125+ QDBusConnection::systemBus().connect("org.freedesktop.UPower", "/org/freedesktop/UPower/devices/DisplayDevice", "org.freedesktop.DBus.Properties",
126+ "PropertiesChanged", this, SLOT(onUPowerPropertiesChanged(QString,QVariantMap,QStringList)));
127+}
128+
129+void Status::onUPowerPropertiesChanged(const QString &iface, const QVariantMap &changedProps, const QStringList &invalidatedProps)
130+{
131+ Q_UNUSED(iface)
132+ Q_UNUSED(invalidatedProps)
133+
134+ if (changedProps.contains("IconName")) {
135+ Q_EMIT batteryIconChanged();
136+ }
137+}
138+
139+QString Status::batteryIcon() const
140+{
141+ const QString iconName = m_upowerIface->property("IconName").toString();
142+ return iconName;
143+}
plugins/Wizard/Status.hnew file+60
@@ -0,0 +1,60 @@
1+/*
2+ * Copyright (C) 2015 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_STATUS_H
18+#define WIZARD_STATUS_H
19+
20+#include <QObject>
21+#include <QString>
22+#include <QDBusInterface>
23+
24+class Status: public QObject
25+{
26+ Q_OBJECT
27+ Q_PROPERTY(bool online READ online NOTIFY onlineChanged)
28+ Q_PROPERTY(QString networkIcon READ networkIcon NOTIFY networkIconChanged)
29+ Q_PROPERTY(QString batteryIcon READ batteryIcon NOTIFY batteryIconChanged)
30+public:
31+ Status();
32+ ~Status() = default;
33+
34+ bool online() const;
35+ QString networkIcon();
36+
37+ QString batteryIcon() const;
38+
39+Q_SIGNALS:
40+ void networkIconChanged();
41+ void onlineChanged();
42+ void batteryIconChanged();
43+
44+private Q_SLOTS:
45+ void onNMPropertiesChanged(const QVariantMap &changedProps);
46+ void onUPowerPropertiesChanged(const QString &iface, const QVariantMap &changedProps, const QStringList &invalidatedProps);
47+
48+private:
49+ Q_DISABLE_COPY(Status)
50+
51+ // network status
52+ void initNM();
53+ QDBusInterface * m_nmIface = nullptr;
54+
55+ // battery status
56+ void initUPower();
57+ QDBusInterface * m_upowerIface = nullptr;
58+};
59+
60+#endif
plugins/Wizard/System.cpp+5−4
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical Ltd.
2+ * Copyright (C) 2014-2015 Canonical Ltd.
33 *
44 * This program is free software: you can redistribute it and/or modify it
55 * under the terms of the GNU General Public License version 3, as published
@@ -25,10 +25,10 @@
2525#include <QLocale>
2626#include <QMap>
2727#include <QProcess>
28+#include <QDebug>
2829
2930System::System()
30− : QObject(),
31− m_fsWatcher()
31+ : QObject()
3232{
3333 // Register the argument needed for UpdateActivationEnvironment below
3434 qDBusRegisterMetaType<QMap<QString,QString>>();
@@ -88,7 +88,7 @@ void System::setSessionVariable(const QString &variable, const QString &value)
8888 QDBusConnection::sessionBus().asyncCall(msg);
8989}
9090
91−void System::updateSessionLanguage(const QString &locale)
91+void System::updateSessionLocale(const QString &locale)
9292{
9393 const QString language = locale.split(QStringLiteral("."))[0];
9494
@@ -106,5 +106,6 @@ void System::updateSessionLanguage(const QString &locale)
106106 initctl stop smart-scopes-proxy; \
107107 initctl emit --no-wait indicator-services-start; \
108108 initctl restart --no-wait maliit-server; \
109+ initctl restart --no-wait indicator-messages; \
109110 initctl restart --no-wait unity8-dash\""));
110111}
plugins/Wizard/System.h+3−2
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical Ltd.
2+ * Copyright (C) 2014-2015 Canonical Ltd.
33 *
44 * This program is free software: you can redistribute it and/or modify it
55 * under the terms of the GNU General Public License version 3, as published
@@ -28,12 +28,13 @@ class System : public QObject
2828
2929public:
3030 System();
31+ ~System() = default;
3132
3233 bool wizardEnabled() const;
3334 void setWizardEnabled(bool enabled);
3435
3536public Q_SLOTS:
36− void updateSessionLanguage(const QString &locale);
37+ void updateSessionLocale(const QString &locale);
3738
3839Q_SIGNALS:
3940 void wizardEnabledChanged();
plugins/Wizard/plugin.cpp+7−8
@@ -17,19 +17,18 @@
1717#include "plugin.h"
1818#include "PageList.h"
1919#include "System.h"
20+#include "timezonemodel.h"
21+#include "LocalePlugin.h"
22+#include "Status.h"
2023
2124#include <QtQml/qqml.h>
2225
23−static QObject *system_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
24−{
25− Q_UNUSED(engine)
26− Q_UNUSED(scriptEngine)
27− return new System();
28−}
29−
3026void WizardPlugin::registerTypes(const char *uri)
3127{
3228 Q_ASSERT(uri == QLatin1String("Wizard"));
3329 qmlRegisterType<PageList>(uri, 0, 1, "PageList");
34− qmlRegisterSingletonType<System>(uri, 0, 1, "System", system_provider);
30+ qmlRegisterSingletonType<System>(uri, 0, 1, "System", [](QQmlEngine*, QJSEngine*) -> QObject* { return new System; });
31+ qmlRegisterSingletonType<Status>(uri, 0, 1, "Status", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Status; });
32+ qmlRegisterType<TimeZoneLocationModel>(uri, 0, 1, "TimeZoneModel");
33+ qmlRegisterType<LocalePlugin>(uri, 0, 1, "LocalePlugin");
3534}
plugins/Wizard/plugin.h+1−2
@@ -17,13 +17,12 @@
1717#ifndef WIZARD_PLUGIN_H
1818#define WIZARD_PLUGIN_H
1919
20−#include <QtQml/QQmlEngine>
2120#include <QtQml/QQmlExtensionPlugin>
2221
2322class WizardPlugin : public QQmlExtensionPlugin
2423{
2524 Q_OBJECT
26− Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
25+ Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
2726
2827public:
2928 void registerTypes(const char *uri) override;
plugins/Wizard/timezonemodel.cppnew file+244
@@ -0,0 +1,244 @@
1+/*
2+ * Copyright (C) 2016 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 <QDebug>
18+
19+#include <glib.h>
20+#include <glib-object.h>
21+
22+#include "LocalePlugin.h"
23+#include "timezonemodel.h"
24+
25+TimeZoneLocationModel::TimeZoneLocationModel(QObject *parent):
26+ QAbstractListModel(parent),
27+ m_listUpdating(false),
28+ m_cancellable(nullptr)
29+{
30+ m_roleNames[Qt::DisplayRole] = "displayName";
31+ m_roleNames[TimeZoneRole] = "timeZone";
32+ m_roleNames[CityRole] = "city";
33+ m_roleNames[CountryRole] = "country";
34+ m_roleNames[OffsetRole] = "offset";
35+ m_roleNames[LatitudeRole] = "latitude";
36+ m_roleNames[LongitudeRole] = "longitude";
37+}
38+
39+int TimeZoneLocationModel::rowCount(const QModelIndex &parent) const
40+{
41+ if (parent.isValid()) {
42+ return 0;
43+ } else if (m_filter.isEmpty()) {
44+ return m_countryLocations.count();
45+ } else {
46+ return m_locations.count();
47+ }
48+}
49+
50+QVariant TimeZoneLocationModel::data(const QModelIndex &index, int role) const
51+{
52+ GeonamesCity *city;
53+ if (m_filter.isEmpty()) {
54+ city = m_countryLocations.value(index.row());
55+ } else {
56+ city = m_locations.value(index.row());
57+ }
58+ if (!city)
59+ return QVariant();
60+
61+ switch (role) {
62+ case Qt::DisplayRole:
63+ return QStringLiteral("%1, %2, %3").arg(geonames_city_get_name(city))
64+ .arg(geonames_city_get_state(city))
65+ .arg(geonames_city_get_country(city));
66+ case SimpleRole:
67+ return QStringLiteral("%1, %2").arg(geonames_city_get_name(city))
68+ .arg(geonames_city_get_country(city));
69+ case TimeZoneRole:
70+ return geonames_city_get_timezone(city);
71+ case CountryRole:
72+ return geonames_city_get_country(city);
73+ case CityRole:
74+ return geonames_city_get_name(city);
75+ case OffsetRole: {
76+ QTimeZone tmp(geonames_city_get_timezone(city));
77+ return static_cast<double>(tmp.standardTimeOffset(QDateTime::currentDateTime())) / 3600;
78+ }
79+ case LatitudeRole:
80+ return geonames_city_get_latitude(city);
81+ case LongitudeRole:
82+ return geonames_city_get_longitude(city);
83+ default:
84+ qWarning() << Q_FUNC_INFO << "Unknown role";
85+ return QVariant();
86+ }
87+}
88+
89+QHash<int, QByteArray> TimeZoneLocationModel::roleNames() const
90+{
91+ return m_roleNames;
92+}
93+
94+void TimeZoneLocationModel::setModel(const QList<GeonamesCity *> &locations)
95+{
96+ beginResetModel();
97+
98+ Q_FOREACH(GeonamesCity *city, m_locations) {
99+ geonames_city_free(city);
100+ }
101+
102+ m_locations = locations;
103+ endResetModel();
104+}
105+
106+void TimeZoneLocationModel::filterFinished(GObject *source_object,
107+ GAsyncResult *res,
108+ gpointer user_data)
109+{
110+ Q_UNUSED(source_object);
111+
112+ g_autofree gint *cities = nullptr;
113+ guint cities_len = 0;
114+ g_autoptr(GError) error = nullptr;
115+
116+ cities = geonames_query_cities_finish(res, &cities_len, &error);
117+ if (error) {
118+ if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
119+ TimeZoneLocationModel *model = static_cast<TimeZoneLocationModel *>(user_data);
120+ g_clear_object(&model->m_cancellable);
121+ model->setListUpdating(false);
122+ qWarning() << "Could not filter timezones:" << error->message;
123+ }
124+ return;
125+ }
126+
127+ QList<GeonamesCity *> locations;
128+
129+ for (guint i = 0; i < cities_len; ++i) {
130+ GeonamesCity *city = geonames_get_city(cities[i]);
131+ if (city) {
132+ locations.append(city);
133+ }
134+ }
135+
136+ TimeZoneLocationModel *model = static_cast<TimeZoneLocationModel *>(user_data);
137+
138+ g_clear_object(&model->m_cancellable);
139+
140+ model->setModel(locations);
141+ model->setListUpdating(false);
142+}
143+
144+bool TimeZoneLocationModel::listUpdating() const
145+{
146+ return m_listUpdating;
147+}
148+
149+void TimeZoneLocationModel::setListUpdating(bool listUpdating)
150+{
151+ if (m_listUpdating != listUpdating) {
152+ m_listUpdating = listUpdating;
153+ Q_EMIT listUpdatingChanged();
154+ }
155+}
156+
157+QString TimeZoneLocationModel::filter() const
158+{
159+ return m_filter;
160+}
161+
162+void TimeZoneLocationModel::setFilter(const QString &filter)
163+{
164+ if (filter != m_filter) {
165+ m_filter = filter;
166+ Q_EMIT filterChanged();
167+ }
168+
169+ setListUpdating(true);
170+
171+ if (m_cancellable) {
172+ g_cancellable_cancel(m_cancellable);
173+ g_clear_object(&m_cancellable);
174+ }
175+
176+ setModel(QList<GeonamesCity *>());
177+
178+ if (filter.isEmpty()) {
179+ setListUpdating(false);
180+ return;
181+ }
182+
183+ m_cancellable = g_cancellable_new();
184+ geonames_query_cities(filter.toUtf8().data(),
185+ GEONAMES_QUERY_DEFAULT,
186+ m_cancellable,
187+ filterFinished,
188+ this);
189+}
190+
191+QString TimeZoneLocationModel::country() const
192+{
193+ return m_country;
194+}
195+
196+static bool citycmp(GeonamesCity *a, GeonamesCity *b)
197+{
198+ return geonames_city_get_population(b) < geonames_city_get_population(a);
199+}
200+
201+void TimeZoneLocationModel::setCountry(const QString &country)
202+{
203+ if (m_country == country)
204+ return;
205+
206+ beginResetModel();
207+
208+ m_country = country;
209+
210+ Q_FOREACH(GeonamesCity *city, m_countryLocations) {
211+ geonames_city_free(city);
212+ }
213+ m_countryLocations.clear();
214+
215+ gint num_cities = geonames_get_n_cities();
216+ for (gint i = 0; i < num_cities; i++) {
217+ GeonamesCity *city = geonames_get_city(i);
218+ if (city && m_country == geonames_city_get_country_code(city)) {
219+ m_countryLocations.append(city);
220+ }
221+ }
222+
223+ std::sort(m_countryLocations.begin(), m_countryLocations.end(), citycmp);
224+
225+ endResetModel();
226+
227+ Q_EMIT countryChanged(country);
228+}
229+
230+TimeZoneLocationModel::~TimeZoneLocationModel()
231+{
232+ if (m_cancellable) {
233+ g_cancellable_cancel(m_cancellable);
234+ g_clear_object(&m_cancellable);
235+ }
236+
237+ Q_FOREACH(GeonamesCity *city, m_countryLocations) {
238+ geonames_city_free(city);
239+ }
240+
241+ Q_FOREACH(GeonamesCity *city, m_locations) {
242+ geonames_city_free(city);
243+ }
244+}
plugins/Wizard/timezonemodel.hnew file+80
@@ -0,0 +1,80 @@
1+/*
2+ * Copyright (C) 2016 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 TIMEZONEMODEL_H
18+#define TIMEZONEMODEL_H
19+
20+#include <geonames.h>
21+#include <glib.h>
22+#include <QAbstractListModel>
23+
24+class TimeZoneLocationModel: public QAbstractListModel
25+{
26+ Q_OBJECT
27+ Q_PROPERTY(bool listUpdating READ listUpdating NOTIFY listUpdatingChanged)
28+ Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
29+ Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged)
30+ Q_ENUMS(Roles)
31+
32+public:
33+ explicit TimeZoneLocationModel(QObject *parent = nullptr);
34+ ~TimeZoneLocationModel();
35+
36+ enum Roles {
37+ TimeZoneRole = Qt::UserRole + 1,
38+ CityRole,
39+ CountryRole,
40+ SimpleRole,
41+ OffsetRole,
42+ LatitudeRole,
43+ LongitudeRole
44+ };
45+
46+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
47+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
48+ QHash<int, QByteArray> roleNames() const override;
49+
50+ bool listUpdating() const;
51+
52+ QString filter() const;
53+ void setFilter(const QString &filter);
54+
55+ QString country() const;
56+ void setCountry(const QString &country);
57+
58+Q_SIGNALS:
59+ void listUpdatingChanged();
60+ void filterChanged();
61+ void countryChanged(const QString &country);
62+
63+private:
64+ void setModel(const QList<GeonamesCity *> &locations);
65+ void setListUpdating(bool listUpdating);
66+ static void filterFinished(GObject *source_object,
67+ GAsyncResult *res,
68+ gpointer user_data);
69+
70+
71+ bool m_listUpdating;
72+ QString m_filter;
73+ QString m_country;
74+ GCancellable *m_cancellable;
75+ QHash<int, QByteArray> m_roleNames;
76+ QList<GeonamesCity *> m_locations;
77+ QList<GeonamesCity *> m_countryLocations;
78+};
79+
80+#endif
po/aa.po+290−184
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1111"PO-Revision-Date: 2016-02-12 10:18+0000\n"
1212"Last-Translator: Charif AYFARAH <ayfarah@ymail.com>\n"
1313"Language-Team: Afar <aa@li.org>\n"
@@ -15,8 +15,8 @@ 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: 2016-03-13 05:50+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19+"X-Generator: Launchpad (build 17958)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -73,64 +73,46 @@ msgctxt "Button: Log out from the system"
7373msgid "Log Out"
7474msgstr "Eweq"
7575
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
77−#: qml/Components/Dialogs.qml:253
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
7879msgid "Cancel"
7980msgstr "Bayis"
8081
8182#: qml/Components/Dialogs.qml:173
82−msgctxt "Title: Reboot/Shut down dialog"
83−msgid "Shut down"
84−msgstr "Bargus"
85−
86−#: qml/Components/Dialogs.qml:174
87−msgid "Are you sure you want to shut down?"
88−msgstr "Bargussuh digga maay litoo?"
89−
90−#: qml/Components/Dialogs.qml:176
91−msgctxt "Button: Reboot the system"
92−msgid "Reboot"
93−msgstr "Wadir-ugus"
94−
95−#: qml/Components/Dialogs.qml:185
96−msgctxt "Button: Shut down the system"
97−msgid "Shut down"
98−msgstr "Bargus"
99−
100−#: qml/Components/Dialogs.qml:207
10183msgctxt "Title: Reboot dialog"
10284msgid "Reboot"
10385msgstr "Wadir-ugus"
10486
105−#: qml/Components/Dialogs.qml:208
87+#: qml/Components/Dialogs.qml:174
10688msgid "Are you sure you want to reboot?"
10789msgstr "Wadir-ugussuh digga maay litoo?"
10890
109−#: qml/Components/Dialogs.qml:210
91+#: qml/Components/Dialogs.qml:176
11092msgid "No"
11193msgstr "Maleey"
11294
113−#: qml/Components/Dialogs.qml:217
95+#: qml/Components/Dialogs.qml:183
11496msgid "Yes"
11597msgstr "Yeey"
11698
117−#: qml/Components/Dialogs.qml:232
99+#: qml/Components/Dialogs.qml:198
118100msgctxt "Title: Power off/Restart dialog"
119101msgid "Power"
120102msgstr "Cayla"
121103
122−#: qml/Components/Dialogs.qml:233
104+#: qml/Components/Dialogs.qml:199
123105msgid ""
124106"Are you sure you would like\n"
125107"to power off?"
126108msgstr "Timmi haytuh digga maay litoo?"
127109
128−#: qml/Components/Dialogs.qml:235
110+#: qml/Components/Dialogs.qml:201
129111msgctxt "Button: Power off the system"
130112msgid "Power off"
131113msgstr "Timmi hayis"
132114
133−#: qml/Components/Dialogs.qml:244
115+#: qml/Components/Dialogs.qml:210
134116msgctxt "Button: Restart the system"
135117msgid "Restart"
136118msgstr "Wadir-qimbis"
@@ -173,42 +155,58 @@ msgstr ""
173155msgid "Close all"
174156msgstr "Inkih alif"
175157
176−#: qml/Dash/DashPageHeader.qml:270
158+#: qml/Dash/DashPageHeader.qml:337
177159msgctxt "Button: Open the Ubuntu Store"
178160msgid "Store"
179161msgstr ""
180162
181−#: qml/Dash/DashPageHeader.qml:277
163+#: qml/Dash/DashPageHeader.qml:344
182164msgctxt "Button: Start a search in the current dash scope"
183165msgid "Search"
184166msgstr "Goranto"
185167
186−#: qml/Dash/DashPageHeader.qml:287
168+#: qml/Dash/DashPageHeader.qml:354
187169msgctxt "Button: Show the current dash scope settings"
188170msgid "Settings"
189171msgstr "Massosu"
190172
191−#: qml/Dash/DashPageHeader.qml:294
173+#: qml/Dash/DashPageHeader.qml:361
192174msgid "Remove from Favorites"
193175msgstr ""
194176
195−#: qml/Dash/DashPageHeader.qml:294
177+#: qml/Dash/DashPageHeader.qml:361
196178msgid "Add to Favorites"
197179msgstr ""
198180
199−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
181+#: qml/Dash/FiltersPopover.qml:60
182+msgid "Refine your results"
183+msgstr ""
184+
185+#: qml/Dash/FiltersPopover.qml:69
186+msgid "Reset"
187+msgstr ""
188+
189+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
200190msgid "See less"
201191msgstr ""
202192
203−#: qml/Dash/GenericScopeView.qml:567
193+#: qml/Dash/GenericScopeView.qml:570
204194msgid "See all"
205195msgstr ""
206196
207−#: qml/Dash/GenericScopeView.qml:629
197+#: qml/Dash/GenericScopeView.qml:627
208198msgctxt "Label: Hint for dash search line edit"
209199msgid "Search"
210200msgstr "Goranto"
211201
202+#: qml/Dash/PageHeaderExtraPanel.qml:55
203+msgid "Recent Searches"
204+msgstr ""
205+
206+#: qml/Dash/PageHeaderExtraPanel.qml:66
207+msgid "Clear All"
208+msgstr ""
209+
212210#: qml/Dash/Previews/PreviewActionCombo.qml:35
213211msgid "More..."
214212msgstr ""
@@ -276,11 +274,11 @@ msgstr "Qagis"
276274msgid "Tap to unlock"
277275msgstr ""
278276
279−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
277+#: qml/Greeter/NarrowView.qml:54
280278msgid "Sorry, incorrect passphrase."
281279msgstr ""
282280
283−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
281+#: qml/Greeter/NarrowView.qml:55
284282msgid "Sorry, incorrect passcode."
285283msgstr ""
286284
@@ -305,7 +303,7 @@ msgstr ""
305303msgid "Enter %1"
306304msgstr "%1 culus"
307305
308−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
306+#: qml/Greeter/NarrowView.qml:117
309307msgid "Enter passphrase"
310308msgstr "Tatur-maxco culus"
311309
@@ -343,62 +341,62 @@ msgstr ""
343341msgid "Conference"
344342msgstr "Koboxu"
345343
346−#: qml/Panel/Indicators/MenuItemFactory.qml:752
344+#: qml/Panel/Indicators/MenuItemFactory.qml:761
347345msgid "Nothing is playing"
348346msgstr ""
349347
350−#: qml/Panel/Indicators/MenuItemFactory.qml:881
348+#: qml/Panel/Indicators/MenuItemFactory.qml:890
351349#, qt-format
352350msgid "%1 hour"
353351msgid_plural "%1 hours"
354352msgstr[0] "%1 saaqata"
355353msgstr[1] "%1 saaqata"
356354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:885
355+#: qml/Panel/Indicators/MenuItemFactory.qml:894
358356#, qt-format
359357msgid "%1 minute"
360358msgid_plural "%1 minutes"
361359msgstr[0] "%1 miniti"
362360msgstr[1] "%1 miniti"
363361
364−#: qml/Panel/Indicators/MenuItemFactory.qml:890
362+#: qml/Panel/Indicators/MenuItemFactory.qml:899
365363#, qt-format
366364msgid "%1 second"
367365msgid_plural "%1 seconds"
368366msgstr[0] "%1 nammayye"
369367msgstr[1] "%1 nammayye"
370368
371−#: qml/Panel/Indicators/MenuItemFactory.qml:893
369+#: qml/Panel/Indicators/MenuItemFactory.qml:902
372370msgid "0 seconds"
373371msgstr "0 nammayye"
374372
375373#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
376−#: qml/Panel/Indicators/MenuItemFactory.qml:895
374+#: qml/Panel/Indicators/MenuItemFactory.qml:904
377375#, qt-format
378376msgid "%1 remaining"
379377msgstr "%1 raaqe"
380378
381−#: qml/Panel/Indicators/MenuItemFactory.qml:901
379+#: qml/Panel/Indicators/MenuItemFactory.qml:910
382380msgid "In queue…"
383381msgstr ""
384382
385−#: qml/Panel/Indicators/MenuItemFactory.qml:905
383+#: qml/Panel/Indicators/MenuItemFactory.qml:914
386384msgid "Downloading"
387385msgstr "Qulluumah"
388386
389−#: qml/Panel/Indicators/MenuItemFactory.qml:907
387+#: qml/Panel/Indicators/MenuItemFactory.qml:916
390388msgid "Paused, tap to resume"
391389msgstr ""
392390
393−#: qml/Panel/Indicators/MenuItemFactory.qml:909
391+#: qml/Panel/Indicators/MenuItemFactory.qml:918
394392msgid "Canceled"
395393msgstr "Bayteh"
396394
397−#: qml/Panel/Indicators/MenuItemFactory.qml:911
395+#: qml/Panel/Indicators/MenuItemFactory.qml:920
398396msgid "Finished"
399397msgstr "Duudumteh"
400398
401−#: qml/Panel/Indicators/MenuItemFactory.qml:913
399+#: qml/Panel/Indicators/MenuItemFactory.qml:922
402400msgid "Failed, tap to retry"
403401msgstr ""
404402
@@ -418,244 +416,352 @@ msgctxt "Button: Call back on phone"
418416msgid "Call back"
419417msgstr ""
420418
421−#: qml/Tutorial/TutorialBottom.qml:28
422−msgid "Open special menus"
423−msgstr ""
424−
425−#: qml/Tutorial/TutorialBottom.qml:29
426−msgid "Swipe up from the bottom edge."
419+#: qml/Stages/SideStage.qml:76
420+msgid "Drag using 3 fingers any application from one window to the other"
427421msgstr ""
428422
429−#: qml/Tutorial/TutorialBottomFinish.qml:24
430−msgid "This action does different things for different apps"
423+#: qml/Tutorial/TutorialBottom.qml:78
424+msgid "Swipe up to add a contact"
431425msgstr ""
432426
433−#: qml/Tutorial/TutorialBottomFinish.qml:25
434−msgid "Tap here to finish."
427+#: qml/Tutorial/TutorialBottom.qml:80
428+msgid "Swipe up for favorite calculations"
435429msgstr ""
436430
437−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
438−#: qml/Tutorial/TutorialRight.qml:144
439−msgid "Tap here to continue."
431+#: qml/Tutorial/TutorialBottom.qml:82
432+msgid "Swipe up for recent calls"
440433msgstr ""
441434
442−#: qml/Tutorial/TutorialLeft.qml:26
443−msgid "Open the launcher"
435+#: qml/Tutorial/TutorialBottom.qml:84
436+msgid "Swipe up to create a message"
444437msgstr ""
445438
446−#: qml/Tutorial/TutorialLeft.qml:27
447−msgid "Short swipe from the left edge."
439+#: qml/Tutorial/TutorialBottom.qml:85
440+msgid "Swipe up to manage the app"
448441msgstr ""
449442
450−#: qml/Tutorial/TutorialLeftFinish.qml:24
451−msgid "These are the shortcuts to favorite apps"
443+#: qml/Tutorial/TutorialLeft.qml:47
444+msgid "Swipe from the left edge to open the launcher"
452445msgstr ""
453446
454−#: qml/Tutorial/TutorialPage.qml:178
455−msgid "You almost got it!"
447+#: qml/Tutorial/TutorialLeftLong.qml:47
448+msgid "Long swipe from the left edge to open the Today scope"
456449msgstr ""
457450
458−#: qml/Tutorial/TutorialPage.qml:195
459−msgid "Try again."
451+#: qml/Tutorial/TutorialRight.qml:54
452+msgid "Hover your mouse on the right edge to view your open apps"
460453msgstr ""
461454
462−#: qml/Tutorial/TutorialRight.qml:31
463−msgid "To view open apps"
455+#: qml/Tutorial/TutorialRight.qml:55
456+msgid "Short or long swipe from the right edge to view your open apps"
464457msgstr ""
465458
466−#: qml/Tutorial/TutorialRight.qml:32
467−msgid "Long swipe from the right edge."
459+#: qml/Tutorial/TutorialTop.qml:53
460+msgid "Swipe from the top right edge to open the notification bar"
468461msgstr ""
469462
470−#: qml/Tutorial/TutorialRight.qml:122
471−msgid "View all your running tasks."
463+#: qml/Tutorial/TutorialTop.qml:54
464+msgid "Swipe from the top edge to open the notification bar"
472465msgstr ""
473466
474−#: qml/Wizard/Page.qml:89
467+#: qml/Wizard/Page.qml:54
475468msgctxt "Button: Go back one page in the Wizard"
476469msgid "Back"
477470msgstr "Derre"
478471
479472#: qml/Wizard/Pages/10-welcome.qml:27
480−msgid "Hi!"
481−msgstr "Nagaale!"
473+msgid "Language"
474+msgstr ""
482475
483−#: qml/Wizard/Pages/10-welcome.qml:44
484−msgid "Welcome to your Ubuntu device."
476+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
477+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
478+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
479+#: qml/Wizard/Pages/75-report-check.qml:84
480+#: qml/Wizard/Pages/passcode-desktop.qml:124
481+#: qml/Wizard/Pages/password-set.qml:141
482+msgid "Next"
485483msgstr ""
486484
487−#: qml/Wizard/Pages/10-welcome.qml:52
488−msgid "Let’s get started."
489−msgstr "Hayya qimbisnay."
485+#: qml/Wizard/Pages/30-wifi.qml:29
486+msgid "Connect to Wi‑Fi"
487+msgstr ""
490488
491−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
492−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
493−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
494−#: qml/Wizard/Pages/passwd-set.qml:90
495−msgid "Continue"
496−msgstr "Tatur"
489+#: qml/Wizard/Pages/30-wifi.qml:130
490+msgid "Connected"
491+msgstr ""
497492
498−#: qml/Wizard/Pages/20-sim.qml:25
499−msgid "Add a SIM card and restart your device"
493+#: qml/Wizard/Pages/30-wifi.qml:163
494+msgid "Available Wi-Fi networks"
500495msgstr ""
501496
502−#: qml/Wizard/Pages/20-sim.qml:59
503−msgid "Without it, you won’t be able to make calls or use text messaging."
497+#: qml/Wizard/Pages/30-wifi.qml:164
498+msgid "No available Wi-Fi networks"
504499msgstr ""
505500
506−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
501+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
502+#: qml/Wizard/Pages/sim.qml:101
507503msgid "Skip"
508504msgstr "Kaqit"
509505
510−#: qml/Wizard/Pages/30-passwd-type.qml:39
511−msgid "Lock security"
506+#: qml/Wizard/Pages/40-location.qml:27
507+msgid "Location Services"
512508msgstr ""
513509
514−#: qml/Wizard/Pages/30-passwd-type.qml:79
515−msgid "Please select how you’d like to unlock your device."
510+#: qml/Wizard/Pages/40-location.qml:83
511+msgid ""
512+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
513+"(recommended)"
516514msgstr ""
517515
518−#: qml/Wizard/Pages/30-passwd-type.qml:102
519−msgctxt "Label: Type of security method"
520−msgid "Swipe"
521−msgstr "Uysuttuc"
516+#: qml/Wizard/Pages/40-location.qml:105
517+#, qt-format
518+msgid "By selecting this option you agree to the Nokia HERE %1."
519+msgstr ""
520+
521+#: qml/Wizard/Pages/40-location.qml:106
522+msgctxt "part of: Nokia HERE terms and conditions"
523+msgid "terms and conditions"
524+msgstr ""
525+
526+#: qml/Wizard/Pages/40-location.qml:160
527+msgid "GPS only"
528+msgstr ""
529+
530+#: qml/Wizard/Pages/40-location.qml:214
531+msgid "Don't use my location"
532+msgstr ""
533+
534+#: qml/Wizard/Pages/40-location.qml:260
535+msgid "You can change it later in System Settings."
536+msgstr ""
537+
538+#: qml/Wizard/Pages/50-timezone.qml:29
539+msgid "Time Zone"
540+msgstr ""
541+
542+#: qml/Wizard/Pages/50-timezone.qml:178
543+msgid "Enter your city"
544+msgstr ""
545+
546+#: qml/Wizard/Pages/60-account.qml:24
547+msgid "Personalize Your Device"
548+msgstr ""
549+
550+#: qml/Wizard/Pages/60-account.qml:48
551+msgid "Preferred Name"
552+msgstr ""
522553
523−#: qml/Wizard/Pages/30-passwd-type.qml:103
524−msgctxt "Label: Description of security method"
525−msgid "No security"
554+#: qml/Wizard/Pages/70-passwd-type.qml:39
555+msgid "Lock Screen"
526556msgstr ""
527557
528−#: qml/Wizard/Pages/30-passwd-type.qml:105
558+#: qml/Wizard/Pages/70-passwd-type.qml:101
529559msgctxt "Label: Type of security method"
530−msgid "Passcode"
560+msgid "Create new password"
531561msgstr ""
532562
533−#: qml/Wizard/Pages/30-passwd-type.qml:106
534−msgctxt "Label: Description of security method"
535−msgid "4 digits only"
563+#: qml/Wizard/Pages/70-passwd-type.qml:103
564+msgctxt "Label: Type of security method"
565+msgid "Create passcode (numbers only)"
536566msgstr ""
537567
538−#: qml/Wizard/Pages/30-passwd-type.qml:108
568+#: qml/Wizard/Pages/70-passwd-type.qml:105
539569msgctxt "Label: Type of security method"
540−msgid "Passphrase"
570+msgid "No lock code"
541571msgstr ""
542572
543−#: qml/Wizard/Pages/30-passwd-type.qml:109
544−msgctxt "Label: Description of security method"
545−msgid "Numbers and letters"
573+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
574+msgid "Privacy Policy"
546575msgstr ""
547576
548−#: qml/Wizard/Pages/40-wifi.qml:29
549−msgid "Connect to Wi‑Fi"
577+#: qml/Wizard/Pages/75-report-check.qml:26
578+msgid "Help Us Improve"
579+msgstr ""
580+
581+#: qml/Wizard/Pages/75-report-check.qml:59
582+msgid "Improve system performance by sending us crashes and error reports."
550583msgstr ""
551584
552−#: qml/Wizard/Pages/40-wifi.qml:168
553−msgid "Available networks…"
585+#: qml/Wizard/Pages/75-report-check.qml:60
586+msgid "Privacy policy"
554587msgstr ""
555588
556−#: qml/Wizard/Pages/40-wifi.qml:169
557−msgid "No available networks."
589+#: qml/Wizard/Pages/80-finished.qml:89
590+msgid "Welcome to Ubuntu"
558591msgstr ""
559592
560−#: qml/Wizard/Pages/50-location.qml:27
561−msgid "Location"
593+#: qml/Wizard/Pages/80-finished.qml:104
594+msgid "You are ready to use your device now"
562595msgstr ""
563596
564−#: qml/Wizard/Pages/50-location.qml:62
565−msgid "Let the phone detect your location:"
597+#: qml/Wizard/Pages/80-finished.qml:124
598+msgid "Get Started"
566599msgstr ""
567600
568−#: qml/Wizard/Pages/50-location.qml:69
569−msgid "Using GPS only (less accurate)"
601+#: qml/Wizard/Pages/here-terms.qml:25
602+msgid "Terms & Conditions"
570603msgstr ""
571604
572−#: qml/Wizard/Pages/50-location.qml:86
573−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
605+#: qml/Wizard/Pages/here-terms.qml:69
606+msgid "Your device uses positioning technologies provided by HERE."
574607msgstr ""
575608
576−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
577−#: qml/Wizard/Pages/50-location.qml:103
609+#: qml/Wizard/Pages/here-terms.qml:81
578610msgid ""
579−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
580−"conditions</a>."
611+"To provide you with positioning services and to improve their quality, HERE "
612+"collects information about nearby cell towers and Wi-Fi hotspots around your "
613+"current location whenever your position is being found."
581614msgstr ""
582615
583−#: qml/Wizard/Pages/50-location.qml:112
584−msgid "Not at all"
616+#: qml/Wizard/Pages/here-terms.qml:93
617+msgid ""
618+"The information collected is used to analyze the service and to improve the "
619+"use of service, but not to identify you personally."
585620msgstr ""
586621
587−#: qml/Wizard/Pages/50-location.qml:124
588−msgid "You can change your mind later in <b>System Settings</b>."
622+#: qml/Wizard/Pages/here-terms.qml:106
623+#, qt-format
624+msgid "By continuing, you agree to the HERE platform %1 and %2."
589625msgstr ""
590626
591−#: qml/Wizard/Pages/60-reporting.qml:26
592−msgid "Improving your experience"
627+#: qml/Wizard/Pages/here-terms.qml:107
628+msgid "Service Terms"
593629msgstr ""
594630
595−#: qml/Wizard/Pages/60-reporting.qml:46
596−msgid ""
597−"Your phone is set up to automatically report errors to Canonical and its "
598−"partners, the makers of the operating system."
631+#: qml/Wizard/Pages/passcode-confirm.qml:43
632+#: qml/Wizard/Pages/passcode-desktop.qml:80
633+msgid "Confirm passcode"
599634msgstr ""
600635
601−#: qml/Wizard/Pages/60-reporting.qml:53
602−msgid ""
603−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
604−"Privacy</b>"
636+#: qml/Wizard/Pages/passcode-confirm.qml:45
637+msgid "Incorrect passcode."
605638msgstr ""
606639
607−#: qml/Wizard/Pages/80-finished.qml:24
608−msgid "All done"
640+#: qml/Wizard/Pages/passcode-confirm.qml:45
641+msgctxt "Enter the passcode again"
642+msgid "Please re-enter."
609643msgstr ""
610644
611−#: qml/Wizard/Pages/80-finished.qml:39
612−msgid "Nice work!"
645+#: qml/Wizard/Pages/passcode-desktop.qml:30
646+msgid "Lock Screen Passcode"
613647msgstr ""
614648
615−#: qml/Wizard/Pages/80-finished.qml:46
616−msgid "Your device is now ready to use."
649+#: qml/Wizard/Pages/passcode-desktop.qml:56
650+msgid "Enter 4 numbers to setup your passcode"
617651msgstr ""
618652
619−#: qml/Wizard/Pages/80-finished.qml:53
620−msgid "Finish"
653+#: qml/Wizard/Pages/passcode-desktop.qml:65
654+#: qml/Wizard/Pages/passcode-set.qml:54
655+msgid "Choose passcode"
621656msgstr ""
622657
623−#: qml/Wizard/Pages/here-terms.qml:27
624−msgid "Terms & Conditions"
658+#: qml/Wizard/Pages/passcode-desktop.qml:105
659+msgid "Passcode too short"
625660msgstr ""
626661
627−#: qml/Wizard/Pages/passwd-confirm.qml:49
628−msgid "Confirm passphrase"
662+#: qml/Wizard/Pages/passcode-desktop.qml:107
663+msgid "Passcodes match"
629664msgstr ""
630665
631−#: qml/Wizard/Pages/passwd-confirm.qml:50
632−msgid "Confirm passcode"
666+#: qml/Wizard/Pages/passcode-desktop.qml:109
667+msgid "Passcodes do not match"
633668msgstr ""
634669
635−#: qml/Wizard/Pages/passwd-confirm.qml:53
636−#: qml/Wizard/Pages/passwd-confirm.qml:54
637−msgid "Please try again."
670+#: qml/Wizard/Pages/passcode-set.qml:62
671+msgid "Passcode must be 4 characters long"
638672msgstr ""
639673
640−#: qml/Wizard/Pages/passwd-set.qml:61
641−msgid "Choose your passcode"
674+#: qml/Wizard/Pages/password-set.qml:30
675+msgid "Lock Screen Password"
642676msgstr ""
643677
644−#: qml/Wizard/Pages/passwd-set.qml:68
645−msgid "Passphrase must be 4 characters long"
678+#: qml/Wizard/Pages/password-set.qml:61
679+msgid "Enter at least 8 characters"
646680msgstr ""
647681
648−#. Translators: This is the arrow for "Back" buttons
649−#: qml/Wizard/StackButton.qml:39
650−#, qt-format
651−msgid "〈 %1"
682+#: qml/Wizard/Pages/password-set.qml:73
683+msgid "Choose password"
652684msgstr ""
653685
654−#. Translators: This is the arrow for "Forward" buttons
655−#: qml/Wizard/StackButton.qml:42
656−#, qt-format
657−msgid "%1 〉"
686+#: qml/Wizard/Pages/password-set.qml:103
687+msgid "Confirm password"
688+msgstr ""
689+
690+#: qml/Wizard/Pages/sim.qml:27
691+msgid "No SIM card installed"
692+msgstr ""
693+
694+#: qml/Wizard/Pages/sim.qml:54
695+msgid "SIM card added"
658696msgstr ""
659697
698+#: qml/Wizard/Pages/sim.qml:55
699+msgid "You must restart the device to access the mobile network."
700+msgstr ""
701+
702+#: qml/Wizard/Pages/sim.qml:59
703+msgid "Restart"
704+msgstr ""
705+
706+#: qml/Wizard/Pages/sim.qml:78
707+msgid "You won’t be able to make calls or use text messaging without a SIM."
708+msgstr ""
709+
710+#: qml/Wizard/Pages/sim.qml:90
711+msgid "To proceed with no SIM tap Skip."
712+msgstr ""
713+
714+#: qml/Wizard/PasswordMeter.qml:87
715+msgid "Passwords match"
716+msgstr ""
717+
718+#: qml/Wizard/PasswordMeter.qml:89
719+msgid "Passwords do not match"
720+msgstr ""
721+
722+#: qml/Wizard/PasswordMeter.qml:93
723+msgid "Strong password"
724+msgstr ""
725+
726+#: qml/Wizard/PasswordMeter.qml:95
727+msgid "Fair password"
728+msgstr ""
729+
730+#: qml/Wizard/PasswordMeter.qml:97
731+msgid "Weak password"
732+msgstr ""
733+
734+#: qml/Wizard/PasswordMeter.qml:99
735+msgid "Very weak password"
736+msgstr ""
737+
738+#~ msgctxt "Title: Reboot/Shut down dialog"
739+#~ msgid "Shut down"
740+#~ msgstr "Bargus"
741+
742+#~ msgid "Are you sure you want to shut down?"
743+#~ msgstr "Bargussuh digga maay litoo?"
744+
745+#~ msgctxt "Button: Shut down the system"
746+#~ msgid "Shut down"
747+#~ msgstr "Bargus"
748+
749+#~ msgctxt "Button: Reboot the system"
750+#~ msgid "Reboot"
751+#~ msgstr "Wadir-ugus"
752+
753+#~ msgctxt "Label: Type of security method"
754+#~ msgid "Swipe"
755+#~ msgstr "Uysuttuc"
756+
757+#~ msgid "Hi!"
758+#~ msgstr "Nagaale!"
759+
660760#~ msgid "Welcome to your Ubuntu phone."
661761#~ msgstr "Ubuntu Telefoonul arcib"
762+
763+#~ msgid "Let’s get started."
764+#~ msgstr "Hayya qimbisnay."
765+
766+#~ msgid "Continue"
767+#~ msgstr "Tatur"
po/am.po+493−249
@@ -7,16 +7,16 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2016-03-10 22:48+0000\n"
11−"PO-Revision-Date: 2015-11-19 19:27+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11+"PO-Revision-Date: 2016-03-24 19: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: 2016-03-13 05:50+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-25 05:54+0000\n"
19+"X-Generator: Launchpad (build 17967)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -73,53 +73,35 @@ msgctxt "Button: Log out from the system"
7373msgid "Log Out"
7474msgstr "መውጫ"
7575
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
77−#: qml/Components/Dialogs.qml:253
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
7879msgid "Cancel"
7980msgstr "መሰረዣ"
8081
8182#: qml/Components/Dialogs.qml:173
82−msgctxt "Title: Reboot/Shut down dialog"
83−msgid "Shut down"
84−msgstr "ማጥፊያ"
85−
86−#: qml/Components/Dialogs.qml:174
87−msgid "Are you sure you want to shut down?"
88−msgstr "በእርግጥ ማጥፋት ይፈልጋሉ?"
89−
90−#: qml/Components/Dialogs.qml:176
91−msgctxt "Button: Reboot the system"
92−msgid "Reboot"
93−msgstr "እንደገና ማስነሻ"
94−
95−#: qml/Components/Dialogs.qml:185
96−msgctxt "Button: Shut down the system"
97−msgid "Shut down"
98−msgstr "ማጥፊያ"
99−
100−#: qml/Components/Dialogs.qml:207
10183msgctxt "Title: Reboot dialog"
10284msgid "Reboot"
10385msgstr "እንደገና ማስነሻ"
10486
105−#: qml/Components/Dialogs.qml:208
87+#: qml/Components/Dialogs.qml:174
10688msgid "Are you sure you want to reboot?"
10789msgstr "በእርግጥ እንደገና ማስነሳት ይፈልጋሉ?"
10890
109−#: qml/Components/Dialogs.qml:210
91+#: qml/Components/Dialogs.qml:176
11092msgid "No"
11193msgstr "አይ"
11294
113−#: qml/Components/Dialogs.qml:217
95+#: qml/Components/Dialogs.qml:183
11496msgid "Yes"
11597msgstr "አዎ"
11698
117−#: qml/Components/Dialogs.qml:232
99+#: qml/Components/Dialogs.qml:198
118100msgctxt "Title: Power off/Restart dialog"
119101msgid "Power"
120102msgstr "ሐይል"
121103
122−#: qml/Components/Dialogs.qml:233
104+#: qml/Components/Dialogs.qml:199
123105msgid ""
124106"Are you sure you would like\n"
125107"to power off?"
@@ -127,12 +109,12 @@ msgstr ""
127109"በእርግጥ ሐይሉን ማጥፋት\n"
128110"ይፈልጋሉ?"
129111
130−#: qml/Components/Dialogs.qml:235
112+#: qml/Components/Dialogs.qml:201
131113msgctxt "Button: Power off the system"
132114msgid "Power off"
133115msgstr "ሐይል ማጥፊያ"
134116
135−#: qml/Components/Dialogs.qml:244
117+#: qml/Components/Dialogs.qml:210
136118msgctxt "Button: Restart the system"
137119msgid "Restart"
138120msgstr "እንደገና ማስጀመሪያ"
@@ -157,7 +139,7 @@ msgstr "መተግበሪያው ያልተቀመጠ ዳታ ይዟል:"
157139msgctxt ""
158140"Re-dock means connect the device again to an external screen/mouse/keyboard"
159141msgid "Re-dock, save your work and close these apps to continue."
160−msgstr ""
142+msgstr "እንደገና-ማሳረፊያ: ስራዎትን ያስቀምጡ እና ይዝጉ መተግበሪያው እንዲቀጥል"
161143
162144#: qml/Components/ModeSwitchWarningDialog.qml:63
163145msgid "Or force close now (unsaved data will be lost)."
@@ -175,42 +157,58 @@ msgstr "አሁን እንደገና መገናኛ!"
175157msgid "Close all"
176158msgstr "ሁሉንም መዝጊያ"
177159
178−#: qml/Dash/DashPageHeader.qml:270
160+#: qml/Dash/DashPageHeader.qml:337
179161msgctxt "Button: Open the Ubuntu Store"
180162msgid "Store"
181163msgstr "ማስቀመጫ"
182164
183−#: qml/Dash/DashPageHeader.qml:277
165+#: qml/Dash/DashPageHeader.qml:344
184166msgctxt "Button: Start a search in the current dash scope"
185167msgid "Search"
186168msgstr "መፈለጊያ"
187169
188−#: qml/Dash/DashPageHeader.qml:287
170+#: qml/Dash/DashPageHeader.qml:354
189171msgctxt "Button: Show the current dash scope settings"
190172msgid "Settings"
191173msgstr "ማሰናጃዎች"
192174
193−#: qml/Dash/DashPageHeader.qml:294
175+#: qml/Dash/DashPageHeader.qml:361
194176msgid "Remove from Favorites"
195177msgstr "ከምወዳቸው ማስወገጃ"
196178
197−#: qml/Dash/DashPageHeader.qml:294
179+#: qml/Dash/DashPageHeader.qml:361
198180msgid "Add to Favorites"
199181msgstr "ወደምወዳቸው መጨመሪያ"
200182
201−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
183+#: qml/Dash/FiltersPopover.qml:60
184+msgid "Refine your results"
185+msgstr "የ እርስዎን ውጤቶች እንደገና ማጣሪያ"
186+
187+#: qml/Dash/FiltersPopover.qml:69
188+msgid "Reset"
189+msgstr "እንደ ነበረ መመለሻ"
190+
191+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
202192msgid "See less"
203193msgstr "አነስተኛ መመልከቻ"
204194
205−#: qml/Dash/GenericScopeView.qml:567
195+#: qml/Dash/GenericScopeView.qml:570
206196msgid "See all"
207197msgstr "ሁሉንም መመልከቻ"
208198
209−#: qml/Dash/GenericScopeView.qml:629
199+#: qml/Dash/GenericScopeView.qml:627
210200msgctxt "Label: Hint for dash search line edit"
211201msgid "Search"
212202msgstr "መፈለጊያ"
213203
204+#: qml/Dash/PageHeaderExtraPanel.qml:55
205+msgid "Recent Searches"
206+msgstr "የ ቅርብ ጊዜ ፍለጋዎች"
207+
208+#: qml/Dash/PageHeaderExtraPanel.qml:66
209+msgid "Clear All"
210+msgstr "ሁሉንም ማጽጃ"
211+
214212#: qml/Dash/Previews/PreviewActionCombo.qml:35
215213msgid "More..."
216214msgstr "ተጨማሪ..."
@@ -264,7 +262,7 @@ msgstr "እንዲሁም የተገጠሙ"
264262msgid ""
265263"Your device is now connected to an external display. Use this screen as a "
266264"touch pad to interact with the pointer."
267−msgstr ""
265+msgstr "የ እርስዎ አካል አሁን ከ ውጪ ማሳያ ጋር ተገናኝቷል: ይህን መመልከቻ እንደ ተችፓድ መጠቀሚያ"
268266
269267#: qml/Greeter/CoverPage.qml:118
270268msgid "Unlock"
@@ -278,11 +276,11 @@ msgstr "እንደገና ይሞክሩ"
278276msgid "Tap to unlock"
279277msgstr "ለመክፈት መታ ያድርጉ"
280278
281−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
279+#: qml/Greeter/NarrowView.qml:54
282280msgid "Sorry, incorrect passphrase."
283281msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
284282
285−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
283+#: qml/Greeter/NarrowView.qml:55
286284msgid "Sorry, incorrect passcode."
287285msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
288286
@@ -311,7 +309,7 @@ msgstr ""
311309msgid "Enter %1"
312310msgstr "ማስገቢያ %1"
313311
314−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
312+#: qml/Greeter/NarrowView.qml:117
315313msgid "Enter passphrase"
316314msgstr "የ ማለፊያ ሀረግ ያስገቡ"
317315
@@ -349,62 +347,62 @@ msgstr "ወደ ጥሪው ለመመለስ መታ ያድርጉ..."
349347msgid "Conference"
350348msgstr "ስብሰባ"
351349
352−#: qml/Panel/Indicators/MenuItemFactory.qml:752
350+#: qml/Panel/Indicators/MenuItemFactory.qml:761
353351msgid "Nothing is playing"
354352msgstr "ምንም አይጫወትም"
355353
356−#: qml/Panel/Indicators/MenuItemFactory.qml:881
354+#: qml/Panel/Indicators/MenuItemFactory.qml:890
357355#, qt-format
358356msgid "%1 hour"
359357msgid_plural "%1 hours"
360358msgstr[0] "%1 ሰአት"
361359msgstr[1] "%1 ሰአቶች"
362360
363−#: qml/Panel/Indicators/MenuItemFactory.qml:885
361+#: qml/Panel/Indicators/MenuItemFactory.qml:894
364362#, qt-format
365363msgid "%1 minute"
366364msgid_plural "%1 minutes"
367365msgstr[0] "%1 ደቂቃ"
368366msgstr[1] "%1 ደቂቃዎች"
369367
370−#: qml/Panel/Indicators/MenuItemFactory.qml:890
368+#: qml/Panel/Indicators/MenuItemFactory.qml:899
371369#, qt-format
372370msgid "%1 second"
373371msgid_plural "%1 seconds"
374372msgstr[0] "%1 ሰከንድ"
375373msgstr[1] "%1 ሰከንዶች"
376374
377−#: qml/Panel/Indicators/MenuItemFactory.qml:893
375+#: qml/Panel/Indicators/MenuItemFactory.qml:902
378376msgid "0 seconds"
379377msgstr "0 ሰከንዶች"
380378
381379#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
382−#: qml/Panel/Indicators/MenuItemFactory.qml:895
380+#: qml/Panel/Indicators/MenuItemFactory.qml:904
383381#, qt-format
384382msgid "%1 remaining"
385383msgstr "%1 የቀረው"
386384
387−#: qml/Panel/Indicators/MenuItemFactory.qml:901
385+#: qml/Panel/Indicators/MenuItemFactory.qml:910
388386msgid "In queue…"
389387msgstr "ወረፋ በመጠበቅ ላይ…"
390388
391−#: qml/Panel/Indicators/MenuItemFactory.qml:905
389+#: qml/Panel/Indicators/MenuItemFactory.qml:914
392390msgid "Downloading"
393391msgstr "በማውረድ ላይ"
394392
395−#: qml/Panel/Indicators/MenuItemFactory.qml:907
393+#: qml/Panel/Indicators/MenuItemFactory.qml:916
396394msgid "Paused, tap to resume"
397395msgstr "ማስቆሚያ: ለመቀጠል መታ ያድርጉ"
398396
399−#: qml/Panel/Indicators/MenuItemFactory.qml:909
397+#: qml/Panel/Indicators/MenuItemFactory.qml:918
400398msgid "Canceled"
401399msgstr "ተሰርዟል"
402400
403−#: qml/Panel/Indicators/MenuItemFactory.qml:911
401+#: qml/Panel/Indicators/MenuItemFactory.qml:920
404402msgid "Finished"
405403msgstr "ጨርሷል"
406404
407−#: qml/Panel/Indicators/MenuItemFactory.qml:913
405+#: qml/Panel/Indicators/MenuItemFactory.qml:922
408406msgid "Failed, tap to retry"
409407msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"
410408
@@ -424,247 +422,326 @@ msgctxt "Button: Call back on phone"
424422msgid "Call back"
425423msgstr "መልሶ መደወያ"
426424
427−#: qml/Tutorial/TutorialBottom.qml:28
428−msgid "Open special menus"
429−msgstr "የተለዩ ዝርዝሮች መክፈቻ"
425+#: qml/Stages/SideStage.qml:76
426+msgid "Drag using 3 fingers any application from one window to the other"
427+msgstr "መጎተቻ 3 ጣቶች በ መጠቀም ማንኛውንም መተግበሪያ ከ አንድ መስኮት ወደ ሌላ"
430428
431−#: qml/Tutorial/TutorialBottom.qml:29
432−msgid "Swipe up from the bottom edge."
433−msgstr "ከ ታች ጠርዝ በኩል ወደ ላይ ይጥረጉ"
429+#: qml/Tutorial/TutorialBottom.qml:78
430+msgid "Swipe up to add a contact"
431+msgstr "ወደ ላይ ይጥረጉ ግንኙነት ለ መጨመር"
434432
435−#: qml/Tutorial/TutorialBottomFinish.qml:24
436−msgid "This action does different things for different apps"
437−msgstr "ይህ ተግባር ለተለያዩ መተግበሪያዎች የተለያየ ነገር ይሰራል"
433+#: qml/Tutorial/TutorialBottom.qml:80
434+msgid "Swipe up for favorite calculations"
435+msgstr "ወደ ላይ ይጥረጉ የሚወዱትን ለማስላት"
438436
439−#: qml/Tutorial/TutorialBottomFinish.qml:25
440−msgid "Tap here to finish."
441−msgstr "እዚህ መታ ይድርጉ ለመጨረስ"
437+#: qml/Tutorial/TutorialBottom.qml:82
438+msgid "Swipe up for recent calls"
439+msgstr "ወደ ላይ ይጥረጉ ለ ቅርብ ጊዜ ጥሪዎች"
442440
443−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
444−#: qml/Tutorial/TutorialRight.qml:144
445−msgid "Tap here to continue."
446−msgstr "እዚህ መታ ይድርጉ ለመቀጠል"
441+#: qml/Tutorial/TutorialBottom.qml:84
442+msgid "Swipe up to create a message"
443+msgstr "ወደ ላይ ይጥረጉ መልእክት ለ መፍጠር"
447444
448−#: qml/Tutorial/TutorialLeft.qml:26
449−msgid "Open the launcher"
450−msgstr "ማስጀመሪያውን መክፈቻ"
445+#: qml/Tutorial/TutorialBottom.qml:85
446+msgid "Swipe up to manage the app"
447+msgstr "ወደ ላይ ይጥረጉ መተግበሪያ ለማስተዳደር"
451448
452−#: qml/Tutorial/TutorialLeft.qml:27
453−msgid "Short swipe from the left edge."
454−msgstr "ከ ግራ ጠርዝ በኩል በትንሹ ይጥረጉ"
449+#: qml/Tutorial/TutorialLeft.qml:47
450+msgid "Swipe from the left edge to open the launcher"
451+msgstr "ከ ግራ ጠርዝ በኩል ይጥረጉ ማስጀመሪያውን ለ መክፈት"
455452
456−#: qml/Tutorial/TutorialLeftFinish.qml:24
457−msgid "These are the shortcuts to favorite apps"
458−msgstr "እነዚህ አቋራጮች ናቸው እርስዎ ለሚወዷቸው መተግበሪያዎች"
453+#: qml/Tutorial/TutorialLeftLong.qml:47
454+msgid "Long swipe from the left edge to open the Today scope"
455+msgstr "በ ረጅሙ ከ ግራ ጠርዝ በኩል ይጥረጉ የ ዛሬን ክልል ለ መክፈት"
459456
460−#: qml/Tutorial/TutorialPage.qml:178
461−msgid "You almost got it!"
462−msgstr "እርስዎ አሁን እያገኙት ነው!"
457+#: qml/Tutorial/TutorialRight.qml:54
458+msgid "Hover your mouse on the right edge to view your open apps"
459+msgstr "የ እርስዎን አይጥ ወደ ቀኝ ጠርዝ በኩል ሲያደርጉ የ ተከፈቱ መተግበሪያዎች መመልከቻ"
463460
464−#: qml/Tutorial/TutorialPage.qml:195
465−msgid "Try again."
466−msgstr "እንደገና ይሞክሩ"
461+#: qml/Tutorial/TutorialRight.qml:55
462+msgid "Short or long swipe from the right edge to view your open apps"
463+msgstr "በ አጭሩ ወይንም በ ረጅሙ ይጥረጉ ከ ቀኝ ጠረዝ በኩል የ ተከፈቱ መተግበሪያዎችን ለማየት"
467464
468−#: qml/Tutorial/TutorialRight.qml:31
469−msgid "To view open apps"
470−msgstr "ለመመልከት መተግበሪያዎች ይክፈቱ"
465+#: qml/Tutorial/TutorialTop.qml:53
466+msgid "Swipe from the top right edge to open the notification bar"
467+msgstr "ከ ላይ ቀኝ ጠርዝ በኩል ይጥረጉ የ ማስታወቂያ መደርደሪያ ለ መክፈት"
471468
472−#: qml/Tutorial/TutorialRight.qml:32
473−msgid "Long swipe from the right edge."
474−msgstr "ከ ቀኝ ጠርዝ በኩል በረጅሙ ይጥረጉ"
469+#: qml/Tutorial/TutorialTop.qml:54
470+msgid "Swipe from the top edge to open the notification bar"
471+msgstr "ከ ላይ ጠርዝ በኩል ይጥረጉ የ ማስታወቂያ መደርደሪያ ለ መክፈት"
475472
476−#: qml/Tutorial/TutorialRight.qml:122
477−msgid "View all your running tasks."
478−msgstr "እርስዎ የሚያስኬዱትን ተግባሮች በሙሉ መመልከቻ"
479−
480−#: qml/Wizard/Page.qml:89
473+#: qml/Wizard/Page.qml:54
481474msgctxt "Button: Go back one page in the Wizard"
482475msgid "Back"
483476msgstr "ወደ ኋላ"
484477
485478#: qml/Wizard/Pages/10-welcome.qml:27
486−msgid "Hi!"
487−msgstr "ሰላም"
488−
489−#: qml/Wizard/Pages/10-welcome.qml:44
490−msgid "Welcome to your Ubuntu device."
491−msgstr "እንኳን ድህና መጡ ወደ ኡቡንቱ"
492−
493−#: qml/Wizard/Pages/10-welcome.qml:52
494−msgid "Let’s get started."
495−msgstr "ስራ እንጀምር"
496−
497−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
498−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
499−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
500−#: qml/Wizard/Pages/passwd-set.qml:90
501−msgid "Continue"
479+msgid "Language"
480+msgstr "ቋንቋ"
481+
482+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
483+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
484+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
485+#: qml/Wizard/Pages/75-report-check.qml:84
486+#: qml/Wizard/Pages/passcode-desktop.qml:124
487+#: qml/Wizard/Pages/password-set.qml:141
488+msgid "Next"
502489msgstr "ይቀጥሉ"
503490
504−#: qml/Wizard/Pages/20-sim.qml:25
505−msgid "Add a SIM card and restart your device"
506−msgstr "የ ሲም ካርድ ይጨምሩ እና አካሉን እንደገና ያስነሱ"
491+#: qml/Wizard/Pages/30-wifi.qml:29
492+msgid "Connect to Wi‑Fi"
493+msgstr "ወደ ዋይ‑ፋይ መገናኛ"
494+
495+#: qml/Wizard/Pages/30-wifi.qml:130
496+msgid "Connected"
497+msgstr "ተገናኝቷል"
507498
508−#: qml/Wizard/Pages/20-sim.qml:59
509−msgid "Without it, you won’t be able to make calls or use text messaging."
510−msgstr "ያለ እሱ ጥሪ መፈጸም ወይንም የ ጽሁፍ መልእክት መላክ አይችሉም"
499+#: qml/Wizard/Pages/30-wifi.qml:163
500+msgid "Available Wi-Fi networks"
501+msgstr "ዝግጁ የ ዋይ-ፋይ ኔትዎርኮች"
511502
512−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
503+#: qml/Wizard/Pages/30-wifi.qml:164
504+msgid "No available Wi-Fi networks"
505+msgstr "ምንም ዝግጁ ዋይ-ፋይ ኔትዎርኮች አልተገኙም"
506+
507+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
508+#: qml/Wizard/Pages/sim.qml:101
513509msgid "Skip"
514510msgstr "መዝለያ"
515511
516−#: qml/Wizard/Pages/30-passwd-type.qml:39
517−msgid "Lock security"
518−msgstr "ደህንነት መቆለፊያ"
512+#: qml/Wizard/Pages/40-location.qml:27
513+msgid "Location Services"
514+msgstr "የ አካባቢ ግልጋሎት"
519515
520−#: qml/Wizard/Pages/30-passwd-type.qml:79
521−msgid "Please select how you’d like to unlock your device."
522−msgstr "እባክዎን የ እርስዎን አካል እንዴት እንደሚከፈት ይምረጡ"
516+#: qml/Wizard/Pages/40-location.qml:83
517+msgid ""
518+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
519+"(recommended)"
520+msgstr "ይጠቀሙ ጂፒኤስ: ዋይ-ፋይ: hotspots እና ተንቀሳቃሽ ኔትዎርክ ሳይታወቁ አካባቢ ለማግኘት (ይመከራሉ)"
523521
524−#: qml/Wizard/Pages/30-passwd-type.qml:102
525−msgctxt "Label: Type of security method"
526−msgid "Swipe"
527−msgstr "መጥረጊያ"
522+#: qml/Wizard/Pages/40-location.qml:105
523+#, qt-format
524+msgid "By selecting this option you agree to the Nokia HERE %1."
525+msgstr "ይህን ምርጫ በ መምረጥ እርስዎ ተስማምተዋል ከ Nokia HERE %1."
528526
529−#: qml/Wizard/Pages/30-passwd-type.qml:103
530−msgctxt "Label: Description of security method"
531−msgid "No security"
532−msgstr "ደህንነት አልተገኘም"
527+#: qml/Wizard/Pages/40-location.qml:106
528+msgctxt "part of: Nokia HERE terms and conditions"
529+msgid "terms and conditions"
530+msgstr "ስምምነት እና ሁኔታዎች"
533531
534−#: qml/Wizard/Pages/30-passwd-type.qml:105
535−msgctxt "Label: Type of security method"
536−msgid "Passcode"
537−msgstr "ማለፊያ ኮድ"
532+#: qml/Wizard/Pages/40-location.qml:160
533+msgid "GPS only"
534+msgstr "ጂፒኤስ ብቻ"
538535
539−#: qml/Wizard/Pages/30-passwd-type.qml:106
540−msgctxt "Label: Description of security method"
541−msgid "4 digits only"
542−msgstr "4 ዲጂት ብቻ"
536+#: qml/Wizard/Pages/40-location.qml:214
537+msgid "Don't use my location"
538+msgstr "የ እኔን አካባቢ አትጠቀም"
543539
544−#: qml/Wizard/Pages/30-passwd-type.qml:108
545−msgctxt "Label: Type of security method"
546−msgid "Passphrase"
547−msgstr "የማለፊያ ሐረግ"
540+#: qml/Wizard/Pages/40-location.qml:260
541+msgid "You can change it later in System Settings."
542+msgstr "እርስዎ በኋላ በ ስርአት ማሰናጃ ውስጥ መቀየር ይችላሉ"
548543
549−#: qml/Wizard/Pages/30-passwd-type.qml:109
550−msgctxt "Label: Description of security method"
551−msgid "Numbers and letters"
552−msgstr "ቁጥሮች እና ፊደሎች"
544+#: qml/Wizard/Pages/50-timezone.qml:29
545+msgid "Time Zone"
546+msgstr "የ ሰአት ክልል"
553547
554−#: qml/Wizard/Pages/40-wifi.qml:29
555−msgid "Connect to Wi‑Fi"
556−msgstr "ወደ ዋይ‑ፋይ መገናኛ"
548+#: qml/Wizard/Pages/50-timezone.qml:178
549+msgid "Enter your city"
550+msgstr "የ እርስዎን ከተማ ያስገቡ"
557551
558−#: qml/Wizard/Pages/40-wifi.qml:168
559−msgid "Available networks…"
560−msgstr "ዝግጁ ኔትዎርኮች…"
552+#: qml/Wizard/Pages/60-account.qml:24
553+msgid "Personalize Your Device"
554+msgstr "የ እርስዎን አካል የ ግልዎ ያድርጉ"
561555
562−#: qml/Wizard/Pages/40-wifi.qml:169
563−msgid "No available networks."
564−msgstr "ዝግጁ ኔትዎርኮች አልተገኙም"
556+#: qml/Wizard/Pages/60-account.qml:48
557+msgid "Preferred Name"
558+msgstr "የመረጡት ስም"
565559
566−#: qml/Wizard/Pages/50-location.qml:27
567−msgid "Location"
568−msgstr "አካባቢ"
560+#: qml/Wizard/Pages/70-passwd-type.qml:39
561+msgid "Lock Screen"
562+msgstr "መመልከቻውን መቆለፊያ"
569563
570−#: qml/Wizard/Pages/50-location.qml:62
571−msgid "Let the phone detect your location:"
572−msgstr "እባክዎን እርስዎ ያሉበትን አካባቢ ስልኩ እራሱ ይፈልግ:"
564+#: qml/Wizard/Pages/70-passwd-type.qml:101
565+msgctxt "Label: Type of security method"
566+msgid "Create new password"
567+msgstr "አዲስ የ መግቢያ ቃል መፍጠሪያ"
573568
574−#: qml/Wizard/Pages/50-location.qml:69
575−msgid "Using GPS only (less accurate)"
576−msgstr "ጂፒኤስን ብቻ መጠቀሚያ(በጣም ቅርብ)"
569+#: qml/Wizard/Pages/70-passwd-type.qml:103
570+msgctxt "Label: Type of security method"
571+msgid "Create passcode (numbers only)"
572+msgstr "አዲስ የ ማለፊያ ኮድ መፍጠሪያ (ቁጥር ብቻ)"
577573
578−#: qml/Wizard/Pages/50-location.qml:86
579−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
580−msgstr "ይጠቀሙ ጂፒኤስ ግልጽ ያልሆነ ዋይ-ፋይ እና ተንቀሳቃሽ ኔትዎርክ መረጃ (ይመከራሉ)"
574+#: qml/Wizard/Pages/70-passwd-type.qml:105
575+msgctxt "Label: Type of security method"
576+msgid "No lock code"
577+msgstr "ምንም መቆለፊያ ኮድ አልተገኘም"
581578
582−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
583−#: qml/Wizard/Pages/50-location.qml:103
584−msgid ""
585−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
586−"conditions</a>."
587−msgstr "ይህን ምርጫ በመምረጥ ተስማምቻለሁ ከ Nokia HERE <a href='#'>ውሎች እና ሁኔታዎች ጋር</a>."
579+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
580+msgid "Privacy Policy"
581+msgstr "የ ግላዊነት መመሪያ"
582+
583+#: qml/Wizard/Pages/75-report-check.qml:26
584+msgid "Help Us Improve"
585+msgstr "እንድንሻሻል ይርዱን"
586+
587+#: qml/Wizard/Pages/75-report-check.qml:59
588+msgid "Improve system performance by sending us crashes and error reports."
589+msgstr "የ ስርአቱን አፈጻጸም ለማሻሻል የ ግጭት እና የ ስህተት መልእክቶች ይላኩልን"
588590
589−#: qml/Wizard/Pages/50-location.qml:112
590−msgid "Not at all"
591−msgstr "አይደለም"
591+#: qml/Wizard/Pages/75-report-check.qml:60
592+msgid "Privacy policy"
593+msgstr "የ ግላዊነት መመሪያ"
592594
593−#: qml/Wizard/Pages/50-location.qml:124
594−msgid "You can change your mind later in <b>System Settings</b>."
595−msgstr "እርስዎ በኋላ መቀየር ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b>."
595+#: qml/Wizard/Pages/80-finished.qml:89
596+msgid "Welcome to Ubuntu"
597+msgstr "እንኳን ደህና መጡ ወደ ኡቡንቱ"
598+
599+#: qml/Wizard/Pages/80-finished.qml:104
600+msgid "You are ready to use your device now"
601+msgstr "የ እርስዎን አካል ለ መጠቀም አሁን ዝግጁ ነው"
602+
603+#: qml/Wizard/Pages/80-finished.qml:124
604+msgid "Get Started"
605+msgstr "እንጀምር"
606+
607+#: qml/Wizard/Pages/here-terms.qml:25
608+msgid "Terms & Conditions"
609+msgstr "ውሎች & ሁኔታዎች"
596610
597−#: qml/Wizard/Pages/60-reporting.qml:26
598−msgid "Improving your experience"
599−msgstr "የ እርስዎን ልምምድ ማሻሻያ"
611+#: qml/Wizard/Pages/here-terms.qml:69
612+msgid "Your device uses positioning technologies provided by HERE."
613+msgstr "የ እርስዎ አካል ይጠቀማል ያሉበትን አካባቢ ቴክኖሎጂ የቀረበውን በ HERE."
600614
601−#: qml/Wizard/Pages/60-reporting.qml:46
615+#: qml/Wizard/Pages/here-terms.qml:81
602616msgid ""
603−"Your phone is set up to automatically report errors to Canonical and its "
604−"partners, the makers of the operating system."
617+"To provide you with positioning services and to improve their quality, HERE "
618+"collects information about nearby cell towers and Wi-Fi hotspots around your "
619+"current location whenever your position is being found."
605620msgstr ""
606−"የ እርስዎ ስልክ ራሱ በራሱ የ ስህተት መግለጫዎች ወደ Canonical and its partners, የ መስሪያ ስርአት "
607−"አምራቾች"
621+"እርስዎ ያሉበትን አካባቢ ግልጋሎት ለ መስጠት እና ለማሻሻል: HERE መረጃ ይሰበስባል በቅርብ ያሉ የ ሴል ምሶሶዎች እና "
622+"ዋይ-ፋይ hotspots እርስዎ አሁን ያሉበትን አካባቢ ሲታወቅ"
608623
609−#: qml/Wizard/Pages/60-reporting.qml:53
624+#: qml/Wizard/Pages/here-terms.qml:93
610625msgid ""
611−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
612−"Privacy</b>"
613−msgstr ""
614−"ይህን ግልጋሎት ማሰናከል ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b> under <b>Security &amp; Privacy</b>"
626+"The information collected is used to analyze the service and to improve the "
627+"use of service, but not to identify you personally."
628+msgstr "የ ተሰበሰበው መረጃ የሚጠቅመው ግልጋሎት ለማሻሻል ነው: ነገር ግን እርስዎን በ ግል ለ መለየት አይደለም"
615629
616−#: qml/Wizard/Pages/80-finished.qml:24
617−msgid "All done"
618−msgstr "ሁሉም ተፈጽሟል"
630+#: qml/Wizard/Pages/here-terms.qml:106
631+#, qt-format
632+msgid "By continuing, you agree to the HERE platform %1 and %2."
633+msgstr "በ መቀጠል እርስዎ ተስማምተዋል ከ HERE platform %1 እና %2."
619634
620−#: qml/Wizard/Pages/80-finished.qml:39
621−msgid "Nice work!"
622−msgstr "ጥሩ ሰርተዋል!"
635+#: qml/Wizard/Pages/here-terms.qml:107
636+msgid "Service Terms"
637+msgstr "የ ግልጋሎት ስምምነቶች"
623638
624−#: qml/Wizard/Pages/80-finished.qml:46
625−msgid "Your device is now ready to use."
626−msgstr "የ እርስዎ አካል አሁን ዝግጁ ነው"
639+#: qml/Wizard/Pages/passcode-confirm.qml:43
640+#: qml/Wizard/Pages/passcode-desktop.qml:80
641+msgid "Confirm passcode"
642+msgstr "የማለፊያ ኮድ ማረጋገጫ"
627643
628−#: qml/Wizard/Pages/80-finished.qml:53
629−msgid "Finish"
630−msgstr "መጨረሻ"
644+#: qml/Wizard/Pages/passcode-confirm.qml:45
645+msgid "Incorrect passcode."
646+msgstr "የ ተሳሳተ የማለፊያ ኮድ"
631647
632−#: qml/Wizard/Pages/here-terms.qml:27
633−msgid "Terms & Conditions"
634−msgstr "ውሎች & ሁኔታዎች"
648+#: qml/Wizard/Pages/passcode-confirm.qml:45
649+msgctxt "Enter the passcode again"
650+msgid "Please re-enter."
651+msgstr "እባክዎን እንደገና-ያስገቡ"
635652
636−#: qml/Wizard/Pages/passwd-confirm.qml:49
637−msgid "Confirm passphrase"
638−msgstr "የ ማለፊያ ሐረግ ማረጋገጫ"
653+#: qml/Wizard/Pages/passcode-desktop.qml:30
654+msgid "Lock Screen Passcode"
655+msgstr "የ መመልከቻው መቆለፊያ የ ማለፊያ ኮድ"
639656
640−#: qml/Wizard/Pages/passwd-confirm.qml:50
641−msgid "Confirm passcode"
642−msgstr "የማለፊያ ኮድ ማረጋገጫ"
657+#: qml/Wizard/Pages/passcode-desktop.qml:56
658+msgid "Enter 4 numbers to setup your passcode"
659+msgstr "ያስገቡ 4 ቁጥሮች የ እርስዎን የ ማለፊያ ኮድ ለማሰናዳት"
643660
644−#: qml/Wizard/Pages/passwd-confirm.qml:53
645−#: qml/Wizard/Pages/passwd-confirm.qml:54
646−msgid "Please try again."
647−msgstr "እባክዎን እንደገና ይሞክሩ"
661+#: qml/Wizard/Pages/passcode-desktop.qml:65
662+#: qml/Wizard/Pages/passcode-set.qml:54
663+msgid "Choose passcode"
664+msgstr "የ ማለፊያ ኮድ ይምረጡ"
648665
649−#: qml/Wizard/Pages/passwd-set.qml:61
650−msgid "Choose your passcode"
651−msgstr "የ እርስዎን የማለፊያ ኮድ ይምረጡ"
666+#: qml/Wizard/Pages/passcode-desktop.qml:105
667+msgid "Passcode too short"
668+msgstr "የ ማለፊያ ኮዱ በጣም አጭር ነው"
652669
653−#: qml/Wizard/Pages/passwd-set.qml:68
654−msgid "Passphrase must be 4 characters long"
655−msgstr "የ ማለፊያ ሀረግ ቢያንስ 4 ባህሪዎች መሆን አለበት"
670+#: qml/Wizard/Pages/passcode-desktop.qml:107
671+msgid "Passcodes match"
672+msgstr "የ ማለፊያ ኮዶቹ ተመሳሳይ ናቸው"
656673
657−#. Translators: This is the arrow for "Back" buttons
658−#: qml/Wizard/StackButton.qml:39
659−#, qt-format
660−msgid "〈 %1"
661−msgstr "〈 %1"
674+#: qml/Wizard/Pages/passcode-desktop.qml:109
675+msgid "Passcodes do not match"
676+msgstr "የ ማለፊያ ኮዶቹ አይመሳሰሉም"
662677
663−#. Translators: This is the arrow for "Forward" buttons
664−#: qml/Wizard/StackButton.qml:42
665−#, qt-format
666−msgid "%1 〉"
667−msgstr "%1 〉"
678+#: qml/Wizard/Pages/passcode-set.qml:62
679+msgid "Passcode must be 4 characters long"
680+msgstr "የ ማለፊያ ኮድ 4 ባህሪዎች መሆን አለበት"
681+
682+#: qml/Wizard/Pages/password-set.qml:30
683+msgid "Lock Screen Password"
684+msgstr "የ መመልከቻ መቆለፊያ የ መግቢያ ቃል"
685+
686+#: qml/Wizard/Pages/password-set.qml:61
687+msgid "Enter at least 8 characters"
688+msgstr "ያስገቡ ቢያንስ 8 ባህሪዎች"
689+
690+#: qml/Wizard/Pages/password-set.qml:73
691+msgid "Choose password"
692+msgstr "የ መግቢያ ቃል ይምረጡ"
693+
694+#: qml/Wizard/Pages/password-set.qml:103
695+msgid "Confirm password"
696+msgstr "የ መግቢያ ቃሉን ያረጋግጡ"
697+
698+#: qml/Wizard/Pages/sim.qml:27
699+msgid "No SIM card installed"
700+msgstr "ምንም ሲም ካርድ አልተገጠመም"
701+
702+#: qml/Wizard/Pages/sim.qml:54
703+msgid "SIM card added"
704+msgstr "ሲም ካርድ ተጨምሯል"
705+
706+#: qml/Wizard/Pages/sim.qml:55
707+msgid "You must restart the device to access the mobile network."
708+msgstr "እርስዎ አካሉን እንደገና ማስጀመር አለብዎት ተንቀሳቃሽ ኔትዎርክ ጋር ለ መድረስ"
709+
710+#: qml/Wizard/Pages/sim.qml:59
711+msgid "Restart"
712+msgstr "እንደገና ማስጀመሪያ"
713+
714+#: qml/Wizard/Pages/sim.qml:78
715+msgid "You won’t be able to make calls or use text messaging without a SIM."
716+msgstr "ያለ ሲም ካርድ እርስዎ ጥሪ መፈጸም ወይንም በ ጽሁፍ መልእክት መላክ አይችሉም"
717+
718+#: qml/Wizard/Pages/sim.qml:90
719+msgid "To proceed with no SIM tap Skip."
720+msgstr "ያለ ሲም ለ መቀጠል መዝለያውን መታ ያድርጉ"
721+
722+#: qml/Wizard/PasswordMeter.qml:87
723+msgid "Passwords match"
724+msgstr "የ መግቢያ ቃሎቹ ተመሳሳይ ናቸው"
725+
726+#: qml/Wizard/PasswordMeter.qml:89
727+msgid "Passwords do not match"
728+msgstr "የ መግቢያ ቃሎቹ ተመሳሳይ አይደሉም"
729+
730+#: qml/Wizard/PasswordMeter.qml:93
731+msgid "Strong password"
732+msgstr "ጠንካራ የ መግቢያ ቃል"
733+
734+#: qml/Wizard/PasswordMeter.qml:95
735+msgid "Fair password"
736+msgstr "ደህና የ መግቢያ ቃል"
737+
738+#: qml/Wizard/PasswordMeter.qml:97
739+msgid "Weak password"
740+msgstr "ደካማ የ መግቢያ ቃል"
741+
742+#: qml/Wizard/PasswordMeter.qml:99
743+msgid "Very weak password"
744+msgstr "በጣም ደካማ የ መግቢያ ቃል"
668745
669746#~ msgid "Top edge"
670747#~ msgstr "የላይ ጠርዝ"
@@ -735,6 +812,9 @@ msgstr "%1 〉"
735812#~ msgid "Log out"
736813#~ msgstr "መውጫ"
737814
815+#~ msgid "Are you sure you want to shut down?"
816+#~ msgstr "በእርግጥ ማጥፋት ይፈልጋሉ?"
817+
738818#~ msgid "Shut down"
739819#~ msgstr "ማጥፊያ"
740820
@@ -756,24 +836,188 @@ msgstr "%1 〉"
756836#~ msgid "Roaming"
757837#~ msgstr "ማዘዋወሪያ"
758838
759−#~ msgid "Restart"
760−#~ msgstr "እንደገና ማስጀመሪያ"
761−
762839#~ msgid "Manage Scopes"
763840#~ msgstr "የ ክልል አስተዳዳሪ"
764841
765842#~ msgid "Please re-enter"
766843#~ msgstr "እባክዎን እንደገና-ያስገቡ"
767844
845+#~ msgid "Lock security"
846+#~ msgstr "ደህንነት መቆለፊያ"
847+
768848#~ msgid "Please select how you’d like to unlock your phone."
769849#~ msgstr "እባክዎን የ እርስዎን ስልክ እንዴት እንደሚከፍቱ ይምረጡ"
770850
851+#~ msgid "Improving your experience"
852+#~ msgstr "የ እርስዎን ልምምድ ማሻሻያ"
853+
854+#~ msgid "Available networks…"
855+#~ msgstr "ዝግጁ ኔትዎርኮች…"
856+
857+#~ msgid "No available networks."
858+#~ msgstr "ዝግጁ ኔትዎርኮች አልተገኙም"
859+
860+#~ msgid "Location"
861+#~ msgstr "አካባቢ"
862+
863+#~ msgid ""
864+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
865+#~ "Privacy</b>"
866+#~ msgstr ""
867+#~ "ይህን ግልጋሎት ማሰናከል ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b> under <b>Security &amp; Privacy</b>"
868+
869+#~ msgid "Nice work!"
870+#~ msgstr "ጥሩ ሰርተዋል!"
871+
872+#~ msgid "All done"
873+#~ msgstr "ሁሉም ተፈጽሟል"
874+
875+#~ msgid "Finish"
876+#~ msgstr "መጨረሻ"
877+
771878#~ msgid "Your phone is now ready to use."
772879#~ msgstr "ስልኩ አሁን ለመጠቀም ዝግጁ ነው"
773880
881+#~ msgid "Confirm passphrase"
882+#~ msgstr "የ ማለፊያ ሐረግ ማረጋገጫ"
883+
884+#~ msgid "Please try again."
885+#~ msgstr "እባክዎን እንደገና ይሞክሩ"
886+
887+#~ msgid "Add a SIM card and restart your device"
888+#~ msgstr "የ ሲም ካርድ ይጨምሩ እና አካሉን እንደገና ያስነሱ"
889+
890+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
891+#~ msgstr "ያለ እሱ ጥሪ መፈጸም ወይንም የ ጽሁፍ መልእክት መላክ አይችሉም"
892+
893+#~ msgid "Hi!"
894+#~ msgstr "ሰላም"
895+
774896#~ msgid "Welcome to your Ubuntu phone."
775897#~ msgstr "እንኳን ደህና መጡ ወደ እርስዎ ኡቡንቱ ስልክ"
776898
899+#~ msgid "Let’s get started."
900+#~ msgstr "ስራ እንጀምር"
901+
902+#~ msgid "Continue"
903+#~ msgstr "ይቀጥሉ"
904+
905+#~ msgid "Passphrase must be 4 characters long"
906+#~ msgstr "የ ማለፊያ ሀረግ ቢያንስ 4 ባህሪዎች መሆን አለበት"
907+
908+#~ msgid "Choose your passcode"
909+#~ msgstr "የ እርስዎን የማለፊያ ኮድ ይምረጡ"
910+
911+#~ msgid "Let the phone detect your location:"
912+#~ msgstr "እባክዎን እርስዎ ያሉበትን አካባቢ ስልኩ እራሱ ይፈልግ:"
913+
914+#, qt-format
915+#~ msgid "〈 %1"
916+#~ msgstr "〈 %1"
917+
918+#, qt-format
919+#~ msgid "%1 〉"
920+#~ msgstr "%1 〉"
921+
922+#~ msgid "You can change your mind later in <b>System Settings</b>."
923+#~ msgstr "እርስዎ በኋላ መቀየር ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b>."
924+
925+#~ msgid "Not at all"
926+#~ msgstr "አይደለም"
927+
928+#~ msgid "Using GPS only (less accurate)"
929+#~ msgstr "ጂፒኤስን ብቻ መጠቀሚያ(በጣም ቅርብ)"
930+
931+#~ msgid ""
932+#~ "Your phone is set up to automatically report errors to Canonical and its "
933+#~ "partners, the makers of the operating system."
934+#~ msgstr ""
935+#~ "የ እርስዎ ስልክ ራሱ በራሱ የ ስህተት መግለጫዎች ወደ Canonical and its partners, የ መስሪያ ስርአት "
936+#~ "አምራቾች"
937+
938+#~ msgid ""
939+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
940+#~ "conditions</a>."
941+#~ msgstr "ይህን ምርጫ በመምረጥ ተስማምቻለሁ ከ Nokia HERE <a href='#'>ውሎች እና ሁኔታዎች ጋር</a>."
942+
943+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
944+#~ msgstr "ይጠቀሙ ጂፒኤስ ግልጽ ያልሆነ ዋይ-ፋይ እና ተንቀሳቃሽ ኔትዎርክ መረጃ (ይመከራሉ)"
945+
946+#~ msgid "This action does different things for different apps"
947+#~ msgstr "ይህ ተግባር ለተለያዩ መተግበሪያዎች የተለያየ ነገር ይሰራል"
948+
949+#~ msgid "Tap here to finish."
950+#~ msgstr "እዚህ መታ ይድርጉ ለመጨረስ"
951+
952+#~ msgid "Short swipe from the left edge."
953+#~ msgstr "ከ ግራ ጠርዝ በኩል በትንሹ ይጥረጉ"
954+
955+#~ msgid "Open the launcher"
956+#~ msgstr "ማስጀመሪያውን መክፈቻ"
957+
958+#~ msgid "Tap here to continue."
959+#~ msgstr "እዚህ መታ ይድርጉ ለመቀጠል"
960+
961+#~ msgid "These are the shortcuts to favorite apps"
962+#~ msgstr "እነዚህ አቋራጮች ናቸው እርስዎ ለሚወዷቸው መተግበሪያዎች"
963+
964+#~ msgid "Swipe up from the bottom edge."
965+#~ msgstr "ከ ታች ጠርዝ በኩል ወደ ላይ ይጥረጉ"
966+
967+#~ msgid "Open special menus"
968+#~ msgstr "የተለዩ ዝርዝሮች መክፈቻ"
969+
970+#~ msgid "To view open apps"
971+#~ msgstr "ለመመልከት መተግበሪያዎች ይክፈቱ"
972+
973+#~ msgid "Try again."
974+#~ msgstr "እንደገና ይሞክሩ"
975+
976+#~ msgid "You almost got it!"
977+#~ msgstr "እርስዎ አሁን እያገኙት ነው!"
978+
979+#~ msgid "Long swipe from the right edge."
980+#~ msgstr "ከ ቀኝ ጠርዝ በኩል በረጅሙ ይጥረጉ"
981+
982+#~ msgid "View all your running tasks."
983+#~ msgstr "እርስዎ የሚያስኬዱትን ተግባሮች በሙሉ መመልከቻ"
984+
985+#~ msgctxt "Button: Shut down the system"
986+#~ msgid "Shut down"
987+#~ msgstr "ማጥፊያ"
988+
989+#~ msgctxt "Title: Reboot/Shut down dialog"
990+#~ msgid "Shut down"
991+#~ msgstr "ማጥፊያ"
992+
993+#~ msgctxt "Button: Reboot the system"
994+#~ msgid "Reboot"
995+#~ msgstr "እንደገና ማስነሻ"
996+
997+#~ msgctxt "Label: Type of security method"
998+#~ msgid "Passcode"
999+#~ msgstr "ማለፊያ ኮድ"
1000+
1001+#~ msgctxt "Label: Description of security method"
1002+#~ msgid "No security"
1003+#~ msgstr "ደህንነት አልተገኘም"
1004+
1005+#~ msgctxt "Label: Description of security method"
1006+#~ msgid "4 digits only"
1007+#~ msgstr "4 ዲጂት ብቻ"
1008+
1009+#~ msgctxt "Label: Type of security method"
1010+#~ msgid "Swipe"
1011+#~ msgstr "መጥረጊያ"
1012+
1013+#~ msgctxt "Label: Type of security method"
1014+#~ msgid "Passphrase"
1015+#~ msgstr "የማለፊያ ሐረግ"
1016+
1017+#~ msgctxt "Label: Description of security method"
1018+#~ msgid "Numbers and letters"
1019+#~ msgstr "ቁጥሮች እና ፊደሎች"
1020+
7771021#~ msgid "%a %d %b %H:%M"
7781022#~ msgstr "%a %d %b %ሰ:%ደ"
7791023
@@ -807,11 +1051,11 @@ msgstr "%1 〉"
8071051#~ msgid "Call back"
8081052#~ msgstr "መልሶ መደወያ"
8091053
810−#~ msgid "Re-dock, save your work and close these apps to continue."
811−#~ msgstr "እንደገና-ማሳረፊያ: ስራዎትን ያስቀምጡ እና ይዝጉ መተግበሪያው እንዲቀጥል"
1054+#~ msgid "Welcome to your Ubuntu device."
1055+#~ msgstr "እንኳን ድህና መጡ ወደ ኡቡንቱ"
8121056
813−#~ msgid ""
814−#~ "Your device is now connected to an external display. Use this screen as a "
815−#~ "touch pad to interact with the mouse."
816−#~ msgstr ""
817−#~ "የ እርስዎ አካል አሁን ከ ውጪ ማሳያ ጋር ተገናኝቷል: ይህን መመልከቻ እንደ ተችፓድ ከ አይጥ ጋር ተባብሮ ይሰራል"
1057+#~ msgid "Please select how you’d like to unlock your device."
1058+#~ msgstr "እባክዎን የ እርስዎን አካል እንዴት እንደሚከፈት ይምረጡ"
1059+
1060+#~ msgid "Your device is now ready to use."
1061+#~ msgstr "የ እርስዎ አካል አሁን ዝግጁ ነው"
po/ar.po+455−227
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1111"PO-Revision-Date: 2015-07-29 09:41+0000\n"
1212"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
1313"Language-Team: Arabic <ar@li.org>\n"
@@ -16,8 +16,8 @@ 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: 2016-03-13 05:50+0000\n"
20−"X-Generator: Launchpad (build 17939)\n"
19+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
20+"X-Generator: Launchpad (build 17958)\n"
2121
2222#: plugins/IntegratedLightDM/Greeter.cpp:112
2323msgid "Password: "
@@ -80,53 +80,35 @@ msgctxt "Button: Log out from the system"
8080msgid "Log Out"
8181msgstr "خروج"
8282
83−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
84−#: qml/Components/Dialogs.qml:253
83+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
84+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
85+#: qml/Wizard/Pages/passcode-set.qml:32
8586msgid "Cancel"
8687msgstr "إلغاء"
8788
8889#: qml/Components/Dialogs.qml:173
89−msgctxt "Title: Reboot/Shut down dialog"
90−msgid "Shut down"
91−msgstr "إطفاء الجهاز"
92−
93−#: qml/Components/Dialogs.qml:174
94−msgid "Are you sure you want to shut down?"
95−msgstr "هل أنت متأكد من رغبتك في إطفاء الجهاز؟"
96−
97−#: qml/Components/Dialogs.qml:176
98−msgctxt "Button: Reboot the system"
99−msgid "Reboot"
100−msgstr "إعادة التشغيل"
101−
102−#: qml/Components/Dialogs.qml:185
103−msgctxt "Button: Shut down the system"
104−msgid "Shut down"
105−msgstr "إطفاء الجهاز"
106−
107−#: qml/Components/Dialogs.qml:207
10890msgctxt "Title: Reboot dialog"
10991msgid "Reboot"
11092msgstr "إعادة التشغيل"
11193
112−#: qml/Components/Dialogs.qml:208
94+#: qml/Components/Dialogs.qml:174
11395msgid "Are you sure you want to reboot?"
11496msgstr "هل أنت متأكد من رغبتك في إعادة تشغيل الجهاز؟"
11597
116−#: qml/Components/Dialogs.qml:210
98+#: qml/Components/Dialogs.qml:176
11799msgid "No"
118100msgstr "لا"
119101
120−#: qml/Components/Dialogs.qml:217
102+#: qml/Components/Dialogs.qml:183
121103msgid "Yes"
122104msgstr "نعم"
123105
124−#: qml/Components/Dialogs.qml:232
106+#: qml/Components/Dialogs.qml:198
125107msgctxt "Title: Power off/Restart dialog"
126108msgid "Power"
127109msgstr "الطاقة"
128110
129−#: qml/Components/Dialogs.qml:233
111+#: qml/Components/Dialogs.qml:199
130112msgid ""
131113"Are you sure you would like\n"
132114"to power off?"
@@ -134,12 +116,12 @@ msgstr ""
134116"هل أنت متأكد من رغبتك\n"
135117"في إيقاف التشغيل؟"
136118
137−#: qml/Components/Dialogs.qml:235
119+#: qml/Components/Dialogs.qml:201
138120msgctxt "Button: Power off the system"
139121msgid "Power off"
140122msgstr "إيقاف التشغيل"
141123
142−#: qml/Components/Dialogs.qml:244
124+#: qml/Components/Dialogs.qml:210
143125msgctxt "Button: Restart the system"
144126msgid "Restart"
145127msgstr "إعادة التشغيل"
@@ -182,42 +164,58 @@ msgstr ""
182164msgid "Close all"
183165msgstr ""
184166
185−#: qml/Dash/DashPageHeader.qml:270
167+#: qml/Dash/DashPageHeader.qml:337
186168msgctxt "Button: Open the Ubuntu Store"
187169msgid "Store"
188170msgstr "المتجر"
189171
190−#: qml/Dash/DashPageHeader.qml:277
172+#: qml/Dash/DashPageHeader.qml:344
191173msgctxt "Button: Start a search in the current dash scope"
192174msgid "Search"
193175msgstr "بحث"
194176
195−#: qml/Dash/DashPageHeader.qml:287
177+#: qml/Dash/DashPageHeader.qml:354
196178msgctxt "Button: Show the current dash scope settings"
197179msgid "Settings"
198180msgstr "الإعدادات"
199181
200−#: qml/Dash/DashPageHeader.qml:294
182+#: qml/Dash/DashPageHeader.qml:361
201183msgid "Remove from Favorites"
202184msgstr "حذف من المفضلات"
203185
204−#: qml/Dash/DashPageHeader.qml:294
186+#: qml/Dash/DashPageHeader.qml:361
205187msgid "Add to Favorites"
206188msgstr "إضافة إلى المفضلات"
207189
208−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
190+#: qml/Dash/FiltersPopover.qml:60
191+msgid "Refine your results"
192+msgstr ""
193+
194+#: qml/Dash/FiltersPopover.qml:69
195+msgid "Reset"
196+msgstr ""
197+
198+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
209199msgid "See less"
210200msgstr "شاهد أقل"
211201
212−#: qml/Dash/GenericScopeView.qml:567
202+#: qml/Dash/GenericScopeView.qml:570
213203msgid "See all"
214204msgstr "عرض الكل"
215205
216−#: qml/Dash/GenericScopeView.qml:629
206+#: qml/Dash/GenericScopeView.qml:627
217207msgctxt "Label: Hint for dash search line edit"
218208msgid "Search"
219209msgstr "بحث"
220210
211+#: qml/Dash/PageHeaderExtraPanel.qml:55
212+msgid "Recent Searches"
213+msgstr ""
214+
215+#: qml/Dash/PageHeaderExtraPanel.qml:66
216+msgid "Clear All"
217+msgstr ""
218+
221219#: qml/Dash/Previews/PreviewActionCombo.qml:35
222220msgid "More..."
223221msgstr "المزيد..."
@@ -285,11 +283,11 @@ msgstr "إعادة المحاولة"
285283msgid "Tap to unlock"
286284msgstr "انقر لفك القفل"
287285
288−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
286+#: qml/Greeter/NarrowView.qml:54
289287msgid "Sorry, incorrect passphrase."
290288msgstr "عذرًا، عبارة سرّية خاطئة."
291289
292−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
290+#: qml/Greeter/NarrowView.qml:55
293291msgid "Sorry, incorrect passcode."
294292msgstr "عذرًا، رمز سرّي خاطيء."
295293
@@ -318,7 +316,7 @@ msgstr ""
318316msgid "Enter %1"
319317msgstr "أدخِل %1"
320318
321−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
319+#: qml/Greeter/NarrowView.qml:117
322320msgid "Enter passphrase"
323321msgstr "أدخِل العبارة السرية"
324322
@@ -356,11 +354,11 @@ msgstr "انقر للعودة إلى المكالمة..."
356354msgid "Conference"
357355msgstr "مؤتمر"
358356
359−#: qml/Panel/Indicators/MenuItemFactory.qml:752
357+#: qml/Panel/Indicators/MenuItemFactory.qml:761
360358msgid "Nothing is playing"
361359msgstr "لا شيء مُشغّل"
362360
363−#: qml/Panel/Indicators/MenuItemFactory.qml:881
361+#: qml/Panel/Indicators/MenuItemFactory.qml:890
364362#, qt-format
365363msgid "%1 hour"
366364msgid_plural "%1 hours"
@@ -371,7 +369,7 @@ msgstr[3] "%1 ساعات"
371369msgstr[4] "%1 ساعة"
372370msgstr[5] "%1 ساعة"
373371
374−#: qml/Panel/Indicators/MenuItemFactory.qml:885
372+#: qml/Panel/Indicators/MenuItemFactory.qml:894
375373#, qt-format
376374msgid "%1 minute"
377375msgid_plural "%1 minutes"
@@ -382,7 +380,7 @@ msgstr[3] "%1 دقائق"
382380msgstr[4] "%1 دقيقة"
383381msgstr[5] "%1 دقيقة"
384382
385−#: qml/Panel/Indicators/MenuItemFactory.qml:890
383+#: qml/Panel/Indicators/MenuItemFactory.qml:899
386384#, qt-format
387385msgid "%1 second"
388386msgid_plural "%1 seconds"
@@ -393,37 +391,37 @@ msgstr[3] "%1 ثوان"
393391msgstr[4] "%1 ثانية"
394392msgstr[5] "%1 ثانية"
395393
396−#: qml/Panel/Indicators/MenuItemFactory.qml:893
394+#: qml/Panel/Indicators/MenuItemFactory.qml:902
397395msgid "0 seconds"
398396msgstr "أقل من ثانية"
399397
400398#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
401−#: qml/Panel/Indicators/MenuItemFactory.qml:895
399+#: qml/Panel/Indicators/MenuItemFactory.qml:904
402400#, qt-format
403401msgid "%1 remaining"
404402msgstr "باق %1"
405403
406−#: qml/Panel/Indicators/MenuItemFactory.qml:901
404+#: qml/Panel/Indicators/MenuItemFactory.qml:910
407405msgid "In queue…"
408406msgstr "في الانتظار..."
409407
410−#: qml/Panel/Indicators/MenuItemFactory.qml:905
408+#: qml/Panel/Indicators/MenuItemFactory.qml:914
411409msgid "Downloading"
412410msgstr "التنزيل"
413411
414−#: qml/Panel/Indicators/MenuItemFactory.qml:907
412+#: qml/Panel/Indicators/MenuItemFactory.qml:916
415413msgid "Paused, tap to resume"
416414msgstr "مُلبث، انقر للاستئناف"
417415
418−#: qml/Panel/Indicators/MenuItemFactory.qml:909
416+#: qml/Panel/Indicators/MenuItemFactory.qml:918
419417msgid "Canceled"
420418msgstr "تم إلغائه"
421419
422−#: qml/Panel/Indicators/MenuItemFactory.qml:911
420+#: qml/Panel/Indicators/MenuItemFactory.qml:920
423421msgid "Finished"
424422msgstr "انتهى"
425423
426−#: qml/Panel/Indicators/MenuItemFactory.qml:913
424+#: qml/Panel/Indicators/MenuItemFactory.qml:922
427425msgid "Failed, tap to retry"
428426msgstr "فشل، انقل لإعادة المحاولة"
429427
@@ -443,252 +441,323 @@ msgctxt "Button: Call back on phone"
443441msgid "Call back"
444442msgstr ""
445443
446−#: qml/Tutorial/TutorialBottom.qml:28
447−msgid "Open special menus"
448−msgstr "فتح قوائم خاصة"
449−
450−#: qml/Tutorial/TutorialBottom.qml:29
451−msgid "Swipe up from the bottom edge."
452−msgstr "اسحب لأعلى من الحافة السفلى."
444+#: qml/Stages/SideStage.qml:76
445+msgid "Drag using 3 fingers any application from one window to the other"
446+msgstr ""
453447
454−#: qml/Tutorial/TutorialBottomFinish.qml:24
455−msgid "This action does different things for different apps"
456−msgstr "هذا الإجراء يقوم بأشياء مختلفة على التطبيقات المختلفة"
448+#: qml/Tutorial/TutorialBottom.qml:78
449+msgid "Swipe up to add a contact"
450+msgstr ""
457451
458−#: qml/Tutorial/TutorialBottomFinish.qml:25
459−msgid "Tap here to finish."
460−msgstr "انقر هنا للإنهاء."
452+#: qml/Tutorial/TutorialBottom.qml:80
453+msgid "Swipe up for favorite calculations"
454+msgstr ""
461455
462−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
463−#: qml/Tutorial/TutorialRight.qml:144
464−msgid "Tap here to continue."
465−msgstr "انقر هنا للمتابعة."
456+#: qml/Tutorial/TutorialBottom.qml:82
457+msgid "Swipe up for recent calls"
458+msgstr ""
466459
467−#: qml/Tutorial/TutorialLeft.qml:26
468−msgid "Open the launcher"
460+#: qml/Tutorial/TutorialBottom.qml:84
461+msgid "Swipe up to create a message"
469462msgstr ""
470463
471−#: qml/Tutorial/TutorialLeft.qml:27
472−msgid "Short swipe from the left edge."
473−msgstr "اسحب سحبة قصيرة من الحافة اليسرى."
464+#: qml/Tutorial/TutorialBottom.qml:85
465+msgid "Swipe up to manage the app"
466+msgstr ""
474467
475−#: qml/Tutorial/TutorialLeftFinish.qml:24
476−msgid "These are the shortcuts to favorite apps"
477−msgstr "هذه اختصارات للتطبيقات المُفضلة"
468+#: qml/Tutorial/TutorialLeft.qml:47
469+msgid "Swipe from the left edge to open the launcher"
470+msgstr ""
478471
479−#: qml/Tutorial/TutorialPage.qml:178
480−msgid "You almost got it!"
481−msgstr "انت حصلت على ذلك تقريبا!"
472+#: qml/Tutorial/TutorialLeftLong.qml:47
473+msgid "Long swipe from the left edge to open the Today scope"
474+msgstr ""
482475
483−#: qml/Tutorial/TutorialPage.qml:195
484−msgid "Try again."
485−msgstr "حاول مجددًا."
476+#: qml/Tutorial/TutorialRight.qml:54
477+msgid "Hover your mouse on the right edge to view your open apps"
478+msgstr ""
486479
487−#: qml/Tutorial/TutorialRight.qml:31
488−msgid "To view open apps"
480+#: qml/Tutorial/TutorialRight.qml:55
481+msgid "Short or long swipe from the right edge to view your open apps"
489482msgstr ""
490483
491−#: qml/Tutorial/TutorialRight.qml:32
492−msgid "Long swipe from the right edge."
493−msgstr "سحبة طويلة من الحافة اليمنى."
484+#: qml/Tutorial/TutorialTop.qml:53
485+msgid "Swipe from the top right edge to open the notification bar"
486+msgstr ""
494487
495−#: qml/Tutorial/TutorialRight.qml:122
496−msgid "View all your running tasks."
497−msgstr "عرض جميع المهام النشطة."
488+#: qml/Tutorial/TutorialTop.qml:54
489+msgid "Swipe from the top edge to open the notification bar"
490+msgstr ""
498491
499−#: qml/Wizard/Page.qml:89
492+#: qml/Wizard/Page.qml:54
500493msgctxt "Button: Go back one page in the Wizard"
501494msgid "Back"
502495msgstr "عودة"
503496
504497#: qml/Wizard/Pages/10-welcome.qml:27
505−msgid "Hi!"
506−msgstr "أهلا!"
498+msgid "Language"
499+msgstr ""
507500
508−#: qml/Wizard/Pages/10-welcome.qml:44
509−msgid "Welcome to your Ubuntu device."
501+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
502+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
503+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
504+#: qml/Wizard/Pages/75-report-check.qml:84
505+#: qml/Wizard/Pages/passcode-desktop.qml:124
506+#: qml/Wizard/Pages/password-set.qml:141
507+msgid "Next"
510508msgstr ""
511509
512−#: qml/Wizard/Pages/10-welcome.qml:52
513−msgid "Let’s get started."
514−msgstr "هيا بنا نبدأ."
510+#: qml/Wizard/Pages/30-wifi.qml:29
511+msgid "Connect to Wi‑Fi"
512+msgstr "اتصل بالواي فاي"
515513
516−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
517−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
518−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
519−#: qml/Wizard/Pages/passwd-set.qml:90
520−msgid "Continue"
521−msgstr "متابعة"
514+#: qml/Wizard/Pages/30-wifi.qml:130
515+msgid "Connected"
516+msgstr ""
522517
523−#: qml/Wizard/Pages/20-sim.qml:25
524−msgid "Add a SIM card and restart your device"
525−msgstr "أدخِل شريحة SIM ثم أعِد تشغيل الجهاز"
518+#: qml/Wizard/Pages/30-wifi.qml:163
519+msgid "Available Wi-Fi networks"
520+msgstr ""
526521
527−#: qml/Wizard/Pages/20-sim.qml:59
528−msgid "Without it, you won’t be able to make calls or use text messaging."
522+#: qml/Wizard/Pages/30-wifi.qml:164
523+msgid "No available Wi-Fi networks"
529524msgstr ""
530−"بدونها لن تتمكن من إجراء أي مكالمات هاتفية أو استخدام الرسائل النصية."
531525
532−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
526+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
527+#: qml/Wizard/Pages/sim.qml:101
533528msgid "Skip"
534529msgstr "تخطي"
535530
536−#: qml/Wizard/Pages/30-passwd-type.qml:39
537−msgid "Lock security"
538−msgstr "قِفل الأمان"
531+#: qml/Wizard/Pages/40-location.qml:27
532+msgid "Location Services"
533+msgstr ""
539534
540−#: qml/Wizard/Pages/30-passwd-type.qml:79
541−msgid "Please select how you’d like to unlock your device."
535+#: qml/Wizard/Pages/40-location.qml:83
536+msgid ""
537+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
538+"(recommended)"
542539msgstr ""
543540
544−#: qml/Wizard/Pages/30-passwd-type.qml:102
545−msgctxt "Label: Type of security method"
546−msgid "Swipe"
547−msgstr "سحبة"
541+#: qml/Wizard/Pages/40-location.qml:105
542+#, qt-format
543+msgid "By selecting this option you agree to the Nokia HERE %1."
544+msgstr ""
545+
546+#: qml/Wizard/Pages/40-location.qml:106
547+msgctxt "part of: Nokia HERE terms and conditions"
548+msgid "terms and conditions"
549+msgstr ""
550+
551+#: qml/Wizard/Pages/40-location.qml:160
552+msgid "GPS only"
553+msgstr ""
554+
555+#: qml/Wizard/Pages/40-location.qml:214
556+msgid "Don't use my location"
557+msgstr ""
558+
559+#: qml/Wizard/Pages/40-location.qml:260
560+msgid "You can change it later in System Settings."
561+msgstr ""
562+
563+#: qml/Wizard/Pages/50-timezone.qml:29
564+msgid "Time Zone"
565+msgstr ""
566+
567+#: qml/Wizard/Pages/50-timezone.qml:178
568+msgid "Enter your city"
569+msgstr ""
548570
549−#: qml/Wizard/Pages/30-passwd-type.qml:103
550−msgctxt "Label: Description of security method"
551−msgid "No security"
552−msgstr "بدون أمان"
571+#: qml/Wizard/Pages/60-account.qml:24
572+msgid "Personalize Your Device"
573+msgstr ""
574+
575+#: qml/Wizard/Pages/60-account.qml:48
576+msgid "Preferred Name"
577+msgstr ""
553578
554−#: qml/Wizard/Pages/30-passwd-type.qml:105
579+#: qml/Wizard/Pages/70-passwd-type.qml:39
580+msgid "Lock Screen"
581+msgstr ""
582+
583+#: qml/Wizard/Pages/70-passwd-type.qml:101
555584msgctxt "Label: Type of security method"
556−msgid "Passcode"
557−msgstr "رمز سري"
585+msgid "Create new password"
586+msgstr ""
558587
559−#: qml/Wizard/Pages/30-passwd-type.qml:106
560−msgctxt "Label: Description of security method"
561−msgid "4 digits only"
562−msgstr "4 أرقام فقط"
588+#: qml/Wizard/Pages/70-passwd-type.qml:103
589+msgctxt "Label: Type of security method"
590+msgid "Create passcode (numbers only)"
591+msgstr ""
563592
564−#: qml/Wizard/Pages/30-passwd-type.qml:108
593+#: qml/Wizard/Pages/70-passwd-type.qml:105
565594msgctxt "Label: Type of security method"
566−msgid "Passphrase"
567−msgstr "عبارة سرية"
595+msgid "No lock code"
596+msgstr ""
568597
569−#: qml/Wizard/Pages/30-passwd-type.qml:109
570−msgctxt "Label: Description of security method"
571−msgid "Numbers and letters"
572−msgstr "أرقام وحروف"
598+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
599+msgid "Privacy Policy"
600+msgstr ""
573601
574−#: qml/Wizard/Pages/40-wifi.qml:29
575−msgid "Connect to Wi‑Fi"
576−msgstr "اتصل بالواي فاي"
602+#: qml/Wizard/Pages/75-report-check.qml:26
603+msgid "Help Us Improve"
604+msgstr ""
577605
578−#: qml/Wizard/Pages/40-wifi.qml:168
579−msgid "Available networks…"
580−msgstr "الشبكات المتاحة..."
606+#: qml/Wizard/Pages/75-report-check.qml:59
607+msgid "Improve system performance by sending us crashes and error reports."
608+msgstr ""
581609
582−#: qml/Wizard/Pages/40-wifi.qml:169
583−msgid "No available networks."
584−msgstr "لا توجد شبكات متاحة."
610+#: qml/Wizard/Pages/75-report-check.qml:60
611+msgid "Privacy policy"
612+msgstr ""
585613
586−#: qml/Wizard/Pages/50-location.qml:27
587−msgid "Location"
588−msgstr "الموقع"
614+#: qml/Wizard/Pages/80-finished.qml:89
615+msgid "Welcome to Ubuntu"
616+msgstr ""
589617
590−#: qml/Wizard/Pages/50-location.qml:62
591−msgid "Let the phone detect your location:"
592−msgstr "دع هاتفك يحدد موقعك:"
618+#: qml/Wizard/Pages/80-finished.qml:104
619+msgid "You are ready to use your device now"
620+msgstr ""
621+
622+#: qml/Wizard/Pages/80-finished.qml:124
623+msgid "Get Started"
624+msgstr ""
625+
626+#: qml/Wizard/Pages/here-terms.qml:25
627+msgid "Terms & Conditions"
628+msgstr "الشروط والأحكام"
593629
594−#: qml/Wizard/Pages/50-location.qml:69
595−msgid "Using GPS only (less accurate)"
596−msgstr "باستخدام نظام تحديد المواقع (GPS) فقط (أقل دقّة)"
630+#: qml/Wizard/Pages/here-terms.qml:69
631+msgid "Your device uses positioning technologies provided by HERE."
632+msgstr ""
597633
598−#: qml/Wizard/Pages/50-location.qml:86
599−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
634+#: qml/Wizard/Pages/here-terms.qml:81
635+msgid ""
636+"To provide you with positioning services and to improve their quality, HERE "
637+"collects information about nearby cell towers and Wi-Fi hotspots around your "
638+"current location whenever your position is being found."
600639msgstr ""
601−"باستخدام نظام تحديد المواقع (GPS)، والواي فاي، وبيانات الشبكة الخلوية "
602−"(مستحسن)"
603640
604−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
605−#: qml/Wizard/Pages/50-location.qml:103
641+#: qml/Wizard/Pages/here-terms.qml:93
606642msgid ""
607−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
608−"conditions</a>."
643+"The information collected is used to analyze the service and to improve the "
644+"use of service, but not to identify you personally."
609645msgstr ""
610−"باختيارك لهذا الخيار فإنك توافق على <a href='#'>الشروط والأحكام</a> الخاصة "
611−"بـ Nokia HERE."
612646
613−#: qml/Wizard/Pages/50-location.qml:112
614−msgid "Not at all"
647+#: qml/Wizard/Pages/here-terms.qml:106
648+#, qt-format
649+msgid "By continuing, you agree to the HERE platform %1 and %2."
615650msgstr ""
616651
617−#: qml/Wizard/Pages/50-location.qml:124
618−msgid "You can change your mind later in <b>System Settings</b>."
619−msgstr "يمكنك تغيير رأيك في وقت لاحق عن طريق <b>إعدادات النظام</b>."
652+#: qml/Wizard/Pages/here-terms.qml:107
653+msgid "Service Terms"
654+msgstr ""
620655
621−#: qml/Wizard/Pages/60-reporting.qml:26
622−msgid "Improving your experience"
623−msgstr "تحسين تجربتك"
656+#: qml/Wizard/Pages/passcode-confirm.qml:43
657+#: qml/Wizard/Pages/passcode-desktop.qml:80
658+msgid "Confirm passcode"
659+msgstr "تأكيد الرمز السري"
624660
625−#: qml/Wizard/Pages/60-reporting.qml:46
626−msgid ""
627−"Your phone is set up to automatically report errors to Canonical and its "
628−"partners, the makers of the operating system."
661+#: qml/Wizard/Pages/passcode-confirm.qml:45
662+msgid "Incorrect passcode."
629663msgstr ""
630−"هاتفك مُعدّ لإرسال تقارير آلية بالأخطاء إلى كانونيكال وشركائها (صانعي نظام "
631−"التشغيل)."
632664
633−#: qml/Wizard/Pages/60-reporting.qml:53
634−msgid ""
635−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
636−"Privacy</b>"
665+#: qml/Wizard/Pages/passcode-confirm.qml:45
666+msgctxt "Enter the passcode again"
667+msgid "Please re-enter."
668+msgstr ""
669+
670+#: qml/Wizard/Pages/passcode-desktop.qml:30
671+msgid "Lock Screen Passcode"
672+msgstr ""
673+
674+#: qml/Wizard/Pages/passcode-desktop.qml:56
675+msgid "Enter 4 numbers to setup your passcode"
637676msgstr ""
638−"يمكن تعطيل ذلك بالذهاب إلى <b>إعدادات النظام</b> من خلال <b>الأمان "
639−"والخصوصية</b>"
640677
641−#: qml/Wizard/Pages/80-finished.qml:24
642−msgid "All done"
643−msgstr "تم ذلك"
678+#: qml/Wizard/Pages/passcode-desktop.qml:65
679+#: qml/Wizard/Pages/passcode-set.qml:54
680+msgid "Choose passcode"
681+msgstr ""
644682
645−#: qml/Wizard/Pages/80-finished.qml:39
646−msgid "Nice work!"
647−msgstr "عمل جيد!"
683+#: qml/Wizard/Pages/passcode-desktop.qml:105
684+msgid "Passcode too short"
685+msgstr ""
648686
649−#: qml/Wizard/Pages/80-finished.qml:46
650−msgid "Your device is now ready to use."
687+#: qml/Wizard/Pages/passcode-desktop.qml:107
688+msgid "Passcodes match"
651689msgstr ""
652690
653−#: qml/Wizard/Pages/80-finished.qml:53
654−msgid "Finish"
655−msgstr "إنهاء"
691+#: qml/Wizard/Pages/passcode-desktop.qml:109
692+msgid "Passcodes do not match"
693+msgstr ""
656694
657−#: qml/Wizard/Pages/here-terms.qml:27
658−msgid "Terms & Conditions"
659−msgstr "الشروط والأحكام"
695+#: qml/Wizard/Pages/passcode-set.qml:62
696+msgid "Passcode must be 4 characters long"
697+msgstr ""
660698
661−#: qml/Wizard/Pages/passwd-confirm.qml:49
662−msgid "Confirm passphrase"
663−msgstr "تأكيد العبارة السرية"
699+#: qml/Wizard/Pages/password-set.qml:30
700+msgid "Lock Screen Password"
701+msgstr ""
664702
665−#: qml/Wizard/Pages/passwd-confirm.qml:50
666−msgid "Confirm passcode"
667−msgstr "تأكيد الرمز السري"
703+#: qml/Wizard/Pages/password-set.qml:61
704+msgid "Enter at least 8 characters"
705+msgstr ""
668706
669−#: qml/Wizard/Pages/passwd-confirm.qml:53
670−#: qml/Wizard/Pages/passwd-confirm.qml:54
671−msgid "Please try again."
672−msgstr "حاول مجددا."
707+#: qml/Wizard/Pages/password-set.qml:73
708+msgid "Choose password"
709+msgstr ""
673710
674−#: qml/Wizard/Pages/passwd-set.qml:61
675−msgid "Choose your passcode"
676−msgstr "اختر الرمز السري خاصتك"
711+#: qml/Wizard/Pages/password-set.qml:103
712+msgid "Confirm password"
713+msgstr ""
677714
678−#: qml/Wizard/Pages/passwd-set.qml:68
679−msgid "Passphrase must be 4 characters long"
680−msgstr "يجب أن تحتوي العبارة السرية على 4 أحرف على الأقل"
715+#: qml/Wizard/Pages/sim.qml:27
716+msgid "No SIM card installed"
717+msgstr ""
681718
682−#. Translators: This is the arrow for "Back" buttons
683−#: qml/Wizard/StackButton.qml:39
684−#, qt-format
685−msgid "〈 %1"
719+#: qml/Wizard/Pages/sim.qml:54
720+msgid "SIM card added"
686721msgstr ""
687722
688−#. Translators: This is the arrow for "Forward" buttons
689−#: qml/Wizard/StackButton.qml:42
690−#, qt-format
691−msgid "%1 〉"
723+#: qml/Wizard/Pages/sim.qml:55
724+msgid "You must restart the device to access the mobile network."
725+msgstr ""
726+
727+#: qml/Wizard/Pages/sim.qml:59
728+msgid "Restart"
729+msgstr ""
730+
731+#: qml/Wizard/Pages/sim.qml:78
732+msgid "You won’t be able to make calls or use text messaging without a SIM."
733+msgstr ""
734+
735+#: qml/Wizard/Pages/sim.qml:90
736+msgid "To proceed with no SIM tap Skip."
737+msgstr ""
738+
739+#: qml/Wizard/PasswordMeter.qml:87
740+msgid "Passwords match"
741+msgstr ""
742+
743+#: qml/Wizard/PasswordMeter.qml:89
744+msgid "Passwords do not match"
745+msgstr ""
746+
747+#: qml/Wizard/PasswordMeter.qml:93
748+msgid "Strong password"
749+msgstr ""
750+
751+#: qml/Wizard/PasswordMeter.qml:95
752+msgid "Fair password"
753+msgstr ""
754+
755+#: qml/Wizard/PasswordMeter.qml:97
756+msgid "Weak password"
757+msgstr ""
758+
759+#: qml/Wizard/PasswordMeter.qml:99
760+msgid "Very weak password"
692761msgstr ""
693762
694763#~ msgid "Confirm"
@@ -777,20 +846,179 @@ msgstr ""
777846#~ msgid "Tomorrow %H:%M"
778847#~ msgstr "غدًا %H:%M"
779848
849+#~ msgid "Are you sure you want to shut down?"
850+#~ msgstr "هل أنت متأكد من رغبتك في إطفاء الجهاز؟"
851+
852+#~ msgctxt "Button: Shut down the system"
853+#~ msgid "Shut down"
854+#~ msgstr "إطفاء الجهاز"
855+
856+#~ msgctxt "Title: Reboot/Shut down dialog"
857+#~ msgid "Shut down"
858+#~ msgstr "إطفاء الجهاز"
859+
860+#~ msgctxt "Button: Reboot the system"
861+#~ msgid "Reboot"
862+#~ msgstr "إعادة التشغيل"
863+
780864#~ msgid "Please re-enter"
781865#~ msgstr "برجاء إعادة إدخالها"
782866
867+#~ msgid "This action does different things for different apps"
868+#~ msgstr "هذا الإجراء يقوم بأشياء مختلفة على التطبيقات المختلفة"
869+
870+#~ msgid "These are the shortcuts to favorite apps"
871+#~ msgstr "هذه اختصارات للتطبيقات المُفضلة"
872+
783873#~ msgid "Roaming"
784874#~ msgstr "التجوال"
785875
876+#~ msgid "Short swipe from the left edge."
877+#~ msgstr "اسحب سحبة قصيرة من الحافة اليسرى."
878+
879+#~ msgid "Tap here to continue."
880+#~ msgstr "انقر هنا للمتابعة."
881+
882+#~ msgid "Swipe up from the bottom edge."
883+#~ msgstr "اسحب لأعلى من الحافة السفلى."
884+
885+#~ msgid "Open special menus"
886+#~ msgstr "فتح قوائم خاصة"
887+
888+#~ msgid "Tap here to finish."
889+#~ msgstr "انقر هنا للإنهاء."
890+
891+#~ msgid "Long swipe from the right edge."
892+#~ msgstr "سحبة طويلة من الحافة اليمنى."
893+
894+#~ msgid "View all your running tasks."
895+#~ msgstr "عرض جميع المهام النشطة."
896+
897+#~ msgid "Confirm passphrase"
898+#~ msgstr "تأكيد العبارة السرية"
899+
900+#~ msgid "Try again."
901+#~ msgstr "حاول مجددًا."
902+
903+#~ msgid "Please try again."
904+#~ msgstr "حاول مجددا."
905+
906+#~ msgid "Lock security"
907+#~ msgstr "قِفل الأمان"
908+
909+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
910+#~ msgstr ""
911+#~ "بدونها لن تتمكن من إجراء أي مكالمات هاتفية أو استخدام الرسائل النصية."
912+
913+#~ msgid "Add a SIM card and restart your device"
914+#~ msgstr "أدخِل شريحة SIM ثم أعِد تشغيل الجهاز"
915+
916+#~ msgid "Hi!"
917+#~ msgstr "أهلا!"
918+
786919#~ msgid "Welcome to your Ubuntu phone."
787920#~ msgstr "مرحبا بك في أوبونتو للهواتف."
788921
922+#~ msgid "Let’s get started."
923+#~ msgstr "هيا بنا نبدأ."
924+
925+#~ msgid "Continue"
926+#~ msgstr "متابعة"
927+
928+#~ msgid "Choose your passcode"
929+#~ msgstr "اختر الرمز السري خاصتك"
930+
931+#~ msgid "Passphrase must be 4 characters long"
932+#~ msgstr "يجب أن تحتوي العبارة السرية على 4 أحرف على الأقل"
933+
934+#~ msgid "Available networks…"
935+#~ msgstr "الشبكات المتاحة..."
936+
789937#~ msgid "Please select how you’d like to unlock your phone."
790938#~ msgstr "رجاءً اختر الطريقة التي ترغب بأن توصد هاتفك بها."
791939
940+#~ msgctxt "Label: Description of security method"
941+#~ msgid "No security"
942+#~ msgstr "بدون أمان"
943+
944+#~ msgctxt "Label: Type of security method"
945+#~ msgid "Swipe"
946+#~ msgstr "سحبة"
947+
948+#~ msgctxt "Label: Description of security method"
949+#~ msgid "4 digits only"
950+#~ msgstr "4 أرقام فقط"
951+
952+#~ msgctxt "Label: Type of security method"
953+#~ msgid "Passcode"
954+#~ msgstr "رمز سري"
955+
956+#~ msgid "No available networks."
957+#~ msgstr "لا توجد شبكات متاحة."
958+
959+#~ msgctxt "Label: Type of security method"
960+#~ msgid "Passphrase"
961+#~ msgstr "عبارة سرية"
962+
963+#~ msgctxt "Label: Description of security method"
964+#~ msgid "Numbers and letters"
965+#~ msgstr "أرقام وحروف"
966+
967+#~ msgid "Improving your experience"
968+#~ msgstr "تحسين تجربتك"
969+
970+#~ msgid "You can change your mind later in <b>System Settings</b>."
971+#~ msgstr "يمكنك تغيير رأيك في وقت لاحق عن طريق <b>إعدادات النظام</b>."
972+
973+#~ msgid "Location"
974+#~ msgstr "الموقع"
975+
976+#~ msgid "Let the phone detect your location:"
977+#~ msgstr "دع هاتفك يحدد موقعك:"
978+
979+#~ msgid "Using GPS only (less accurate)"
980+#~ msgstr "باستخدام نظام تحديد المواقع (GPS) فقط (أقل دقّة)"
981+
982+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
983+#~ msgstr ""
984+#~ "باستخدام نظام تحديد المواقع (GPS)، والواي فاي، وبيانات الشبكة الخلوية "
985+#~ "(مستحسن)"
986+
987+#~ msgid ""
988+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
989+#~ "Privacy</b>"
990+#~ msgstr ""
991+#~ "يمكن تعطيل ذلك بالذهاب إلى <b>إعدادات النظام</b> من خلال <b>الأمان "
992+#~ "والخصوصية</b>"
993+
994+#~ msgid "Nice work!"
995+#~ msgstr "عمل جيد!"
996+
997+#~ msgid "All done"
998+#~ msgstr "تم ذلك"
999+
1000+#~ msgid "Finish"
1001+#~ msgstr "إنهاء"
1002+
7921003#~ msgid "Your phone is now ready to use."
7931004#~ msgstr "هاتفك جاهز الآن للاستخدام."
7941005
1006+#~ msgid "You almost got it!"
1007+#~ msgstr "انت حصلت على ذلك تقريبا!"
1008+
1009+#~ msgid ""
1010+#~ "Your phone is set up to automatically report errors to Canonical and its "
1011+#~ "partners, the makers of the operating system."
1012+#~ msgstr ""
1013+#~ "هاتفك مُعدّ لإرسال تقارير آلية بالأخطاء إلى كانونيكال وشركائها (صانعي نظام "
1014+#~ "التشغيل)."
1015+
7951016#~ msgid "Unlock SIM"
7961017#~ msgstr "فتح قفل بطاقة SIM"
1018+
1019+#~ msgid ""
1020+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
1021+#~ "conditions</a>."
1022+#~ msgstr ""
1023+#~ "باختيارك لهذا الخيار فإنك توافق على <a href='#'>الشروط والأحكام</a> الخاصة "
1024+#~ "بـ Nokia HERE."
po/ast.po+486−247
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1111"PO-Revision-Date: 2016-03-12 00:17+0000\n"
1212"Last-Translator: enolp <enolp@softastur.org>\n"
1313"Language-Team: Asturian <ast@li.org>\n"
@@ -15,8 +15,8 @@ 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: 2016-03-13 05:50+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19+"X-Generator: Launchpad (build 17958)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -74,53 +74,35 @@ msgctxt "Button: Log out from the system"
7474msgid "Log Out"
7575msgstr "Zarrar sesión"
7676
77−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
78−#: qml/Components/Dialogs.qml:253
77+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
78+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
79+#: qml/Wizard/Pages/passcode-set.qml:32
7980msgid "Cancel"
8081msgstr "Encaboxar"
8182
8283#: qml/Components/Dialogs.qml:173
83−msgctxt "Title: Reboot/Shut down dialog"
84−msgid "Shut down"
85−msgstr "Apagáu"
86−
87−#: qml/Components/Dialogs.qml:174
88−msgid "Are you sure you want to shut down?"
89−msgstr "¿De xuru que quies apagar?"
90−
91−#: qml/Components/Dialogs.qml:176
92−msgctxt "Button: Reboot the system"
93−msgid "Reboot"
94−msgstr "Reaniciar"
95−
96−#: qml/Components/Dialogs.qml:185
97−msgctxt "Button: Shut down the system"
98−msgid "Shut down"
99−msgstr "Apagar"
100−
101−#: qml/Components/Dialogs.qml:207
10284msgctxt "Title: Reboot dialog"
10385msgid "Reboot"
10486msgstr "Reaniciu"
10587
106−#: qml/Components/Dialogs.qml:208
88+#: qml/Components/Dialogs.qml:174
10789msgid "Are you sure you want to reboot?"
10890msgstr "¿De xuru que quies reaniciar?"
10991
110−#: qml/Components/Dialogs.qml:210
92+#: qml/Components/Dialogs.qml:176
11193msgid "No"
11294msgstr "Non"
11395
114−#: qml/Components/Dialogs.qml:217
96+#: qml/Components/Dialogs.qml:183
11597msgid "Yes"
11698msgstr "Sí"
11799
118−#: qml/Components/Dialogs.qml:232
100+#: qml/Components/Dialogs.qml:198
119101msgctxt "Title: Power off/Restart dialog"
120102msgid "Power"
121103msgstr "Apagáu"
122104
123−#: qml/Components/Dialogs.qml:233
105+#: qml/Components/Dialogs.qml:199
124106msgid ""
125107"Are you sure you would like\n"
126108"to power off?"
@@ -128,12 +110,12 @@ msgstr ""
128110"¿De xuru que te prestaría\n"
129111"apagar?"
130112
131−#: qml/Components/Dialogs.qml:235
113+#: qml/Components/Dialogs.qml:201
132114msgctxt "Button: Power off the system"
133115msgid "Power off"
134116msgstr "Apagar"
135117
136−#: qml/Components/Dialogs.qml:244
118+#: qml/Components/Dialogs.qml:210
137119msgctxt "Button: Restart the system"
138120msgid "Restart"
139121msgstr "Reaniciar"
@@ -176,42 +158,58 @@ msgstr "Reconeutar agora."
176158msgid "Close all"
177159msgstr "Zarrar too"
178160
179−#: qml/Dash/DashPageHeader.qml:270
161+#: qml/Dash/DashPageHeader.qml:337
180162msgctxt "Button: Open the Ubuntu Store"
181163msgid "Store"
182164msgstr "Tienda"
183165
184−#: qml/Dash/DashPageHeader.qml:277
166+#: qml/Dash/DashPageHeader.qml:344
185167msgctxt "Button: Start a search in the current dash scope"
186168msgid "Search"
187169msgstr "Guetar"
188170
189−#: qml/Dash/DashPageHeader.qml:287
171+#: qml/Dash/DashPageHeader.qml:354
190172msgctxt "Button: Show the current dash scope settings"
191173msgid "Settings"
192174msgstr "Axustes"
193175
194−#: qml/Dash/DashPageHeader.qml:294
176+#: qml/Dash/DashPageHeader.qml:361
195177msgid "Remove from Favorites"
196178msgstr "Desaniciar de favoritos"
197179
198−#: qml/Dash/DashPageHeader.qml:294
180+#: qml/Dash/DashPageHeader.qml:361
199181msgid "Add to Favorites"
200182msgstr "Amestar a favoritos"
201183
202−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
184+#: qml/Dash/FiltersPopover.qml:60
185+msgid "Refine your results"
186+msgstr ""
187+
188+#: qml/Dash/FiltersPopover.qml:69
189+msgid "Reset"
190+msgstr ""
191+
192+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
203193msgid "See less"
204194msgstr "Ver menos"
205195
206−#: qml/Dash/GenericScopeView.qml:567
196+#: qml/Dash/GenericScopeView.qml:570
207197msgid "See all"
208198msgstr "Ver too"
209199
210−#: qml/Dash/GenericScopeView.qml:629
200+#: qml/Dash/GenericScopeView.qml:627
211201msgctxt "Label: Hint for dash search line edit"
212202msgid "Search"
213203msgstr "Guetar"
214204
205+#: qml/Dash/PageHeaderExtraPanel.qml:55
206+msgid "Recent Searches"
207+msgstr ""
208+
209+#: qml/Dash/PageHeaderExtraPanel.qml:66
210+msgid "Clear All"
211+msgstr ""
212+
215213#: qml/Dash/Previews/PreviewActionCombo.qml:35
216214msgid "More..."
217215msgstr "Más…"
@@ -279,11 +277,11 @@ msgstr "Reintentar"
279277msgid "Tap to unlock"
280278msgstr "Calca pa desbloquiar"
281279
282−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
280+#: qml/Greeter/NarrowView.qml:54
283281msgid "Sorry, incorrect passphrase."
284282msgstr "Perdón, fras de pasu incorreuta"
285283
286−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
284+#: qml/Greeter/NarrowView.qml:55
287285msgid "Sorry, incorrect passcode."
288286msgstr "Perdón, códigu de pasu incorreutu."
289287
@@ -312,7 +310,7 @@ msgstr ""
312310msgid "Enter %1"
313311msgstr "Introduz %1"
314312
315−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
313+#: qml/Greeter/NarrowView.qml:117
316314msgid "Enter passphrase"
317315msgstr "Introduz la fras de pasu"
318316
@@ -350,62 +348,62 @@ msgstr "Toca pa tornar a la llamada..."
350348msgid "Conference"
351349msgstr "Conferencia"
352350
353−#: qml/Panel/Indicators/MenuItemFactory.qml:752
351+#: qml/Panel/Indicators/MenuItemFactory.qml:761
354352msgid "Nothing is playing"
355353msgstr "Nun ta reproduciéndose nada"
356354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:881
355+#: qml/Panel/Indicators/MenuItemFactory.qml:890
358356#, qt-format
359357msgid "%1 hour"
360358msgid_plural "%1 hours"
361359msgstr[0] "%1 hora"
362360msgstr[1] "%1 hores"
363361
364−#: qml/Panel/Indicators/MenuItemFactory.qml:885
362+#: qml/Panel/Indicators/MenuItemFactory.qml:894
365363#, qt-format
366364msgid "%1 minute"
367365msgid_plural "%1 minutes"
368366msgstr[0] "%1 minutu"
369367msgstr[1] "%1 minutos"
370368
371−#: qml/Panel/Indicators/MenuItemFactory.qml:890
369+#: qml/Panel/Indicators/MenuItemFactory.qml:899
372370#, qt-format
373371msgid "%1 second"
374372msgid_plural "%1 seconds"
375373msgstr[0] "%1 segundu"
376374msgstr[1] "%1 segundos"
377375
378−#: qml/Panel/Indicators/MenuItemFactory.qml:893
376+#: qml/Panel/Indicators/MenuItemFactory.qml:902
379377msgid "0 seconds"
380378msgstr "0 segundos"
381379
382380#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
383−#: qml/Panel/Indicators/MenuItemFactory.qml:895
381+#: qml/Panel/Indicators/MenuItemFactory.qml:904
384382#, qt-format
385383msgid "%1 remaining"
386384msgstr "Queden %1"
387385
388−#: qml/Panel/Indicators/MenuItemFactory.qml:901
386+#: qml/Panel/Indicators/MenuItemFactory.qml:910
389387msgid "In queue…"
390388msgstr "Na cola..."
391389
392−#: qml/Panel/Indicators/MenuItemFactory.qml:905
390+#: qml/Panel/Indicators/MenuItemFactory.qml:914
393391msgid "Downloading"
394392msgstr "Baxando"
395393
396−#: qml/Panel/Indicators/MenuItemFactory.qml:907
394+#: qml/Panel/Indicators/MenuItemFactory.qml:916
397395msgid "Paused, tap to resume"
398396msgstr "Posáu, toca pa reanudar"
399397
400−#: qml/Panel/Indicators/MenuItemFactory.qml:909
398+#: qml/Panel/Indicators/MenuItemFactory.qml:918
401399msgid "Canceled"
402400msgstr "Encaboxáu"
403401
404−#: qml/Panel/Indicators/MenuItemFactory.qml:911
402+#: qml/Panel/Indicators/MenuItemFactory.qml:920
405403msgid "Finished"
406404msgstr "Finó"
407405
408−#: qml/Panel/Indicators/MenuItemFactory.qml:913
406+#: qml/Panel/Indicators/MenuItemFactory.qml:922
409407msgid "Failed, tap to retry"
410408msgstr "Falló, toca pa reintentar"
411409
@@ -425,251 +423,324 @@ msgctxt "Button: Call back on phone"
425423msgid "Call back"
426424msgstr "Devolver llamada"
427425
428−#: qml/Tutorial/TutorialBottom.qml:28
429−msgid "Open special menus"
430−msgstr "Abrir menús especiales"
431−
432−#: qml/Tutorial/TutorialBottom.qml:29
433−msgid "Swipe up from the bottom edge."
434−msgstr "Esliza dende'l berbesu d'embaxo."
426+#: qml/Stages/SideStage.qml:76
427+msgid "Drag using 3 fingers any application from one window to the other"
428+msgstr ""
435429
436−#: qml/Tutorial/TutorialBottomFinish.qml:24
437−msgid "This action does different things for different apps"
438−msgstr "Esta aición fai coses distintes p'aplicaciones estremaes"
430+#: qml/Tutorial/TutorialBottom.qml:78
431+msgid "Swipe up to add a contact"
432+msgstr ""
439433
440−#: qml/Tutorial/TutorialBottomFinish.qml:25
441−msgid "Tap here to finish."
442−msgstr "Toca equí pa finar."
434+#: qml/Tutorial/TutorialBottom.qml:80
435+msgid "Swipe up for favorite calculations"
436+msgstr ""
443437
444−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
445−#: qml/Tutorial/TutorialRight.qml:144
446−msgid "Tap here to continue."
447−msgstr "Toca equí pa siguir."
438+#: qml/Tutorial/TutorialBottom.qml:82
439+msgid "Swipe up for recent calls"
440+msgstr ""
448441
449−#: qml/Tutorial/TutorialLeft.qml:26
450−msgid "Open the launcher"
451−msgstr "Abrir el llanzador"
442+#: qml/Tutorial/TutorialBottom.qml:84
443+msgid "Swipe up to create a message"
444+msgstr ""
452445
453−#: qml/Tutorial/TutorialLeft.qml:27
454−msgid "Short swipe from the left edge."
455−msgstr "Esliza un poco dende'l berbesu esquierdu."
446+#: qml/Tutorial/TutorialBottom.qml:85
447+msgid "Swipe up to manage the app"
448+msgstr ""
456449
457−#: qml/Tutorial/TutorialLeftFinish.qml:24
458−msgid "These are the shortcuts to favorite apps"
459−msgstr "Estos son los atayos a les aplicaciones favorites"
450+#: qml/Tutorial/TutorialLeft.qml:47
451+msgid "Swipe from the left edge to open the launcher"
452+msgstr ""
460453
461−#: qml/Tutorial/TutorialPage.qml:178
462−msgid "You almost got it!"
463−msgstr "¡Yá cuasi finamos!"
454+#: qml/Tutorial/TutorialLeftLong.qml:47
455+msgid "Long swipe from the left edge to open the Today scope"
456+msgstr ""
464457
465−#: qml/Tutorial/TutorialPage.qml:195
466−msgid "Try again."
467−msgstr "Intentar de nueves"
458+#: qml/Tutorial/TutorialRight.qml:54
459+msgid "Hover your mouse on the right edge to view your open apps"
460+msgstr ""
468461
469−#: qml/Tutorial/TutorialRight.qml:31
470−msgid "To view open apps"
471−msgstr "Pa ver aplicaciones abiertes"
462+#: qml/Tutorial/TutorialRight.qml:55
463+msgid "Short or long swipe from the right edge to view your open apps"
464+msgstr ""
472465
473−#: qml/Tutorial/TutorialRight.qml:32
474−msgid "Long swipe from the right edge."
475−msgstr "Eslizamientu llargu dende'l berbesu drechu."
466+#: qml/Tutorial/TutorialTop.qml:53
467+msgid "Swipe from the top right edge to open the notification bar"
468+msgstr ""
476469
477−#: qml/Tutorial/TutorialRight.qml:122
478−msgid "View all your running tasks."
479−msgstr "Mira toles tos aplicaciones n'execución."
470+#: qml/Tutorial/TutorialTop.qml:54
471+msgid "Swipe from the top edge to open the notification bar"
472+msgstr ""
480473
481−#: qml/Wizard/Page.qml:89
474+#: qml/Wizard/Page.qml:54
482475msgctxt "Button: Go back one page in the Wizard"
483476msgid "Back"
484477msgstr "Atrás"
485478
486479#: qml/Wizard/Pages/10-welcome.qml:27
487−msgid "Hi!"
488−msgstr "¡Hola!"
480+msgid "Language"
481+msgstr ""
489482
490−#: qml/Wizard/Pages/10-welcome.qml:44
491−msgid "Welcome to your Ubuntu device."
492−msgstr "Bienllegáu/ada al to preséu d'Ubuntu."
483+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
484+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
485+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
486+#: qml/Wizard/Pages/75-report-check.qml:84
487+#: qml/Wizard/Pages/passcode-desktop.qml:124
488+#: qml/Wizard/Pages/password-set.qml:141
489+msgid "Next"
490+msgstr ""
493491
494−#: qml/Wizard/Pages/10-welcome.qml:52
495−msgid "Let’s get started."
496−msgstr "Entamemos."
492+#: qml/Wizard/Pages/30-wifi.qml:29
493+msgid "Connect to Wi‑Fi"
494+msgstr "Coneutase al WiFi"
497495
498−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
499−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
500−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
501−#: qml/Wizard/Pages/passwd-set.qml:90
502−msgid "Continue"
503−msgstr "Siguir"
496+#: qml/Wizard/Pages/30-wifi.qml:130
497+msgid "Connected"
498+msgstr ""
504499
505−#: qml/Wizard/Pages/20-sim.qml:25
506−msgid "Add a SIM card and restart your device"
507−msgstr "Amiesta una tarxeta SIM y reanicia'l to preséu"
500+#: qml/Wizard/Pages/30-wifi.qml:163
501+msgid "Available Wi-Fi networks"
502+msgstr ""
508503
509−#: qml/Wizard/Pages/20-sim.qml:59
510−msgid "Without it, you won’t be able to make calls or use text messaging."
511−msgstr "Ensin ella, nun vas poder facer llamaes nin unviar mensaxes."
504+#: qml/Wizard/Pages/30-wifi.qml:164
505+msgid "No available Wi-Fi networks"
506+msgstr ""
512507
513−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
508+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
509+#: qml/Wizard/Pages/sim.qml:101
514510msgid "Skip"
515511msgstr "Saltar"
516512
517−#: qml/Wizard/Pages/30-passwd-type.qml:39
518−msgid "Lock security"
519−msgstr "Seguranza del bloquéu"
513+#: qml/Wizard/Pages/40-location.qml:27
514+msgid "Location Services"
515+msgstr ""
516+
517+#: qml/Wizard/Pages/40-location.qml:83
518+msgid ""
519+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
520+"(recommended)"
521+msgstr ""
520522
521−#: qml/Wizard/Pages/30-passwd-type.qml:79
522−msgid "Please select how you’d like to unlock your device."
523−msgstr "Esbilla cómo te prestaría desbloquiar el to preséu, por favor."
523+#: qml/Wizard/Pages/40-location.qml:105
524+#, qt-format
525+msgid "By selecting this option you agree to the Nokia HERE %1."
526+msgstr ""
524527
525−#: qml/Wizard/Pages/30-passwd-type.qml:102
526−msgctxt "Label: Type of security method"
527−msgid "Swipe"
528−msgstr "Eslizar"
528+#: qml/Wizard/Pages/40-location.qml:106
529+msgctxt "part of: Nokia HERE terms and conditions"
530+msgid "terms and conditions"
531+msgstr ""
532+
533+#: qml/Wizard/Pages/40-location.qml:160
534+msgid "GPS only"
535+msgstr ""
536+
537+#: qml/Wizard/Pages/40-location.qml:214
538+msgid "Don't use my location"
539+msgstr ""
540+
541+#: qml/Wizard/Pages/40-location.qml:260
542+msgid "You can change it later in System Settings."
543+msgstr ""
544+
545+#: qml/Wizard/Pages/50-timezone.qml:29
546+msgid "Time Zone"
547+msgstr ""
548+
549+#: qml/Wizard/Pages/50-timezone.qml:178
550+msgid "Enter your city"
551+msgstr ""
552+
553+#: qml/Wizard/Pages/60-account.qml:24
554+msgid "Personalize Your Device"
555+msgstr ""
529556
530−#: qml/Wizard/Pages/30-passwd-type.qml:103
531−msgctxt "Label: Description of security method"
532−msgid "No security"
533−msgstr "Ensin seguranza"
557+#: qml/Wizard/Pages/60-account.qml:48
558+msgid "Preferred Name"
559+msgstr ""
560+
561+#: qml/Wizard/Pages/70-passwd-type.qml:39
562+msgid "Lock Screen"
563+msgstr ""
534564
535−#: qml/Wizard/Pages/30-passwd-type.qml:105
565+#: qml/Wizard/Pages/70-passwd-type.qml:101
536566msgctxt "Label: Type of security method"
537−msgid "Passcode"
538−msgstr "Códigu de pasu"
567+msgid "Create new password"
568+msgstr ""
539569
540−#: qml/Wizard/Pages/30-passwd-type.qml:106
541−msgctxt "Label: Description of security method"
542−msgid "4 digits only"
543−msgstr "Namái 4 díxitos"
570+#: qml/Wizard/Pages/70-passwd-type.qml:103
571+msgctxt "Label: Type of security method"
572+msgid "Create passcode (numbers only)"
573+msgstr ""
544574
545−#: qml/Wizard/Pages/30-passwd-type.qml:108
575+#: qml/Wizard/Pages/70-passwd-type.qml:105
546576msgctxt "Label: Type of security method"
547−msgid "Passphrase"
548−msgstr "Fras de pasu"
577+msgid "No lock code"
578+msgstr ""
549579
550−#: qml/Wizard/Pages/30-passwd-type.qml:109
551−msgctxt "Label: Description of security method"
552−msgid "Numbers and letters"
553−msgstr "Númberos y lletres"
580+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
581+msgid "Privacy Policy"
582+msgstr ""
554583
555−#: qml/Wizard/Pages/40-wifi.qml:29
556−msgid "Connect to Wi‑Fi"
557−msgstr "Coneutase al WiFi"
584+#: qml/Wizard/Pages/75-report-check.qml:26
585+msgid "Help Us Improve"
586+msgstr ""
558587
559−#: qml/Wizard/Pages/40-wifi.qml:168
560−msgid "Available networks…"
561−msgstr "Redes disponibles..."
588+#: qml/Wizard/Pages/75-report-check.qml:59
589+msgid "Improve system performance by sending us crashes and error reports."
590+msgstr ""
562591
563−#: qml/Wizard/Pages/40-wifi.qml:169
564−msgid "No available networks."
565−msgstr "Nun hai redes disponibles"
592+#: qml/Wizard/Pages/75-report-check.qml:60
593+msgid "Privacy policy"
594+msgstr ""
566595
567−#: qml/Wizard/Pages/50-location.qml:27
568−msgid "Location"
569−msgstr "Allugamientu"
596+#: qml/Wizard/Pages/80-finished.qml:89
597+msgid "Welcome to Ubuntu"
598+msgstr ""
570599
571−#: qml/Wizard/Pages/50-location.qml:62
572−msgid "Let the phone detect your location:"
573−msgstr "Dexar al teléfonu deteutar l'allugamientu:"
600+#: qml/Wizard/Pages/80-finished.qml:104
601+msgid "You are ready to use your device now"
602+msgstr ""
574603
575−#: qml/Wizard/Pages/50-location.qml:69
576−msgid "Using GPS only (less accurate)"
577−msgstr "Namái usando GPS (menos precisión)"
604+#: qml/Wizard/Pages/80-finished.qml:124
605+msgid "Get Started"
606+msgstr ""
578607
579−#: qml/Wizard/Pages/50-location.qml:86
580−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
608+#: qml/Wizard/Pages/here-terms.qml:25
609+msgid "Terms & Conditions"
610+msgstr "Términos y condiciones"
611+
612+#: qml/Wizard/Pages/here-terms.qml:69
613+msgid "Your device uses positioning technologies provided by HERE."
581614msgstr ""
582−"Usando GPS, Wi-fi anónimes ya información de redes móviles (aconseyao)"
583615
584−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
585−#: qml/Wizard/Pages/50-location.qml:103
616+#: qml/Wizard/Pages/here-terms.qml:81
586617msgid ""
587−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
588−"conditions</a>."
618+"To provide you with positioning services and to improve their quality, HERE "
619+"collects information about nearby cell towers and Wi-Fi hotspots around your "
620+"current location whenever your position is being found."
589621msgstr ""
590−"Esbillando esta opción aceutes los <a href='#'>términos y condiciones</a> de "
591−"Nokia HERE."
592622
593−#: qml/Wizard/Pages/50-location.qml:112
594−msgid "Not at all"
595−msgstr "De nengún mou"
623+#: qml/Wizard/Pages/here-terms.qml:93
624+msgid ""
625+"The information collected is used to analyze the service and to improve the "
626+"use of service, but not to identify you personally."
627+msgstr ""
596628
597−#: qml/Wizard/Pages/50-location.qml:124
598−msgid "You can change your mind later in <b>System Settings</b>."
599−msgstr "Pues cambialo dempués n'<b>Axustes del sistema</b>."
629+#: qml/Wizard/Pages/here-terms.qml:106
630+#, qt-format
631+msgid "By continuing, you agree to the HERE platform %1 and %2."
632+msgstr ""
600633
601−#: qml/Wizard/Pages/60-reporting.qml:26
602−msgid "Improving your experience"
603−msgstr "Ameyorando la to esperiencia"
634+#: qml/Wizard/Pages/here-terms.qml:107
635+msgid "Service Terms"
636+msgstr ""
604637
605−#: qml/Wizard/Pages/60-reporting.qml:46
606−msgid ""
607−"Your phone is set up to automatically report errors to Canonical and its "
608−"partners, the makers of the operating system."
638+#: qml/Wizard/Pages/passcode-confirm.qml:43
639+#: qml/Wizard/Pages/passcode-desktop.qml:80
640+msgid "Confirm passcode"
641+msgstr "Confirmar códigu de pasu"
642+
643+#: qml/Wizard/Pages/passcode-confirm.qml:45
644+msgid "Incorrect passcode."
609645msgstr ""
610−"El teléfonu ta configuráu pa informar automáticamente de los fallos a "
611−"Canonical y asociaos, los fabricantes del sistema operativu."
612646
613−#: qml/Wizard/Pages/60-reporting.qml:53
614−msgid ""
615−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
616−"Privacy</b>"
647+#: qml/Wizard/Pages/passcode-confirm.qml:45
648+msgctxt "Enter the passcode again"
649+msgid "Please re-enter."
617650msgstr ""
618−"Esto pue deshabilitase nos <b>Axustes del sistema</b> en <b>Seguranza y "
619−"privacidá</b>"
620651
621−#: qml/Wizard/Pages/80-finished.qml:24
622−msgid "All done"
623−msgstr "Too fecho"
652+#: qml/Wizard/Pages/passcode-desktop.qml:30
653+msgid "Lock Screen Passcode"
654+msgstr ""
624655
625−#: qml/Wizard/Pages/80-finished.qml:39
626−msgid "Nice work!"
627−msgstr "¡Bon trabayu!"
656+#: qml/Wizard/Pages/passcode-desktop.qml:56
657+msgid "Enter 4 numbers to setup your passcode"
658+msgstr ""
628659
629−#: qml/Wizard/Pages/80-finished.qml:46
630−msgid "Your device is now ready to use."
631−msgstr "Agora'l to preséu ta preparáu pa usase."
660+#: qml/Wizard/Pages/passcode-desktop.qml:65
661+#: qml/Wizard/Pages/passcode-set.qml:54
662+msgid "Choose passcode"
663+msgstr ""
632664
633−#: qml/Wizard/Pages/80-finished.qml:53
634−msgid "Finish"
635−msgstr "Finar"
665+#: qml/Wizard/Pages/passcode-desktop.qml:105
666+msgid "Passcode too short"
667+msgstr ""
636668
637−#: qml/Wizard/Pages/here-terms.qml:27
638−msgid "Terms & Conditions"
639−msgstr "Términos y condiciones"
669+#: qml/Wizard/Pages/passcode-desktop.qml:107
670+msgid "Passcodes match"
671+msgstr ""
640672
641−#: qml/Wizard/Pages/passwd-confirm.qml:49
642−msgid "Confirm passphrase"
643−msgstr "Confirmar frase de pasu"
673+#: qml/Wizard/Pages/passcode-desktop.qml:109
674+msgid "Passcodes do not match"
675+msgstr ""
644676
645−#: qml/Wizard/Pages/passwd-confirm.qml:50
646−msgid "Confirm passcode"
647−msgstr "Confirmar códigu de pasu"
677+#: qml/Wizard/Pages/passcode-set.qml:62
678+msgid "Passcode must be 4 characters long"
679+msgstr ""
648680
649−#: qml/Wizard/Pages/passwd-confirm.qml:53
650−#: qml/Wizard/Pages/passwd-confirm.qml:54
651−msgid "Please try again."
652−msgstr "Por favor, vuelvi a intentalo."
681+#: qml/Wizard/Pages/password-set.qml:30
682+msgid "Lock Screen Password"
683+msgstr ""
653684
654−#: qml/Wizard/Pages/passwd-set.qml:61
655−msgid "Choose your passcode"
656−msgstr "Escueyi'l to códigu de pasu"
685+#: qml/Wizard/Pages/password-set.qml:61
686+msgid "Enter at least 8 characters"
687+msgstr ""
657688
658−#: qml/Wizard/Pages/passwd-set.qml:68
659−msgid "Passphrase must be 4 characters long"
660−msgstr "La fras de pasu tien de ser 4 caráuteres de llargor"
689+#: qml/Wizard/Pages/password-set.qml:73
690+msgid "Choose password"
691+msgstr ""
661692
662−#. Translators: This is the arrow for "Back" buttons
663−#: qml/Wizard/StackButton.qml:39
664−#, qt-format
665−msgid "〈 %1"
666−msgstr "〈 %1"
693+#: qml/Wizard/Pages/password-set.qml:103
694+msgid "Confirm password"
695+msgstr ""
667696
668−#. Translators: This is the arrow for "Forward" buttons
669−#: qml/Wizard/StackButton.qml:42
670−#, qt-format
671−msgid "%1 〉"
672−msgstr "%1 〉"
697+#: qml/Wizard/Pages/sim.qml:27
698+msgid "No SIM card installed"
699+msgstr ""
700+
701+#: qml/Wizard/Pages/sim.qml:54
702+msgid "SIM card added"
703+msgstr ""
704+
705+#: qml/Wizard/Pages/sim.qml:55
706+msgid "You must restart the device to access the mobile network."
707+msgstr ""
708+
709+#: qml/Wizard/Pages/sim.qml:59
710+msgid "Restart"
711+msgstr "Reaniciar"
712+
713+#: qml/Wizard/Pages/sim.qml:78
714+msgid "You won’t be able to make calls or use text messaging without a SIM."
715+msgstr ""
716+
717+#: qml/Wizard/Pages/sim.qml:90
718+msgid "To proceed with no SIM tap Skip."
719+msgstr ""
720+
721+#: qml/Wizard/PasswordMeter.qml:87
722+msgid "Passwords match"
723+msgstr ""
724+
725+#: qml/Wizard/PasswordMeter.qml:89
726+msgid "Passwords do not match"
727+msgstr ""
728+
729+#: qml/Wizard/PasswordMeter.qml:93
730+msgid "Strong password"
731+msgstr ""
732+
733+#: qml/Wizard/PasswordMeter.qml:95
734+msgid "Fair password"
735+msgstr ""
736+
737+#: qml/Wizard/PasswordMeter.qml:97
738+msgid "Weak password"
739+msgstr ""
740+
741+#: qml/Wizard/PasswordMeter.qml:99
742+msgid "Very weak password"
743+msgstr ""
673744
674745#~ msgid "Skip intro"
675746#~ msgstr "Omitir la intro"
@@ -764,24 +835,195 @@ msgstr "%1 〉"
764835#~ msgid "Roaming"
765836#~ msgstr "Roaming"
766837
767−#~ msgid "Restart"
768−#~ msgstr "Reaniciar"
769−
770838#~ msgid "Manage Scopes"
771839#~ msgstr "Xestionar ámbitos"
772840
841+#~ msgid "Continue"
842+#~ msgstr "Siguir"
843+
844+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
845+#~ msgstr "Ensin ella, nun vas poder facer llamaes nin unviar mensaxes."
846+
847+#~ msgid "You can change your mind later in <b>System Settings</b>."
848+#~ msgstr "Pues cambialo dempués n'<b>Axustes del sistema</b>."
849+
850+#~ msgid "Available networks…"
851+#~ msgstr "Redes disponibles..."
852+
853+#~ msgid "No available networks."
854+#~ msgstr "Nun hai redes disponibles"
855+
856+#~ msgid "Using GPS only (less accurate)"
857+#~ msgstr "Namái usando GPS (menos precisión)"
858+
859+#~ msgid ""
860+#~ "Your phone is set up to automatically report errors to Canonical and its "
861+#~ "partners, the makers of the operating system."
862+#~ msgstr ""
863+#~ "El teléfonu ta configuráu pa informar automáticamente de los fallos a "
864+#~ "Canonical y asociaos, los fabricantes del sistema operativu."
865+
866+#~ msgid "All done"
867+#~ msgstr "Too fecho"
868+
869+#~ msgid "Finish"
870+#~ msgstr "Finar"
871+
872+#~ msgid "Not at all"
873+#~ msgstr "De nengún mou"
874+
875+#, qt-format
876+#~ msgid "〈 %1"
877+#~ msgstr "〈 %1"
878+
879+#, qt-format
880+#~ msgid "%1 〉"
881+#~ msgstr "%1 〉"
882+
883+#~ msgid "Open the launcher"
884+#~ msgstr "Abrir el llanzador"
885+
886+#~ msgid "Tap here to continue."
887+#~ msgstr "Toca equí pa siguir."
888+
889+#~ msgid "Open special menus"
890+#~ msgstr "Abrir menús especiales"
891+
892+#~ msgid "Tap here to finish."
893+#~ msgstr "Toca equí pa finar."
894+
895+#~ msgctxt "Button: Shut down the system"
896+#~ msgid "Shut down"
897+#~ msgstr "Apagar"
898+
899+#~ msgctxt "Button: Reboot the system"
900+#~ msgid "Reboot"
901+#~ msgstr "Reaniciar"
902+
903+#~ msgid "These are the shortcuts to favorite apps"
904+#~ msgstr "Estos son los atayos a les aplicaciones favorites"
905+
906+#~ msgctxt "Label: Type of security method"
907+#~ msgid "Passcode"
908+#~ msgstr "Códigu de pasu"
909+
910+#~ msgid "To view open apps"
911+#~ msgstr "Pa ver aplicaciones abiertes"
912+
913+#~ msgid "Are you sure you want to shut down?"
914+#~ msgstr "¿De xuru que quies apagar?"
915+
916+#~ msgctxt "Title: Reboot/Shut down dialog"
917+#~ msgid "Shut down"
918+#~ msgstr "Apagáu"
919+
773920#~ msgid "Please re-enter"
774921#~ msgstr "Por favor, reintroduzla"
775922
923+#~ msgid "This action does different things for different apps"
924+#~ msgstr "Esta aición fai coses distintes p'aplicaciones estremaes"
925+
926+#~ msgid "Swipe up from the bottom edge."
927+#~ msgstr "Esliza dende'l berbesu d'embaxo."
928+
929+#~ msgid "Long swipe from the right edge."
930+#~ msgstr "Eslizamientu llargu dende'l berbesu drechu."
931+
932+#~ msgid "View all your running tasks."
933+#~ msgstr "Mira toles tos aplicaciones n'execución."
934+
935+#~ msgid "Try again."
936+#~ msgstr "Intentar de nueves"
937+
938+#~ msgid "You almost got it!"
939+#~ msgstr "¡Yá cuasi finamos!"
940+
941+#~ msgid "Short swipe from the left edge."
942+#~ msgstr "Esliza un poco dende'l berbesu esquierdu."
943+
944+#~ msgid "Hi!"
945+#~ msgstr "¡Hola!"
946+
947+#~ msgid "Lock security"
948+#~ msgstr "Seguranza del bloquéu"
949+
950+#~ msgid "Add a SIM card and restart your device"
951+#~ msgstr "Amiesta una tarxeta SIM y reanicia'l to preséu"
952+
776953#~ msgid "Please select how you’d like to unlock your phone."
777954#~ msgstr "Por favor, esbilla como te prestaría desbloquiar el teléfonu."
778955
956+#~ msgctxt "Label: Description of security method"
957+#~ msgid "No security"
958+#~ msgstr "Ensin seguranza"
959+
960+#~ msgctxt "Label: Type of security method"
961+#~ msgid "Swipe"
962+#~ msgstr "Eslizar"
963+
779964#~ msgid "Welcome to your Ubuntu phone."
780965#~ msgstr "Bienllegáu/ada al to teléfonu d'Ubuntu"
781966
967+#~ msgid "Let’s get started."
968+#~ msgstr "Entamemos."
969+
970+#~ msgctxt "Label: Description of security method"
971+#~ msgid "4 digits only"
972+#~ msgstr "Namái 4 díxitos"
973+
974+#~ msgid "Let the phone detect your location:"
975+#~ msgstr "Dexar al teléfonu deteutar l'allugamientu:"
976+
977+#~ msgid "Location"
978+#~ msgstr "Allugamientu"
979+
980+#~ msgctxt "Label: Type of security method"
981+#~ msgid "Passphrase"
982+#~ msgstr "Fras de pasu"
983+
984+#~ msgctxt "Label: Description of security method"
985+#~ msgid "Numbers and letters"
986+#~ msgstr "Númberos y lletres"
987+
988+#~ msgid "Improving your experience"
989+#~ msgstr "Ameyorando la to esperiencia"
990+
991+#~ msgid ""
992+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
993+#~ "Privacy</b>"
994+#~ msgstr ""
995+#~ "Esto pue deshabilitase nos <b>Axustes del sistema</b> en <b>Seguranza y "
996+#~ "privacidá</b>"
997+
998+#~ msgid "Nice work!"
999+#~ msgstr "¡Bon trabayu!"
1000+
1001+#~ msgid ""
1002+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
1003+#~ "conditions</a>."
1004+#~ msgstr ""
1005+#~ "Esbillando esta opción aceutes los <a href='#'>términos y condiciones</a> de "
1006+#~ "Nokia HERE."
1007+
1008+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
1009+#~ msgstr ""
1010+#~ "Usando GPS, Wi-fi anónimes ya información de redes móviles (aconseyao)"
1011+
7821012#~ msgid "Your phone is now ready to use."
7831013#~ msgstr "El teléfonu yá ta tresnáu pa usase."
7841014
1015+#~ msgid "Confirm passphrase"
1016+#~ msgstr "Confirmar frase de pasu"
1017+
1018+#~ msgid "Passphrase must be 4 characters long"
1019+#~ msgstr "La fras de pasu tien de ser 4 caráuteres de llargor"
1020+
1021+#~ msgid "Choose your passcode"
1022+#~ msgstr "Escueyi'l to códigu de pasu"
1023+
1024+#~ msgid "Please try again."
1025+#~ msgstr "Por favor, vuelvi a intentalo."
1026+
7851027#~ msgid "%a %H:%M"
7861028#~ msgstr "%a %H:%M"
7871029
@@ -815,14 +1057,11 @@ msgstr "%1 〉"
8151057#~ msgid "Call back"
8161058#~ msgstr "Devolver llamada"
8171059
818−#~ msgid "Re-dock, save your work and close these apps to continue."
819−#~ msgstr ""
820−#~ "Pa siguir coneuta nuevamente'l preséu, guarda'l trabayu y zarra estes "
821−#~ "aplicaciones."
1060+#~ msgid "Your device is now ready to use."
1061+#~ msgstr "Agora'l to preséu ta preparáu pa usase."
8221062
823−#~ msgid ""
824−#~ "Your device is now connected to an external display. Use this screen as a "
825−#~ "touch pad to interact with the mouse."
826−#~ msgstr ""
827−#~ "Agora'l to preséu ta coneutáu a una pantalla esterna. Usa esta pantalla como "
828−#~ "panel táutil pa interactuar col mur."
1063+#~ msgid "Welcome to your Ubuntu device."
1064+#~ msgstr "Bienllegáu/ada al to preséu d'Ubuntu."
1065+
1066+#~ msgid "Please select how you’d like to unlock your device."
1067+#~ msgstr "Esbilla cómo te prestaría desbloquiar el to preséu, por favor."
po/az.po+261−180
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\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,8 +15,8 @@ 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: 2016-03-13 05:50+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19+"X-Generator: Launchpad (build 17958)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -73,64 +73,46 @@ msgctxt "Button: Log out from the system"
7373msgid "Log Out"
7474msgstr ""
7575
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
77−#: qml/Components/Dialogs.qml:253
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
7879msgid "Cancel"
7980msgstr "İmtina"
8081
8182#: qml/Components/Dialogs.qml:173
82−msgctxt "Title: Reboot/Shut down dialog"
83−msgid "Shut down"
84−msgstr ""
85−
86−#: qml/Components/Dialogs.qml:174
87−msgid "Are you sure you want to shut down?"
88−msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"
89−
90−#: qml/Components/Dialogs.qml:176
91−msgctxt "Button: Reboot the system"
92−msgid "Reboot"
93−msgstr ""
94−
95−#: qml/Components/Dialogs.qml:185
96−msgctxt "Button: Shut down the system"
97−msgid "Shut down"
98−msgstr ""
99−
100−#: qml/Components/Dialogs.qml:207
10183msgctxt "Title: Reboot dialog"
10284msgid "Reboot"
10385msgstr ""
10486
105−#: qml/Components/Dialogs.qml:208
87+#: qml/Components/Dialogs.qml:174
10688msgid "Are you sure you want to reboot?"
10789msgstr "Yenidәn başlatmaq istәdiyinizә әminsiniz?"
10890
109−#: qml/Components/Dialogs.qml:210
91+#: qml/Components/Dialogs.qml:176
11092msgid "No"
11193msgstr "Yox"
11294
113−#: qml/Components/Dialogs.qml:217
95+#: qml/Components/Dialogs.qml:183
11496msgid "Yes"
11597msgstr "Hə"
11698
117−#: qml/Components/Dialogs.qml:232
99+#: qml/Components/Dialogs.qml:198
118100msgctxt "Title: Power off/Restart dialog"
119101msgid "Power"
120102msgstr ""
121103
122−#: qml/Components/Dialogs.qml:233
104+#: qml/Components/Dialogs.qml:199
123105msgid ""
124106"Are you sure you would like\n"
125107"to power off?"
126108msgstr ""
127109
128−#: qml/Components/Dialogs.qml:235
110+#: qml/Components/Dialogs.qml:201
129111msgctxt "Button: Power off the system"
130112msgid "Power off"
131113msgstr ""
132114
133−#: qml/Components/Dialogs.qml:244
115+#: qml/Components/Dialogs.qml:210
134116msgctxt "Button: Restart the system"
135117msgid "Restart"
136118msgstr ""
@@ -173,42 +155,58 @@ msgstr ""
173155msgid "Close all"
174156msgstr ""
175157
176−#: qml/Dash/DashPageHeader.qml:270
158+#: qml/Dash/DashPageHeader.qml:337
177159msgctxt "Button: Open the Ubuntu Store"
178160msgid "Store"
179161msgstr ""
180162
181−#: qml/Dash/DashPageHeader.qml:277
163+#: qml/Dash/DashPageHeader.qml:344
182164msgctxt "Button: Start a search in the current dash scope"
183165msgid "Search"
184166msgstr ""
185167
186−#: qml/Dash/DashPageHeader.qml:287
168+#: qml/Dash/DashPageHeader.qml:354
187169msgctxt "Button: Show the current dash scope settings"
188170msgid "Settings"
189171msgstr ""
190172
191−#: qml/Dash/DashPageHeader.qml:294
173+#: qml/Dash/DashPageHeader.qml:361
192174msgid "Remove from Favorites"
193175msgstr "Seçilmişlәrdәn çıxart"
194176
195−#: qml/Dash/DashPageHeader.qml:294
177+#: qml/Dash/DashPageHeader.qml:361
196178msgid "Add to Favorites"
197179msgstr "Seçilmişlәrә әlavә et"
198180
199−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
181+#: qml/Dash/FiltersPopover.qml:60
182+msgid "Refine your results"
183+msgstr ""
184+
185+#: qml/Dash/FiltersPopover.qml:69
186+msgid "Reset"
187+msgstr ""
188+
189+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
200190msgid "See less"
201191msgstr "Daha azını gör"
202192
203−#: qml/Dash/GenericScopeView.qml:567
193+#: qml/Dash/GenericScopeView.qml:570
204194msgid "See all"
205195msgstr "Hamısını gör"
206196
207−#: qml/Dash/GenericScopeView.qml:629
197+#: qml/Dash/GenericScopeView.qml:627
208198msgctxt "Label: Hint for dash search line edit"
209199msgid "Search"
210200msgstr ""
211201
202+#: qml/Dash/PageHeaderExtraPanel.qml:55
203+msgid "Recent Searches"
204+msgstr ""
205+
206+#: qml/Dash/PageHeaderExtraPanel.qml:66
207+msgid "Clear All"
208+msgstr ""
209+
212210#: qml/Dash/Previews/PreviewActionCombo.qml:35
213211msgid "More..."
214212msgstr "Daha çox..."
@@ -276,11 +274,11 @@ msgstr ""
276274msgid "Tap to unlock"
277275msgstr ""
278276
279−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
277+#: qml/Greeter/NarrowView.qml:54
280278msgid "Sorry, incorrect passphrase."
281279msgstr "Bağışlayın, açar söz yanlışdır."
282280
283−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
281+#: qml/Greeter/NarrowView.qml:55
284282msgid "Sorry, incorrect passcode."
285283msgstr "Təəssüf ki, açar kod yanlışdır."
286284
@@ -309,7 +307,7 @@ msgstr ""
309307msgid "Enter %1"
310308msgstr ""
311309
312−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
310+#: qml/Greeter/NarrowView.qml:117
313311msgid "Enter passphrase"
314312msgstr ""
315313
@@ -347,62 +345,62 @@ msgstr "Zəngə qayıtmaq üçün toxunun..."
347345msgid "Conference"
348346msgstr "Konfrans"
349347
350−#: qml/Panel/Indicators/MenuItemFactory.qml:752
348+#: qml/Panel/Indicators/MenuItemFactory.qml:761
351349msgid "Nothing is playing"
352350msgstr ""
353351
354−#: qml/Panel/Indicators/MenuItemFactory.qml:881
352+#: qml/Panel/Indicators/MenuItemFactory.qml:890
355353#, qt-format
356354msgid "%1 hour"
357355msgid_plural "%1 hours"
358356msgstr[0] ""
359357msgstr[1] ""
360358
361−#: qml/Panel/Indicators/MenuItemFactory.qml:885
359+#: qml/Panel/Indicators/MenuItemFactory.qml:894
362360#, qt-format
363361msgid "%1 minute"
364362msgid_plural "%1 minutes"
365363msgstr[0] ""
366364msgstr[1] ""
367365
368−#: qml/Panel/Indicators/MenuItemFactory.qml:890
366+#: qml/Panel/Indicators/MenuItemFactory.qml:899
369367#, qt-format
370368msgid "%1 second"
371369msgid_plural "%1 seconds"
372370msgstr[0] ""
373371msgstr[1] ""
374372
375−#: qml/Panel/Indicators/MenuItemFactory.qml:893
373+#: qml/Panel/Indicators/MenuItemFactory.qml:902
376374msgid "0 seconds"
377375msgstr ""
378376
379377#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
380−#: qml/Panel/Indicators/MenuItemFactory.qml:895
378+#: qml/Panel/Indicators/MenuItemFactory.qml:904
381379#, qt-format
382380msgid "%1 remaining"
383381msgstr ""
384382
385−#: qml/Panel/Indicators/MenuItemFactory.qml:901
383+#: qml/Panel/Indicators/MenuItemFactory.qml:910
386384msgid "In queue…"
387385msgstr "Növbədədir..."
388386
389−#: qml/Panel/Indicators/MenuItemFactory.qml:905
387+#: qml/Panel/Indicators/MenuItemFactory.qml:914
390388msgid "Downloading"
391389msgstr "Endirilir"
392390
393−#: qml/Panel/Indicators/MenuItemFactory.qml:907
391+#: qml/Panel/Indicators/MenuItemFactory.qml:916
394392msgid "Paused, tap to resume"
395393msgstr "Dayandırıldı. Davam etmək üçün toxunun"
396394
397−#: qml/Panel/Indicators/MenuItemFactory.qml:909
395+#: qml/Panel/Indicators/MenuItemFactory.qml:918
398396msgid "Canceled"
399397msgstr "İmtina edildi"
400398
401−#: qml/Panel/Indicators/MenuItemFactory.qml:911
399+#: qml/Panel/Indicators/MenuItemFactory.qml:920
402400msgid "Finished"
403401msgstr "Bitdi"
404402
405−#: qml/Panel/Indicators/MenuItemFactory.qml:913
403+#: qml/Panel/Indicators/MenuItemFactory.qml:922
406404msgid "Failed, tap to retry"
407405msgstr "Alınmadı. Yenidәn cәhd etmək üçün toxunun"
408406
@@ -422,243 +420,323 @@ msgctxt "Button: Call back on phone"
422420msgid "Call back"
423421msgstr ""
424422
425−#: qml/Tutorial/TutorialBottom.qml:28
426−msgid "Open special menus"
427−msgstr ""
428−
429−#: qml/Tutorial/TutorialBottom.qml:29
430−msgid "Swipe up from the bottom edge."
423+#: qml/Stages/SideStage.qml:76
424+msgid "Drag using 3 fingers any application from one window to the other"
431425msgstr ""
432426
433−#: qml/Tutorial/TutorialBottomFinish.qml:24
434−msgid "This action does different things for different apps"
427+#: qml/Tutorial/TutorialBottom.qml:78
428+msgid "Swipe up to add a contact"
435429msgstr ""
436430
437−#: qml/Tutorial/TutorialBottomFinish.qml:25
438−msgid "Tap here to finish."
431+#: qml/Tutorial/TutorialBottom.qml:80
432+msgid "Swipe up for favorite calculations"
439433msgstr ""
440434
441−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
442−#: qml/Tutorial/TutorialRight.qml:144
443−msgid "Tap here to continue."
435+#: qml/Tutorial/TutorialBottom.qml:82
436+msgid "Swipe up for recent calls"
444437msgstr ""
445438
446−#: qml/Tutorial/TutorialLeft.qml:26
447−msgid "Open the launcher"
439+#: qml/Tutorial/TutorialBottom.qml:84
440+msgid "Swipe up to create a message"
448441msgstr ""
449442
450−#: qml/Tutorial/TutorialLeft.qml:27
451−msgid "Short swipe from the left edge."
443+#: qml/Tutorial/TutorialBottom.qml:85
444+msgid "Swipe up to manage the app"
452445msgstr ""
453446
454−#: qml/Tutorial/TutorialLeftFinish.qml:24
455−msgid "These are the shortcuts to favorite apps"
447+#: qml/Tutorial/TutorialLeft.qml:47
448+msgid "Swipe from the left edge to open the launcher"
456449msgstr ""
457450
458−#: qml/Tutorial/TutorialPage.qml:178
459−msgid "You almost got it!"
451+#: qml/Tutorial/TutorialLeftLong.qml:47
452+msgid "Long swipe from the left edge to open the Today scope"
460453msgstr ""
461454
462−#: qml/Tutorial/TutorialPage.qml:195
463−msgid "Try again."
455+#: qml/Tutorial/TutorialRight.qml:54
456+msgid "Hover your mouse on the right edge to view your open apps"
464457msgstr ""
465458
466−#: qml/Tutorial/TutorialRight.qml:31
467−msgid "To view open apps"
459+#: qml/Tutorial/TutorialRight.qml:55
460+msgid "Short or long swipe from the right edge to view your open apps"
468461msgstr ""
469462
470−#: qml/Tutorial/TutorialRight.qml:32
471−msgid "Long swipe from the right edge."
463+#: qml/Tutorial/TutorialTop.qml:53
464+msgid "Swipe from the top right edge to open the notification bar"
472465msgstr ""
473466
474−#: qml/Tutorial/TutorialRight.qml:122
475−msgid "View all your running tasks."
467+#: qml/Tutorial/TutorialTop.qml:54
468+msgid "Swipe from the top edge to open the notification bar"
476469msgstr ""
477470
478−#: qml/Wizard/Page.qml:89
471+#: qml/Wizard/Page.qml:54
479472msgctxt "Button: Go back one page in the Wizard"
480473msgid "Back"
481474msgstr ""
482475
483476#: qml/Wizard/Pages/10-welcome.qml:27
484−msgid "Hi!"
477+msgid "Language"
485478msgstr ""
486479
487−#: qml/Wizard/Pages/10-welcome.qml:44
488−msgid "Welcome to your Ubuntu device."
480+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
481+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
482+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
483+#: qml/Wizard/Pages/75-report-check.qml:84
484+#: qml/Wizard/Pages/passcode-desktop.qml:124
485+#: qml/Wizard/Pages/password-set.qml:141
486+msgid "Next"
489487msgstr ""
490488
491−#: qml/Wizard/Pages/10-welcome.qml:52
492−msgid "Let’s get started."
489+#: qml/Wizard/Pages/30-wifi.qml:29
490+msgid "Connect to Wi‑Fi"
493491msgstr ""
494492
495−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
496−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
497−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
498−#: qml/Wizard/Pages/passwd-set.qml:90
499−msgid "Continue"
493+#: qml/Wizard/Pages/30-wifi.qml:130
494+msgid "Connected"
500495msgstr ""
501496
502−#: qml/Wizard/Pages/20-sim.qml:25
503−msgid "Add a SIM card and restart your device"
497+#: qml/Wizard/Pages/30-wifi.qml:163
498+msgid "Available Wi-Fi networks"
504499msgstr ""
505500
506−#: qml/Wizard/Pages/20-sim.qml:59
507−msgid "Without it, you won’t be able to make calls or use text messaging."
501+#: qml/Wizard/Pages/30-wifi.qml:164
502+msgid "No available Wi-Fi networks"
508503msgstr ""
509504
510−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
505+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
506+#: qml/Wizard/Pages/sim.qml:101
511507msgid "Skip"
512508msgstr ""
513509
514−#: qml/Wizard/Pages/30-passwd-type.qml:39
515−msgid "Lock security"
510+#: qml/Wizard/Pages/40-location.qml:27
511+msgid "Location Services"
516512msgstr ""
517513
518−#: qml/Wizard/Pages/30-passwd-type.qml:79
519−msgid "Please select how you’d like to unlock your device."
514+#: qml/Wizard/Pages/40-location.qml:83
515+msgid ""
516+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
517+"(recommended)"
520518msgstr ""
521519
522−#: qml/Wizard/Pages/30-passwd-type.qml:102
523−msgctxt "Label: Type of security method"
524−msgid "Swipe"
520+#: qml/Wizard/Pages/40-location.qml:105
521+#, qt-format
522+msgid "By selecting this option you agree to the Nokia HERE %1."
523+msgstr ""
524+
525+#: qml/Wizard/Pages/40-location.qml:106
526+msgctxt "part of: Nokia HERE terms and conditions"
527+msgid "terms and conditions"
528+msgstr ""
529+
530+#: qml/Wizard/Pages/40-location.qml:160
531+msgid "GPS only"
532+msgstr ""
533+
534+#: qml/Wizard/Pages/40-location.qml:214
535+msgid "Don't use my location"
536+msgstr ""
537+
538+#: qml/Wizard/Pages/40-location.qml:260
539+msgid "You can change it later in System Settings."
540+msgstr ""
541+
542+#: qml/Wizard/Pages/50-timezone.qml:29
543+msgid "Time Zone"
544+msgstr ""
545+
546+#: qml/Wizard/Pages/50-timezone.qml:178
547+msgid "Enter your city"
548+msgstr ""
549+
550+#: qml/Wizard/Pages/60-account.qml:24
551+msgid "Personalize Your Device"
552+msgstr ""
553+
554+#: qml/Wizard/Pages/60-account.qml:48
555+msgid "Preferred Name"
525556msgstr ""
526557
527−#: qml/Wizard/Pages/30-passwd-type.qml:103
528−msgctxt "Label: Description of security method"
529−msgid "No security"
558+#: qml/Wizard/Pages/70-passwd-type.qml:39
559+msgid "Lock Screen"
530560msgstr ""
531561
532−#: qml/Wizard/Pages/30-passwd-type.qml:105
562+#: qml/Wizard/Pages/70-passwd-type.qml:101
533563msgctxt "Label: Type of security method"
534−msgid "Passcode"
564+msgid "Create new password"
535565msgstr ""
536566
537−#: qml/Wizard/Pages/30-passwd-type.qml:106
538−msgctxt "Label: Description of security method"
539−msgid "4 digits only"
567+#: qml/Wizard/Pages/70-passwd-type.qml:103
568+msgctxt "Label: Type of security method"
569+msgid "Create passcode (numbers only)"
540570msgstr ""
541571
542−#: qml/Wizard/Pages/30-passwd-type.qml:108
572+#: qml/Wizard/Pages/70-passwd-type.qml:105
543573msgctxt "Label: Type of security method"
544−msgid "Passphrase"
574+msgid "No lock code"
545575msgstr ""
546576
547−#: qml/Wizard/Pages/30-passwd-type.qml:109
548−msgctxt "Label: Description of security method"
549−msgid "Numbers and letters"
577+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
578+msgid "Privacy Policy"
550579msgstr ""
551580
552−#: qml/Wizard/Pages/40-wifi.qml:29
553−msgid "Connect to Wi‑Fi"
581+#: qml/Wizard/Pages/75-report-check.qml:26
582+msgid "Help Us Improve"
554583msgstr ""
555584
556−#: qml/Wizard/Pages/40-wifi.qml:168
557−msgid "Available networks…"
585+#: qml/Wizard/Pages/75-report-check.qml:59
586+msgid "Improve system performance by sending us crashes and error reports."
558587msgstr ""
559588
560−#: qml/Wizard/Pages/40-wifi.qml:169
561−msgid "No available networks."
589+#: qml/Wizard/Pages/75-report-check.qml:60
590+msgid "Privacy policy"
562591msgstr ""
563592
564−#: qml/Wizard/Pages/50-location.qml:27
565−msgid "Location"
593+#: qml/Wizard/Pages/80-finished.qml:89
594+msgid "Welcome to Ubuntu"
566595msgstr ""
567596
568−#: qml/Wizard/Pages/50-location.qml:62
569−msgid "Let the phone detect your location:"
597+#: qml/Wizard/Pages/80-finished.qml:104
598+msgid "You are ready to use your device now"
570599msgstr ""
571600
572−#: qml/Wizard/Pages/50-location.qml:69
573−msgid "Using GPS only (less accurate)"
601+#: qml/Wizard/Pages/80-finished.qml:124
602+msgid "Get Started"
574603msgstr ""
575604
576−#: qml/Wizard/Pages/50-location.qml:86
577−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
605+#: qml/Wizard/Pages/here-terms.qml:25
606+msgid "Terms & Conditions"
578607msgstr ""
579608
580−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
581−#: qml/Wizard/Pages/50-location.qml:103
609+#: qml/Wizard/Pages/here-terms.qml:69
610+msgid "Your device uses positioning technologies provided by HERE."
611+msgstr ""
612+
613+#: qml/Wizard/Pages/here-terms.qml:81
582614msgid ""
583−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
584−"conditions</a>."
615+"To provide you with positioning services and to improve their quality, HERE "
616+"collects information about nearby cell towers and Wi-Fi hotspots around your "
617+"current location whenever your position is being found."
585618msgstr ""
586619
587−#: qml/Wizard/Pages/50-location.qml:112
588−msgid "Not at all"
620+#: qml/Wizard/Pages/here-terms.qml:93
621+msgid ""
622+"The information collected is used to analyze the service and to improve the "
623+"use of service, but not to identify you personally."
589624msgstr ""
590625
591−#: qml/Wizard/Pages/50-location.qml:124
592−msgid "You can change your mind later in <b>System Settings</b>."
626+#: qml/Wizard/Pages/here-terms.qml:106
627+#, qt-format
628+msgid "By continuing, you agree to the HERE platform %1 and %2."
593629msgstr ""
594630
595−#: qml/Wizard/Pages/60-reporting.qml:26
596−msgid "Improving your experience"
631+#: qml/Wizard/Pages/here-terms.qml:107
632+msgid "Service Terms"
597633msgstr ""
598634
599−#: qml/Wizard/Pages/60-reporting.qml:46
600−msgid ""
601−"Your phone is set up to automatically report errors to Canonical and its "
602−"partners, the makers of the operating system."
635+#: qml/Wizard/Pages/passcode-confirm.qml:43
636+#: qml/Wizard/Pages/passcode-desktop.qml:80
637+msgid "Confirm passcode"
603638msgstr ""
604639
605−#: qml/Wizard/Pages/60-reporting.qml:53
606−msgid ""
607−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
608−"Privacy</b>"
640+#: qml/Wizard/Pages/passcode-confirm.qml:45
641+msgid "Incorrect passcode."
609642msgstr ""
610643
611−#: qml/Wizard/Pages/80-finished.qml:24
612−msgid "All done"
644+#: qml/Wizard/Pages/passcode-confirm.qml:45
645+msgctxt "Enter the passcode again"
646+msgid "Please re-enter."
613647msgstr ""
614648
615−#: qml/Wizard/Pages/80-finished.qml:39
616−msgid "Nice work!"
649+#: qml/Wizard/Pages/passcode-desktop.qml:30
650+msgid "Lock Screen Passcode"
617651msgstr ""
618652
619−#: qml/Wizard/Pages/80-finished.qml:46
620−msgid "Your device is now ready to use."
653+#: qml/Wizard/Pages/passcode-desktop.qml:56
654+msgid "Enter 4 numbers to setup your passcode"
621655msgstr ""
622656
623−#: qml/Wizard/Pages/80-finished.qml:53
624−msgid "Finish"
657+#: qml/Wizard/Pages/passcode-desktop.qml:65
658+#: qml/Wizard/Pages/passcode-set.qml:54
659+msgid "Choose passcode"
625660msgstr ""
626661
627−#: qml/Wizard/Pages/here-terms.qml:27
628−msgid "Terms & Conditions"
662+#: qml/Wizard/Pages/passcode-desktop.qml:105
663+msgid "Passcode too short"
629664msgstr ""
630665
631−#: qml/Wizard/Pages/passwd-confirm.qml:49
632−msgid "Confirm passphrase"
666+#: qml/Wizard/Pages/passcode-desktop.qml:107
667+msgid "Passcodes match"
633668msgstr ""
634669
635−#: qml/Wizard/Pages/passwd-confirm.qml:50
636−msgid "Confirm passcode"
670+#: qml/Wizard/Pages/passcode-desktop.qml:109
671+msgid "Passcodes do not match"
637672msgstr ""
638673
639−#: qml/Wizard/Pages/passwd-confirm.qml:53
640−#: qml/Wizard/Pages/passwd-confirm.qml:54
641−msgid "Please try again."
674+#: qml/Wizard/Pages/passcode-set.qml:62
675+msgid "Passcode must be 4 characters long"
642676msgstr ""
643677
644−#: qml/Wizard/Pages/passwd-set.qml:61
645−msgid "Choose your passcode"
678+#: qml/Wizard/Pages/password-set.qml:30
679+msgid "Lock Screen Password"
646680msgstr ""
647681
648−#: qml/Wizard/Pages/passwd-set.qml:68
649−msgid "Passphrase must be 4 characters long"
682+#: qml/Wizard/Pages/password-set.qml:61
683+msgid "Enter at least 8 characters"
650684msgstr ""
651685
652−#. Translators: This is the arrow for "Back" buttons
653−#: qml/Wizard/StackButton.qml:39
654−#, qt-format
655−msgid "〈 %1"
686+#: qml/Wizard/Pages/password-set.qml:73
687+msgid "Choose password"
656688msgstr ""
657689
658−#. Translators: This is the arrow for "Forward" buttons
659−#: qml/Wizard/StackButton.qml:42
660−#, qt-format
661−msgid "%1 〉"
690+#: qml/Wizard/Pages/password-set.qml:103
691+msgid "Confirm password"
692+msgstr ""
693+
694+#: qml/Wizard/Pages/sim.qml:27
695+msgid "No SIM card installed"
696+msgstr ""
697+
698+#: qml/Wizard/Pages/sim.qml:54
699+msgid "SIM card added"
700+msgstr ""
701+
702+#: qml/Wizard/Pages/sim.qml:55
703+msgid "You must restart the device to access the mobile network."
704+msgstr ""
705+
706+#: qml/Wizard/Pages/sim.qml:59
707+msgid "Restart"
708+msgstr ""
709+
710+#: qml/Wizard/Pages/sim.qml:78
711+msgid "You won’t be able to make calls or use text messaging without a SIM."
712+msgstr ""
713+
714+#: qml/Wizard/Pages/sim.qml:90
715+msgid "To proceed with no SIM tap Skip."
716+msgstr ""
717+
718+#: qml/Wizard/PasswordMeter.qml:87
719+msgid "Passwords match"
720+msgstr ""
721+
722+#: qml/Wizard/PasswordMeter.qml:89
723+msgid "Passwords do not match"
724+msgstr ""
725+
726+#: qml/Wizard/PasswordMeter.qml:93
727+msgid "Strong password"
728+msgstr ""
729+
730+#: qml/Wizard/PasswordMeter.qml:95
731+msgid "Fair password"
732+msgstr ""
733+
734+#: qml/Wizard/PasswordMeter.qml:97
735+msgid "Weak password"
736+msgstr ""
737+
738+#: qml/Wizard/PasswordMeter.qml:99
739+msgid "Very weak password"
662740msgstr ""
663741
664742#~ msgid "Confirm"
@@ -716,6 +794,9 @@ msgstr ""
716794#~ msgid "Log out"
717795#~ msgstr "Çıxış"
718796
797+#~ msgid "Are you sure you want to shut down?"
798+#~ msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"
799+
719800#~ msgid "Shut down"
720801#~ msgstr "Sistemi Söndür"
721802
po/be.po+475−236
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1111"PO-Revision-Date: 2015-12-13 13:12+0000\n"
1212"Last-Translator: Mikhail_SaTuRn <mikhail_saturn@tut.by>\n"
1313"Language-Team: Belarusian <be@li.org>\n"
@@ -16,8 +16,8 @@ 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: 2016-03-13 05:50+0000\n"
20−"X-Generator: Launchpad (build 17939)\n"
19+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
20+"X-Generator: Launchpad (build 17958)\n"
2121
2222#: plugins/IntegratedLightDM/Greeter.cpp:112
2323msgid "Password: "
@@ -78,53 +78,35 @@ msgctxt "Button: Log out from the system"
7878msgid "Log Out"
7979msgstr "Выйсці"
8080
81−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
82−#: qml/Components/Dialogs.qml:253
81+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
82+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
83+#: qml/Wizard/Pages/passcode-set.qml:32
8384msgid "Cancel"
8485msgstr "Скасаваць"
8586
8687#: qml/Components/Dialogs.qml:173
87−msgctxt "Title: Reboot/Shut down dialog"
88−msgid "Shut down"
89−msgstr "Выключыць"
90−
91−#: qml/Components/Dialogs.qml:174
92−msgid "Are you sure you want to shut down?"
93−msgstr "Вы ўпэўненыя, што жадаеце выключыць прыладу?"
94−
95−#: qml/Components/Dialogs.qml:176
96−msgctxt "Button: Reboot the system"
97−msgid "Reboot"
98−msgstr "Перазагрузіць"
99−
100−#: qml/Components/Dialogs.qml:185
101−msgctxt "Button: Shut down the system"
102−msgid "Shut down"
103−msgstr "Выключыць"
104−
105−#: qml/Components/Dialogs.qml:207
10688msgctxt "Title: Reboot dialog"
10789msgid "Reboot"
10890msgstr "Перазагрузіць"
10991
110−#: qml/Components/Dialogs.qml:208
92+#: qml/Components/Dialogs.qml:174
11193msgid "Are you sure you want to reboot?"
11294msgstr "Вы ўпэўнены, што жадаеце перазагрузіць?"
11395
114−#: qml/Components/Dialogs.qml:210
96+#: qml/Components/Dialogs.qml:176
11597msgid "No"
11698msgstr "Не"
11799
118−#: qml/Components/Dialogs.qml:217
100+#: qml/Components/Dialogs.qml:183
119101msgid "Yes"
120102msgstr "Так"
121103
122−#: qml/Components/Dialogs.qml:232
104+#: qml/Components/Dialogs.qml:198
123105msgctxt "Title: Power off/Restart dialog"
124106msgid "Power"
125107msgstr "Сілкаванне"
126108
127−#: qml/Components/Dialogs.qml:233
109+#: qml/Components/Dialogs.qml:199
128110msgid ""
129111"Are you sure you would like\n"
130112"to power off?"
@@ -132,12 +114,12 @@ msgstr ""
132114"Вы ўпэўнены, што хочаце\n"
133115"выключыць камп'ютэр?"
134116
135−#: qml/Components/Dialogs.qml:235
117+#: qml/Components/Dialogs.qml:201
136118msgctxt "Button: Power off the system"
137119msgid "Power off"
138120msgstr "Выключыць"
139121
140−#: qml/Components/Dialogs.qml:244
122+#: qml/Components/Dialogs.qml:210
141123msgctxt "Button: Restart the system"
142124msgid "Restart"
143125msgstr "Перазапуск"
@@ -180,42 +162,58 @@ msgstr "Перападлучыцца зараз!"
180162msgid "Close all"
181163msgstr "Зачыніць усё"
182164
183−#: qml/Dash/DashPageHeader.qml:270
165+#: qml/Dash/DashPageHeader.qml:337
184166msgctxt "Button: Open the Ubuntu Store"
185167msgid "Store"
186168msgstr "Крама"
187169
188−#: qml/Dash/DashPageHeader.qml:277
170+#: qml/Dash/DashPageHeader.qml:344
189171msgctxt "Button: Start a search in the current dash scope"
190172msgid "Search"
191173msgstr "Пошук"
192174
193−#: qml/Dash/DashPageHeader.qml:287
175+#: qml/Dash/DashPageHeader.qml:354
194176msgctxt "Button: Show the current dash scope settings"
195177msgid "Settings"
196178msgstr "Налады"
197179
198−#: qml/Dash/DashPageHeader.qml:294
180+#: qml/Dash/DashPageHeader.qml:361
199181msgid "Remove from Favorites"
200182msgstr "Выдаліць з абранага"
201183
202−#: qml/Dash/DashPageHeader.qml:294
184+#: qml/Dash/DashPageHeader.qml:361
203185msgid "Add to Favorites"
204186msgstr "Дадаць да абранага"
205187
206−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
188+#: qml/Dash/FiltersPopover.qml:60
189+msgid "Refine your results"
190+msgstr ""
191+
192+#: qml/Dash/FiltersPopover.qml:69
193+msgid "Reset"
194+msgstr ""
195+
196+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
207197msgid "See less"
208198msgstr "Карацей"
209199
210−#: qml/Dash/GenericScopeView.qml:567
200+#: qml/Dash/GenericScopeView.qml:570
211201msgid "See all"
212202msgstr "Больш падрабязна"
213203
214−#: qml/Dash/GenericScopeView.qml:629
204+#: qml/Dash/GenericScopeView.qml:627
215205msgctxt "Label: Hint for dash search line edit"
216206msgid "Search"
217207msgstr "Пошук"
218208
209+#: qml/Dash/PageHeaderExtraPanel.qml:55
210+msgid "Recent Searches"
211+msgstr ""
212+
213+#: qml/Dash/PageHeaderExtraPanel.qml:66
214+msgid "Clear All"
215+msgstr ""
216+
219217#: qml/Dash/Previews/PreviewActionCombo.qml:35
220218msgid "More..."
221219msgstr "Болей…"
@@ -283,11 +281,11 @@ msgstr "Паспрабаваць зноў"
283281msgid "Tap to unlock"
284282msgstr "Націсніце, каб разблакаваць"
285283
286−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
284+#: qml/Greeter/NarrowView.qml:54
287285msgid "Sorry, incorrect passphrase."
288286msgstr "Даруйце, няслушны пароль."
289287
290−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
288+#: qml/Greeter/NarrowView.qml:55
291289msgid "Sorry, incorrect passcode."
292290msgstr "Даруйце, няслушны код."
293291
@@ -316,7 +314,7 @@ msgstr ""
316314msgid "Enter %1"
317315msgstr "Увядзіце %1"
318316
319−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
317+#: qml/Greeter/NarrowView.qml:117
320318msgid "Enter passphrase"
321319msgstr "Увядзіце пароль"
322320
@@ -354,11 +352,11 @@ msgstr "Націсніце, каб вярнуцца да выкліку..."
354352msgid "Conference"
355353msgstr "Канферэнцыя"
356354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:752
355+#: qml/Panel/Indicators/MenuItemFactory.qml:761
358356msgid "Nothing is playing"
359357msgstr "Нічога не грае"
360358
361−#: qml/Panel/Indicators/MenuItemFactory.qml:881
359+#: qml/Panel/Indicators/MenuItemFactory.qml:890
362360#, qt-format
363361msgid "%1 hour"
364362msgid_plural "%1 hours"
@@ -366,7 +364,7 @@ msgstr[0] "%1 гадзіна"
366364msgstr[1] "%1 гадзіны"
367365msgstr[2] "%1 гадзінаў"
368366
369−#: qml/Panel/Indicators/MenuItemFactory.qml:885
367+#: qml/Panel/Indicators/MenuItemFactory.qml:894
370368#, qt-format
371369msgid "%1 minute"
372370msgid_plural "%1 minutes"
@@ -374,7 +372,7 @@ msgstr[0] "%1 хвіліна"
374372msgstr[1] "%1 хвіліны"
375373msgstr[2] "%1 хвілінаў"
376374
377−#: qml/Panel/Indicators/MenuItemFactory.qml:890
375+#: qml/Panel/Indicators/MenuItemFactory.qml:899
378376#, qt-format
379377msgid "%1 second"
380378msgid_plural "%1 seconds"
@@ -382,37 +380,37 @@ msgstr[0] "%1 секунда"
382380msgstr[1] "%1 секунды"
383381msgstr[2] "%1 секундаў"
384382
385−#: qml/Panel/Indicators/MenuItemFactory.qml:893
383+#: qml/Panel/Indicators/MenuItemFactory.qml:902
386384msgid "0 seconds"
387385msgstr "0 секунд"
388386
389387#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
390−#: qml/Panel/Indicators/MenuItemFactory.qml:895
388+#: qml/Panel/Indicators/MenuItemFactory.qml:904
391389#, qt-format
392390msgid "%1 remaining"
393391msgstr "%1 засталося"
394392
395−#: qml/Panel/Indicators/MenuItemFactory.qml:901
393+#: qml/Panel/Indicators/MenuItemFactory.qml:910
396394msgid "In queue…"
397395msgstr "У чарзе..."
398396
399−#: qml/Panel/Indicators/MenuItemFactory.qml:905
397+#: qml/Panel/Indicators/MenuItemFactory.qml:914
400398msgid "Downloading"
401399msgstr "Запампоўка"
402400
403−#: qml/Panel/Indicators/MenuItemFactory.qml:907
401+#: qml/Panel/Indicators/MenuItemFactory.qml:916
404402msgid "Paused, tap to resume"
405403msgstr "Прыпынена, націсніце для працягу"
406404
407−#: qml/Panel/Indicators/MenuItemFactory.qml:909
405+#: qml/Panel/Indicators/MenuItemFactory.qml:918
408406msgid "Canceled"
409407msgstr "Скасавана"
410408
411−#: qml/Panel/Indicators/MenuItemFactory.qml:911
409+#: qml/Panel/Indicators/MenuItemFactory.qml:920
412410msgid "Finished"
413411msgstr "Скончана"
414412
415−#: qml/Panel/Indicators/MenuItemFactory.qml:913
413+#: qml/Panel/Indicators/MenuItemFactory.qml:922
416414msgid "Failed, tap to retry"
417415msgstr "Не атрымалася, націсніце, каб паўтарыць спробу"
418416
@@ -432,251 +430,324 @@ msgctxt "Button: Call back on phone"
432430msgid "Call back"
433431msgstr "Патэлефанаваць"
434432
435−#: qml/Tutorial/TutorialBottom.qml:28
436−msgid "Open special menus"
437−msgstr "Адкрыць спецыяльныя меню"
438−
439−#: qml/Tutorial/TutorialBottom.qml:29
440−msgid "Swipe up from the bottom edge."
441−msgstr "Правесці уверх ад ніжняга краю."
433+#: qml/Stages/SideStage.qml:76
434+msgid "Drag using 3 fingers any application from one window to the other"
435+msgstr ""
442436
443−#: qml/Tutorial/TutorialBottomFinish.qml:24
444−msgid "This action does different things for different apps"
445−msgstr "Гэта дзеянне мае розныя наступствы для розных праграм"
437+#: qml/Tutorial/TutorialBottom.qml:78
438+msgid "Swipe up to add a contact"
439+msgstr ""
446440
447−#: qml/Tutorial/TutorialBottomFinish.qml:25
448−msgid "Tap here to finish."
449−msgstr "Націсніце тут, каб завяршыць."
441+#: qml/Tutorial/TutorialBottom.qml:80
442+msgid "Swipe up for favorite calculations"
443+msgstr ""
450444
451−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
452−#: qml/Tutorial/TutorialRight.qml:144
453−msgid "Tap here to continue."
454−msgstr "Націсніце тут, каб працягнуць."
445+#: qml/Tutorial/TutorialBottom.qml:82
446+msgid "Swipe up for recent calls"
447+msgstr ""
455448
456−#: qml/Tutorial/TutorialLeft.qml:26
457−msgid "Open the launcher"
458−msgstr "Адкрыць панэль запуску"
449+#: qml/Tutorial/TutorialBottom.qml:84
450+msgid "Swipe up to create a message"
451+msgstr ""
459452
460−#: qml/Tutorial/TutorialLeft.qml:27
461−msgid "Short swipe from the left edge."
462−msgstr "Кароткі рух з левага краю."
453+#: qml/Tutorial/TutorialBottom.qml:85
454+msgid "Swipe up to manage the app"
455+msgstr ""
463456
464−#: qml/Tutorial/TutorialLeftFinish.qml:24
465−msgid "These are the shortcuts to favorite apps"
466−msgstr "Гэта скарачэнні для абраных праграм"
457+#: qml/Tutorial/TutorialLeft.qml:47
458+msgid "Swipe from the left edge to open the launcher"
459+msgstr ""
467460
468−#: qml/Tutorial/TutorialPage.qml:178
469−msgid "You almost got it!"
470−msgstr "Амаль усё!"
461+#: qml/Tutorial/TutorialLeftLong.qml:47
462+msgid "Long swipe from the left edge to open the Today scope"
463+msgstr ""
471464
472−#: qml/Tutorial/TutorialPage.qml:195
473−msgid "Try again."
474−msgstr "Паспрабуйце яшчэ."
465+#: qml/Tutorial/TutorialRight.qml:54
466+msgid "Hover your mouse on the right edge to view your open apps"
467+msgstr ""
475468
476−#: qml/Tutorial/TutorialRight.qml:31
477−msgid "To view open apps"
478−msgstr "Паглядзець адкрытыя праграмы"
469+#: qml/Tutorial/TutorialRight.qml:55
470+msgid "Short or long swipe from the right edge to view your open apps"
471+msgstr ""
479472
480−#: qml/Tutorial/TutorialRight.qml:32
481−msgid "Long swipe from the right edge."
482−msgstr "Доўгі рух ад правага краю."
473+#: qml/Tutorial/TutorialTop.qml:53
474+msgid "Swipe from the top right edge to open the notification bar"
475+msgstr ""
483476
484−#: qml/Tutorial/TutorialRight.qml:122
485−msgid "View all your running tasks."
486−msgstr "Паказаць усе запушчаныя задачы."
477+#: qml/Tutorial/TutorialTop.qml:54
478+msgid "Swipe from the top edge to open the notification bar"
479+msgstr ""
487480
488−#: qml/Wizard/Page.qml:89
481+#: qml/Wizard/Page.qml:54
489482msgctxt "Button: Go back one page in the Wizard"
490483msgid "Back"
491484msgstr "Вярнуцца"
492485
493486#: qml/Wizard/Pages/10-welcome.qml:27
494−msgid "Hi!"
495−msgstr "Вітай!"
487+msgid "Language"
488+msgstr ""
496489
497−#: qml/Wizard/Pages/10-welcome.qml:44
498−msgid "Welcome to your Ubuntu device."
490+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
491+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
492+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
493+#: qml/Wizard/Pages/75-report-check.qml:84
494+#: qml/Wizard/Pages/passcode-desktop.qml:124
495+#: qml/Wizard/Pages/password-set.qml:141
496+msgid "Next"
499497msgstr ""
500498
501−#: qml/Wizard/Pages/10-welcome.qml:52
502−msgid "Let’s get started."
503−msgstr "Пачнем."
499+#: qml/Wizard/Pages/30-wifi.qml:29
500+msgid "Connect to Wi‑Fi"
501+msgstr "Злучыцца з Wi-Fi"
504502
505−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
506−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
507−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
508−#: qml/Wizard/Pages/passwd-set.qml:90
509−msgid "Continue"
510−msgstr "Працягнуць"
503+#: qml/Wizard/Pages/30-wifi.qml:130
504+msgid "Connected"
505+msgstr ""
511506
512−#: qml/Wizard/Pages/20-sim.qml:25
513−msgid "Add a SIM card and restart your device"
514−msgstr "Дадайце SIM-карту і перазагрузіце Вашую прыладу"
507+#: qml/Wizard/Pages/30-wifi.qml:163
508+msgid "Available Wi-Fi networks"
509+msgstr ""
515510
516−#: qml/Wizard/Pages/20-sim.qml:59
517−msgid "Without it, you won’t be able to make calls or use text messaging."
518−msgstr "Без яе Вы не зможаце тэлефанаваць ці адпраўляць паведамленні."
511+#: qml/Wizard/Pages/30-wifi.qml:164
512+msgid "No available Wi-Fi networks"
513+msgstr ""
519514
520−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
515+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
516+#: qml/Wizard/Pages/sim.qml:101
521517msgid "Skip"
522518msgstr "Прапусціць"
523519
524−#: qml/Wizard/Pages/30-passwd-type.qml:39
525−msgid "Lock security"
526−msgstr "Блакіроўка"
520+#: qml/Wizard/Pages/40-location.qml:27
521+msgid "Location Services"
522+msgstr ""
527523
528−#: qml/Wizard/Pages/30-passwd-type.qml:79
529−msgid "Please select how you’d like to unlock your device."
524+#: qml/Wizard/Pages/40-location.qml:83
525+msgid ""
526+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
527+"(recommended)"
530528msgstr ""
531529
532−#: qml/Wizard/Pages/30-passwd-type.qml:102
533−msgctxt "Label: Type of security method"
534−msgid "Swipe"
535−msgstr "Рух"
530+#: qml/Wizard/Pages/40-location.qml:105
531+#, qt-format
532+msgid "By selecting this option you agree to the Nokia HERE %1."
533+msgstr ""
534+
535+#: qml/Wizard/Pages/40-location.qml:106
536+msgctxt "part of: Nokia HERE terms and conditions"
537+msgid "terms and conditions"
538+msgstr ""
539+
540+#: qml/Wizard/Pages/40-location.qml:160
541+msgid "GPS only"
542+msgstr ""
536543
537−#: qml/Wizard/Pages/30-passwd-type.qml:103
538−msgctxt "Label: Description of security method"
539−msgid "No security"
540−msgstr "Без бяспекі"
544+#: qml/Wizard/Pages/40-location.qml:214
545+msgid "Don't use my location"
546+msgstr ""
541547
542−#: qml/Wizard/Pages/30-passwd-type.qml:105
548+#: qml/Wizard/Pages/40-location.qml:260
549+msgid "You can change it later in System Settings."
550+msgstr ""
551+
552+#: qml/Wizard/Pages/50-timezone.qml:29
553+msgid "Time Zone"
554+msgstr ""
555+
556+#: qml/Wizard/Pages/50-timezone.qml:178
557+msgid "Enter your city"
558+msgstr ""
559+
560+#: qml/Wizard/Pages/60-account.qml:24
561+msgid "Personalize Your Device"
562+msgstr ""
563+
564+#: qml/Wizard/Pages/60-account.qml:48
565+msgid "Preferred Name"
566+msgstr ""
567+
568+#: qml/Wizard/Pages/70-passwd-type.qml:39
569+msgid "Lock Screen"
570+msgstr ""
571+
572+#: qml/Wizard/Pages/70-passwd-type.qml:101
543573msgctxt "Label: Type of security method"
544−msgid "Passcode"
545−msgstr "Код-пароль"
574+msgid "Create new password"
575+msgstr ""
546576
547−#: qml/Wizard/Pages/30-passwd-type.qml:106
548−msgctxt "Label: Description of security method"
549−msgid "4 digits only"
550−msgstr "Толькі 4 лічбы"
577+#: qml/Wizard/Pages/70-passwd-type.qml:103
578+msgctxt "Label: Type of security method"
579+msgid "Create passcode (numbers only)"
580+msgstr ""
551581
552−#: qml/Wizard/Pages/30-passwd-type.qml:108
582+#: qml/Wizard/Pages/70-passwd-type.qml:105
553583msgctxt "Label: Type of security method"
554−msgid "Passphrase"
555−msgstr "Пароль"
584+msgid "No lock code"
585+msgstr ""
556586
557−#: qml/Wizard/Pages/30-passwd-type.qml:109
558−msgctxt "Label: Description of security method"
559−msgid "Numbers and letters"
560−msgstr "Літары і лічбы"
587+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
588+msgid "Privacy Policy"
589+msgstr ""
561590
562−#: qml/Wizard/Pages/40-wifi.qml:29
563−msgid "Connect to Wi‑Fi"
564−msgstr "Злучыцца з Wi-Fi"
591+#: qml/Wizard/Pages/75-report-check.qml:26
592+msgid "Help Us Improve"
593+msgstr ""
565594
566−#: qml/Wizard/Pages/40-wifi.qml:168
567−msgid "Available networks…"
568−msgstr "Даступныя сеткі..."
595+#: qml/Wizard/Pages/75-report-check.qml:59
596+msgid "Improve system performance by sending us crashes and error reports."
597+msgstr ""
569598
570−#: qml/Wizard/Pages/40-wifi.qml:169
571−msgid "No available networks."
572−msgstr "Няма даступных сетак."
599+#: qml/Wizard/Pages/75-report-check.qml:60
600+msgid "Privacy policy"
601+msgstr ""
602+
603+#: qml/Wizard/Pages/80-finished.qml:89
604+msgid "Welcome to Ubuntu"
605+msgstr ""
573606
574−#: qml/Wizard/Pages/50-location.qml:27
575−msgid "Location"
576−msgstr "Месца"
607+#: qml/Wizard/Pages/80-finished.qml:104
608+msgid "You are ready to use your device now"
609+msgstr ""
610+
611+#: qml/Wizard/Pages/80-finished.qml:124
612+msgid "Get Started"
613+msgstr ""
577614
578−#: qml/Wizard/Pages/50-location.qml:62
579−msgid "Let the phone detect your location:"
580−msgstr "Дазволіць тэлефону вызначаць месцазнаходжанне:"
615+#: qml/Wizard/Pages/here-terms.qml:25
616+msgid "Terms & Conditions"
617+msgstr "Умовы карыстання"
581618
582−#: qml/Wizard/Pages/50-location.qml:69
583−msgid "Using GPS only (less accurate)"
584−msgstr "З дапамогай толькі GPS (найменш дакладна)"
619+#: qml/Wizard/Pages/here-terms.qml:69
620+msgid "Your device uses positioning technologies provided by HERE."
621+msgstr ""
585622
586−#: qml/Wizard/Pages/50-location.qml:86
587−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
623+#: qml/Wizard/Pages/here-terms.qml:81
624+msgid ""
625+"To provide you with positioning services and to improve their quality, HERE "
626+"collects information about nearby cell towers and Wi-Fi hotspots around your "
627+"current location whenever your position is being found."
588628msgstr ""
589−"На аснове GPS, ананімізаванага Wi-Fi і дадзеных сотавай сеткі (рэкамендуецца)"
590629
591−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
592−#: qml/Wizard/Pages/50-location.qml:103
630+#: qml/Wizard/Pages/here-terms.qml:93
593631msgid ""
594−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
595−"conditions</a>."
632+"The information collected is used to analyze the service and to improve the "
633+"use of service, but not to identify you personally."
596634msgstr ""
597−"Выбарам гэтага варыянту дзеянняў вы згаджаецеся з <a href='#'> умовамі "
598−"прадстаўлення паслуг Nokia HERE</a>."
599635
600−#: qml/Wizard/Pages/50-location.qml:112
601−msgid "Not at all"
602−msgstr "Не дазваляць"
636+#: qml/Wizard/Pages/here-terms.qml:106
637+#, qt-format
638+msgid "By continuing, you agree to the HERE platform %1 and %2."
639+msgstr ""
603640
604−#: qml/Wizard/Pages/50-location.qml:124
605−msgid "You can change your mind later in <b>System Settings</b>."
606−msgstr "Пасля змяніць налады можна з дапамогай <b>Сістэмных наладкаў</b>."
641+#: qml/Wizard/Pages/here-terms.qml:107
642+msgid "Service Terms"
643+msgstr ""
607644
608−#: qml/Wizard/Pages/60-reporting.qml:26
609−msgid "Improving your experience"
610−msgstr "Спрашчэнне вашай працы"
645+#: qml/Wizard/Pages/passcode-confirm.qml:43
646+#: qml/Wizard/Pages/passcode-desktop.qml:80
647+msgid "Confirm passcode"
648+msgstr "Пацвердзіце код-пароль"
611649
612−#: qml/Wizard/Pages/60-reporting.qml:46
613−msgid ""
614−"Your phone is set up to automatically report errors to Canonical and its "
615−"partners, the makers of the operating system."
650+#: qml/Wizard/Pages/passcode-confirm.qml:45
651+msgid "Incorrect passcode."
616652msgstr ""
617−"Ваш тэлефон настроены на аўтаматычную адпраўку справаздач пра памылкі ў "
618−"Canonical і партнёрскія установы, вытворцам аперацыйнай сістэмы."
619653
620−#: qml/Wizard/Pages/60-reporting.qml:53
621−msgid ""
622−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
623−"Privacy</b>"
654+#: qml/Wizard/Pages/passcode-confirm.qml:45
655+msgctxt "Enter the passcode again"
656+msgid "Please re-enter."
624657msgstr ""
625−"Гэтае можна адключыць у <b>Сістэмных наладках</b>, дзе <b>Бяспека &amp; "
626−"канфедэнцыйнасці</b>"
627658
628−#: qml/Wizard/Pages/80-finished.qml:24
629−msgid "All done"
630−msgstr "Зроблена"
659+#: qml/Wizard/Pages/passcode-desktop.qml:30
660+msgid "Lock Screen Passcode"
661+msgstr ""
631662
632−#: qml/Wizard/Pages/80-finished.qml:39
633−msgid "Nice work!"
634−msgstr "Выдатная праца!"
663+#: qml/Wizard/Pages/passcode-desktop.qml:56
664+msgid "Enter 4 numbers to setup your passcode"
665+msgstr ""
635666
636−#: qml/Wizard/Pages/80-finished.qml:46
637−msgid "Your device is now ready to use."
667+#: qml/Wizard/Pages/passcode-desktop.qml:65
668+#: qml/Wizard/Pages/passcode-set.qml:54
669+msgid "Choose passcode"
638670msgstr ""
639671
640−#: qml/Wizard/Pages/80-finished.qml:53
641−msgid "Finish"
642−msgstr "Скончыць"
672+#: qml/Wizard/Pages/passcode-desktop.qml:105
673+msgid "Passcode too short"
674+msgstr ""
643675
644−#: qml/Wizard/Pages/here-terms.qml:27
645−msgid "Terms & Conditions"
646−msgstr "Умовы карыстання"
676+#: qml/Wizard/Pages/passcode-desktop.qml:107
677+msgid "Passcodes match"
678+msgstr ""
647679
648−#: qml/Wizard/Pages/passwd-confirm.qml:49
649−msgid "Confirm passphrase"
650−msgstr "Пацвердзіце пароль"
680+#: qml/Wizard/Pages/passcode-desktop.qml:109
681+msgid "Passcodes do not match"
682+msgstr ""
651683
652−#: qml/Wizard/Pages/passwd-confirm.qml:50
653−msgid "Confirm passcode"
654−msgstr "Пацвердзіце код-пароль"
684+#: qml/Wizard/Pages/passcode-set.qml:62
685+msgid "Passcode must be 4 characters long"
686+msgstr ""
655687
656−#: qml/Wizard/Pages/passwd-confirm.qml:53
657−#: qml/Wizard/Pages/passwd-confirm.qml:54
658−msgid "Please try again."
659−msgstr "Калі ласка, паспрабуйце яшчэ раз."
688+#: qml/Wizard/Pages/password-set.qml:30
689+msgid "Lock Screen Password"
690+msgstr ""
660691
661−#: qml/Wizard/Pages/passwd-set.qml:61
662−msgid "Choose your passcode"
663−msgstr "Выберыце код"
692+#: qml/Wizard/Pages/password-set.qml:61
693+msgid "Enter at least 8 characters"
694+msgstr ""
664695
665−#: qml/Wizard/Pages/passwd-set.qml:68
666−msgid "Passphrase must be 4 characters long"
667−msgstr "Код мусіць складацца з 4 сімвалаў"
696+#: qml/Wizard/Pages/password-set.qml:73
697+msgid "Choose password"
698+msgstr ""
668699
669−#. Translators: This is the arrow for "Back" buttons
670−#: qml/Wizard/StackButton.qml:39
671−#, qt-format
672−msgid "〈 %1"
673−msgstr "〈 %1"
700+#: qml/Wizard/Pages/password-set.qml:103
701+msgid "Confirm password"
702+msgstr ""
674703
675−#. Translators: This is the arrow for "Forward" buttons
676−#: qml/Wizard/StackButton.qml:42
677−#, qt-format
678−msgid "%1 〉"
679−msgstr "%1 〉"
704+#: qml/Wizard/Pages/sim.qml:27
705+msgid "No SIM card installed"
706+msgstr ""
707+
708+#: qml/Wizard/Pages/sim.qml:54
709+msgid "SIM card added"
710+msgstr ""
711+
712+#: qml/Wizard/Pages/sim.qml:55
713+msgid "You must restart the device to access the mobile network."
714+msgstr ""
715+
716+#: qml/Wizard/Pages/sim.qml:59
717+msgid "Restart"
718+msgstr "Перазапусціць"
719+
720+#: qml/Wizard/Pages/sim.qml:78
721+msgid "You won’t be able to make calls or use text messaging without a SIM."
722+msgstr ""
723+
724+#: qml/Wizard/Pages/sim.qml:90
725+msgid "To proceed with no SIM tap Skip."
726+msgstr ""
727+
728+#: qml/Wizard/PasswordMeter.qml:87
729+msgid "Passwords match"
730+msgstr ""
731+
732+#: qml/Wizard/PasswordMeter.qml:89
733+msgid "Passwords do not match"
734+msgstr ""
735+
736+#: qml/Wizard/PasswordMeter.qml:93
737+msgid "Strong password"
738+msgstr ""
739+
740+#: qml/Wizard/PasswordMeter.qml:95
741+msgid "Fair password"
742+msgstr ""
743+
744+#: qml/Wizard/PasswordMeter.qml:97
745+msgid "Weak password"
746+msgstr ""
747+
748+#: qml/Wizard/PasswordMeter.qml:99
749+msgid "Very weak password"
750+msgstr ""
680751
681752#~ msgid "Reboot"
682753#~ msgstr "Перазагрузіць"
@@ -723,6 +794,9 @@ msgstr "%1 〉"
723794#~ msgid "Log out"
724795#~ msgstr "Выйсці"
725796
797+#~ msgid "Are you sure you want to shut down?"
798+#~ msgstr "Вы ўпэўненыя, што жадаеце выключыць прыладу?"
799+
726800#~ msgid "Power"
727801#~ msgstr "Сілкаванне"
728802
@@ -746,17 +820,88 @@ msgstr "%1 〉"
746820#~ msgid "Store"
747821#~ msgstr "Крама"
748822
823+#~ msgid "Add a SIM card and restart your device"
824+#~ msgstr "Дадайце SIM-карту і перазагрузіце Вашую прыладу"
825+
826+#~ msgid "Hi!"
827+#~ msgstr "Вітай!"
828+
749829#~ msgid "Welcome to your Ubuntu phone."
750830#~ msgstr "Вітаем Вас у сістэме тэлефона Ubuntu."
751831
832+#~ msgid "Let’s get started."
833+#~ msgstr "Пачнем."
834+
835+#~ msgid "Continue"
836+#~ msgstr "Працягнуць"
837+
752838#~ msgid "Please select how you’d like to unlock your phone."
753839#~ msgstr "Калі ласка, абярыце спосаб разблакавання тэлефона."
754840
841+#~ msgid "Using GPS only (less accurate)"
842+#~ msgstr "З дапамогай толькі GPS (найменш дакладна)"
843+
844+#~ msgid "Available networks…"
845+#~ msgstr "Даступныя сеткі..."
846+
847+#~ msgid "No available networks."
848+#~ msgstr "Няма даступных сетак."
849+
850+#~ msgid "Location"
851+#~ msgstr "Месца"
852+
853+#~ msgid "Let the phone detect your location:"
854+#~ msgstr "Дазволіць тэлефону вызначаць месцазнаходжанне:"
855+
856+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
857+#~ msgstr ""
858+#~ "На аснове GPS, ананімізаванага Wi-Fi і дадзеных сотавай сеткі (рэкамендуецца)"
859+
860+#~ msgid "Improving your experience"
861+#~ msgstr "Спрашчэнне вашай працы"
862+
863+#~ msgid ""
864+#~ "Your phone is set up to automatically report errors to Canonical and its "
865+#~ "partners, the makers of the operating system."
866+#~ msgstr ""
867+#~ "Ваш тэлефон настроены на аўтаматычную адпраўку справаздач пра памылкі ў "
868+#~ "Canonical і партнёрскія установы, вытворцам аперацыйнай сістэмы."
869+
870+#~ msgid "Nice work!"
871+#~ msgstr "Выдатная праца!"
872+
873+#~ msgid "All done"
874+#~ msgstr "Зроблена"
875+
876+#~ msgid "Finish"
877+#~ msgstr "Скончыць"
878+
755879#~ msgid "Your phone is now ready to use."
756880#~ msgstr "Цяпер Вашым тэлефонам можна карыстацца."
757881
758−#~ msgid "Restart"
759−#~ msgstr "Перазапусціць"
882+#~ msgid ""
883+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
884+#~ "conditions</a>."
885+#~ msgstr ""
886+#~ "Выбарам гэтага варыянту дзеянняў вы згаджаецеся з <a href='#'> умовамі "
887+#~ "прадстаўлення паслуг Nokia HERE</a>."
888+
889+#~ msgid "Not at all"
890+#~ msgstr "Не дазваляць"
891+
892+#, qt-format
893+#~ msgid "〈 %1"
894+#~ msgstr "〈 %1"
895+
896+#~ msgid "Confirm passphrase"
897+#~ msgstr "Пацвердзіце пароль"
898+
899+#, qt-format
900+#~ msgid "%1 〉"
901+#~ msgstr "%1 〉"
902+
903+#~ msgid "Please try again."
904+#~ msgstr "Калі ласка, паспрабуйце яшчэ раз."
760905
761906#~ msgid "Close"
762907#~ msgstr "Закрыць"
@@ -778,6 +923,103 @@ msgstr "%1 〉"
778923#~ msgid "Please re-enter"
779924#~ msgstr "Калі ласка, паўтарыце ўвод"
780925
926+#~ msgid "Lock security"
927+#~ msgstr "Блакіроўка"
928+
929+#~ msgid "You can change your mind later in <b>System Settings</b>."
930+#~ msgstr "Пасля змяніць налады можна з дапамогай <b>Сістэмных наладкаў</b>."
931+
932+#~ msgid ""
933+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
934+#~ "Privacy</b>"
935+#~ msgstr ""
936+#~ "Гэтае можна адключыць у <b>Сістэмных наладках</b>, дзе <b>Бяспека &amp; "
937+#~ "канфедэнцыйнасці</b>"
938+
939+#~ msgid "Choose your passcode"
940+#~ msgstr "Выберыце код"
941+
942+#~ msgctxt "Button: Shut down the system"
943+#~ msgid "Shut down"
944+#~ msgstr "Выключыць"
945+
946+#~ msgctxt "Title: Reboot/Shut down dialog"
947+#~ msgid "Shut down"
948+#~ msgstr "Выключыць"
949+
950+#~ msgctxt "Button: Reboot the system"
951+#~ msgid "Reboot"
952+#~ msgstr "Перазагрузіць"
953+
954+#~ msgid "Swipe up from the bottom edge."
955+#~ msgstr "Правесці уверх ад ніжняга краю."
956+
957+#~ msgid "Open special menus"
958+#~ msgstr "Адкрыць спецыяльныя меню"
959+
960+#~ msgid "Tap here to finish."
961+#~ msgstr "Націсніце тут, каб завяршыць."
962+
963+#~ msgid "This action does different things for different apps"
964+#~ msgstr "Гэта дзеянне мае розныя наступствы для розных праграм"
965+
966+#~ msgid "To view open apps"
967+#~ msgstr "Паглядзець адкрытыя праграмы"
968+
969+#~ msgid "You almost got it!"
970+#~ msgstr "Амаль усё!"
971+
972+#~ msgid "Short swipe from the left edge."
973+#~ msgstr "Кароткі рух з левага краю."
974+
975+#~ msgid "Long swipe from the right edge."
976+#~ msgstr "Доўгі рух ад правага краю."
977+
978+#~ msgid "View all your running tasks."
979+#~ msgstr "Паказаць усе запушчаныя задачы."
980+
981+#~ msgid "Try again."
982+#~ msgstr "Паспрабуйце яшчэ."
983+
984+#~ msgid "Open the launcher"
985+#~ msgstr "Адкрыць панэль запуску"
986+
987+#~ msgid "Tap here to continue."
988+#~ msgstr "Націсніце тут, каб працягнуць."
989+
990+#~ msgid "These are the shortcuts to favorite apps"
991+#~ msgstr "Гэта скарачэнні для абраных праграм"
992+
993+#~ msgctxt "Label: Description of security method"
994+#~ msgid "No security"
995+#~ msgstr "Без бяспекі"
996+
997+#~ msgctxt "Label: Type of security method"
998+#~ msgid "Swipe"
999+#~ msgstr "Рух"
1000+
1001+#~ msgctxt "Label: Description of security method"
1002+#~ msgid "4 digits only"
1003+#~ msgstr "Толькі 4 лічбы"
1004+
1005+#~ msgctxt "Label: Type of security method"
1006+#~ msgid "Passphrase"
1007+#~ msgstr "Пароль"
1008+
1009+#~ msgctxt "Label: Description of security method"
1010+#~ msgid "Numbers and letters"
1011+#~ msgstr "Літары і лічбы"
1012+
1013+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
1014+#~ msgstr "Без яе Вы не зможаце тэлефанаваць ці адпраўляць паведамленні."
1015+
1016+#~ msgid "Passphrase must be 4 characters long"
1017+#~ msgstr "Код мусіць складацца з 4 сімвалаў"
1018+
1019+#~ msgctxt "Label: Type of security method"
1020+#~ msgid "Passcode"
1021+#~ msgstr "Код-пароль"
1022+
7811023#~ msgid "%a %l:%M %p"
7821024#~ msgstr "%a a %H:%M"
7831025
@@ -810,6 +1052,3 @@ msgstr "%1 〉"
8101052
8111053#~ msgid "Call back"
8121054#~ msgstr "Зваротны выклік"
813−
814−#~ msgid "Re-dock, save your work and close these apps to continue."
815−#~ msgstr "Захавайце сваю працу і зачыніце прылады, каб працягнуць."
po/bg.po+258−180
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1111"PO-Revision-Date: 2015-04-12 14:43+0000\n"
1212"Last-Translator: George Karavasilev <kokoto-java@ubuntu.com>\n"
1313"Language-Team: Bulgarian <bg@li.org>\n"
@@ -15,8 +15,8 @@ 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: 2016-03-13 05:50+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19+"X-Generator: Launchpad (build 17958)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -73,53 +73,35 @@ msgctxt "Button: Log out from the system"
7373msgid "Log Out"
7474msgstr ""
7575
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
77−#: qml/Components/Dialogs.qml:253
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
7879msgid "Cancel"
7980msgstr ""
8081
8182#: qml/Components/Dialogs.qml:173
82−msgctxt "Title: Reboot/Shut down dialog"
83−msgid "Shut down"
84−msgstr ""
85−
86−#: qml/Components/Dialogs.qml:174
87−msgid "Are you sure you want to shut down?"
88−msgstr ""
89−
90−#: qml/Components/Dialogs.qml:176
91−msgctxt "Button: Reboot the system"
92−msgid "Reboot"
93−msgstr ""
94−
95−#: qml/Components/Dialogs.qml:185
96−msgctxt "Button: Shut down the system"
97−msgid "Shut down"
98−msgstr ""
99−
100−#: qml/Components/Dialogs.qml:207
10183msgctxt "Title: Reboot dialog"
10284msgid "Reboot"
10385msgstr ""
10486
105−#: qml/Components/Dialogs.qml:208
87+#: qml/Components/Dialogs.qml:174
10688msgid "Are you sure you want to reboot?"
10789msgstr ""
10890
109−#: qml/Components/Dialogs.qml:210
91+#: qml/Components/Dialogs.qml:176
11092msgid "No"
11193msgstr ""
11294
113−#: qml/Components/Dialogs.qml:217
95+#: qml/Components/Dialogs.qml:183
11496msgid "Yes"
11597msgstr ""
11698
117−#: qml/Components/Dialogs.qml:232
99+#: qml/Components/Dialogs.qml:198
118100msgctxt "Title: Power off/Restart dialog"
119101msgid "Power"
120102msgstr ""
121103
122−#: qml/Components/Dialogs.qml:233
104+#: qml/Components/Dialogs.qml:199
123105msgid ""
124106"Are you sure you would like\n"
125107"to power off?"
@@ -127,12 +109,12 @@ msgstr ""
127109"Искате ли да \n"
128110"изключите захранването на устройството?"
129111
130−#: qml/Components/Dialogs.qml:235
112+#: qml/Components/Dialogs.qml:201
131113msgctxt "Button: Power off the system"
132114msgid "Power off"
133115msgstr ""
134116
135−#: qml/Components/Dialogs.qml:244
117+#: qml/Components/Dialogs.qml:210
136118msgctxt "Button: Restart the system"
137119msgid "Restart"
138120msgstr ""
@@ -175,42 +157,58 @@ msgstr ""
175157msgid "Close all"
176158msgstr ""
177159
178−#: qml/Dash/DashPageHeader.qml:270
160+#: qml/Dash/DashPageHeader.qml:337
179161msgctxt "Button: Open the Ubuntu Store"
180162msgid "Store"
181163msgstr ""
182164
183−#: qml/Dash/DashPageHeader.qml:277
165+#: qml/Dash/DashPageHeader.qml:344
184166msgctxt "Button: Start a search in the current dash scope"
185167msgid "Search"
186168msgstr ""
187169
188−#: qml/Dash/DashPageHeader.qml:287
170+#: qml/Dash/DashPageHeader.qml:354
189171msgctxt "Button: Show the current dash scope settings"
190172msgid "Settings"
191173msgstr ""
192174
193−#: qml/Dash/DashPageHeader.qml:294
175+#: qml/Dash/DashPageHeader.qml:361
194176msgid "Remove from Favorites"
195177msgstr ""
196178
197−#: qml/Dash/DashPageHeader.qml:294
179+#: qml/Dash/DashPageHeader.qml:361
198180msgid "Add to Favorites"
199181msgstr ""
200182
201−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
183+#: qml/Dash/FiltersPopover.qml:60
184+msgid "Refine your results"
185+msgstr ""
186+
187+#: qml/Dash/FiltersPopover.qml:69
188+msgid "Reset"
189+msgstr ""
190+
191+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
202192msgid "See less"
203193msgstr ""
204194
205−#: qml/Dash/GenericScopeView.qml:567
195+#: qml/Dash/GenericScopeView.qml:570
206196msgid "See all"
207197msgstr ""
208198
209−#: qml/Dash/GenericScopeView.qml:629
199+#: qml/Dash/GenericScopeView.qml:627
210200msgctxt "Label: Hint for dash search line edit"
211201msgid "Search"
212202msgstr ""
213203
204+#: qml/Dash/PageHeaderExtraPanel.qml:55
205+msgid "Recent Searches"
206+msgstr ""
207+
208+#: qml/Dash/PageHeaderExtraPanel.qml:66
209+msgid "Clear All"
210+msgstr ""
211+
214212#: qml/Dash/Previews/PreviewActionCombo.qml:35
215213msgid "More..."
216214msgstr ""
@@ -278,11 +276,11 @@ msgstr ""
278276msgid "Tap to unlock"
279277msgstr ""
280278
281−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
279+#: qml/Greeter/NarrowView.qml:54
282280msgid "Sorry, incorrect passphrase."
283281msgstr ""
284282
285−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
283+#: qml/Greeter/NarrowView.qml:55
286284msgid "Sorry, incorrect passcode."
287285msgstr ""
288286
@@ -307,7 +305,7 @@ msgstr ""
307305msgid "Enter %1"
308306msgstr ""
309307
310−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
308+#: qml/Greeter/NarrowView.qml:117
311309msgid "Enter passphrase"
312310msgstr ""
313311
@@ -345,62 +343,62 @@ msgstr ""
345343msgid "Conference"
346344msgstr ""
347345
348−#: qml/Panel/Indicators/MenuItemFactory.qml:752
346+#: qml/Panel/Indicators/MenuItemFactory.qml:761
349347msgid "Nothing is playing"
350348msgstr ""
351349
352−#: qml/Panel/Indicators/MenuItemFactory.qml:881
350+#: qml/Panel/Indicators/MenuItemFactory.qml:890
353351#, qt-format
354352msgid "%1 hour"
355353msgid_plural "%1 hours"
356354msgstr[0] ""
357355msgstr[1] ""
358356
359−#: qml/Panel/Indicators/MenuItemFactory.qml:885
357+#: qml/Panel/Indicators/MenuItemFactory.qml:894
360358#, qt-format
361359msgid "%1 minute"
362360msgid_plural "%1 minutes"
363361msgstr[0] ""
364362msgstr[1] ""
365363
366−#: qml/Panel/Indicators/MenuItemFactory.qml:890
364+#: qml/Panel/Indicators/MenuItemFactory.qml:899
367365#, qt-format
368366msgid "%1 second"
369367msgid_plural "%1 seconds"
370368msgstr[0] ""
371369msgstr[1] ""
372370
373−#: qml/Panel/Indicators/MenuItemFactory.qml:893
371+#: qml/Panel/Indicators/MenuItemFactory.qml:902
374372msgid "0 seconds"
375373msgstr ""
376374
377375#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
378−#: qml/Panel/Indicators/MenuItemFactory.qml:895
376+#: qml/Panel/Indicators/MenuItemFactory.qml:904
379377#, qt-format
380378msgid "%1 remaining"
381379msgstr ""
382380
383−#: qml/Panel/Indicators/MenuItemFactory.qml:901
381+#: qml/Panel/Indicators/MenuItemFactory.qml:910
384382msgid "In queue…"
385383msgstr ""
386384
387−#: qml/Panel/Indicators/MenuItemFactory.qml:905
385+#: qml/Panel/Indicators/MenuItemFactory.qml:914
388386msgid "Downloading"
389387msgstr ""
390388
391−#: qml/Panel/Indicators/MenuItemFactory.qml:907
389+#: qml/Panel/Indicators/MenuItemFactory.qml:916
392390msgid "Paused, tap to resume"
393391msgstr ""
394392
395−#: qml/Panel/Indicators/MenuItemFactory.qml:909
393+#: qml/Panel/Indicators/MenuItemFactory.qml:918
396394msgid "Canceled"
397395msgstr ""
398396
399−#: qml/Panel/Indicators/MenuItemFactory.qml:911
397+#: qml/Panel/Indicators/MenuItemFactory.qml:920
400398msgid "Finished"
401399msgstr ""
402400
403−#: qml/Panel/Indicators/MenuItemFactory.qml:913
401+#: qml/Panel/Indicators/MenuItemFactory.qml:922
404402msgid "Failed, tap to retry"
405403msgstr ""
406404
@@ -420,243 +418,323 @@ msgctxt "Button: Call back on phone"
420418msgid "Call back"
421419msgstr ""
422420
423−#: qml/Tutorial/TutorialBottom.qml:28
424−msgid "Open special menus"
421+#: qml/Stages/SideStage.qml:76
422+msgid "Drag using 3 fingers any application from one window to the other"
425423msgstr ""
426424
427−#: qml/Tutorial/TutorialBottom.qml:29
428−msgid "Swipe up from the bottom edge."
425+#: qml/Tutorial/TutorialBottom.qml:78
426+msgid "Swipe up to add a contact"
429427msgstr ""
430428
431−#: qml/Tutorial/TutorialBottomFinish.qml:24
432−msgid "This action does different things for different apps"
429+#: qml/Tutorial/TutorialBottom.qml:80
430+msgid "Swipe up for favorite calculations"
433431msgstr ""
434432
435−#: qml/Tutorial/TutorialBottomFinish.qml:25
436−msgid "Tap here to finish."
433+#: qml/Tutorial/TutorialBottom.qml:82
434+msgid "Swipe up for recent calls"
437435msgstr ""
438436
439−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
440−#: qml/Tutorial/TutorialRight.qml:144
441−msgid "Tap here to continue."
437+#: qml/Tutorial/TutorialBottom.qml:84
438+msgid "Swipe up to create a message"
442439msgstr ""
443440
444−#: qml/Tutorial/TutorialLeft.qml:26
445−msgid "Open the launcher"
441+#: qml/Tutorial/TutorialBottom.qml:85
442+msgid "Swipe up to manage the app"
446443msgstr ""
447444
448−#: qml/Tutorial/TutorialLeft.qml:27
449−msgid "Short swipe from the left edge."
445+#: qml/Tutorial/TutorialLeft.qml:47
446+msgid "Swipe from the left edge to open the launcher"
450447msgstr ""
451448
452−#: qml/Tutorial/TutorialLeftFinish.qml:24
453−msgid "These are the shortcuts to favorite apps"
449+#: qml/Tutorial/TutorialLeftLong.qml:47
450+msgid "Long swipe from the left edge to open the Today scope"
454451msgstr ""
455452
456−#: qml/Tutorial/TutorialPage.qml:178
457−msgid "You almost got it!"
453+#: qml/Tutorial/TutorialRight.qml:54
454+msgid "Hover your mouse on the right edge to view your open apps"
458455msgstr ""
459456
460−#: qml/Tutorial/TutorialPage.qml:195
461−msgid "Try again."
457+#: qml/Tutorial/TutorialRight.qml:55
458+msgid "Short or long swipe from the right edge to view your open apps"
462459msgstr ""
463460
464−#: qml/Tutorial/TutorialRight.qml:31
465−msgid "To view open apps"
461+#: qml/Tutorial/TutorialTop.qml:53
462+msgid "Swipe from the top right edge to open the notification bar"
466463msgstr ""
467464
468−#: qml/Tutorial/TutorialRight.qml:32
469−msgid "Long swipe from the right edge."
465+#: qml/Tutorial/TutorialTop.qml:54
466+msgid "Swipe from the top edge to open the notification bar"
470467msgstr ""
471468
472−#: qml/Tutorial/TutorialRight.qml:122
473−msgid "View all your running tasks."
474−msgstr ""
475−
476−#: qml/Wizard/Page.qml:89
469+#: qml/Wizard/Page.qml:54
477470msgctxt "Button: Go back one page in the Wizard"
478471msgid "Back"
479472msgstr ""
480473
481474#: qml/Wizard/Pages/10-welcome.qml:27
482−msgid "Hi!"
475+msgid "Language"
483476msgstr ""
484477
485−#: qml/Wizard/Pages/10-welcome.qml:44
486−msgid "Welcome to your Ubuntu device."
478+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
479+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
480+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
481+#: qml/Wizard/Pages/75-report-check.qml:84
482+#: qml/Wizard/Pages/passcode-desktop.qml:124
483+#: qml/Wizard/Pages/password-set.qml:141
484+msgid "Next"
487485msgstr ""
488486
489−#: qml/Wizard/Pages/10-welcome.qml:52
490−msgid "Let’s get started."
487+#: qml/Wizard/Pages/30-wifi.qml:29
488+msgid "Connect to Wi‑Fi"
491489msgstr ""
492490
493−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
494−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
495−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
496−#: qml/Wizard/Pages/passwd-set.qml:90
497−msgid "Continue"
491+#: qml/Wizard/Pages/30-wifi.qml:130
492+msgid "Connected"
498493msgstr ""
499494
500−#: qml/Wizard/Pages/20-sim.qml:25
501−msgid "Add a SIM card and restart your device"
495+#: qml/Wizard/Pages/30-wifi.qml:163
496+msgid "Available Wi-Fi networks"
502497msgstr ""
503498
504−#: qml/Wizard/Pages/20-sim.qml:59
505−msgid "Without it, you won’t be able to make calls or use text messaging."
499+#: qml/Wizard/Pages/30-wifi.qml:164
500+msgid "No available Wi-Fi networks"
506501msgstr ""
507502
508−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
503+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
504+#: qml/Wizard/Pages/sim.qml:101
509505msgid "Skip"
510506msgstr ""
511507
512−#: qml/Wizard/Pages/30-passwd-type.qml:39
513−msgid "Lock security"
508+#: qml/Wizard/Pages/40-location.qml:27
509+msgid "Location Services"
514510msgstr ""
515511
516−#: qml/Wizard/Pages/30-passwd-type.qml:79
517−msgid "Please select how you’d like to unlock your device."
512+#: qml/Wizard/Pages/40-location.qml:83
513+msgid ""
514+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
515+"(recommended)"
518516msgstr ""
519517
520−#: qml/Wizard/Pages/30-passwd-type.qml:102
521−msgctxt "Label: Type of security method"
522−msgid "Swipe"
518+#: qml/Wizard/Pages/40-location.qml:105
519+#, qt-format
520+msgid "By selecting this option you agree to the Nokia HERE %1."
521+msgstr ""
522+
523+#: qml/Wizard/Pages/40-location.qml:106
524+msgctxt "part of: Nokia HERE terms and conditions"
525+msgid "terms and conditions"
526+msgstr ""
527+
528+#: qml/Wizard/Pages/40-location.qml:160
529+msgid "GPS only"
530+msgstr ""
531+
532+#: qml/Wizard/Pages/40-location.qml:214
533+msgid "Don't use my location"
534+msgstr ""
535+
536+#: qml/Wizard/Pages/40-location.qml:260
537+msgid "You can change it later in System Settings."
538+msgstr ""
539+
540+#: qml/Wizard/Pages/50-timezone.qml:29
541+msgid "Time Zone"
542+msgstr ""
543+
544+#: qml/Wizard/Pages/50-timezone.qml:178
545+msgid "Enter your city"
523546msgstr ""
524547
525−#: qml/Wizard/Pages/30-passwd-type.qml:103
526−msgctxt "Label: Description of security method"
527−msgid "No security"
548+#: qml/Wizard/Pages/60-account.qml:24
549+msgid "Personalize Your Device"
528550msgstr ""
529551
530−#: qml/Wizard/Pages/30-passwd-type.qml:105
552+#: qml/Wizard/Pages/60-account.qml:48
553+msgid "Preferred Name"
554+msgstr ""
555+
556+#: qml/Wizard/Pages/70-passwd-type.qml:39
557+msgid "Lock Screen"
558+msgstr ""
559+
560+#: qml/Wizard/Pages/70-passwd-type.qml:101
531561msgctxt "Label: Type of security method"
532−msgid "Passcode"
562+msgid "Create new password"
533563msgstr ""
534564
535−#: qml/Wizard/Pages/30-passwd-type.qml:106
536−msgctxt "Label: Description of security method"
537−msgid "4 digits only"
565+#: qml/Wizard/Pages/70-passwd-type.qml:103
566+msgctxt "Label: Type of security method"
567+msgid "Create passcode (numbers only)"
538568msgstr ""
539569
540−#: qml/Wizard/Pages/30-passwd-type.qml:108
570+#: qml/Wizard/Pages/70-passwd-type.qml:105
541571msgctxt "Label: Type of security method"
542−msgid "Passphrase"
572+msgid "No lock code"
543573msgstr ""
544574
545−#: qml/Wizard/Pages/30-passwd-type.qml:109
546−msgctxt "Label: Description of security method"
547−msgid "Numbers and letters"
575+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
576+msgid "Privacy Policy"
548577msgstr ""
549578
550−#: qml/Wizard/Pages/40-wifi.qml:29
551−msgid "Connect to Wi‑Fi"
579+#: qml/Wizard/Pages/75-report-check.qml:26
580+msgid "Help Us Improve"
552581msgstr ""
553582
554−#: qml/Wizard/Pages/40-wifi.qml:168
555−msgid "Available networks…"
583+#: qml/Wizard/Pages/75-report-check.qml:59
584+msgid "Improve system performance by sending us crashes and error reports."
556585msgstr ""
557586
558−#: qml/Wizard/Pages/40-wifi.qml:169
559−msgid "No available networks."
587+#: qml/Wizard/Pages/75-report-check.qml:60
588+msgid "Privacy policy"
560589msgstr ""
561590
562−#: qml/Wizard/Pages/50-location.qml:27
563−msgid "Location"
591+#: qml/Wizard/Pages/80-finished.qml:89
592+msgid "Welcome to Ubuntu"
564593msgstr ""
565594
566−#: qml/Wizard/Pages/50-location.qml:62
567−msgid "Let the phone detect your location:"
595+#: qml/Wizard/Pages/80-finished.qml:104
596+msgid "You are ready to use your device now"
597+msgstr ""
598+
599+#: qml/Wizard/Pages/80-finished.qml:124
600+msgid "Get Started"
601+msgstr ""
602+
603+#: qml/Wizard/Pages/here-terms.qml:25
604+msgid "Terms & Conditions"
568605msgstr ""
569606
570−#: qml/Wizard/Pages/50-location.qml:69
571−msgid "Using GPS only (less accurate)"
607+#: qml/Wizard/Pages/here-terms.qml:69
608+msgid "Your device uses positioning technologies provided by HERE."
572609msgstr ""
573610
574−#: qml/Wizard/Pages/50-location.qml:86
575−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
611+#: qml/Wizard/Pages/here-terms.qml:81
612+msgid ""
613+"To provide you with positioning services and to improve their quality, HERE "
614+"collects information about nearby cell towers and Wi-Fi hotspots around your "
615+"current location whenever your position is being found."
576616msgstr ""
577617
578−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
579−#: qml/Wizard/Pages/50-location.qml:103
618+#: qml/Wizard/Pages/here-terms.qml:93
580619msgid ""
581−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
582−"conditions</a>."
620+"The information collected is used to analyze the service and to improve the "
621+"use of service, but not to identify you personally."
583622msgstr ""
584623
585−#: qml/Wizard/Pages/50-location.qml:112
586−msgid "Not at all"
624+#: qml/Wizard/Pages/here-terms.qml:106
625+#, qt-format
626+msgid "By continuing, you agree to the HERE platform %1 and %2."
587627msgstr ""
588628
589−#: qml/Wizard/Pages/50-location.qml:124
590−msgid "You can change your mind later in <b>System Settings</b>."
629+#: qml/Wizard/Pages/here-terms.qml:107
630+msgid "Service Terms"
591631msgstr ""
592632
593−#: qml/Wizard/Pages/60-reporting.qml:26
594−msgid "Improving your experience"
633+#: qml/Wizard/Pages/passcode-confirm.qml:43
634+#: qml/Wizard/Pages/passcode-desktop.qml:80
635+msgid "Confirm passcode"
595636msgstr ""
596637
597−#: qml/Wizard/Pages/60-reporting.qml:46
598−msgid ""
599−"Your phone is set up to automatically report errors to Canonical and its "
600−"partners, the makers of the operating system."
638+#: qml/Wizard/Pages/passcode-confirm.qml:45
639+msgid "Incorrect passcode."
601640msgstr ""
602641
603−#: qml/Wizard/Pages/60-reporting.qml:53
604−msgid ""
605−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
606−"Privacy</b>"
642+#: qml/Wizard/Pages/passcode-confirm.qml:45
643+msgctxt "Enter the passcode again"
644+msgid "Please re-enter."
607645msgstr ""
608646
609−#: qml/Wizard/Pages/80-finished.qml:24
610−msgid "All done"
647+#: qml/Wizard/Pages/passcode-desktop.qml:30
648+msgid "Lock Screen Passcode"
611649msgstr ""
612650
613−#: qml/Wizard/Pages/80-finished.qml:39
614−msgid "Nice work!"
651+#: qml/Wizard/Pages/passcode-desktop.qml:56
652+msgid "Enter 4 numbers to setup your passcode"
615653msgstr ""
616654
617−#: qml/Wizard/Pages/80-finished.qml:46
618−msgid "Your device is now ready to use."
655+#: qml/Wizard/Pages/passcode-desktop.qml:65
656+#: qml/Wizard/Pages/passcode-set.qml:54
657+msgid "Choose passcode"
619658msgstr ""
620659
621−#: qml/Wizard/Pages/80-finished.qml:53
622−msgid "Finish"
660+#: qml/Wizard/Pages/passcode-desktop.qml:105
661+msgid "Passcode too short"
623662msgstr ""
624663
625−#: qml/Wizard/Pages/here-terms.qml:27
626−msgid "Terms & Conditions"
664+#: qml/Wizard/Pages/passcode-desktop.qml:107
665+msgid "Passcodes match"
627666msgstr ""
628667
629−#: qml/Wizard/Pages/passwd-confirm.qml:49
630−msgid "Confirm passphrase"
668+#: qml/Wizard/Pages/passcode-desktop.qml:109
669+msgid "Passcodes do not match"
631670msgstr ""
632671
633−#: qml/Wizard/Pages/passwd-confirm.qml:50
634−msgid "Confirm passcode"
672+#: qml/Wizard/Pages/passcode-set.qml:62
673+msgid "Passcode must be 4 characters long"
635674msgstr ""
636675
637−#: qml/Wizard/Pages/passwd-confirm.qml:53
638−#: qml/Wizard/Pages/passwd-confirm.qml:54
639−msgid "Please try again."
676+#: qml/Wizard/Pages/password-set.qml:30
677+msgid "Lock Screen Password"
640678msgstr ""
641679
642−#: qml/Wizard/Pages/passwd-set.qml:61
643−msgid "Choose your passcode"
680+#: qml/Wizard/Pages/password-set.qml:61
681+msgid "Enter at least 8 characters"
644682msgstr ""
645683
646−#: qml/Wizard/Pages/passwd-set.qml:68
647−msgid "Passphrase must be 4 characters long"
684+#: qml/Wizard/Pages/password-set.qml:73
685+msgid "Choose password"
648686msgstr ""
649687
650−#. Translators: This is the arrow for "Back" buttons
651−#: qml/Wizard/StackButton.qml:39
652−#, qt-format
653−msgid "〈 %1"
688+#: qml/Wizard/Pages/password-set.qml:103
689+msgid "Confirm password"
654690msgstr ""
655691
656−#. Translators: This is the arrow for "Forward" buttons
657−#: qml/Wizard/StackButton.qml:42
658−#, qt-format
659−msgid "%1 〉"
692+#: qml/Wizard/Pages/sim.qml:27
693+msgid "No SIM card installed"
694+msgstr ""
695+
696+#: qml/Wizard/Pages/sim.qml:54
697+msgid "SIM card added"
698+msgstr ""
699+
700+#: qml/Wizard/Pages/sim.qml:55
701+msgid "You must restart the device to access the mobile network."
702+msgstr ""
703+
704+#: qml/Wizard/Pages/sim.qml:59
705+msgid "Restart"
706+msgstr ""
707+
708+#: qml/Wizard/Pages/sim.qml:78
709+msgid "You won’t be able to make calls or use text messaging without a SIM."
710+msgstr ""
711+
712+#: qml/Wizard/Pages/sim.qml:90
713+msgid "To proceed with no SIM tap Skip."
714+msgstr ""
715+
716+#: qml/Wizard/PasswordMeter.qml:87
717+msgid "Passwords match"
718+msgstr ""
719+
720+#: qml/Wizard/PasswordMeter.qml:89
721+msgid "Passwords do not match"
722+msgstr ""
723+
724+#: qml/Wizard/PasswordMeter.qml:93
725+msgid "Strong password"
726+msgstr ""
727+
728+#: qml/Wizard/PasswordMeter.qml:95
729+msgid "Fair password"
730+msgstr ""
731+
732+#: qml/Wizard/PasswordMeter.qml:97
733+msgid "Weak password"
734+msgstr ""
735+
736+#: qml/Wizard/PasswordMeter.qml:99
737+msgid "Very weak password"
660738msgstr ""
661739
662740#~ msgid "Confirm"
po/bn.po+339−198
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1111"PO-Revision-Date: 2015-11-27 19:38+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Bengali <bn@li.org>\n"
@@ -15,8 +15,8 @@ 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: 2016-03-13 05:50+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19+"X-Generator: Launchpad (build 17958)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -73,53 +73,35 @@ msgctxt "Button: Log out from the system"
7373msgid "Log Out"
7474msgstr ""
7575
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
77−#: qml/Components/Dialogs.qml:253
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
7879msgid "Cancel"
7980msgstr "বাতিল"
8081
8182#: qml/Components/Dialogs.qml:173
82−msgctxt "Title: Reboot/Shut down dialog"
83−msgid "Shut down"
84−msgstr "বন্ধ করুন"
85−
86−#: qml/Components/Dialogs.qml:174
87−msgid "Are you sure you want to shut down?"
88−msgstr "আপনি কি কম্পিউটার বন্ধ করতে চান?"
89−
90−#: qml/Components/Dialogs.qml:176
91−msgctxt "Button: Reboot the system"
92−msgid "Reboot"
93−msgstr "পুনরায় চালু করুন"
94−
95−#: qml/Components/Dialogs.qml:185
96−msgctxt "Button: Shut down the system"
97−msgid "Shut down"
98−msgstr "বন্ধ করুন"
99−
100−#: qml/Components/Dialogs.qml:207
10183msgctxt "Title: Reboot dialog"
10284msgid "Reboot"
10385msgstr "পুনরায় চালু"
10486
105−#: qml/Components/Dialogs.qml:208
87+#: qml/Components/Dialogs.qml:174
10688msgid "Are you sure you want to reboot?"
10789msgstr "আপনি কি পুনরায় চালু করতে চান?"
10890
109−#: qml/Components/Dialogs.qml:210
91+#: qml/Components/Dialogs.qml:176
11092msgid "No"
11193msgstr "না"
11294
113−#: qml/Components/Dialogs.qml:217
95+#: qml/Components/Dialogs.qml:183
11496msgid "Yes"
11597msgstr "হ্যাঁ"
11698
117−#: qml/Components/Dialogs.qml:232
99+#: qml/Components/Dialogs.qml:198
118100msgctxt "Title: Power off/Restart dialog"
119101msgid "Power"
120102msgstr ""
121103
122−#: qml/Components/Dialogs.qml:233
104+#: qml/Components/Dialogs.qml:199
123105msgid ""
124106"Are you sure you would like\n"
125107"to power off?"
@@ -127,12 +109,12 @@ msgstr ""
127109"আপনি নিশ্চিত যে আপনি\n"
128110"বন্ধ করতে চান?"
129111
130−#: qml/Components/Dialogs.qml:235
112+#: qml/Components/Dialogs.qml:201
131113msgctxt "Button: Power off the system"
132114msgid "Power off"
133115msgstr "বন্ধ করুন"
134116
135−#: qml/Components/Dialogs.qml:244
117+#: qml/Components/Dialogs.qml:210
136118msgctxt "Button: Restart the system"
137119msgid "Restart"
138120msgstr "পুনরায় চালু"
@@ -175,42 +157,58 @@ msgstr ""
175157msgid "Close all"
176158msgstr ""
177159
178−#: qml/Dash/DashPageHeader.qml:270
160+#: qml/Dash/DashPageHeader.qml:337
179161msgctxt "Button: Open the Ubuntu Store"
180162msgid "Store"
181163msgstr "স্টোর"
182164
183−#: qml/Dash/DashPageHeader.qml:277
165+#: qml/Dash/DashPageHeader.qml:344
184166msgctxt "Button: Start a search in the current dash scope"
185167msgid "Search"
186168msgstr "খুঁজুন"
187169
188−#: qml/Dash/DashPageHeader.qml:287
170+#: qml/Dash/DashPageHeader.qml:354
189171msgctxt "Button: Show the current dash scope settings"
190172msgid "Settings"
191173msgstr "সেটিংস"
192174
193−#: qml/Dash/DashPageHeader.qml:294
175+#: qml/Dash/DashPageHeader.qml:361
194176msgid "Remove from Favorites"
195177msgstr "পছন্দ থেকে মুছে ফেলুন"
196178
197−#: qml/Dash/DashPageHeader.qml:294
179+#: qml/Dash/DashPageHeader.qml:361
198180msgid "Add to Favorites"
199181msgstr "পছন্দতে যোগ করুন"
200182
201−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
183+#: qml/Dash/FiltersPopover.qml:60
184+msgid "Refine your results"
185+msgstr ""
186+
187+#: qml/Dash/FiltersPopover.qml:69
188+msgid "Reset"
189+msgstr ""
190+
191+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
202192msgid "See less"
203193msgstr "কম দেখুন"
204194
205−#: qml/Dash/GenericScopeView.qml:567
195+#: qml/Dash/GenericScopeView.qml:570
206196msgid "See all"
207197msgstr "সব দেখুন"
208198
209−#: qml/Dash/GenericScopeView.qml:629
199+#: qml/Dash/GenericScopeView.qml:627
210200msgctxt "Label: Hint for dash search line edit"
211201msgid "Search"
212202msgstr "খুঁজুন"
213203
204+#: qml/Dash/PageHeaderExtraPanel.qml:55
205+msgid "Recent Searches"
206+msgstr ""
207+
208+#: qml/Dash/PageHeaderExtraPanel.qml:66
209+msgid "Clear All"
210+msgstr ""
211+
214212#: qml/Dash/Previews/PreviewActionCombo.qml:35
215213msgid "More..."
216214msgstr "আরো..."
@@ -278,11 +276,11 @@ msgstr ""
278276msgid "Tap to unlock"
279277msgstr "লক খোলার জন্য চাপ দিন"
280278
281−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
279+#: qml/Greeter/NarrowView.qml:54
282280msgid "Sorry, incorrect passphrase."
283281msgstr "দুঃখিত, পাসওয়ার্ডটি ভুল হয়েছে।"
284282
285−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
283+#: qml/Greeter/NarrowView.qml:55
286284msgid "Sorry, incorrect passcode."
287285msgstr "দুঃখিত, পাসকোডটি ভুল হয়েছে।"
288286
@@ -308,7 +306,7 @@ msgstr "ভুল পাসকোড প্রদান করলে, আপন
308306msgid "Enter %1"
309307msgstr "%1 লিখুন"
310308
311−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
309+#: qml/Greeter/NarrowView.qml:117
312310msgid "Enter passphrase"
313311msgstr "পাসওয়ার্ড লিখুন"
314312
@@ -346,62 +344,62 @@ msgstr "কলে ফিরে যেতে চাপ দিন..."
346344msgid "Conference"
347345msgstr "কনফারেন্স"
348346
349−#: qml/Panel/Indicators/MenuItemFactory.qml:752
347+#: qml/Panel/Indicators/MenuItemFactory.qml:761
350348msgid "Nothing is playing"
351349msgstr "কোন কিছু বাজছে না।"
352350
353−#: qml/Panel/Indicators/MenuItemFactory.qml:881
351+#: qml/Panel/Indicators/MenuItemFactory.qml:890
354352#, qt-format
355353msgid "%1 hour"
356354msgid_plural "%1 hours"
357355msgstr[0] "%1 ঘণ্টা"
358356msgstr[1] "%1 ঘণ্টা"
359357
360−#: qml/Panel/Indicators/MenuItemFactory.qml:885
358+#: qml/Panel/Indicators/MenuItemFactory.qml:894
361359#, qt-format
362360msgid "%1 minute"
363361msgid_plural "%1 minutes"
364362msgstr[0] "%1 মিনিট"
365363msgstr[1] "%1 মিনিট"
366364
367−#: qml/Panel/Indicators/MenuItemFactory.qml:890
365+#: qml/Panel/Indicators/MenuItemFactory.qml:899
368366#, qt-format
369367msgid "%1 second"
370368msgid_plural "%1 seconds"
371369msgstr[0] "%1 সেকেন্ড"
372370msgstr[1] "%1 সেকেন্ড"
373371
374−#: qml/Panel/Indicators/MenuItemFactory.qml:893
372+#: qml/Panel/Indicators/MenuItemFactory.qml:902
375373msgid "0 seconds"
376374msgstr "0 সেকেন্ড"
377375
378376#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
379−#: qml/Panel/Indicators/MenuItemFactory.qml:895
377+#: qml/Panel/Indicators/MenuItemFactory.qml:904
380378#, qt-format
381379msgid "%1 remaining"
382380msgstr "%1 বাকি"
383381
384−#: qml/Panel/Indicators/MenuItemFactory.qml:901
382+#: qml/Panel/Indicators/MenuItemFactory.qml:910
385383msgid "In queue…"
386384msgstr "অপেক্ষায় রয়েছে..."
387385
388−#: qml/Panel/Indicators/MenuItemFactory.qml:905
386+#: qml/Panel/Indicators/MenuItemFactory.qml:914
389387msgid "Downloading"
390388msgstr "ডাউনলোড হচ্ছে"
391389
392−#: qml/Panel/Indicators/MenuItemFactory.qml:907
390+#: qml/Panel/Indicators/MenuItemFactory.qml:916
393391msgid "Paused, tap to resume"
394392msgstr "থামানো, শুরু করতে চাপ দিন"
395393
396−#: qml/Panel/Indicators/MenuItemFactory.qml:909
394+#: qml/Panel/Indicators/MenuItemFactory.qml:918
397395msgid "Canceled"
398396msgstr "বাতিল হয়েছে"
399397
400−#: qml/Panel/Indicators/MenuItemFactory.qml:911
398+#: qml/Panel/Indicators/MenuItemFactory.qml:920
401399msgid "Finished"
402400msgstr "শেষ"
403401
404−#: qml/Panel/Indicators/MenuItemFactory.qml:913
402+#: qml/Panel/Indicators/MenuItemFactory.qml:922
405403msgid "Failed, tap to retry"
406404msgstr "ব্যার্থ হয়েছে, পুনরায় চেষ্টা করতে চাপ দিন"
407405
@@ -421,251 +419,373 @@ msgctxt "Button: Call back on phone"
421419msgid "Call back"
422420msgstr "কল ব্যাক"
423421
424−#: qml/Tutorial/TutorialBottom.qml:28
425−msgid "Open special menus"
422+#: qml/Stages/SideStage.qml:76
423+msgid "Drag using 3 fingers any application from one window to the other"
426424msgstr ""
427425
428−#: qml/Tutorial/TutorialBottom.qml:29
429−msgid "Swipe up from the bottom edge."
430−msgstr "নিচের প্রান্ত হতে উপরের দিকে সোয়াইপ করুন।"
431−
432−#: qml/Tutorial/TutorialBottomFinish.qml:24
433−msgid "This action does different things for different apps"
434−msgstr "এই কাজটি বিভিন্ন অ্যাপের জন্য ভিন্ন ভিন্ন ভাবে কাজ করে।"
426+#: qml/Tutorial/TutorialBottom.qml:78
427+msgid "Swipe up to add a contact"
428+msgstr ""
435429
436−#: qml/Tutorial/TutorialBottomFinish.qml:25
437−msgid "Tap here to finish."
430+#: qml/Tutorial/TutorialBottom.qml:80
431+msgid "Swipe up for favorite calculations"
438432msgstr ""
439433
440−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
441−#: qml/Tutorial/TutorialRight.qml:144
442−msgid "Tap here to continue."
443−msgstr "অগ্রসর হওয়ার জন্য এখানে চাপ দিন।"
434+#: qml/Tutorial/TutorialBottom.qml:82
435+msgid "Swipe up for recent calls"
436+msgstr ""
444437
445−#: qml/Tutorial/TutorialLeft.qml:26
446−msgid "Open the launcher"
447−msgstr "লঞ্চার খুলুন"
438+#: qml/Tutorial/TutorialBottom.qml:84
439+msgid "Swipe up to create a message"
440+msgstr ""
448441
449−#: qml/Tutorial/TutorialLeft.qml:27
450−msgid "Short swipe from the left edge."
442+#: qml/Tutorial/TutorialBottom.qml:85
443+msgid "Swipe up to manage the app"
451444msgstr ""
452445
453−#: qml/Tutorial/TutorialLeftFinish.qml:24
454−msgid "These are the shortcuts to favorite apps"
455−msgstr "এগুলো আপনার প্রিয় অ্যাপেরর শর্টকাট"
446+#: qml/Tutorial/TutorialLeft.qml:47
447+msgid "Swipe from the left edge to open the launcher"
448+msgstr ""
456449
457−#: qml/Tutorial/TutorialPage.qml:178
458−msgid "You almost got it!"
459−msgstr "আপনি প্রায় পেরে গেছেন!"
450+#: qml/Tutorial/TutorialLeftLong.qml:47
451+msgid "Long swipe from the left edge to open the Today scope"
452+msgstr ""
460453
461−#: qml/Tutorial/TutorialPage.qml:195
462−msgid "Try again."
463−msgstr "আবার চেষ্টা করুন"
454+#: qml/Tutorial/TutorialRight.qml:54
455+msgid "Hover your mouse on the right edge to view your open apps"
456+msgstr ""
464457
465−#: qml/Tutorial/TutorialRight.qml:31
466−msgid "To view open apps"
467−msgstr "সচল অ্যাপগুলো দেখার জন্য"
458+#: qml/Tutorial/TutorialRight.qml:55
459+msgid "Short or long swipe from the right edge to view your open apps"
460+msgstr ""
468461
469−#: qml/Tutorial/TutorialRight.qml:32
470−msgid "Long swipe from the right edge."
462+#: qml/Tutorial/TutorialTop.qml:53
463+msgid "Swipe from the top right edge to open the notification bar"
471464msgstr ""
472465
473−#: qml/Tutorial/TutorialRight.qml:122
474−msgid "View all your running tasks."
466+#: qml/Tutorial/TutorialTop.qml:54
467+msgid "Swipe from the top edge to open the notification bar"
475468msgstr ""
476469
477−#: qml/Wizard/Page.qml:89
470+#: qml/Wizard/Page.qml:54
478471msgctxt "Button: Go back one page in the Wizard"
479472msgid "Back"
480473msgstr ""
481474
482475#: qml/Wizard/Pages/10-welcome.qml:27
483−msgid "Hi!"
476+msgid "Language"
484477msgstr ""
485478
486−#: qml/Wizard/Pages/10-welcome.qml:44
487−msgid "Welcome to your Ubuntu device."
479+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
480+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
481+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
482+#: qml/Wizard/Pages/75-report-check.qml:84
483+#: qml/Wizard/Pages/passcode-desktop.qml:124
484+#: qml/Wizard/Pages/password-set.qml:141
485+msgid "Next"
488486msgstr ""
489487
490−#: qml/Wizard/Pages/10-welcome.qml:52
491−msgid "Let’s get started."
492−msgstr "আসুন শুরু করা যাক।"
488+#: qml/Wizard/Pages/30-wifi.qml:29
489+msgid "Connect to Wi‑Fi"
490+msgstr ""
493491
494−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
495−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
496−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
497−#: qml/Wizard/Pages/passwd-set.qml:90
498−msgid "Continue"
499−msgstr "পরবর্তী"
492+#: qml/Wizard/Pages/30-wifi.qml:130
493+msgid "Connected"
494+msgstr ""
500495
501−#: qml/Wizard/Pages/20-sim.qml:25
502−msgid "Add a SIM card and restart your device"
503−msgstr "সিম কার্ড যোগ করুন এবং ফোন পুনরায় চালু করুন।"
496+#: qml/Wizard/Pages/30-wifi.qml:163
497+msgid "Available Wi-Fi networks"
498+msgstr ""
504499
505−#: qml/Wizard/Pages/20-sim.qml:59
506−msgid "Without it, you won’t be able to make calls or use text messaging."
507−msgstr "এটি ছাড়া, আপনি ফোন কল বা টেক্সট মেসেজ ব্যবহার করতে পারবেন না।"
500+#: qml/Wizard/Pages/30-wifi.qml:164
501+msgid "No available Wi-Fi networks"
502+msgstr ""
508503
509−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
504+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
505+#: qml/Wizard/Pages/sim.qml:101
510506msgid "Skip"
511507msgstr "এড়িয়ে যান"
512508
513−#: qml/Wizard/Pages/30-passwd-type.qml:39
514−msgid "Lock security"
515−msgstr "নিরাপত্তা লক"
509+#: qml/Wizard/Pages/40-location.qml:27
510+msgid "Location Services"
511+msgstr ""
516512
517−#: qml/Wizard/Pages/30-passwd-type.qml:79
518−msgid "Please select how you’d like to unlock your device."
513+#: qml/Wizard/Pages/40-location.qml:83
514+msgid ""
515+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
516+"(recommended)"
519517msgstr ""
520518
521−#: qml/Wizard/Pages/30-passwd-type.qml:102
522−msgctxt "Label: Type of security method"
523−msgid "Swipe"
519+#: qml/Wizard/Pages/40-location.qml:105
520+#, qt-format
521+msgid "By selecting this option you agree to the Nokia HERE %1."
524522msgstr ""
525523
526−#: qml/Wizard/Pages/30-passwd-type.qml:103
527−msgctxt "Label: Description of security method"
528−msgid "No security"
529−msgstr "কোন নিরাপত্তা নেই"
524+#: qml/Wizard/Pages/40-location.qml:106
525+msgctxt "part of: Nokia HERE terms and conditions"
526+msgid "terms and conditions"
527+msgstr ""
528+
529+#: qml/Wizard/Pages/40-location.qml:160
530+msgid "GPS only"
531+msgstr ""
532+
533+#: qml/Wizard/Pages/40-location.qml:214
534+msgid "Don't use my location"
535+msgstr ""
536+
537+#: qml/Wizard/Pages/40-location.qml:260
538+msgid "You can change it later in System Settings."
539+msgstr ""
530540
531−#: qml/Wizard/Pages/30-passwd-type.qml:105
541+#: qml/Wizard/Pages/50-timezone.qml:29
542+msgid "Time Zone"
543+msgstr ""
544+
545+#: qml/Wizard/Pages/50-timezone.qml:178
546+msgid "Enter your city"
547+msgstr ""
548+
549+#: qml/Wizard/Pages/60-account.qml:24
550+msgid "Personalize Your Device"
551+msgstr ""
552+
553+#: qml/Wizard/Pages/60-account.qml:48
554+msgid "Preferred Name"
555+msgstr ""
556+
557+#: qml/Wizard/Pages/70-passwd-type.qml:39
558+msgid "Lock Screen"
559+msgstr ""
560+
561+#: qml/Wizard/Pages/70-passwd-type.qml:101
532562msgctxt "Label: Type of security method"
533−msgid "Passcode"
534−msgstr "পাসকোড"
563+msgid "Create new password"
564+msgstr ""
535565
536−#: qml/Wizard/Pages/30-passwd-type.qml:106
537−msgctxt "Label: Description of security method"
538−msgid "4 digits only"
539−msgstr "কেবল মাত্র ৪টি সংখ্যা"
566+#: qml/Wizard/Pages/70-passwd-type.qml:103
567+msgctxt "Label: Type of security method"
568+msgid "Create passcode (numbers only)"
569+msgstr ""
540570
541−#: qml/Wizard/Pages/30-passwd-type.qml:108
571+#: qml/Wizard/Pages/70-passwd-type.qml:105
542572msgctxt "Label: Type of security method"
543−msgid "Passphrase"
573+msgid "No lock code"
544574msgstr ""
545575
546−#: qml/Wizard/Pages/30-passwd-type.qml:109
547−msgctxt "Label: Description of security method"
548−msgid "Numbers and letters"
576+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
577+msgid "Privacy Policy"
549578msgstr ""
550579
551−#: qml/Wizard/Pages/40-wifi.qml:29
552−msgid "Connect to Wi‑Fi"
580+#: qml/Wizard/Pages/75-report-check.qml:26
581+msgid "Help Us Improve"
553582msgstr ""
554583
555−#: qml/Wizard/Pages/40-wifi.qml:168
556−msgid "Available networks…"
584+#: qml/Wizard/Pages/75-report-check.qml:59
585+msgid "Improve system performance by sending us crashes and error reports."
557586msgstr ""
558587
559−#: qml/Wizard/Pages/40-wifi.qml:169
560−msgid "No available networks."
588+#: qml/Wizard/Pages/75-report-check.qml:60
589+msgid "Privacy policy"
561590msgstr ""
562591
563−#: qml/Wizard/Pages/50-location.qml:27
564−msgid "Location"
592+#: qml/Wizard/Pages/80-finished.qml:89
593+msgid "Welcome to Ubuntu"
565594msgstr ""
566595
567−#: qml/Wizard/Pages/50-location.qml:62
568−msgid "Let the phone detect your location:"
596+#: qml/Wizard/Pages/80-finished.qml:104
597+msgid "You are ready to use your device now"
569598msgstr ""
570599
571−#: qml/Wizard/Pages/50-location.qml:69
572−msgid "Using GPS only (less accurate)"
600+#: qml/Wizard/Pages/80-finished.qml:124
601+msgid "Get Started"
573602msgstr ""
574603
575−#: qml/Wizard/Pages/50-location.qml:86
576−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
604+#: qml/Wizard/Pages/here-terms.qml:25
605+msgid "Terms & Conditions"
577606msgstr ""
578607
579−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
580−#: qml/Wizard/Pages/50-location.qml:103
608+#: qml/Wizard/Pages/here-terms.qml:69
609+msgid "Your device uses positioning technologies provided by HERE."
610+msgstr ""
611+
612+#: qml/Wizard/Pages/here-terms.qml:81
581613msgid ""
582−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
583−"conditions</a>."
614+"To provide you with positioning services and to improve their quality, HERE "
615+"collects information about nearby cell towers and Wi-Fi hotspots around your "
616+"current location whenever your position is being found."
584617msgstr ""
585618
586−#: qml/Wizard/Pages/50-location.qml:112
587−msgid "Not at all"
619+#: qml/Wizard/Pages/here-terms.qml:93
620+msgid ""
621+"The information collected is used to analyze the service and to improve the "
622+"use of service, but not to identify you personally."
588623msgstr ""
589624
590−#: qml/Wizard/Pages/50-location.qml:124
591−msgid "You can change your mind later in <b>System Settings</b>."
625+#: qml/Wizard/Pages/here-terms.qml:106
626+#, qt-format
627+msgid "By continuing, you agree to the HERE platform %1 and %2."
592628msgstr ""
593629
594−#: qml/Wizard/Pages/60-reporting.qml:26
595−msgid "Improving your experience"
630+#: qml/Wizard/Pages/here-terms.qml:107
631+msgid "Service Terms"
596632msgstr ""
597633
598−#: qml/Wizard/Pages/60-reporting.qml:46
599−msgid ""
600−"Your phone is set up to automatically report errors to Canonical and its "
601−"partners, the makers of the operating system."
634+#: qml/Wizard/Pages/passcode-confirm.qml:43
635+#: qml/Wizard/Pages/passcode-desktop.qml:80
636+msgid "Confirm passcode"
602637msgstr ""
603638
604−#: qml/Wizard/Pages/60-reporting.qml:53
605−msgid ""
606−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
607−"Privacy</b>"
639+#: qml/Wizard/Pages/passcode-confirm.qml:45
640+msgid "Incorrect passcode."
608641msgstr ""
609642
610−#: qml/Wizard/Pages/80-finished.qml:24
611−msgid "All done"
643+#: qml/Wizard/Pages/passcode-confirm.qml:45
644+msgctxt "Enter the passcode again"
645+msgid "Please re-enter."
612646msgstr ""
613647
614−#: qml/Wizard/Pages/80-finished.qml:39
615−msgid "Nice work!"
648+#: qml/Wizard/Pages/passcode-desktop.qml:30
649+msgid "Lock Screen Passcode"
616650msgstr ""
617651
618−#: qml/Wizard/Pages/80-finished.qml:46
619−msgid "Your device is now ready to use."
652+#: qml/Wizard/Pages/passcode-desktop.qml:56
653+msgid "Enter 4 numbers to setup your passcode"
620654msgstr ""
621655
622−#: qml/Wizard/Pages/80-finished.qml:53
623−msgid "Finish"
656+#: qml/Wizard/Pages/passcode-desktop.qml:65
657+#: qml/Wizard/Pages/passcode-set.qml:54
658+msgid "Choose passcode"
624659msgstr ""
625660
626−#: qml/Wizard/Pages/here-terms.qml:27
627−msgid "Terms & Conditions"
661+#: qml/Wizard/Pages/passcode-desktop.qml:105
662+msgid "Passcode too short"
628663msgstr ""
629664
630−#: qml/Wizard/Pages/passwd-confirm.qml:49
631−msgid "Confirm passphrase"
665+#: qml/Wizard/Pages/passcode-desktop.qml:107
666+msgid "Passcodes match"
632667msgstr ""
633668
634−#: qml/Wizard/Pages/passwd-confirm.qml:50
635−msgid "Confirm passcode"
669+#: qml/Wizard/Pages/passcode-desktop.qml:109
670+msgid "Passcodes do not match"
636671msgstr ""
637672
638−#: qml/Wizard/Pages/passwd-confirm.qml:53
639−#: qml/Wizard/Pages/passwd-confirm.qml:54
640−msgid "Please try again."
673+#: qml/Wizard/Pages/passcode-set.qml:62
674+msgid "Passcode must be 4 characters long"
641675msgstr ""
642676
643−#: qml/Wizard/Pages/passwd-set.qml:61
644−msgid "Choose your passcode"
677+#: qml/Wizard/Pages/password-set.qml:30
678+msgid "Lock Screen Password"
645679msgstr ""
646680
647−#: qml/Wizard/Pages/passwd-set.qml:68
648−msgid "Passphrase must be 4 characters long"
681+#: qml/Wizard/Pages/password-set.qml:61
682+msgid "Enter at least 8 characters"
649683msgstr ""
650684
651−#. Translators: This is the arrow for "Back" buttons
652−#: qml/Wizard/StackButton.qml:39
653−#, qt-format
654−msgid "〈 %1"
685+#: qml/Wizard/Pages/password-set.qml:73
686+msgid "Choose password"
655687msgstr ""
656688
657−#. Translators: This is the arrow for "Forward" buttons
658−#: qml/Wizard/StackButton.qml:42
659−#, qt-format
660−msgid "%1 〉"
689+#: qml/Wizard/Pages/password-set.qml:103
690+msgid "Confirm password"
691+msgstr ""
692+
693+#: qml/Wizard/Pages/sim.qml:27
694+msgid "No SIM card installed"
695+msgstr ""
696+
697+#: qml/Wizard/Pages/sim.qml:54
698+msgid "SIM card added"
699+msgstr ""
700+
701+#: qml/Wizard/Pages/sim.qml:55
702+msgid "You must restart the device to access the mobile network."
703+msgstr ""
704+
705+#: qml/Wizard/Pages/sim.qml:59
706+msgid "Restart"
707+msgstr "পুনরায় চালু"
708+
709+#: qml/Wizard/Pages/sim.qml:78
710+msgid "You won’t be able to make calls or use text messaging without a SIM."
711+msgstr ""
712+
713+#: qml/Wizard/Pages/sim.qml:90
714+msgid "To proceed with no SIM tap Skip."
715+msgstr ""
716+
717+#: qml/Wizard/PasswordMeter.qml:87
718+msgid "Passwords match"
719+msgstr ""
720+
721+#: qml/Wizard/PasswordMeter.qml:89
722+msgid "Passwords do not match"
723+msgstr ""
724+
725+#: qml/Wizard/PasswordMeter.qml:93
726+msgid "Strong password"
727+msgstr ""
728+
729+#: qml/Wizard/PasswordMeter.qml:95
730+msgid "Fair password"
661731msgstr ""
662732
733+#: qml/Wizard/PasswordMeter.qml:97
734+msgid "Weak password"
735+msgstr ""
736+
737+#: qml/Wizard/PasswordMeter.qml:99
738+msgid "Very weak password"
739+msgstr ""
740+
741+#~ msgctxt "Button: Reboot the system"
742+#~ msgid "Reboot"
743+#~ msgstr "পুনরায় চালু করুন"
744+
745+#~ msgid "This action does different things for different apps"
746+#~ msgstr "এই কাজটি বিভিন্ন অ্যাপের জন্য ভিন্ন ভিন্ন ভাবে কাজ করে।"
747+
748+#~ msgid "To view open apps"
749+#~ msgstr "সচল অ্যাপগুলো দেখার জন্য"
750+
663751#~ msgid "Welcome to your Ubuntu phone."
664752#~ msgstr "আপনার উবুন্টু ফোনে স্বাগতম।"
665753
754+#~ msgid "Try again."
755+#~ msgstr "আবার চেষ্টা করুন"
756+
757+#~ msgid "You almost got it!"
758+#~ msgstr "আপনি প্রায় পেরে গেছেন!"
759+
760+#~ msgid "Open the launcher"
761+#~ msgstr "লঞ্চার খুলুন"
762+
763+#~ msgctxt "Label: Type of security method"
764+#~ msgid "Passcode"
765+#~ msgstr "পাসকোড"
766+
767+#~ msgid "Add a SIM card and restart your device"
768+#~ msgstr "সিম কার্ড যোগ করুন এবং ফোন পুনরায় চালু করুন।"
769+
770+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
771+#~ msgstr "এটি ছাড়া, আপনি ফোন কল বা টেক্সট মেসেজ ব্যবহার করতে পারবেন না।"
772+
773+#~ msgid "Tap here to continue."
774+#~ msgstr "অগ্রসর হওয়ার জন্য এখানে চাপ দিন।"
775+
776+#~ msgid "Swipe up from the bottom edge."
777+#~ msgstr "নিচের প্রান্ত হতে উপরের দিকে সোয়াইপ করুন।"
778+
779+#~ msgctxt "Label: Description of security method"
780+#~ msgid "No security"
781+#~ msgstr "কোন নিরাপত্তা নেই"
782+
666783#~ msgid "Log out"
667784#~ msgstr "লগ অাউট"
668785
786+#~ msgid "Are you sure you want to shut down?"
787+#~ msgstr "আপনি কি কম্পিউটার বন্ধ করতে চান?"
788+
669789#~ msgid "Reboot"
670790#~ msgstr "পুনরায় চালু করুন"
671791
@@ -675,9 +795,6 @@ msgstr ""
675795#~ msgid "Power off"
676796#~ msgstr "বন্ধ করুন"
677797
678−#~ msgid "Restart"
679−#~ msgstr "পুনরায় চালু"
680−
681798#~ msgid "Top edge"
682799#~ msgstr "উপরের প্রান্ত"
683800
@@ -729,5 +846,29 @@ msgstr ""
729846#~ msgid "Please re-enter"
730847#~ msgstr "অনুগ্রহ করে আবার লিখুন"
731848
849+#~ msgctxt "Button: Shut down the system"
850+#~ msgid "Shut down"
851+#~ msgstr "বন্ধ করুন"
852+
853+#~ msgctxt "Title: Reboot/Shut down dialog"
854+#~ msgid "Shut down"
855+#~ msgstr "বন্ধ করুন"
856+
857+#~ msgid "Let’s get started."
858+#~ msgstr "আসুন শুরু করা যাক।"
859+
860+#~ msgid "These are the shortcuts to favorite apps"
861+#~ msgstr "এগুলো আপনার প্রিয় অ্যাপেরর শর্টকাট"
862+
863+#~ msgid "Lock security"
864+#~ msgstr "নিরাপত্তা লক"
865+
732866#~ msgid "Please select how you’d like to unlock your phone."
733867#~ msgstr "আপনি কিভাবে ফোনের লক খুলতে চান তা নির্ধারণ করুন।"
868+
869+#~ msgctxt "Label: Description of security method"
870+#~ msgid "4 digits only"
871+#~ msgstr "কেবল মাত্র ৪টি সংখ্যা"
872+
873+#~ msgid "Continue"
874+#~ msgstr "পরবর্তী"
po/br.po+485−245
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1111"PO-Revision-Date: 2016-02-22 12:29+0000\n"
1212"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
1313"Language-Team: Breton <br@li.org>\n"
@@ -15,8 +15,8 @@ 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: 2016-03-13 05:50+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19+"X-Generator: Launchpad (build 17958)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -77,53 +77,35 @@ msgctxt "Button: Log out from the system"
7777msgid "Log Out"
7878msgstr "Digevreañ"
7979
80−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
81−#: qml/Components/Dialogs.qml:253
80+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
81+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
82+#: qml/Wizard/Pages/passcode-set.qml:32
8283msgid "Cancel"
8384msgstr "Nullañ"
8485
8586#: qml/Components/Dialogs.qml:173
86−msgctxt "Title: Reboot/Shut down dialog"
87−msgid "Shut down"
88−msgstr "Lazhañ ar benveg"
89−
90−#: qml/Components/Dialogs.qml:174
91−msgid "Are you sure you want to shut down?"
92−msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"
93−
94−#: qml/Components/Dialogs.qml:176
95−msgctxt "Button: Reboot the system"
96−msgid "Reboot"
97−msgstr "Adloc'hañ"
98−
99−#: qml/Components/Dialogs.qml:185
100−msgctxt "Button: Shut down the system"
101−msgid "Shut down"
102−msgstr "Lazhañ ar benveg"
103−
104−#: qml/Components/Dialogs.qml:207
10587msgctxt "Title: Reboot dialog"
10688msgid "Reboot"
10789msgstr "Adloc'hañ"
10890
109−#: qml/Components/Dialogs.qml:208
91+#: qml/Components/Dialogs.qml:174
11092msgid "Are you sure you want to reboot?"
11193msgstr "Ha sur oc'h e fell deoc'h adloc'hañ ?"
11294
113−#: qml/Components/Dialogs.qml:210
95+#: qml/Components/Dialogs.qml:176
11496msgid "No"
11597msgstr "N'on ket"
11698
117−#: qml/Components/Dialogs.qml:217
99+#: qml/Components/Dialogs.qml:183
118100msgid "Yes"
119101msgstr "Ya"
120102
121−#: qml/Components/Dialogs.qml:232
103+#: qml/Components/Dialogs.qml:198
122104msgctxt "Title: Power off/Restart dialog"
123105msgid "Power"
124106msgstr "Enaouiñ"
125107
126−#: qml/Components/Dialogs.qml:233
108+#: qml/Components/Dialogs.qml:199
127109msgid ""
128110"Are you sure you would like\n"
129111"to power off?"
@@ -131,12 +113,12 @@ msgstr ""
131113"Ha sur oc'h e fell deoc'h\n"
132114"troc'hañ an tredan ?"
133115
134−#: qml/Components/Dialogs.qml:235
116+#: qml/Components/Dialogs.qml:201
135117msgctxt "Button: Power off the system"
136118msgid "Power off"
137119msgstr "Lazhañ"
138120
139−#: qml/Components/Dialogs.qml:244
121+#: qml/Components/Dialogs.qml:210
140122msgctxt "Button: Restart the system"
141123msgid "Restart"
142124msgstr "Adloc'hañ"
@@ -180,42 +162,58 @@ msgstr "Adkevreañ bremañ !"
180162msgid "Close all"
181163msgstr "Serriñ pep tra"
182164
183−#: qml/Dash/DashPageHeader.qml:270
165+#: qml/Dash/DashPageHeader.qml:337
184166msgctxt "Button: Open the Ubuntu Store"
185167msgid "Store"
186168msgstr "Stal"
187169
188−#: qml/Dash/DashPageHeader.qml:277
170+#: qml/Dash/DashPageHeader.qml:344
189171msgctxt "Button: Start a search in the current dash scope"
190172msgid "Search"
191173msgstr "Klask"
192174
193−#: qml/Dash/DashPageHeader.qml:287
175+#: qml/Dash/DashPageHeader.qml:354
194176msgctxt "Button: Show the current dash scope settings"
195177msgid "Settings"
196178msgstr "Arventennoù"
197179
198−#: qml/Dash/DashPageHeader.qml:294
180+#: qml/Dash/DashPageHeader.qml:361
199181msgid "Remove from Favorites"
200182msgstr "Lemel eus ar sinedoù"
201183
202−#: qml/Dash/DashPageHeader.qml:294
184+#: qml/Dash/DashPageHeader.qml:361
203185msgid "Add to Favorites"
204186msgstr "Ouzhpennañ d'ar sinedoù"
205187
206−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
188+#: qml/Dash/FiltersPopover.qml:60
189+msgid "Refine your results"
190+msgstr ""
191+
192+#: qml/Dash/FiltersPopover.qml:69
193+msgid "Reset"
194+msgstr ""
195+
196+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
207197msgid "See less"
208198msgstr "Gwelet nebeutoc'h"
209199
210−#: qml/Dash/GenericScopeView.qml:567
200+#: qml/Dash/GenericScopeView.qml:570
211201msgid "See all"
212202msgstr "Gwelet pep tra"
213203
214−#: qml/Dash/GenericScopeView.qml:629
204+#: qml/Dash/GenericScopeView.qml:627
215205msgctxt "Label: Hint for dash search line edit"
216206msgid "Search"
217207msgstr "Klask"
218208
209+#: qml/Dash/PageHeaderExtraPanel.qml:55
210+msgid "Recent Searches"
211+msgstr ""
212+
213+#: qml/Dash/PageHeaderExtraPanel.qml:66
214+msgid "Clear All"
215+msgstr ""
216+
219217#: qml/Dash/Previews/PreviewActionCombo.qml:35
220218msgid "More..."
221219msgstr "Muioc'h..."
@@ -283,11 +281,11 @@ msgstr "Esaeañ en-dro"
283281msgid "Tap to unlock"
284282msgstr "Pouezañ evit dibrennañ"
285283
286−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
284+#: qml/Greeter/NarrowView.qml:54
287285msgid "Sorry, incorrect passphrase."
288286msgstr "Siwazh, frazenn-dremen direizh"
289287
290−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
288+#: qml/Greeter/NarrowView.qml:55
291289msgid "Sorry, incorrect passcode."
292290msgstr "Siwazh, kod-tremen direizh"
293291
@@ -316,7 +314,7 @@ msgstr ""
316314msgid "Enter %1"
317315msgstr "Merkañ %1"
318316
319−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
317+#: qml/Greeter/NarrowView.qml:117
320318msgid "Enter passphrase"
321319msgstr "Merkañ ar frazenn-dremen"
322320
@@ -354,62 +352,62 @@ msgstr "Touchit evit distreiñ d'ar bellgomzadenn..."
354352msgid "Conference"
355353msgstr "Kendiviz"
356354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:752
355+#: qml/Panel/Indicators/MenuItemFactory.qml:761
358356msgid "Nothing is playing"
359357msgstr "Ne lenner netra bremañ"
360358
361−#: qml/Panel/Indicators/MenuItemFactory.qml:881
359+#: qml/Panel/Indicators/MenuItemFactory.qml:890
362360#, qt-format
363361msgid "%1 hour"
364362msgid_plural "%1 hours"
365363msgstr[0] "%1 eur"
366364msgstr[1] "%1 eur"
367365
368−#: qml/Panel/Indicators/MenuItemFactory.qml:885
366+#: qml/Panel/Indicators/MenuItemFactory.qml:894
369367#, qt-format
370368msgid "%1 minute"
371369msgid_plural "%1 minutes"
372370msgstr[0] "%1 vunutenn"
373371msgstr[1] "%1 vunutenn"
374372
375−#: qml/Panel/Indicators/MenuItemFactory.qml:890
373+#: qml/Panel/Indicators/MenuItemFactory.qml:899
376374#, qt-format
377375msgid "%1 second"
378376msgid_plural "%1 seconds"
379377msgstr[0] "%1 eilenn"
380378msgstr[1] "%1 eilenn"
381379
382−#: qml/Panel/Indicators/MenuItemFactory.qml:893
380+#: qml/Panel/Indicators/MenuItemFactory.qml:902
383381msgid "0 seconds"
384382msgstr "0 eilenn"
385383
386384#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
387−#: qml/Panel/Indicators/MenuItemFactory.qml:895
385+#: qml/Panel/Indicators/MenuItemFactory.qml:904
388386#, qt-format
389387msgid "%1 remaining"
390388msgstr "%1 o chom"
391389
392−#: qml/Panel/Indicators/MenuItemFactory.qml:901
390+#: qml/Panel/Indicators/MenuItemFactory.qml:910
393391msgid "In queue…"
394392msgstr "El lostennad..."
395393
396−#: qml/Panel/Indicators/MenuItemFactory.qml:905
394+#: qml/Panel/Indicators/MenuItemFactory.qml:914
397395msgid "Downloading"
398396msgstr "O pellgargañ"
399397
400−#: qml/Panel/Indicators/MenuItemFactory.qml:907
398+#: qml/Panel/Indicators/MenuItemFactory.qml:916
401399msgid "Paused, tap to resume"
402400msgstr "Ehanet, touchit evit adkregiñ"
403401
404−#: qml/Panel/Indicators/MenuItemFactory.qml:909
402+#: qml/Panel/Indicators/MenuItemFactory.qml:918
405403msgid "Canceled"
406404msgstr "Nullet"
407405
408−#: qml/Panel/Indicators/MenuItemFactory.qml:911
406+#: qml/Panel/Indicators/MenuItemFactory.qml:920
409407msgid "Finished"
410408msgstr "Echu"
411409
412−#: qml/Panel/Indicators/MenuItemFactory.qml:913
410+#: qml/Panel/Indicators/MenuItemFactory.qml:922
413411msgid "Failed, tap to retry"
414412msgstr "C'hwitet, touchit evit adkregiñ"
415413
@@ -429,251 +427,324 @@ msgctxt "Button: Call back on phone"
429427msgid "Call back"
430428msgstr "Gervel en-dro"
431429
432−#: qml/Tutorial/TutorialBottom.qml:28
433−msgid "Open special menus"
434−msgstr "Digeriñ al lañserioù ispisial"
435−
436−#: qml/Tutorial/TutorialBottom.qml:29
437−msgid "Swipe up from the bottom edge."
438−msgstr "Riklit war-du an nec'h adalek an traoñ"
430+#: qml/Stages/SideStage.qml:76
431+msgid "Drag using 3 fingers any application from one window to the other"
432+msgstr ""
439433
440−#: qml/Tutorial/TutorialBottomFinish.qml:24
441−msgid "This action does different things for different apps"
442−msgstr "An ober-mañ a ra meur a dra evit meur a arload"
434+#: qml/Tutorial/TutorialBottom.qml:78
435+msgid "Swipe up to add a contact"
436+msgstr ""
443437
444−#: qml/Tutorial/TutorialBottomFinish.qml:25
445−msgid "Tap here to finish."
446−msgstr "Pouezañ amañ evit echuiñ."
438+#: qml/Tutorial/TutorialBottom.qml:80
439+msgid "Swipe up for favorite calculations"
440+msgstr ""
447441
448−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
449−#: qml/Tutorial/TutorialRight.qml:144
450−msgid "Tap here to continue."
451−msgstr "Pouzañ amañ evit kenderc'hel"
442+#: qml/Tutorial/TutorialBottom.qml:82
443+msgid "Swipe up for recent calls"
444+msgstr ""
452445
453−#: qml/Tutorial/TutorialLeft.qml:26
454−msgid "Open the launcher"
455−msgstr "Digeriñ al lañser"
446+#: qml/Tutorial/TutorialBottom.qml:84
447+msgid "Swipe up to create a message"
448+msgstr ""
456449
457−#: qml/Tutorial/TutorialLeft.qml:27
458−msgid "Short swipe from the left edge."
459−msgstr "Riklik dousik adalek ar bord kleiz."
450+#: qml/Tutorial/TutorialBottom.qml:85
451+msgid "Swipe up to manage the app"
452+msgstr ""
460453
461−#: qml/Tutorial/TutorialLeftFinish.qml:24
462−msgid "These are the shortcuts to favorite apps"
463−msgstr "Berradennoù war-du hoc'h arloadoù gwellañ-deuet eo ar re-mañ"
454+#: qml/Tutorial/TutorialLeft.qml:47
455+msgid "Swipe from the left edge to open the launcher"
456+msgstr ""
464457
465−#: qml/Tutorial/TutorialPage.qml:178
466−msgid "You almost got it!"
467−msgstr "Deuet eo ganeoc'h pe dost ?"
458+#: qml/Tutorial/TutorialLeftLong.qml:47
459+msgid "Long swipe from the left edge to open the Today scope"
460+msgstr ""
468461
469−#: qml/Tutorial/TutorialPage.qml:195
470−msgid "Try again."
471−msgstr "Esaeit en-dro."
462+#: qml/Tutorial/TutorialRight.qml:54
463+msgid "Hover your mouse on the right edge to view your open apps"
464+msgstr ""
472465
473−#: qml/Tutorial/TutorialRight.qml:31
474−msgid "To view open apps"
475−msgstr "Evit gwelet an arloadoù digor"
466+#: qml/Tutorial/TutorialRight.qml:55
467+msgid "Short or long swipe from the right edge to view your open apps"
468+msgstr ""
476469
477−#: qml/Tutorial/TutorialRight.qml:32
478−msgid "Long swipe from the right edge."
479−msgstr "Riklit pell adalek ar bord dehoù."
470+#: qml/Tutorial/TutorialTop.qml:53
471+msgid "Swipe from the top right edge to open the notification bar"
472+msgstr ""
480473
481−#: qml/Tutorial/TutorialRight.qml:122
482−msgid "View all your running tasks."
483−msgstr "Gwelet an holl drevelloù a ya en-dro."
474+#: qml/Tutorial/TutorialTop.qml:54
475+msgid "Swipe from the top edge to open the notification bar"
476+msgstr ""
484477
485−#: qml/Wizard/Page.qml:89
478+#: qml/Wizard/Page.qml:54
486479msgctxt "Button: Go back one page in the Wizard"
487480msgid "Back"
488481msgstr "Distreiñ"
489482
490483#: qml/Wizard/Pages/10-welcome.qml:27
491−msgid "Hi!"
492−msgstr "Salud deoc'h !"
484+msgid "Language"
485+msgstr ""
493486
494−#: qml/Wizard/Pages/10-welcome.qml:44
495−msgid "Welcome to your Ubuntu device."
496−msgstr "Donemat en ho penveg Ubuntu"
487+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
488+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
489+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
490+#: qml/Wizard/Pages/75-report-check.qml:84
491+#: qml/Wizard/Pages/passcode-desktop.qml:124
492+#: qml/Wizard/Pages/password-set.qml:141
493+msgid "Next"
494+msgstr ""
497495
498−#: qml/Wizard/Pages/10-welcome.qml:52
499−msgid "Let’s get started."
500−msgstr "Krogomp ganti."
496+#: qml/Wizard/Pages/30-wifi.qml:29
497+msgid "Connect to Wi‑Fi"
498+msgstr "Kevreañ ouzh ar Wi-Fi"
501499
502−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
503−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
504−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
505−#: qml/Wizard/Pages/passwd-set.qml:90
506−msgid "Continue"
507−msgstr "Kenderc'hel"
500+#: qml/Wizard/Pages/30-wifi.qml:130
501+msgid "Connected"
502+msgstr ""
508503
509−#: qml/Wizard/Pages/20-sim.qml:25
510−msgid "Add a SIM card and restart your device"
511−msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"
504+#: qml/Wizard/Pages/30-wifi.qml:163
505+msgid "Available Wi-Fi networks"
506+msgstr ""
512507
513−#: qml/Wizard/Pages/20-sim.qml:59
514−msgid "Without it, you won’t be able to make calls or use text messaging."
515−msgstr "Ne vioc'h ket evit pellgomz pe kas kemennadennoù hepti."
508+#: qml/Wizard/Pages/30-wifi.qml:164
509+msgid "No available Wi-Fi networks"
510+msgstr ""
516511
517−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
512+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
513+#: qml/Wizard/Pages/sim.qml:101
518514msgid "Skip"
519515msgstr "Tremen hebiou"
520516
521−#: qml/Wizard/Pages/30-passwd-type.qml:39
522−msgid "Lock security"
523−msgstr "Surentez ar prennañ"
517+#: qml/Wizard/Pages/40-location.qml:27
518+msgid "Location Services"
519+msgstr ""
520+
521+#: qml/Wizard/Pages/40-location.qml:83
522+msgid ""
523+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
524+"(recommended)"
525+msgstr ""
526+
527+#: qml/Wizard/Pages/40-location.qml:105
528+#, qt-format
529+msgid "By selecting this option you agree to the Nokia HERE %1."
530+msgstr ""
524531
525−#: qml/Wizard/Pages/30-passwd-type.qml:79
526−msgid "Please select how you’d like to unlock your device."
527−msgstr "Diuzit penaos e fell deoc'h dibrennañ ho penveg, mar plij."
532+#: qml/Wizard/Pages/40-location.qml:106
533+msgctxt "part of: Nokia HERE terms and conditions"
534+msgid "terms and conditions"
535+msgstr ""
528536
529−#: qml/Wizard/Pages/30-passwd-type.qml:102
530−msgctxt "Label: Type of security method"
531−msgid "Swipe"
532−msgstr "Riklañ"
537+#: qml/Wizard/Pages/40-location.qml:160
538+msgid "GPS only"
539+msgstr ""
540+
541+#: qml/Wizard/Pages/40-location.qml:214
542+msgid "Don't use my location"
543+msgstr ""
544+
545+#: qml/Wizard/Pages/40-location.qml:260
546+msgid "You can change it later in System Settings."
547+msgstr ""
548+
549+#: qml/Wizard/Pages/50-timezone.qml:29
550+msgid "Time Zone"
551+msgstr ""
552+
553+#: qml/Wizard/Pages/50-timezone.qml:178
554+msgid "Enter your city"
555+msgstr ""
556+
557+#: qml/Wizard/Pages/60-account.qml:24
558+msgid "Personalize Your Device"
559+msgstr ""
560+
561+#: qml/Wizard/Pages/60-account.qml:48
562+msgid "Preferred Name"
563+msgstr ""
533564
534−#: qml/Wizard/Pages/30-passwd-type.qml:103
535−msgctxt "Label: Description of security method"
536−msgid "No security"
537−msgstr "Tamm surentez ebet"
565+#: qml/Wizard/Pages/70-passwd-type.qml:39
566+msgid "Lock Screen"
567+msgstr ""
538568
539−#: qml/Wizard/Pages/30-passwd-type.qml:105
569+#: qml/Wizard/Pages/70-passwd-type.qml:101
540570msgctxt "Label: Type of security method"
541−msgid "Passcode"
542−msgstr "Kod-tremen"
571+msgid "Create new password"
572+msgstr ""
543573
544−#: qml/Wizard/Pages/30-passwd-type.qml:106
545−msgctxt "Label: Description of security method"
546−msgid "4 digits only"
547−msgstr "4 sifr hepken"
574+#: qml/Wizard/Pages/70-passwd-type.qml:103
575+msgctxt "Label: Type of security method"
576+msgid "Create passcode (numbers only)"
577+msgstr ""
548578
549−#: qml/Wizard/Pages/30-passwd-type.qml:108
579+#: qml/Wizard/Pages/70-passwd-type.qml:105
550580msgctxt "Label: Type of security method"
551−msgid "Passphrase"
552−msgstr "Frazenn-dremen"
581+msgid "No lock code"
582+msgstr ""
553583
554−#: qml/Wizard/Pages/30-passwd-type.qml:109
555−msgctxt "Label: Description of security method"
556−msgid "Numbers and letters"
557−msgstr "Sifroù ha lizherennoù"
584+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
585+msgid "Privacy Policy"
586+msgstr ""
558587
559−#: qml/Wizard/Pages/40-wifi.qml:29
560−msgid "Connect to Wi‑Fi"
561−msgstr "Kevreañ ouzh ar Wi-Fi"
588+#: qml/Wizard/Pages/75-report-check.qml:26
589+msgid "Help Us Improve"
590+msgstr ""
562591
563−#: qml/Wizard/Pages/40-wifi.qml:168
564−msgid "Available networks…"
565−msgstr "Rouedadoù a c'haller kaout..."
592+#: qml/Wizard/Pages/75-report-check.qml:59
593+msgid "Improve system performance by sending us crashes and error reports."
594+msgstr ""
566595
567−#: qml/Wizard/Pages/40-wifi.qml:169
568−msgid "No available networks."
569−msgstr "N'eus rouedad ebet da gaout."
596+#: qml/Wizard/Pages/75-report-check.qml:60
597+msgid "Privacy policy"
598+msgstr ""
570599
571−#: qml/Wizard/Pages/50-location.qml:27
572−msgid "Location"
573−msgstr "Lec'h"
600+#: qml/Wizard/Pages/80-finished.qml:89
601+msgid "Welcome to Ubuntu"
602+msgstr ""
574603
575−#: qml/Wizard/Pages/50-location.qml:62
576−msgid "Let the phone detect your location:"
577−msgstr "Lezel ar pellgomzer da gavout pelec'h emaoc'h :"
604+#: qml/Wizard/Pages/80-finished.qml:104
605+msgid "You are ready to use your device now"
606+msgstr ""
578607
579−#: qml/Wizard/Pages/50-location.qml:69
580−msgid "Using GPS only (less accurate)"
581−msgstr "Implijout ar GPS hepken (n'eo ket ken resis)"
608+#: qml/Wizard/Pages/80-finished.qml:124
609+msgid "Get Started"
610+msgstr ""
611+
612+#: qml/Wizard/Pages/here-terms.qml:25
613+msgid "Terms & Conditions"
614+msgstr "Penndivizoù implij"
582615
583−#: qml/Wizard/Pages/50-location.qml:86
584−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
616+#: qml/Wizard/Pages/here-terms.qml:69
617+msgid "Your device uses positioning technologies provided by HERE."
585618msgstr ""
586−"Implijout ar GPS, Wi-Fi dizanv pe titouroù ar rouedad kelligel (aliet)"
587619
588−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
589−#: qml/Wizard/Pages/50-location.qml:103
620+#: qml/Wizard/Pages/here-terms.qml:81
590621msgid ""
591−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
592−"conditions</a>."
622+"To provide you with positioning services and to improve their quality, HERE "
623+"collects information about nearby cell towers and Wi-Fi hotspots around your "
624+"current location whenever your position is being found."
593625msgstr ""
594−"Pa ziuzit an dibarzh-mañ ez asantit da <a href='#'>zivizoù implij</a> Nokia."
595626
596−#: qml/Wizard/Pages/50-location.qml:112
597−msgid "Not at all"
598−msgstr "Tamm ebet"
627+#: qml/Wizard/Pages/here-terms.qml:93
628+msgid ""
629+"The information collected is used to analyze the service and to improve the "
630+"use of service, but not to identify you personally."
631+msgstr ""
599632
600−#: qml/Wizard/Pages/50-location.qml:124
601−msgid "You can change your mind later in <b>System Settings</b>."
633+#: qml/Wizard/Pages/here-terms.qml:106
634+#, qt-format
635+msgid "By continuing, you agree to the HERE platform %1 and %2."
602636msgstr ""
603−"Gallout a rit cheñch soñj diwezhatoc'h en <b>Arventennoù ar reizhad</b>."
604637
605−#: qml/Wizard/Pages/60-reporting.qml:26
606−msgid "Improving your experience"
607−msgstr "Gwellaat ho skiant-prenet"
638+#: qml/Wizard/Pages/here-terms.qml:107
639+msgid "Service Terms"
640+msgstr ""
608641
609−#: qml/Wizard/Pages/60-reporting.qml:46
610−msgid ""
611−"Your phone is set up to automatically report errors to Canonical and its "
612−"partners, the makers of the operating system."
642+#: qml/Wizard/Pages/passcode-confirm.qml:43
643+#: qml/Wizard/Pages/passcode-desktop.qml:80
644+msgid "Confirm passcode"
645+msgstr "Kadarnaat ar c'hod-tremen"
646+
647+#: qml/Wizard/Pages/passcode-confirm.qml:45
648+msgid "Incorrect passcode."
613649msgstr ""
614−"Arventennet eo ho pellgomzer evit titourañ ent emgefre ar fazioù da "
615−"gCanonical ha d'e gevelerien, ar re o deus savet ar reizhiad korvoiñ."
616650
617−#: qml/Wizard/Pages/60-reporting.qml:53
618−msgid ""
619−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
620−"Privacy</b>"
651+#: qml/Wizard/Pages/passcode-confirm.qml:45
652+msgctxt "Enter the passcode again"
653+msgid "Please re-enter."
621654msgstr ""
622−"Gallout a ra bezañ diweredekaet e-barzh <b>Arventennoù ar reizhiad</b> "
623−"dindan <b>Surentez &amp; Prevezded</b>"
624655
625−#: qml/Wizard/Pages/80-finished.qml:24
626−msgid "All done"
627−msgstr "Echu penn-da-benn"
656+#: qml/Wizard/Pages/passcode-desktop.qml:30
657+msgid "Lock Screen Passcode"
658+msgstr ""
628659
629−#: qml/Wizard/Pages/80-finished.qml:39
630−msgid "Nice work!"
631−msgstr "Gwellat labour !"
660+#: qml/Wizard/Pages/passcode-desktop.qml:56
661+msgid "Enter 4 numbers to setup your passcode"
662+msgstr ""
632663
633−#: qml/Wizard/Pages/80-finished.qml:46
634−msgid "Your device is now ready to use."
635−msgstr "Prest eo ho penveg da vezañ implijet bremañ."
664+#: qml/Wizard/Pages/passcode-desktop.qml:65
665+#: qml/Wizard/Pages/passcode-set.qml:54
666+msgid "Choose passcode"
667+msgstr ""
636668
637−#: qml/Wizard/Pages/80-finished.qml:53
638−msgid "Finish"
639−msgstr "Echuiñ"
669+#: qml/Wizard/Pages/passcode-desktop.qml:105
670+msgid "Passcode too short"
671+msgstr ""
640672
641−#: qml/Wizard/Pages/here-terms.qml:27
642−msgid "Terms & Conditions"
643−msgstr "Penndivizoù implij"
673+#: qml/Wizard/Pages/passcode-desktop.qml:107
674+msgid "Passcodes match"
675+msgstr ""
644676
645−#: qml/Wizard/Pages/passwd-confirm.qml:49
646−msgid "Confirm passphrase"
647−msgstr "Kadarnaat ar frazenn-dremen"
677+#: qml/Wizard/Pages/passcode-desktop.qml:109
678+msgid "Passcodes do not match"
679+msgstr ""
648680
649−#: qml/Wizard/Pages/passwd-confirm.qml:50
650−msgid "Confirm passcode"
651−msgstr "Kadarnaat ar c'hod-tremen"
681+#: qml/Wizard/Pages/passcode-set.qml:62
682+msgid "Passcode must be 4 characters long"
683+msgstr ""
652684
653−#: qml/Wizard/Pages/passwd-confirm.qml:53
654−#: qml/Wizard/Pages/passwd-confirm.qml:54
655−msgid "Please try again."
656−msgstr "Esaeit en-dro, mar plij."
685+#: qml/Wizard/Pages/password-set.qml:30
686+msgid "Lock Screen Password"
687+msgstr ""
657688
658−#: qml/Wizard/Pages/passwd-set.qml:61
659−msgid "Choose your passcode"
660−msgstr "Choaz ho kod-tremen"
689+#: qml/Wizard/Pages/password-set.qml:61
690+msgid "Enter at least 8 characters"
691+msgstr ""
661692
662−#: qml/Wizard/Pages/passwd-set.qml:68
663−msgid "Passphrase must be 4 characters long"
664−msgstr "4 arouezenn a rank bezañ er frazenn-dremen"
693+#: qml/Wizard/Pages/password-set.qml:73
694+msgid "Choose password"
695+msgstr ""
665696
666−#. Translators: This is the arrow for "Back" buttons
667−#: qml/Wizard/StackButton.qml:39
668−#, qt-format
669−msgid "〈 %1"
670−msgstr "〈 %1"
697+#: qml/Wizard/Pages/password-set.qml:103
698+msgid "Confirm password"
699+msgstr ""
671700
672−#. Translators: This is the arrow for "Forward" buttons
673−#: qml/Wizard/StackButton.qml:42
674−#, qt-format
675−msgid "%1 〉"
676−msgstr "%1 〉"
701+#: qml/Wizard/Pages/sim.qml:27
702+msgid "No SIM card installed"
703+msgstr ""
704+
705+#: qml/Wizard/Pages/sim.qml:54
706+msgid "SIM card added"
707+msgstr ""
708+
709+#: qml/Wizard/Pages/sim.qml:55
710+msgid "You must restart the device to access the mobile network."
711+msgstr ""
712+
713+#: qml/Wizard/Pages/sim.qml:59
714+msgid "Restart"
715+msgstr "Adloc'hañ"
716+
717+#: qml/Wizard/Pages/sim.qml:78
718+msgid "You won’t be able to make calls or use text messaging without a SIM."
719+msgstr ""
720+
721+#: qml/Wizard/Pages/sim.qml:90
722+msgid "To proceed with no SIM tap Skip."
723+msgstr ""
724+
725+#: qml/Wizard/PasswordMeter.qml:87
726+msgid "Passwords match"
727+msgstr ""
728+
729+#: qml/Wizard/PasswordMeter.qml:89
730+msgid "Passwords do not match"
731+msgstr ""
732+
733+#: qml/Wizard/PasswordMeter.qml:93
734+msgid "Strong password"
735+msgstr ""
736+
737+#: qml/Wizard/PasswordMeter.qml:95
738+msgid "Fair password"
739+msgstr ""
740+
741+#: qml/Wizard/PasswordMeter.qml:97
742+msgid "Weak password"
743+msgstr ""
744+
745+#: qml/Wizard/PasswordMeter.qml:99
746+msgid "Very weak password"
747+msgstr ""
677748
678749#~ msgid "Close"
679750#~ msgstr "Serriñ"
@@ -762,6 +833,9 @@ msgstr "%1 〉"
762833#~ msgid "Log out"
763834#~ msgstr "Digevreañ"
764835
836+#~ msgid "Are you sure you want to shut down?"
837+#~ msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"
838+
765839#~ msgid "Reboot"
766840#~ msgstr "Adloc'hañ"
767841
@@ -771,25 +845,193 @@ msgstr "%1 〉"
771845#~ msgid "Settings"
772846#~ msgstr "Arventennoù"
773847
774−#~ msgid "Restart"
775−#~ msgstr "Adloc'hañ"
776−
777848#~ msgid "Manage Scopes"
778849#~ msgstr "Merañ ar c'hefluskerioù enklask"
779850
780851#~ msgid "Please re-enter"
781852#~ msgstr "Adverkañ, mar plij"
782853
854+#~ msgid "Lock security"
855+#~ msgstr "Surentez ar prennañ"
856+
857+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
858+#~ msgstr "Ne vioc'h ket evit pellgomz pe kas kemennadennoù hepti."
859+
860+#~ msgid "Add a SIM card and restart your device"
861+#~ msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"
862+
783863#~ msgid "Please select how you’d like to unlock your phone."
784864#~ msgstr ""
785865#~ "Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."
786866
867+#~ msgid "Hi!"
868+#~ msgstr "Salud deoc'h !"
869+
870+#~ msgid "Let’s get started."
871+#~ msgstr "Krogomp ganti."
872+
873+#~ msgid "Continue"
874+#~ msgstr "Kenderc'hel"
875+
787876#~ msgid "Welcome to your Ubuntu phone."
788877#~ msgstr "Deuet-mat oc'h en ho pellgomzer Ubuntu."
789878
879+#~ msgid "Available networks…"
880+#~ msgstr "Rouedadoù a c'haller kaout..."
881+
882+#~ msgid "No available networks."
883+#~ msgstr "N'eus rouedad ebet da gaout."
884+
885+#~ msgid "Location"
886+#~ msgstr "Lec'h"
887+
888+#~ msgid "You can change your mind later in <b>System Settings</b>."
889+#~ msgstr ""
890+#~ "Gallout a rit cheñch soñj diwezhatoc'h en <b>Arventennoù ar reizhad</b>."
891+
892+#~ msgid ""
893+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
894+#~ "Privacy</b>"
895+#~ msgstr ""
896+#~ "Gallout a ra bezañ diweredekaet e-barzh <b>Arventennoù ar reizhiad</b> "
897+#~ "dindan <b>Surentez &amp; Prevezded</b>"
898+
899+#~ msgid ""
900+#~ "Your phone is set up to automatically report errors to Canonical and its "
901+#~ "partners, the makers of the operating system."
902+#~ msgstr ""
903+#~ "Arventennet eo ho pellgomzer evit titourañ ent emgefre ar fazioù da "
904+#~ "gCanonical ha d'e gevelerien, ar re o deus savet ar reizhiad korvoiñ."
905+
906+#~ msgid "All done"
907+#~ msgstr "Echu penn-da-benn"
908+
909+#~ msgid "Improving your experience"
910+#~ msgstr "Gwellaat ho skiant-prenet"
911+
912+#~ msgid ""
913+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
914+#~ "conditions</a>."
915+#~ msgstr ""
916+#~ "Pa ziuzit an dibarzh-mañ ez asantit da <a href='#'>zivizoù implij</a> Nokia."
917+
918+#~ msgid "Not at all"
919+#~ msgstr "Tamm ebet"
920+
921+#~ msgid "Let the phone detect your location:"
922+#~ msgstr "Lezel ar pellgomzer da gavout pelec'h emaoc'h :"
923+
924+#~ msgid "Using GPS only (less accurate)"
925+#~ msgstr "Implijout ar GPS hepken (n'eo ket ken resis)"
926+
927+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
928+#~ msgstr ""
929+#~ "Implijout ar GPS, Wi-Fi dizanv pe titouroù ar rouedad kelligel (aliet)"
930+
931+#~ msgid "Nice work!"
932+#~ msgstr "Gwellat labour !"
933+
934+#~ msgid "Finish"
935+#~ msgstr "Echuiñ"
936+
937+#~ msgid "Confirm passphrase"
938+#~ msgstr "Kadarnaat ar frazenn-dremen"
939+
940+#, qt-format
941+#~ msgid "〈 %1"
942+#~ msgstr "〈 %1"
943+
944+#~ msgid "Choose your passcode"
945+#~ msgstr "Choaz ho kod-tremen"
946+
947+#~ msgid "Passphrase must be 4 characters long"
948+#~ msgstr "4 arouezenn a rank bezañ er frazenn-dremen"
949+
950+#~ msgid "Please try again."
951+#~ msgstr "Esaeit en-dro, mar plij."
952+
790953#~ msgid "Your phone is now ready to use."
791954#~ msgstr "Prest eo ho pellgomzer da vezañ implijet bremañ."
792955
956+#, qt-format
957+#~ msgid "%1 〉"
958+#~ msgstr "%1 〉"
959+
960+#~ msgid "This action does different things for different apps"
961+#~ msgstr "An ober-mañ a ra meur a dra evit meur a arload"
962+
963+#~ msgid "Open special menus"
964+#~ msgstr "Digeriñ al lañserioù ispisial"
965+
966+#~ msgid "Tap here to finish."
967+#~ msgstr "Pouezañ amañ evit echuiñ."
968+
969+#~ msgid "To view open apps"
970+#~ msgstr "Evit gwelet an arloadoù digor"
971+
972+#~ msgid "Long swipe from the right edge."
973+#~ msgstr "Riklit pell adalek ar bord dehoù."
974+
975+#~ msgid "View all your running tasks."
976+#~ msgstr "Gwelet an holl drevelloù a ya en-dro."
977+
978+#~ msgid "Try again."
979+#~ msgstr "Esaeit en-dro."
980+
981+#~ msgid "You almost got it!"
982+#~ msgstr "Deuet eo ganeoc'h pe dost ?"
983+
984+#~ msgid "Short swipe from the left edge."
985+#~ msgstr "Riklik dousik adalek ar bord kleiz."
986+
987+#~ msgid "Open the launcher"
988+#~ msgstr "Digeriñ al lañser"
989+
990+#~ msgid "Tap here to continue."
991+#~ msgstr "Pouzañ amañ evit kenderc'hel"
992+
993+#~ msgid "These are the shortcuts to favorite apps"
994+#~ msgstr "Berradennoù war-du hoc'h arloadoù gwellañ-deuet eo ar re-mañ"
995+
996+#~ msgid "Swipe up from the bottom edge."
997+#~ msgstr "Riklit war-du an nec'h adalek an traoñ"
998+
999+#~ msgctxt "Button: Shut down the system"
1000+#~ msgid "Shut down"
1001+#~ msgstr "Lazhañ ar benveg"
1002+
1003+#~ msgctxt "Title: Reboot/Shut down dialog"
1004+#~ msgid "Shut down"
1005+#~ msgstr "Lazhañ ar benveg"
1006+
1007+#~ msgctxt "Button: Reboot the system"
1008+#~ msgid "Reboot"
1009+#~ msgstr "Adloc'hañ"
1010+
1011+#~ msgctxt "Label: Type of security method"
1012+#~ msgid "Passcode"
1013+#~ msgstr "Kod-tremen"
1014+
1015+#~ msgctxt "Label: Description of security method"
1016+#~ msgid "No security"
1017+#~ msgstr "Tamm surentez ebet"
1018+
1019+#~ msgctxt "Label: Type of security method"
1020+#~ msgid "Swipe"
1021+#~ msgstr "Riklañ"
1022+
1023+#~ msgctxt "Label: Description of security method"
1024+#~ msgid "4 digits only"
1025+#~ msgstr "4 sifr hepken"
1026+
1027+#~ msgctxt "Label: Type of security method"
1028+#~ msgid "Passphrase"
1029+#~ msgstr "Frazenn-dremen"
1030+
1031+#~ msgctxt "Label: Description of security method"
1032+#~ msgid "Numbers and letters"
1033+#~ msgstr "Sifroù ha lizherennoù"
1034+
7931035#~ msgid "%a %d %b %H:%M"
7941036#~ msgstr "%a %b %d %H:%M"
7951037
@@ -823,13 +1065,11 @@ msgstr "%1 〉"
8231065#~ msgid "Call back"
8241066#~ msgstr "Gervel en-dro"
8251067
826−#~ msgid ""
827−#~ "Your device is now connected to an external display. Use this screen as a "
828−#~ "touch pad to interact with the mouse."
829−#~ msgstr ""
830−#~ "N'eo ket kevreet ho penveg ouzh un diskwel diavaez. Implijit ar skramm-mañ "
831−#~ "da douch evit ober gant al logodenn."
1068+#~ msgid "Welcome to your Ubuntu device."
1069+#~ msgstr "Donemat en ho penveg Ubuntu"
8321070
833−#~ msgid "Re-dock, save your work and close these apps to continue."
834−#~ msgstr ""
835−#~ "Adlugit, enrollit ho labour ha serrit an arloadoù-mañ evit kenderc'hel."
1071+#~ msgid "Please select how you’d like to unlock your device."
1072+#~ msgstr "Diuzit penaos e fell deoc'h dibrennañ ho penveg, mar plij."
1073+
1074+#~ msgid "Your device is now ready to use."
1075+#~ msgstr "Prest eo ho penveg da vezañ implijet bremañ."
po/bs.po+476−234
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1111"PO-Revision-Date: 2015-12-01 20:06+0000\n"
1212"Last-Translator: Kenan Gutić <Unknown>\n"
1313"Language-Team: Bosnian <bs@li.org>\n"
@@ -16,8 +16,8 @@ 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: 2016-03-13 05:50+0000\n"
20−"X-Generator: Launchpad (build 17939)\n"
19+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
20+"X-Generator: Launchpad (build 17958)\n"
2121
2222#: plugins/IntegratedLightDM/Greeter.cpp:112
2323msgid "Password: "
@@ -75,53 +75,35 @@ msgctxt "Button: Log out from the system"
7575msgid "Log Out"
7676msgstr "Odjavi se"
7777
78−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
79−#: qml/Components/Dialogs.qml:253
78+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
79+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
80+#: qml/Wizard/Pages/passcode-set.qml:32
8081msgid "Cancel"
8182msgstr "Otkaži"
8283
8384#: qml/Components/Dialogs.qml:173
84−msgctxt "Title: Reboot/Shut down dialog"
85−msgid "Shut down"
86−msgstr "Ugasi"
87−
88−#: qml/Components/Dialogs.qml:174
89−msgid "Are you sure you want to shut down?"
90−msgstr "Da li ste sigurni da želite ugasiti?"
91−
92−#: qml/Components/Dialogs.qml:176
93−msgctxt "Button: Reboot the system"
94−msgid "Reboot"
95−msgstr "Ponovo pokreni"
96−
97−#: qml/Components/Dialogs.qml:185
98−msgctxt "Button: Shut down the system"
99−msgid "Shut down"
100−msgstr "Gašenje sistema"
101−
102−#: qml/Components/Dialogs.qml:207
10385msgctxt "Title: Reboot dialog"
10486msgid "Reboot"
10587msgstr "Ponovo pokreni"
10688
107−#: qml/Components/Dialogs.qml:208
89+#: qml/Components/Dialogs.qml:174
10890msgid "Are you sure you want to reboot?"
10991msgstr "Da li ste sigurni da želite ponovo pokrenuti?"
11092
111−#: qml/Components/Dialogs.qml:210
93+#: qml/Components/Dialogs.qml:176
11294msgid "No"
11395msgstr "Ne"
11496
115−#: qml/Components/Dialogs.qml:217
97+#: qml/Components/Dialogs.qml:183
11698msgid "Yes"
11799msgstr "Da"
118100
119−#: qml/Components/Dialogs.qml:232
101+#: qml/Components/Dialogs.qml:198
120102msgctxt "Title: Power off/Restart dialog"
121103msgid "Power"
122104msgstr "Napajanje"
123105
124−#: qml/Components/Dialogs.qml:233
106+#: qml/Components/Dialogs.qml:199
125107msgid ""
126108"Are you sure you would like\n"
127109"to power off?"
@@ -129,12 +111,12 @@ msgstr ""
129111"Da li ste sigurni da želite\n"
130112"isključiti?"
131113
132−#: qml/Components/Dialogs.qml:235
114+#: qml/Components/Dialogs.qml:201
133115msgctxt "Button: Power off the system"
134116msgid "Power off"
135117msgstr "Isključi"
136118
137−#: qml/Components/Dialogs.qml:244
119+#: qml/Components/Dialogs.qml:210
138120msgctxt "Button: Restart the system"
139121msgid "Restart"
140122msgstr "Restartuj"
@@ -179,42 +161,58 @@ msgstr "Ponovo poveži sada"
179161msgid "Close all"
180162msgstr "Zatvori sve"
181163
182−#: qml/Dash/DashPageHeader.qml:270
164+#: qml/Dash/DashPageHeader.qml:337
183165msgctxt "Button: Open the Ubuntu Store"
184166msgid "Store"
185167msgstr "Trgovina"
186168
187−#: qml/Dash/DashPageHeader.qml:277
169+#: qml/Dash/DashPageHeader.qml:344
188170msgctxt "Button: Start a search in the current dash scope"
189171msgid "Search"
190172msgstr "Pretraživanje"
191173
192−#: qml/Dash/DashPageHeader.qml:287
174+#: qml/Dash/DashPageHeader.qml:354
193175msgctxt "Button: Show the current dash scope settings"
194176msgid "Settings"
195177msgstr "Podešavanja"
196178
197−#: qml/Dash/DashPageHeader.qml:294
179+#: qml/Dash/DashPageHeader.qml:361
198180msgid "Remove from Favorites"
199181msgstr "Ukloni iz Omiljenih"
200182
201−#: qml/Dash/DashPageHeader.qml:294
183+#: qml/Dash/DashPageHeader.qml:361
202184msgid "Add to Favorites"
203185msgstr "Dodaj u Omiljene"
204186
205−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
187+#: qml/Dash/FiltersPopover.qml:60
188+msgid "Refine your results"
189+msgstr ""
190+
191+#: qml/Dash/FiltersPopover.qml:69
192+msgid "Reset"
193+msgstr ""
194+
195+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
206196msgid "See less"
207197msgstr "Pogledati manje"
208198
209−#: qml/Dash/GenericScopeView.qml:567
199+#: qml/Dash/GenericScopeView.qml:570
210200msgid "See all"
211201msgstr "Pogledati sve"
212202
213−#: qml/Dash/GenericScopeView.qml:629
203+#: qml/Dash/GenericScopeView.qml:627
214204msgctxt "Label: Hint for dash search line edit"
215205msgid "Search"
216206msgstr "Pretraži"
217207
208+#: qml/Dash/PageHeaderExtraPanel.qml:55
209+msgid "Recent Searches"
210+msgstr ""
211+
212+#: qml/Dash/PageHeaderExtraPanel.qml:66
213+msgid "Clear All"
214+msgstr ""
215+
218216#: qml/Dash/Previews/PreviewActionCombo.qml:35
219217msgid "More..."
220218msgstr "Više..."
@@ -282,11 +280,11 @@ msgstr "Ponovi"
282280msgid "Tap to unlock"
283281msgstr "Kucnite za otključavanje"
284282
285−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
283+#: qml/Greeter/NarrowView.qml:54
286284msgid "Sorry, incorrect passphrase."
287285msgstr "Izvinite, pogrešna pristupna fraza."
288286
289−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
287+#: qml/Greeter/NarrowView.qml:55
290288msgid "Sorry, incorrect passcode."
291289msgstr "Izvinite, pogrešan pristupni kod."
292290
@@ -315,7 +313,7 @@ msgstr ""
315313msgid "Enter %1"
316314msgstr "Unesite %1"
317315
318−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
316+#: qml/Greeter/NarrowView.qml:117
319317msgid "Enter passphrase"
320318msgstr "Unesite propusnu frazu"
321319
@@ -353,11 +351,11 @@ msgstr "Kucnite da uzvratite poziv..."
353351msgid "Conference"
354352msgstr "Savjetovanje"
355353
356−#: qml/Panel/Indicators/MenuItemFactory.qml:752
354+#: qml/Panel/Indicators/MenuItemFactory.qml:761
357355msgid "Nothing is playing"
358356msgstr "Ništa nije pokrenuto"
359357
360−#: qml/Panel/Indicators/MenuItemFactory.qml:881
358+#: qml/Panel/Indicators/MenuItemFactory.qml:890
361359#, qt-format
362360msgid "%1 hour"
363361msgid_plural "%1 hours"
@@ -365,7 +363,7 @@ msgstr[0] "%1 sat"
365363msgstr[1] "%1 sata"
366364msgstr[2] "%1 sati"
367365
368−#: qml/Panel/Indicators/MenuItemFactory.qml:885
366+#: qml/Panel/Indicators/MenuItemFactory.qml:894
369367#, qt-format
370368msgid "%1 minute"
371369msgid_plural "%1 minutes"
@@ -373,7 +371,7 @@ msgstr[0] "%1 minut"
373371msgstr[1] "%1 minuta"
374372msgstr[2] "%1 minuta"
375373
376−#: qml/Panel/Indicators/MenuItemFactory.qml:890
374+#: qml/Panel/Indicators/MenuItemFactory.qml:899
377375#, qt-format
378376msgid "%1 second"
379377msgid_plural "%1 seconds"
@@ -381,37 +379,37 @@ msgstr[0] "%1 sekunda"
381379msgstr[1] "%1 sekunde"
382380msgstr[2] "%1 sekundi"
383381
384−#: qml/Panel/Indicators/MenuItemFactory.qml:893
382+#: qml/Panel/Indicators/MenuItemFactory.qml:902
385383msgid "0 seconds"
386384msgstr "0 sekundi"
387385
388386#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
389−#: qml/Panel/Indicators/MenuItemFactory.qml:895
387+#: qml/Panel/Indicators/MenuItemFactory.qml:904
390388#, qt-format
391389msgid "%1 remaining"
392390msgstr "%1 preostalo"
393391
394−#: qml/Panel/Indicators/MenuItemFactory.qml:901
392+#: qml/Panel/Indicators/MenuItemFactory.qml:910
395393msgid "In queue…"
396394msgstr "U red..."
397395
398−#: qml/Panel/Indicators/MenuItemFactory.qml:905
396+#: qml/Panel/Indicators/MenuItemFactory.qml:914
399397msgid "Downloading"
400398msgstr "Preuzimanje"
401399
402−#: qml/Panel/Indicators/MenuItemFactory.qml:907
400+#: qml/Panel/Indicators/MenuItemFactory.qml:916
403401msgid "Paused, tap to resume"
404402msgstr "Pauzirano, kucnuti za nastavak"
405403
406−#: qml/Panel/Indicators/MenuItemFactory.qml:909
404+#: qml/Panel/Indicators/MenuItemFactory.qml:918
407405msgid "Canceled"
408406msgstr "Otkazano"
409407
410−#: qml/Panel/Indicators/MenuItemFactory.qml:911
408+#: qml/Panel/Indicators/MenuItemFactory.qml:920
411409msgid "Finished"
412410msgstr "Završeno"
413411
414−#: qml/Panel/Indicators/MenuItemFactory.qml:913
412+#: qml/Panel/Indicators/MenuItemFactory.qml:922
415413msgid "Failed, tap to retry"
416414msgstr "Neuspjelo, kucnuti za ponavljanje"
417415
@@ -431,252 +429,324 @@ msgctxt "Button: Call back on phone"
431429msgid "Call back"
432430msgstr "Uzvrati poziv"
433431
434−#: qml/Tutorial/TutorialBottom.qml:28
435−msgid "Open special menus"
436−msgstr "Otvorite posebne menije"
437−
438−#: qml/Tutorial/TutorialBottom.qml:29
439−msgid "Swipe up from the bottom edge."
440−msgstr "Prevucite od donje ivice."
432+#: qml/Stages/SideStage.qml:76
433+msgid "Drag using 3 fingers any application from one window to the other"
434+msgstr ""
441435
442−#: qml/Tutorial/TutorialBottomFinish.qml:24
443−msgid "This action does different things for different apps"
444−msgstr "Ova radnja čini različite stvari za različite aplikacije"
436+#: qml/Tutorial/TutorialBottom.qml:78
437+msgid "Swipe up to add a contact"
438+msgstr ""
445439
446−#: qml/Tutorial/TutorialBottomFinish.qml:25
447−msgid "Tap here to finish."
448−msgstr "Kucnite ovdje za kraj."
440+#: qml/Tutorial/TutorialBottom.qml:80
441+msgid "Swipe up for favorite calculations"
442+msgstr ""
449443
450−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
451−#: qml/Tutorial/TutorialRight.qml:144
452−msgid "Tap here to continue."
453−msgstr "Kucnite ovdje za nastavak."
444+#: qml/Tutorial/TutorialBottom.qml:82
445+msgid "Swipe up for recent calls"
446+msgstr ""
454447
455−#: qml/Tutorial/TutorialLeft.qml:26
456−msgid "Open the launcher"
457−msgstr "Otvorite pokretač"
448+#: qml/Tutorial/TutorialBottom.qml:84
449+msgid "Swipe up to create a message"
450+msgstr ""
458451
459−#: qml/Tutorial/TutorialLeft.qml:27
460−msgid "Short swipe from the left edge."
461−msgstr "Kratko prevlačenje od lijeve ivice."
452+#: qml/Tutorial/TutorialBottom.qml:85
453+msgid "Swipe up to manage the app"
454+msgstr ""
462455
463−#: qml/Tutorial/TutorialLeftFinish.qml:24
464−msgid "These are the shortcuts to favorite apps"
465−msgstr "Ovo su kratice za omiljene aplikacije"
456+#: qml/Tutorial/TutorialLeft.qml:47
457+msgid "Swipe from the left edge to open the launcher"
458+msgstr ""
466459
467−#: qml/Tutorial/TutorialPage.qml:178
468−msgid "You almost got it!"
469−msgstr "Skoro ste uspjeli!"
460+#: qml/Tutorial/TutorialLeftLong.qml:47
461+msgid "Long swipe from the left edge to open the Today scope"
462+msgstr ""
470463
471−#: qml/Tutorial/TutorialPage.qml:195
472−msgid "Try again."
473−msgstr "Pokušajte ponovo."
464+#: qml/Tutorial/TutorialRight.qml:54
465+msgid "Hover your mouse on the right edge to view your open apps"
466+msgstr ""
474467
475−#: qml/Tutorial/TutorialRight.qml:31
476−msgid "To view open apps"
477−msgstr "Za pregled pokrenutih aplikacija"
468+#: qml/Tutorial/TutorialRight.qml:55
469+msgid "Short or long swipe from the right edge to view your open apps"
470+msgstr ""
478471
479−#: qml/Tutorial/TutorialRight.qml:32
480−msgid "Long swipe from the right edge."
481−msgstr "Dugo prevlačenje od desne ivice."
472+#: qml/Tutorial/TutorialTop.qml:53
473+msgid "Swipe from the top right edge to open the notification bar"
474+msgstr ""
482475
483−#: qml/Tutorial/TutorialRight.qml:122
484−msgid "View all your running tasks."
485−msgstr "Pogledajte sve pokrenute zadatke."
476+#: qml/Tutorial/TutorialTop.qml:54
477+msgid "Swipe from the top edge to open the notification bar"
478+msgstr ""
486479
487−#: qml/Wizard/Page.qml:89
480+#: qml/Wizard/Page.qml:54
488481msgctxt "Button: Go back one page in the Wizard"
489482msgid "Back"
490483msgstr "Nazad"
491484
492485#: qml/Wizard/Pages/10-welcome.qml:27
493−msgid "Hi!"
494−msgstr "Ćao!"
486+msgid "Language"
487+msgstr ""
495488
496−#: qml/Wizard/Pages/10-welcome.qml:44
497−msgid "Welcome to your Ubuntu device."
489+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
490+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
491+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
492+#: qml/Wizard/Pages/75-report-check.qml:84
493+#: qml/Wizard/Pages/passcode-desktop.qml:124
494+#: qml/Wizard/Pages/password-set.qml:141
495+msgid "Next"
498496msgstr ""
499497
500−#: qml/Wizard/Pages/10-welcome.qml:52
501−msgid "Let’s get started."
502−msgstr "Započnimo"
498+#: qml/Wizard/Pages/30-wifi.qml:29
499+msgid "Connect to Wi‑Fi"
500+msgstr "Povezati na Wi-Fi"
503501
504−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
505−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
506−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
507−#: qml/Wizard/Pages/passwd-set.qml:90
508−msgid "Continue"
509−msgstr "Nastavite"
502+#: qml/Wizard/Pages/30-wifi.qml:130
503+msgid "Connected"
504+msgstr ""
510505
511−#: qml/Wizard/Pages/20-sim.qml:25
512−msgid "Add a SIM card and restart your device"
513−msgstr "Dodajte SIM karticu i restartujte vaš uređaj"
506+#: qml/Wizard/Pages/30-wifi.qml:163
507+msgid "Available Wi-Fi networks"
508+msgstr ""
514509
515−#: qml/Wizard/Pages/20-sim.qml:59
516−msgid "Without it, you won’t be able to make calls or use text messaging."
510+#: qml/Wizard/Pages/30-wifi.qml:164
511+msgid "No available Wi-Fi networks"
517512msgstr ""
518−"Bez nje, nećete biti u mogućnosti da uspostavite pozive ili koristite "
519−"tekstualne poruke."
520513
521−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
514+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
515+#: qml/Wizard/Pages/sim.qml:101
522516msgid "Skip"
523517msgstr "Preskočite"
524518
525−#: qml/Wizard/Pages/30-passwd-type.qml:39
526−msgid "Lock security"
527−msgstr "Sigurnost zaključavanja"
519+#: qml/Wizard/Pages/40-location.qml:27
520+msgid "Location Services"
521+msgstr ""
528522
529−#: qml/Wizard/Pages/30-passwd-type.qml:79
530−msgid "Please select how you’d like to unlock your device."
523+#: qml/Wizard/Pages/40-location.qml:83
524+msgid ""
525+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
526+"(recommended)"
531527msgstr ""
532528
533−#: qml/Wizard/Pages/30-passwd-type.qml:102
534−msgctxt "Label: Type of security method"
535−msgid "Swipe"
536−msgstr "Prevlačenje"
529+#: qml/Wizard/Pages/40-location.qml:105
530+#, qt-format
531+msgid "By selecting this option you agree to the Nokia HERE %1."
532+msgstr ""
537533
538−#: qml/Wizard/Pages/30-passwd-type.qml:103
539−msgctxt "Label: Description of security method"
540−msgid "No security"
541−msgstr "Bez sigurnosti"
534+#: qml/Wizard/Pages/40-location.qml:106
535+msgctxt "part of: Nokia HERE terms and conditions"
536+msgid "terms and conditions"
537+msgstr ""
538+
539+#: qml/Wizard/Pages/40-location.qml:160
540+msgid "GPS only"
541+msgstr ""
542+
543+#: qml/Wizard/Pages/40-location.qml:214
544+msgid "Don't use my location"
545+msgstr ""
546+
547+#: qml/Wizard/Pages/40-location.qml:260
548+msgid "You can change it later in System Settings."
549+msgstr ""
550+
551+#: qml/Wizard/Pages/50-timezone.qml:29
552+msgid "Time Zone"
553+msgstr ""
542554
543−#: qml/Wizard/Pages/30-passwd-type.qml:105
555+#: qml/Wizard/Pages/50-timezone.qml:178
556+msgid "Enter your city"
557+msgstr ""
558+
559+#: qml/Wizard/Pages/60-account.qml:24
560+msgid "Personalize Your Device"
561+msgstr ""
562+
563+#: qml/Wizard/Pages/60-account.qml:48
564+msgid "Preferred Name"
565+msgstr ""
566+
567+#: qml/Wizard/Pages/70-passwd-type.qml:39
568+msgid "Lock Screen"
569+msgstr ""
570+
571+#: qml/Wizard/Pages/70-passwd-type.qml:101
544572msgctxt "Label: Type of security method"
545−msgid "Passcode"
546−msgstr "Pristupni kod"
573+msgid "Create new password"
574+msgstr ""
547575
548−#: qml/Wizard/Pages/30-passwd-type.qml:106
549−msgctxt "Label: Description of security method"
550−msgid "4 digits only"
551−msgstr "samo 4 cifre"
576+#: qml/Wizard/Pages/70-passwd-type.qml:103
577+msgctxt "Label: Type of security method"
578+msgid "Create passcode (numbers only)"
579+msgstr ""
552580
553−#: qml/Wizard/Pages/30-passwd-type.qml:108
581+#: qml/Wizard/Pages/70-passwd-type.qml:105
554582msgctxt "Label: Type of security method"
555−msgid "Passphrase"
556−msgstr "Pristupna fraza"
583+msgid "No lock code"
584+msgstr ""
557585
558−#: qml/Wizard/Pages/30-passwd-type.qml:109
559−msgctxt "Label: Description of security method"
560−msgid "Numbers and letters"
561−msgstr "Brojevi i slova"
586+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
587+msgid "Privacy Policy"
588+msgstr ""
562589
563−#: qml/Wizard/Pages/40-wifi.qml:29
564−msgid "Connect to Wi‑Fi"
565−msgstr "Povezati na Wi-Fi"
590+#: qml/Wizard/Pages/75-report-check.qml:26
591+msgid "Help Us Improve"
592+msgstr ""
566593
567−#: qml/Wizard/Pages/40-wifi.qml:168
568−msgid "Available networks…"
569−msgstr "Dostupne mreže..."
594+#: qml/Wizard/Pages/75-report-check.qml:59
595+msgid "Improve system performance by sending us crashes and error reports."
596+msgstr ""
570597
571−#: qml/Wizard/Pages/40-wifi.qml:169
572−msgid "No available networks."
573−msgstr "Nema dostupnih mreža."
598+#: qml/Wizard/Pages/75-report-check.qml:60
599+msgid "Privacy policy"
600+msgstr ""
574601
575−#: qml/Wizard/Pages/50-location.qml:27
576−msgid "Location"
577−msgstr "Lokacija"
602+#: qml/Wizard/Pages/80-finished.qml:89
603+msgid "Welcome to Ubuntu"
604+msgstr ""
578605
579−#: qml/Wizard/Pages/50-location.qml:62
580−msgid "Let the phone detect your location:"
581−msgstr "Dopustite da telefon otkrije Vašu lokaciju:"
606+#: qml/Wizard/Pages/80-finished.qml:104
607+msgid "You are ready to use your device now"
608+msgstr ""
609+
610+#: qml/Wizard/Pages/80-finished.qml:124
611+msgid "Get Started"
612+msgstr ""
613+
614+#: qml/Wizard/Pages/here-terms.qml:25
615+msgid "Terms & Conditions"
616+msgstr "Uslovi i odredbe"
582617
583−#: qml/Wizard/Pages/50-location.qml:69
584−msgid "Using GPS only (less accurate)"
585−msgstr "Samo pomoću GPS (manje precizno)"
618+#: qml/Wizard/Pages/here-terms.qml:69
619+msgid "Your device uses positioning technologies provided by HERE."
620+msgstr ""
586621
587−#: qml/Wizard/Pages/50-location.qml:86
588−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
589−msgstr "Pomoću GPS, anonimnog Wi-Fi i podataka mobilne mreže (preporučeno)"
622+#: qml/Wizard/Pages/here-terms.qml:81
623+msgid ""
624+"To provide you with positioning services and to improve their quality, HERE "
625+"collects information about nearby cell towers and Wi-Fi hotspots around your "
626+"current location whenever your position is being found."
627+msgstr ""
590628
591−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
592−#: qml/Wizard/Pages/50-location.qml:103
629+#: qml/Wizard/Pages/here-terms.qml:93
593630msgid ""
594−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
595−"conditions</a>."
631+"The information collected is used to analyze the service and to improve the "
632+"use of service, but not to identify you personally."
596633msgstr ""
597−"Birajući ovu opciju prihvatate za Nokia OVDJE <a href='#'>terms and "
598−"conditions</a>."
599634
600−#: qml/Wizard/Pages/50-location.qml:112
601−msgid "Not at all"
602−msgstr "Nipošto"
635+#: qml/Wizard/Pages/here-terms.qml:106
636+#, qt-format
637+msgid "By continuing, you agree to the HERE platform %1 and %2."
638+msgstr ""
603639
604−#: qml/Wizard/Pages/50-location.qml:124
605−msgid "You can change your mind later in <b>System Settings</b>."
606−msgstr "Možete se predomisliti kasnije u <b>System Settings</b>."
640+#: qml/Wizard/Pages/here-terms.qml:107
641+msgid "Service Terms"
642+msgstr ""
607643
608−#: qml/Wizard/Pages/60-reporting.qml:26
609−msgid "Improving your experience"
610−msgstr "Poboljšavajući vaše iskustvo"
644+#: qml/Wizard/Pages/passcode-confirm.qml:43
645+#: qml/Wizard/Pages/passcode-desktop.qml:80
646+msgid "Confirm passcode"
647+msgstr "Potvrdi pristupni kod"
611648
612−#: qml/Wizard/Pages/60-reporting.qml:46
613−msgid ""
614−"Your phone is set up to automatically report errors to Canonical and its "
615−"partners, the makers of the operating system."
649+#: qml/Wizard/Pages/passcode-confirm.qml:45
650+msgid "Incorrect passcode."
616651msgstr ""
617−"Vaš telefon je podešen da automatski prijavljuje greške Canonical i "
618−"njegovim partnerima, tvorcima operativnog sistema."
619652
620−#: qml/Wizard/Pages/60-reporting.qml:53
621−msgid ""
622−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
623−"Privacy</b>"
653+#: qml/Wizard/Pages/passcode-confirm.qml:45
654+msgctxt "Enter the passcode again"
655+msgid "Please re-enter."
656+msgstr ""
657+
658+#: qml/Wizard/Pages/passcode-desktop.qml:30
659+msgid "Lock Screen Passcode"
624660msgstr ""
625−"Ovo može biti isključeno u <b>System Settings</b> under <b>Security &amp; "
626−"Privacy</b>"
627661
628−#: qml/Wizard/Pages/80-finished.qml:24
629−msgid "All done"
630−msgstr "Sve urađeno"
662+#: qml/Wizard/Pages/passcode-desktop.qml:56
663+msgid "Enter 4 numbers to setup your passcode"
664+msgstr ""
631665
632−#: qml/Wizard/Pages/80-finished.qml:39
633−msgid "Nice work!"
634−msgstr "Dobro urađeno!"
666+#: qml/Wizard/Pages/passcode-desktop.qml:65
667+#: qml/Wizard/Pages/passcode-set.qml:54
668+msgid "Choose passcode"
669+msgstr ""
635670
636−#: qml/Wizard/Pages/80-finished.qml:46
637−msgid "Your device is now ready to use."
671+#: qml/Wizard/Pages/passcode-desktop.qml:105
672+msgid "Passcode too short"
638673msgstr ""
639674
640−#: qml/Wizard/Pages/80-finished.qml:53
641−msgid "Finish"
642−msgstr "Završiti"
675+#: qml/Wizard/Pages/passcode-desktop.qml:107
676+msgid "Passcodes match"
677+msgstr ""
643678
644−#: qml/Wizard/Pages/here-terms.qml:27
645−msgid "Terms & Conditions"
646−msgstr "Uslovi i odredbe"
679+#: qml/Wizard/Pages/passcode-desktop.qml:109
680+msgid "Passcodes do not match"
681+msgstr ""
647682
648−#: qml/Wizard/Pages/passwd-confirm.qml:49
649−msgid "Confirm passphrase"
650−msgstr "Potvrditi pristupnu rečenicu"
683+#: qml/Wizard/Pages/passcode-set.qml:62
684+msgid "Passcode must be 4 characters long"
685+msgstr ""
651686
652−#: qml/Wizard/Pages/passwd-confirm.qml:50
653−msgid "Confirm passcode"
654−msgstr "Potvrdi pristupni kod"
687+#: qml/Wizard/Pages/password-set.qml:30
688+msgid "Lock Screen Password"
689+msgstr ""
655690
656−#: qml/Wizard/Pages/passwd-confirm.qml:53
657−#: qml/Wizard/Pages/passwd-confirm.qml:54
658−msgid "Please try again."
659−msgstr "Molimo pokušajte ponovo."
691+#: qml/Wizard/Pages/password-set.qml:61
692+msgid "Enter at least 8 characters"
693+msgstr ""
660694
661−#: qml/Wizard/Pages/passwd-set.qml:61
662−msgid "Choose your passcode"
663−msgstr "Izaberite vaš pristupni kod"
695+#: qml/Wizard/Pages/password-set.qml:73
696+msgid "Choose password"
697+msgstr ""
664698
665−#: qml/Wizard/Pages/passwd-set.qml:68
666−msgid "Passphrase must be 4 characters long"
667−msgstr "Pristupna fraza mora sadržavati 4 slova"
699+#: qml/Wizard/Pages/password-set.qml:103
700+msgid "Confirm password"
701+msgstr ""
668702
669−#. Translators: This is the arrow for "Back" buttons
670−#: qml/Wizard/StackButton.qml:39
671−#, qt-format
672−msgid "〈 %1"
673−msgstr "〈 %1"
703+#: qml/Wizard/Pages/sim.qml:27
704+msgid "No SIM card installed"
705+msgstr ""
674706
675−#. Translators: This is the arrow for "Forward" buttons
676−#: qml/Wizard/StackButton.qml:42
677−#, qt-format
678−msgid "%1 〉"
679−msgstr "%1 〉"
707+#: qml/Wizard/Pages/sim.qml:54
708+msgid "SIM card added"
709+msgstr ""
710+
711+#: qml/Wizard/Pages/sim.qml:55
712+msgid "You must restart the device to access the mobile network."
713+msgstr ""
714+
715+#: qml/Wizard/Pages/sim.qml:59
716+msgid "Restart"
717+msgstr ""
718+
719+#: qml/Wizard/Pages/sim.qml:78
720+msgid "You won’t be able to make calls or use text messaging without a SIM."
721+msgstr ""
722+
723+#: qml/Wizard/Pages/sim.qml:90
724+msgid "To proceed with no SIM tap Skip."
725+msgstr ""
726+
727+#: qml/Wizard/PasswordMeter.qml:87
728+msgid "Passwords match"
729+msgstr ""
730+
731+#: qml/Wizard/PasswordMeter.qml:89
732+msgid "Passwords do not match"
733+msgstr ""
734+
735+#: qml/Wizard/PasswordMeter.qml:93
736+msgid "Strong password"
737+msgstr ""
738+
739+#: qml/Wizard/PasswordMeter.qml:95
740+msgid "Fair password"
741+msgstr ""
742+
743+#: qml/Wizard/PasswordMeter.qml:97
744+msgid "Weak password"
745+msgstr ""
746+
747+#: qml/Wizard/PasswordMeter.qml:99
748+msgid "Very weak password"
749+msgstr ""
680750
681751#~ msgid "Top edge"
682752#~ msgstr "Gornja ivica"
@@ -690,23 +760,195 @@ msgstr "%1 〉"
690760#~ msgid "Right edge"
691761#~ msgstr "Desna ivica"
692762
763+#~ msgid "Are you sure you want to shut down?"
764+#~ msgstr "Da li ste sigurni da želite ugasiti?"
765+
766+#~ msgctxt "Button: Shut down the system"
767+#~ msgid "Shut down"
768+#~ msgstr "Gašenje sistema"
769+
693770#~ msgid "Please re-enter"
694771#~ msgstr "Molimo ponovo unesite"
695772
773+#~ msgid "This action does different things for different apps"
774+#~ msgstr "Ova radnja čini različite stvari za različite aplikacije"
775+
696776#~ msgid "Unlock SIM"
697777#~ msgstr "Otključajte SIM"
698778
699779#~ msgid "Roaming"
700780#~ msgstr "Roaming"
701781
782+#~ msgid "Tap here to continue."
783+#~ msgstr "Kucnite ovdje za nastavak."
784+
785+#~ msgid "These are the shortcuts to favorite apps"
786+#~ msgstr "Ovo su kratice za omiljene aplikacije"
787+
788+#~ msgid "Swipe up from the bottom edge."
789+#~ msgstr "Prevucite od donje ivice."
790+
791+#~ msgid "Open special menus"
792+#~ msgstr "Otvorite posebne menije"
793+
794+#~ msgid "Tap here to finish."
795+#~ msgstr "Kucnite ovdje za kraj."
796+
797+#~ msgid "Long swipe from the right edge."
798+#~ msgstr "Dugo prevlačenje od desne ivice."
799+
800+#~ msgid "View all your running tasks."
801+#~ msgstr "Pogledajte sve pokrenute zadatke."
802+
803+#~ msgid "Hi!"
804+#~ msgstr "Ćao!"
805+
702806#~ msgid "Welcome to your Ubuntu phone."
703807#~ msgstr "Dobrodošli u vaš Ubuntu telefon."
704808
809+#~ msgid "To view open apps"
810+#~ msgstr "Za pregled pokrenutih aplikacija"
811+
812+#~ msgid "Try again."
813+#~ msgstr "Pokušajte ponovo."
814+
815+#~ msgid "You almost got it!"
816+#~ msgstr "Skoro ste uspjeli!"
817+
818+#~ msgid "Short swipe from the left edge."
819+#~ msgstr "Kratko prevlačenje od lijeve ivice."
820+
821+#~ msgid "Open the launcher"
822+#~ msgstr "Otvorite pokretač"
823+
824+#~ msgid "Lock security"
825+#~ msgstr "Sigurnost zaključavanja"
826+
827+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
828+#~ msgstr ""
829+#~ "Bez nje, nećete biti u mogućnosti da uspostavite pozive ili koristite "
830+#~ "tekstualne poruke."
831+
832+#~ msgid "Add a SIM card and restart your device"
833+#~ msgstr "Dodajte SIM karticu i restartujte vaš uređaj"
834+
705835#~ msgid "Please select how you’d like to unlock your phone."
706836#~ msgstr "Molimo izaberite kako biste željeli da otključavate vaš telefon."
707837
838+#~ msgctxt "Label: Description of security method"
839+#~ msgid "No security"
840+#~ msgstr "Bez sigurnosti"
841+
842+#~ msgctxt "Label: Type of security method"
843+#~ msgid "Swipe"
844+#~ msgstr "Prevlačenje"
845+
846+#~ msgctxt "Label: Type of security method"
847+#~ msgid "Passcode"
848+#~ msgstr "Pristupni kod"
849+
850+#~ msgid "Let’s get started."
851+#~ msgstr "Započnimo"
852+
853+#~ msgid "Continue"
854+#~ msgstr "Nastavite"
855+
856+#~ msgctxt "Label: Description of security method"
857+#~ msgid "4 digits only"
858+#~ msgstr "samo 4 cifre"
859+
860+#~ msgid "Let the phone detect your location:"
861+#~ msgstr "Dopustite da telefon otkrije Vašu lokaciju:"
862+
863+#~ msgid "Available networks…"
864+#~ msgstr "Dostupne mreže..."
865+
866+#~ msgid "No available networks."
867+#~ msgstr "Nema dostupnih mreža."
868+
869+#~ msgid "Location"
870+#~ msgstr "Lokacija"
871+
872+#~ msgid "Using GPS only (less accurate)"
873+#~ msgstr "Samo pomoću GPS (manje precizno)"
874+
875+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
876+#~ msgstr "Pomoću GPS, anonimnog Wi-Fi i podataka mobilne mreže (preporučeno)"
877+
878+#~ msgctxt "Label: Description of security method"
879+#~ msgid "Numbers and letters"
880+#~ msgstr "Brojevi i slova"
881+
882+#~ msgid "Improving your experience"
883+#~ msgstr "Poboljšavajući vaše iskustvo"
884+
885+#~ msgid "You can change your mind later in <b>System Settings</b>."
886+#~ msgstr "Možete se predomisliti kasnije u <b>System Settings</b>."
887+
888+#~ msgid ""
889+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
890+#~ "Privacy</b>"
891+#~ msgstr ""
892+#~ "Ovo može biti isključeno u <b>System Settings</b> under <b>Security &amp; "
893+#~ "Privacy</b>"
894+
895+#~ msgid ""
896+#~ "Your phone is set up to automatically report errors to Canonical and its "
897+#~ "partners, the makers of the operating system."
898+#~ msgstr ""
899+#~ "Vaš telefon je podešen da automatski prijavljuje greške Canonical i "
900+#~ "njegovim partnerima, tvorcima operativnog sistema."
901+
902+#~ msgid "Nice work!"
903+#~ msgstr "Dobro urađeno!"
904+
905+#~ msgid "All done"
906+#~ msgstr "Sve urađeno"
907+
908+#~ msgid "Finish"
909+#~ msgstr "Završiti"
910+
911+#~ msgid ""
912+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
913+#~ "conditions</a>."
914+#~ msgstr ""
915+#~ "Birajući ovu opciju prihvatate za Nokia OVDJE <a href='#'>terms and "
916+#~ "conditions</a>."
917+
918+#~ msgid "Not at all"
919+#~ msgstr "Nipošto"
920+
708921#~ msgid "Your phone is now ready to use."
709922#~ msgstr "Vaš telefon je sada spreman za upotrebu."
710923
711−#~ msgid "Re-dock, save your work and close these apps to continue."
712−#~ msgstr "Postavi opet, snimi svoj rad i zatvori ove aplikacije za nastavak."
924+#~ msgid "Confirm passphrase"
925+#~ msgstr "Potvrditi pristupnu rečenicu"
926+
927+#, qt-format
928+#~ msgid "〈 %1"
929+#~ msgstr "〈 %1"
930+
931+#, qt-format
932+#~ msgid "%1 〉"
933+#~ msgstr "%1 〉"
934+
935+#~ msgid "Choose your passcode"
936+#~ msgstr "Izaberite vaš pristupni kod"
937+
938+#~ msgid "Please try again."
939+#~ msgstr "Molimo pokušajte ponovo."
940+
941+#~ msgid "Passphrase must be 4 characters long"
942+#~ msgstr "Pristupna fraza mora sadržavati 4 slova"
943+
944+#~ msgctxt "Label: Type of security method"
945+#~ msgid "Passphrase"
946+#~ msgstr "Pristupna fraza"
947+
948+#~ msgctxt "Title: Reboot/Shut down dialog"
949+#~ msgid "Shut down"
950+#~ msgstr "Ugasi"
951+
952+#~ msgctxt "Button: Reboot the system"
953+#~ msgid "Reboot"
954+#~ msgstr "Ponovo pokreni"
po/ca.po+477−240
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1111"PO-Revision-Date: 2015-07-04 09:48+0000\n"
1212"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
1313"Language-Team: Catalan <ca@li.org>\n"
@@ -15,8 +15,8 @@ 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: 2016-03-13 05:50+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19+"X-Generator: Launchpad (build 17958)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -77,53 +77,35 @@ msgctxt "Button: Log out from the system"
7777msgid "Log Out"
7878msgstr "Surt"
7979
80−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
81−#: qml/Components/Dialogs.qml:253
80+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
81+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
82+#: qml/Wizard/Pages/passcode-set.qml:32
8283msgid "Cancel"
8384msgstr "Cancel·la"
8485
8586#: qml/Components/Dialogs.qml:173
86−msgctxt "Title: Reboot/Shut down dialog"
87−msgid "Shut down"
88−msgstr "Apaga"
89−
90−#: qml/Components/Dialogs.qml:174
91−msgid "Are you sure you want to shut down?"
92−msgstr "Segur que voleu apagar?"
93−
94−#: qml/Components/Dialogs.qml:176
95−msgctxt "Button: Reboot the system"
96−msgid "Reboot"
97−msgstr "Reinicia"
98−
99−#: qml/Components/Dialogs.qml:185
100−msgctxt "Button: Shut down the system"
101−msgid "Shut down"
102−msgstr "Apaga"
103−
104−#: qml/Components/Dialogs.qml:207
10587msgctxt "Title: Reboot dialog"
10688msgid "Reboot"
10789msgstr "Reinicia"
10890
109−#: qml/Components/Dialogs.qml:208
91+#: qml/Components/Dialogs.qml:174
11092msgid "Are you sure you want to reboot?"
11193msgstr "Segur que voleu reiniciar?"
11294
113−#: qml/Components/Dialogs.qml:210
95+#: qml/Components/Dialogs.qml:176
11496msgid "No"
11597msgstr "No"
11698
117−#: qml/Components/Dialogs.qml:217
99+#: qml/Components/Dialogs.qml:183
118100msgid "Yes"
119101msgstr "Sí"
120102
121−#: qml/Components/Dialogs.qml:232
103+#: qml/Components/Dialogs.qml:198
122104msgctxt "Title: Power off/Restart dialog"
123105msgid "Power"
124106msgstr "Energia"
125107
126−#: qml/Components/Dialogs.qml:233
108+#: qml/Components/Dialogs.qml:199
127109msgid ""
128110"Are you sure you would like\n"
129111"to power off?"
@@ -131,12 +113,12 @@ msgstr ""
131113"Segur que voleu\n"
132114"apagar?"
133115
134−#: qml/Components/Dialogs.qml:235
116+#: qml/Components/Dialogs.qml:201
135117msgctxt "Button: Power off the system"
136118msgid "Power off"
137119msgstr "Apaga"
138120
139−#: qml/Components/Dialogs.qml:244
121+#: qml/Components/Dialogs.qml:210
140122msgctxt "Button: Restart the system"
141123msgid "Restart"
142124msgstr "Reinicia"
@@ -179,42 +161,58 @@ msgstr "Torna a connectar"
179161msgid "Close all"
180162msgstr "Tanca-ho tot"
181163
182−#: qml/Dash/DashPageHeader.qml:270
164+#: qml/Dash/DashPageHeader.qml:337
183165msgctxt "Button: Open the Ubuntu Store"
184166msgid "Store"
185167msgstr "Botiga"
186168
187−#: qml/Dash/DashPageHeader.qml:277
169+#: qml/Dash/DashPageHeader.qml:344
188170msgctxt "Button: Start a search in the current dash scope"
189171msgid "Search"
190172msgstr "Cerca"
191173
192−#: qml/Dash/DashPageHeader.qml:287
174+#: qml/Dash/DashPageHeader.qml:354
193175msgctxt "Button: Show the current dash scope settings"
194176msgid "Settings"
195177msgstr "Paràmetres"
196178
197−#: qml/Dash/DashPageHeader.qml:294
179+#: qml/Dash/DashPageHeader.qml:361
198180msgid "Remove from Favorites"
199181msgstr "Suprimeix dels preferits"
200182
201−#: qml/Dash/DashPageHeader.qml:294
183+#: qml/Dash/DashPageHeader.qml:361
202184msgid "Add to Favorites"
203185msgstr "Afegeix als preferits"
204186
205−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
187+#: qml/Dash/FiltersPopover.qml:60
188+msgid "Refine your results"
189+msgstr ""
190+
191+#: qml/Dash/FiltersPopover.qml:69
192+msgid "Reset"
193+msgstr ""
194+
195+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
206196msgid "See less"
207197msgstr "Mostra'n menys"
208198
209−#: qml/Dash/GenericScopeView.qml:567
199+#: qml/Dash/GenericScopeView.qml:570
210200msgid "See all"
211201msgstr "Mostra-ho tot"
212202
213−#: qml/Dash/GenericScopeView.qml:629
203+#: qml/Dash/GenericScopeView.qml:627
214204msgctxt "Label: Hint for dash search line edit"
215205msgid "Search"
216206msgstr "Cerca"
217207
208+#: qml/Dash/PageHeaderExtraPanel.qml:55
209+msgid "Recent Searches"
210+msgstr ""
211+
212+#: qml/Dash/PageHeaderExtraPanel.qml:66
213+msgid "Clear All"
214+msgstr ""
215+
218216#: qml/Dash/Previews/PreviewActionCombo.qml:35
219217msgid "More..."
220218msgstr "Més..."
@@ -282,11 +280,11 @@ msgstr "Torna-ho a provar"
282280msgid "Tap to unlock"
283281msgstr "Feu un toc per desblocar"
284282
285−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
283+#: qml/Greeter/NarrowView.qml:54
286284msgid "Sorry, incorrect passphrase."
287285msgstr "La contrasenya és incorrecta"
288286
289−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
287+#: qml/Greeter/NarrowView.qml:55
290288msgid "Sorry, incorrect passcode."
291289msgstr "El codi d'accés no és correcte"
292290
@@ -317,7 +315,7 @@ msgstr ""
317315msgid "Enter %1"
318316msgstr "Introduïu: %1"
319317
320−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
318+#: qml/Greeter/NarrowView.qml:117
321319msgid "Enter passphrase"
322320msgstr "Introduïu la contrasenya"
323321
@@ -355,62 +353,62 @@ msgstr "Feu un toc per tornar a la trucada..."
355353msgid "Conference"
356354msgstr "Conferència"
357355
358−#: qml/Panel/Indicators/MenuItemFactory.qml:752
356+#: qml/Panel/Indicators/MenuItemFactory.qml:761
359357msgid "Nothing is playing"
360358msgstr "No s'està reproduint res"
361359
362−#: qml/Panel/Indicators/MenuItemFactory.qml:881
360+#: qml/Panel/Indicators/MenuItemFactory.qml:890
363361#, qt-format
364362msgid "%1 hour"
365363msgid_plural "%1 hours"
366364msgstr[0] "%1 hora"
367365msgstr[1] "%1 hores"
368366
369−#: qml/Panel/Indicators/MenuItemFactory.qml:885
367+#: qml/Panel/Indicators/MenuItemFactory.qml:894
370368#, qt-format
371369msgid "%1 minute"
372370msgid_plural "%1 minutes"
373371msgstr[0] "%1 minut"
374372msgstr[1] "%1 minuts"
375373
376−#: qml/Panel/Indicators/MenuItemFactory.qml:890
374+#: qml/Panel/Indicators/MenuItemFactory.qml:899
377375#, qt-format
378376msgid "%1 second"
379377msgid_plural "%1 seconds"
380378msgstr[0] "%1 segon"
381379msgstr[1] "%1 segons"
382380
383−#: qml/Panel/Indicators/MenuItemFactory.qml:893
381+#: qml/Panel/Indicators/MenuItemFactory.qml:902
384382msgid "0 seconds"
385383msgstr "0 segons"
386384
387385#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
388−#: qml/Panel/Indicators/MenuItemFactory.qml:895
386+#: qml/Panel/Indicators/MenuItemFactory.qml:904
389387#, qt-format
390388msgid "%1 remaining"
391389msgstr "Resta %1"
392390
393−#: qml/Panel/Indicators/MenuItemFactory.qml:901
391+#: qml/Panel/Indicators/MenuItemFactory.qml:910
394392msgid "In queue…"
395393msgstr "A la cua..."
396394
397−#: qml/Panel/Indicators/MenuItemFactory.qml:905
395+#: qml/Panel/Indicators/MenuItemFactory.qml:914
398396msgid "Downloading"
399397msgstr "S'està baixant"
400398
401−#: qml/Panel/Indicators/MenuItemFactory.qml:907
399+#: qml/Panel/Indicators/MenuItemFactory.qml:916
402400msgid "Paused, tap to resume"
403401msgstr "En pausa, feu un toc per continuar"
404402
405−#: qml/Panel/Indicators/MenuItemFactory.qml:909
403+#: qml/Panel/Indicators/MenuItemFactory.qml:918
406404msgid "Canceled"
407405msgstr "S'ha cancel·lat"
408406
409−#: qml/Panel/Indicators/MenuItemFactory.qml:911
407+#: qml/Panel/Indicators/MenuItemFactory.qml:920
410408msgid "Finished"
411409msgstr "S'ha finalitzat"
412410
413−#: qml/Panel/Indicators/MenuItemFactory.qml:913
411+#: qml/Panel/Indicators/MenuItemFactory.qml:922
414412msgid "Failed, tap to retry"
415413msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
416414
@@ -430,253 +428,324 @@ msgctxt "Button: Call back on phone"
430428msgid "Call back"
431429msgstr "Retorna la trucada"
432430
433−#: qml/Tutorial/TutorialBottom.qml:28
434−msgid "Open special menus"
435−msgstr "Obre els menús especials"
436−
437−#: qml/Tutorial/TutorialBottom.qml:29
438−msgid "Swipe up from the bottom edge."
439−msgstr "Llisqueu el dit des de la vora inferior."
431+#: qml/Stages/SideStage.qml:76
432+msgid "Drag using 3 fingers any application from one window to the other"
433+msgstr ""
440434
441−#: qml/Tutorial/TutorialBottomFinish.qml:24
442−msgid "This action does different things for different apps"
443−msgstr "Aquesta acció fa coses diferents depenent de l'aplicació"
435+#: qml/Tutorial/TutorialBottom.qml:78
436+msgid "Swipe up to add a contact"
437+msgstr ""
444438
445−#: qml/Tutorial/TutorialBottomFinish.qml:25
446−msgid "Tap here to finish."
447−msgstr "Feu un toc per finalitzar."
439+#: qml/Tutorial/TutorialBottom.qml:80
440+msgid "Swipe up for favorite calculations"
441+msgstr ""
448442
449−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
450−#: qml/Tutorial/TutorialRight.qml:144
451−msgid "Tap here to continue."
452−msgstr "Feu un toc per continuar."
443+#: qml/Tutorial/TutorialBottom.qml:82
444+msgid "Swipe up for recent calls"
445+msgstr ""
453446
454−#: qml/Tutorial/TutorialLeft.qml:26
455−msgid "Open the launcher"
456−msgstr "Obre el llançador"
447+#: qml/Tutorial/TutorialBottom.qml:84
448+msgid "Swipe up to create a message"
449+msgstr ""
457450
458−#: qml/Tutorial/TutorialLeft.qml:27
459−msgid "Short swipe from the left edge."
460−msgstr "Lliscament curt des de la vora esquerra."
451+#: qml/Tutorial/TutorialBottom.qml:85
452+msgid "Swipe up to manage the app"
453+msgstr ""
461454
462−#: qml/Tutorial/TutorialLeftFinish.qml:24
463−msgid "These are the shortcuts to favorite apps"
464−msgstr "Aquestes són les dreceres a les aplicacions preferides"
455+#: qml/Tutorial/TutorialLeft.qml:47
456+msgid "Swipe from the left edge to open the launcher"
457+msgstr ""
465458
466−#: qml/Tutorial/TutorialPage.qml:178
467−msgid "You almost got it!"
468−msgstr "Ja gairebé ho teniu!"
459+#: qml/Tutorial/TutorialLeftLong.qml:47
460+msgid "Long swipe from the left edge to open the Today scope"
461+msgstr ""
469462
470−#: qml/Tutorial/TutorialPage.qml:195
471−msgid "Try again."
472−msgstr "Torneu-ho a provar."
463+#: qml/Tutorial/TutorialRight.qml:54
464+msgid "Hover your mouse on the right edge to view your open apps"
465+msgstr ""
473466
474−#: qml/Tutorial/TutorialRight.qml:31
475−msgid "To view open apps"
476−msgstr "Per veure les aplicacions obertes"
467+#: qml/Tutorial/TutorialRight.qml:55
468+msgid "Short or long swipe from the right edge to view your open apps"
469+msgstr ""
477470
478−#: qml/Tutorial/TutorialRight.qml:32
479−msgid "Long swipe from the right edge."
480−msgstr "Lliscament llarg des de la vora dreta."
471+#: qml/Tutorial/TutorialTop.qml:53
472+msgid "Swipe from the top right edge to open the notification bar"
473+msgstr ""
481474
482−#: qml/Tutorial/TutorialRight.qml:122
483−msgid "View all your running tasks."
484−msgstr "Mostra totes les tasques en execució."
475+#: qml/Tutorial/TutorialTop.qml:54
476+msgid "Swipe from the top edge to open the notification bar"
477+msgstr ""
485478
486−#: qml/Wizard/Page.qml:89
479+#: qml/Wizard/Page.qml:54
487480msgctxt "Button: Go back one page in the Wizard"
488481msgid "Back"
489482msgstr "Enrere"
490483
491484#: qml/Wizard/Pages/10-welcome.qml:27
492−msgid "Hi!"
493−msgstr "Hola!"
485+msgid "Language"
486+msgstr ""
494487
495−#: qml/Wizard/Pages/10-welcome.qml:44
496−msgid "Welcome to your Ubuntu device."
488+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
489+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
490+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
491+#: qml/Wizard/Pages/75-report-check.qml:84
492+#: qml/Wizard/Pages/passcode-desktop.qml:124
493+#: qml/Wizard/Pages/password-set.qml:141
494+msgid "Next"
497495msgstr ""
498496
499−#: qml/Wizard/Pages/10-welcome.qml:52
500−msgid "Let’s get started."
501−msgstr "Comencem."
497+#: qml/Wizard/Pages/30-wifi.qml:29
498+msgid "Connect to Wi‑Fi"
499+msgstr "Connecta't a la Wi-Fi"
502500
503−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
504−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
505−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
506−#: qml/Wizard/Pages/passwd-set.qml:90
507−msgid "Continue"
508−msgstr "Continua"
501+#: qml/Wizard/Pages/30-wifi.qml:130
502+msgid "Connected"
503+msgstr ""
509504
510−#: qml/Wizard/Pages/20-sim.qml:25
511−msgid "Add a SIM card and restart your device"
512−msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
505+#: qml/Wizard/Pages/30-wifi.qml:163
506+msgid "Available Wi-Fi networks"
507+msgstr ""
513508
514−#: qml/Wizard/Pages/20-sim.qml:59
515−msgid "Without it, you won’t be able to make calls or use text messaging."
516−msgstr "Sense ella, no podreu fer trucades o enviar missatges de text."
509+#: qml/Wizard/Pages/30-wifi.qml:164
510+msgid "No available Wi-Fi networks"
511+msgstr ""
517512
518−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
513+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
514+#: qml/Wizard/Pages/sim.qml:101
519515msgid "Skip"
520516msgstr "Omet"
521517
522−#: qml/Wizard/Pages/30-passwd-type.qml:39
523−msgid "Lock security"
524−msgstr "Seguretat del bloqueig"
518+#: qml/Wizard/Pages/40-location.qml:27
519+msgid "Location Services"
520+msgstr ""
521+
522+#: qml/Wizard/Pages/40-location.qml:83
523+msgid ""
524+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
525+"(recommended)"
526+msgstr ""
525527
526−#: qml/Wizard/Pages/30-passwd-type.qml:79
527−msgid "Please select how you’d like to unlock your device."
528+#: qml/Wizard/Pages/40-location.qml:105
529+#, qt-format
530+msgid "By selecting this option you agree to the Nokia HERE %1."
528531msgstr ""
529532
530−#: qml/Wizard/Pages/30-passwd-type.qml:102
531−msgctxt "Label: Type of security method"
532−msgid "Swipe"
533−msgstr "Lliscament amb el dit"
533+#: qml/Wizard/Pages/40-location.qml:106
534+msgctxt "part of: Nokia HERE terms and conditions"
535+msgid "terms and conditions"
536+msgstr ""
534537
535−#: qml/Wizard/Pages/30-passwd-type.qml:103
536−msgctxt "Label: Description of security method"
537−msgid "No security"
538−msgstr "Sense seguretat"
538+#: qml/Wizard/Pages/40-location.qml:160
539+msgid "GPS only"
540+msgstr ""
539541
540−#: qml/Wizard/Pages/30-passwd-type.qml:105
542+#: qml/Wizard/Pages/40-location.qml:214
543+msgid "Don't use my location"
544+msgstr ""
545+
546+#: qml/Wizard/Pages/40-location.qml:260
547+msgid "You can change it later in System Settings."
548+msgstr ""
549+
550+#: qml/Wizard/Pages/50-timezone.qml:29
551+msgid "Time Zone"
552+msgstr ""
553+
554+#: qml/Wizard/Pages/50-timezone.qml:178
555+msgid "Enter your city"
556+msgstr ""
557+
558+#: qml/Wizard/Pages/60-account.qml:24
559+msgid "Personalize Your Device"
560+msgstr ""
561+
562+#: qml/Wizard/Pages/60-account.qml:48
563+msgid "Preferred Name"
564+msgstr ""
565+
566+#: qml/Wizard/Pages/70-passwd-type.qml:39
567+msgid "Lock Screen"
568+msgstr ""
569+
570+#: qml/Wizard/Pages/70-passwd-type.qml:101
541571msgctxt "Label: Type of security method"
542−msgid "Passcode"
543−msgstr "Codi d'accés"
572+msgid "Create new password"
573+msgstr ""
544574
545−#: qml/Wizard/Pages/30-passwd-type.qml:106
546−msgctxt "Label: Description of security method"
547−msgid "4 digits only"
548−msgstr "Només 4 dígits"
575+#: qml/Wizard/Pages/70-passwd-type.qml:103
576+msgctxt "Label: Type of security method"
577+msgid "Create passcode (numbers only)"
578+msgstr ""
549579
550−#: qml/Wizard/Pages/30-passwd-type.qml:108
580+#: qml/Wizard/Pages/70-passwd-type.qml:105
551581msgctxt "Label: Type of security method"
552−msgid "Passphrase"
553−msgstr "Contrasenya"
582+msgid "No lock code"
583+msgstr ""
584+
585+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
586+msgid "Privacy Policy"
587+msgstr ""
554588
555−#: qml/Wizard/Pages/30-passwd-type.qml:109
556−msgctxt "Label: Description of security method"
557−msgid "Numbers and letters"
558−msgstr "Números i lletres"
589+#: qml/Wizard/Pages/75-report-check.qml:26
590+msgid "Help Us Improve"
591+msgstr ""
559592
560−#: qml/Wizard/Pages/40-wifi.qml:29
561−msgid "Connect to Wi‑Fi"
562−msgstr "Connecta't a la Wi-Fi"
593+#: qml/Wizard/Pages/75-report-check.qml:59
594+msgid "Improve system performance by sending us crashes and error reports."
595+msgstr ""
596+
597+#: qml/Wizard/Pages/75-report-check.qml:60
598+msgid "Privacy policy"
599+msgstr ""
563600
564−#: qml/Wizard/Pages/40-wifi.qml:168
565−msgid "Available networks…"
566−msgstr "Xarxes disponibles..."
601+#: qml/Wizard/Pages/80-finished.qml:89
602+msgid "Welcome to Ubuntu"
603+msgstr ""
567604
568−#: qml/Wizard/Pages/40-wifi.qml:169
569−msgid "No available networks."
570−msgstr "No hi ha xarxes disponibles"
605+#: qml/Wizard/Pages/80-finished.qml:104
606+msgid "You are ready to use your device now"
607+msgstr ""
571608
572−#: qml/Wizard/Pages/50-location.qml:27
573−msgid "Location"
574−msgstr "Ubicació"
609+#: qml/Wizard/Pages/80-finished.qml:124
610+msgid "Get Started"
611+msgstr ""
575612
576−#: qml/Wizard/Pages/50-location.qml:62
577−msgid "Let the phone detect your location:"
578−msgstr "Fes que el telèfon detecti la meva ubicació:"
613+#: qml/Wizard/Pages/here-terms.qml:25
614+msgid "Terms & Conditions"
615+msgstr "Condicions generals"
579616
580−#: qml/Wizard/Pages/50-location.qml:69
581−msgid "Using GPS only (less accurate)"
582−msgstr "Utilitza només el GPS (menys precís)"
617+#: qml/Wizard/Pages/here-terms.qml:69
618+msgid "Your device uses positioning technologies provided by HERE."
619+msgstr ""
583620
584−#: qml/Wizard/Pages/50-location.qml:86
585−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
621+#: qml/Wizard/Pages/here-terms.qml:81
622+msgid ""
623+"To provide you with positioning services and to improve their quality, HERE "
624+"collects information about nearby cell towers and Wi-Fi hotspots around your "
625+"current location whenever your position is being found."
586626msgstr ""
587−"Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "
588−"(recomanat)"
589627
590−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
591−#: qml/Wizard/Pages/50-location.qml:103
628+#: qml/Wizard/Pages/here-terms.qml:93
592629msgid ""
593−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
594−"conditions</a>."
630+"The information collected is used to analyze the service and to improve the "
631+"use of service, but not to identify you personally."
595632msgstr ""
596−"Si seleccioneu aquesta opció, accepteu <a href='#'>les condicions generals "
597−"del servei Nokia HERE</a>."
598633
599−#: qml/Wizard/Pages/50-location.qml:112
600−msgid "Not at all"
601−msgstr "No"
634+#: qml/Wizard/Pages/here-terms.qml:106
635+#, qt-format
636+msgid "By continuing, you agree to the HERE platform %1 and %2."
637+msgstr ""
602638
603−#: qml/Wizard/Pages/50-location.qml:124
604−msgid "You can change your mind later in <b>System Settings</b>."
639+#: qml/Wizard/Pages/here-terms.qml:107
640+msgid "Service Terms"
605641msgstr ""
606−"Podeu canviar-ho més endavant a l'aplicació <b>Paràmetres del sistema</b>"
607642
608−#: qml/Wizard/Pages/60-reporting.qml:26
609−msgid "Improving your experience"
610−msgstr "Millora de l'experiència"
643+#: qml/Wizard/Pages/passcode-confirm.qml:43
644+#: qml/Wizard/Pages/passcode-desktop.qml:80
645+msgid "Confirm passcode"
646+msgstr "Confirmeu el codi d'accés"
611647
612−#: qml/Wizard/Pages/60-reporting.qml:46
613−msgid ""
614−"Your phone is set up to automatically report errors to Canonical and its "
615−"partners, the makers of the operating system."
648+#: qml/Wizard/Pages/passcode-confirm.qml:45
649+msgid "Incorrect passcode."
616650msgstr ""
617−"Aquest telèfon està configurat per enviar errors de manera automàtica a "
618−"Canonical i associats, els creadors del sistema operatiu."
619651
620−#: qml/Wizard/Pages/60-reporting.qml:53
621−msgid ""
622−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
623−"Privacy</b>"
652+#: qml/Wizard/Pages/passcode-confirm.qml:45
653+msgctxt "Enter the passcode again"
654+msgid "Please re-enter."
624655msgstr ""
625−"Podeu inhabilitar-ho a <b>Configuració del sistema</b>, a la secció "
626−"<b>Seguretat i privadesa</b>"
627656
628−#: qml/Wizard/Pages/80-finished.qml:24
629−msgid "All done"
630−msgstr "Tot fet"
657+#: qml/Wizard/Pages/passcode-desktop.qml:30
658+msgid "Lock Screen Passcode"
659+msgstr ""
631660
632−#: qml/Wizard/Pages/80-finished.qml:39
633−msgid "Nice work!"
634−msgstr "Bona feina!"
661+#: qml/Wizard/Pages/passcode-desktop.qml:56
662+msgid "Enter 4 numbers to setup your passcode"
663+msgstr ""
635664
636−#: qml/Wizard/Pages/80-finished.qml:46
637−msgid "Your device is now ready to use."
665+#: qml/Wizard/Pages/passcode-desktop.qml:65
666+#: qml/Wizard/Pages/passcode-set.qml:54
667+msgid "Choose passcode"
638668msgstr ""
639669
640−#: qml/Wizard/Pages/80-finished.qml:53
641−msgid "Finish"
642−msgstr "Finalitza"
670+#: qml/Wizard/Pages/passcode-desktop.qml:105
671+msgid "Passcode too short"
672+msgstr ""
643673
644−#: qml/Wizard/Pages/here-terms.qml:27
645−msgid "Terms & Conditions"
646−msgstr "Condicions generals"
674+#: qml/Wizard/Pages/passcode-desktop.qml:107
675+msgid "Passcodes match"
676+msgstr ""
647677
648−#: qml/Wizard/Pages/passwd-confirm.qml:49
649−msgid "Confirm passphrase"
650−msgstr "Confirmeu la contrasenya"
678+#: qml/Wizard/Pages/passcode-desktop.qml:109
679+msgid "Passcodes do not match"
680+msgstr ""
651681
652−#: qml/Wizard/Pages/passwd-confirm.qml:50
653−msgid "Confirm passcode"
654−msgstr "Confirmeu el codi d'accés"
682+#: qml/Wizard/Pages/passcode-set.qml:62
683+msgid "Passcode must be 4 characters long"
684+msgstr ""
655685
656−#: qml/Wizard/Pages/passwd-confirm.qml:53
657−#: qml/Wizard/Pages/passwd-confirm.qml:54
658−msgid "Please try again."
659−msgstr "Torneu-ho a intentar."
686+#: qml/Wizard/Pages/password-set.qml:30
687+msgid "Lock Screen Password"
688+msgstr ""
660689
661−#: qml/Wizard/Pages/passwd-set.qml:61
662−msgid "Choose your passcode"
663−msgstr "Trieu el codi d'accés"
690+#: qml/Wizard/Pages/password-set.qml:61
691+msgid "Enter at least 8 characters"
692+msgstr ""
664693
665−#: qml/Wizard/Pages/passwd-set.qml:68
666−msgid "Passphrase must be 4 characters long"
667−msgstr "La contrasenya ha de tenir 4 caràcters com a mínim"
694+#: qml/Wizard/Pages/password-set.qml:73
695+msgid "Choose password"
696+msgstr ""
668697
669−#. Translators: This is the arrow for "Back" buttons
670−#: qml/Wizard/StackButton.qml:39
671−#, qt-format
672−msgid "〈 %1"
673−msgstr "〈 %1"
698+#: qml/Wizard/Pages/password-set.qml:103
699+msgid "Confirm password"
700+msgstr ""
674701
675−#. Translators: This is the arrow for "Forward" buttons
676−#: qml/Wizard/StackButton.qml:42
677−#, qt-format
678−msgid "%1 〉"
679−msgstr "%1 〉"
702+#: qml/Wizard/Pages/sim.qml:27
703+msgid "No SIM card installed"
704+msgstr ""
705+
706+#: qml/Wizard/Pages/sim.qml:54
707+msgid "SIM card added"
708+msgstr ""
709+
710+#: qml/Wizard/Pages/sim.qml:55
711+msgid "You must restart the device to access the mobile network."
712+msgstr ""
713+
714+#: qml/Wizard/Pages/sim.qml:59
715+msgid "Restart"
716+msgstr "Reinicia"
717+
718+#: qml/Wizard/Pages/sim.qml:78
719+msgid "You won’t be able to make calls or use text messaging without a SIM."
720+msgstr ""
721+
722+#: qml/Wizard/Pages/sim.qml:90
723+msgid "To proceed with no SIM tap Skip."
724+msgstr ""
725+
726+#: qml/Wizard/PasswordMeter.qml:87
727+msgid "Passwords match"
728+msgstr ""
729+
730+#: qml/Wizard/PasswordMeter.qml:89
731+msgid "Passwords do not match"
732+msgstr ""
733+
734+#: qml/Wizard/PasswordMeter.qml:93
735+msgid "Strong password"
736+msgstr ""
737+
738+#: qml/Wizard/PasswordMeter.qml:95
739+msgid "Fair password"
740+msgstr ""
741+
742+#: qml/Wizard/PasswordMeter.qml:97
743+msgid "Weak password"
744+msgstr ""
745+
746+#: qml/Wizard/PasswordMeter.qml:99
747+msgid "Very weak password"
748+msgstr ""
680749
681750#~ msgid "Confirm"
682751#~ msgstr "Confirma"
@@ -772,27 +841,200 @@ msgstr "%1 〉"
772841#~ msgid "Power off"
773842#~ msgstr "Apaga"
774843
844+#~ msgid "Are you sure you want to shut down?"
845+#~ msgstr "Segur que voleu apagar?"
846+
775847#~ msgid "Shut down"
776848#~ msgstr "Apaga"
777849
778−#~ msgid "Restart"
779−#~ msgstr "Reinicia"
780−
781850#~ msgid "Please re-enter"
782851#~ msgstr "Torneu-ho a introduir"
783852
784853#~ msgid "Manage Scopes"
785854#~ msgstr "Gestioneu les lents"
786855
856+#~ msgid "Add a SIM card and restart your device"
857+#~ msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
858+
859+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
860+#~ msgstr "Sense ella, no podreu fer trucades o enviar missatges de text."
861+
862+#~ msgid "Hi!"
863+#~ msgstr "Hola!"
864+
787865#~ msgid "Welcome to your Ubuntu phone."
788866#~ msgstr "Us donem la benvinguda al vostre telèfon Ubuntu."
789867
868+#~ msgid "Let’s get started."
869+#~ msgstr "Comencem."
870+
871+#~ msgid "Continue"
872+#~ msgstr "Continua"
873+
874+#~ msgid "Lock security"
875+#~ msgstr "Seguretat del bloqueig"
876+
790877#~ msgid "Please select how you’d like to unlock your phone."
791878#~ msgstr "Seleccioneu com voleu desblocar el telèfon."
792879
880+#~ msgid "Improving your experience"
881+#~ msgstr "Millora de l'experiència"
882+
883+#~ msgid "Available networks…"
884+#~ msgstr "Xarxes disponibles..."
885+
886+#~ msgid "No available networks."
887+#~ msgstr "No hi ha xarxes disponibles"
888+
889+#~ msgid "Location"
890+#~ msgstr "Ubicació"
891+
892+#~ msgid ""
893+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
894+#~ "Privacy</b>"
895+#~ msgstr ""
896+#~ "Podeu inhabilitar-ho a <b>Configuració del sistema</b>, a la secció "
897+#~ "<b>Seguretat i privadesa</b>"
898+
899+#~ msgid ""
900+#~ "Your phone is set up to automatically report errors to Canonical and its "
901+#~ "partners, the makers of the operating system."
902+#~ msgstr ""
903+#~ "Aquest telèfon està configurat per enviar errors de manera automàtica a "
904+#~ "Canonical i associats, els creadors del sistema operatiu."
905+
906+#~ msgid "Finish"
907+#~ msgstr "Finalitza"
908+
793909#~ msgid "Your phone is now ready to use."
794910#~ msgstr "Ja podeu utilitzar el vostre telèfon."
795911
912+#~ msgid "Confirm passphrase"
913+#~ msgstr "Confirmeu la contrasenya"
914+
915+#~ msgid "Please try again."
916+#~ msgstr "Torneu-ho a intentar."
917+
918+#~ msgid "Nice work!"
919+#~ msgstr "Bona feina!"
920+
921+#~ msgid "All done"
922+#~ msgstr "Tot fet"
923+
924+#~ msgid "Choose your passcode"
925+#~ msgstr "Trieu el codi d'accés"
926+
927+#, qt-format
928+#~ msgid "%1 〉"
929+#~ msgstr "%1 〉"
930+
931+#~ msgid "Passphrase must be 4 characters long"
932+#~ msgstr "La contrasenya ha de tenir 4 caràcters com a mínim"
933+
934+#, qt-format
935+#~ msgid "〈 %1"
936+#~ msgstr "〈 %1"
937+
938+#~ msgid "Let the phone detect your location:"
939+#~ msgstr "Fes que el telèfon detecti la meva ubicació:"
940+
941+#~ msgid "Using GPS only (less accurate)"
942+#~ msgstr "Utilitza només el GPS (menys precís)"
943+
944+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
945+#~ msgstr ""
946+#~ "Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "
947+#~ "(recomanat)"
948+
949+#~ msgid "You can change your mind later in <b>System Settings</b>."
950+#~ msgstr ""
951+#~ "Podeu canviar-ho més endavant a l'aplicació <b>Paràmetres del sistema</b>"
952+
953+#~ msgid ""
954+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
955+#~ "conditions</a>."
956+#~ msgstr ""
957+#~ "Si seleccioneu aquesta opció, accepteu <a href='#'>les condicions generals "
958+#~ "del servei Nokia HERE</a>."
959+
960+#~ msgid "Not at all"
961+#~ msgstr "No"
962+
963+#~ msgid "You almost got it!"
964+#~ msgstr "Ja gairebé ho teniu!"
965+
966+#~ msgid "Open the launcher"
967+#~ msgstr "Obre el llançador"
968+
969+#~ msgid "Tap here to continue."
970+#~ msgstr "Feu un toc per continuar."
971+
972+#~ msgid "Open special menus"
973+#~ msgstr "Obre els menús especials"
974+
975+#~ msgid "To view open apps"
976+#~ msgstr "Per veure les aplicacions obertes"
977+
978+#~ msgid "Long swipe from the right edge."
979+#~ msgstr "Lliscament llarg des de la vora dreta."
980+
981+#~ msgid "View all your running tasks."
982+#~ msgstr "Mostra totes les tasques en execució."
983+
984+#~ msgid "This action does different things for different apps"
985+#~ msgstr "Aquesta acció fa coses diferents depenent de l'aplicació"
986+
987+#~ msgid "Try again."
988+#~ msgstr "Torneu-ho a provar."
989+
990+#~ msgid "Short swipe from the left edge."
991+#~ msgstr "Lliscament curt des de la vora esquerra."
992+
993+#~ msgid "These are the shortcuts to favorite apps"
994+#~ msgstr "Aquestes són les dreceres a les aplicacions preferides"
995+
996+#~ msgid "Swipe up from the bottom edge."
997+#~ msgstr "Llisqueu el dit des de la vora inferior."
998+
999+#~ msgid "Tap here to finish."
1000+#~ msgstr "Feu un toc per finalitzar."
1001+
1002+#~ msgctxt "Label: Description of security method"
1003+#~ msgid "4 digits only"
1004+#~ msgstr "Només 4 dígits"
1005+
1006+#~ msgctxt "Button: Shut down the system"
1007+#~ msgid "Shut down"
1008+#~ msgstr "Apaga"
1009+
1010+#~ msgctxt "Title: Reboot/Shut down dialog"
1011+#~ msgid "Shut down"
1012+#~ msgstr "Apaga"
1013+
1014+#~ msgctxt "Button: Reboot the system"
1015+#~ msgid "Reboot"
1016+#~ msgstr "Reinicia"
1017+
1018+#~ msgctxt "Label: Type of security method"
1019+#~ msgid "Swipe"
1020+#~ msgstr "Lliscament amb el dit"
1021+
1022+#~ msgctxt "Label: Type of security method"
1023+#~ msgid "Passcode"
1024+#~ msgstr "Codi d'accés"
1025+
1026+#~ msgctxt "Label: Description of security method"
1027+#~ msgid "No security"
1028+#~ msgstr "Sense seguretat"
1029+
1030+#~ msgctxt "Label: Type of security method"
1031+#~ msgid "Passphrase"
1032+#~ msgstr "Contrasenya"
1033+
1034+#~ msgctxt "Label: Description of security method"
1035+#~ msgid "Numbers and letters"
1036+#~ msgstr "Números i lletres"
1037+
7961038#~ msgid "Yesterday %l:%M %p"
7971039#~ msgstr "Ahir %l.%M %p"
7981040
@@ -825,8 +1067,3 @@ msgstr "%1 〉"
8251067
8261068#~ msgid "Call back"
8271069#~ msgstr "Retorna la trucada"
828−
829−#~ msgid "Re-dock, save your work and close these apps to continue."
830−#~ msgstr ""
831−#~ "Torneu a connectar, deseu la feina i tanqueu aquestes aplicacions per "
832−#~ "continuar."
po/ca@valencia.po+384−217
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1111"PO-Revision-Date: 2015-02-22 15:22+0000\n"
1212"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
1313"Language-Team: Catalan <ca@li.org>\n"
@@ -15,8 +15,8 @@ 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: 2016-03-13 05:51+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:08+0000\n"
19+"X-Generator: Launchpad (build 17958)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -77,53 +77,35 @@ msgctxt "Button: Log out from the system"
7777msgid "Log Out"
7878msgstr ""
7979
80−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
81−#: qml/Components/Dialogs.qml:253
80+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
81+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
82+#: qml/Wizard/Pages/passcode-set.qml:32
8283msgid "Cancel"
8384msgstr "Cancel·la"
8485
8586#: qml/Components/Dialogs.qml:173
86−msgctxt "Title: Reboot/Shut down dialog"
87−msgid "Shut down"
88−msgstr ""
89−
90−#: qml/Components/Dialogs.qml:174
91−msgid "Are you sure you want to shut down?"
92−msgstr "Segur que voleu apagar?"
93−
94−#: qml/Components/Dialogs.qml:176
95−msgctxt "Button: Reboot the system"
96−msgid "Reboot"
97−msgstr ""
98−
99−#: qml/Components/Dialogs.qml:185
100−msgctxt "Button: Shut down the system"
101−msgid "Shut down"
102−msgstr ""
103−
104−#: qml/Components/Dialogs.qml:207
10587msgctxt "Title: Reboot dialog"
10688msgid "Reboot"
10789msgstr ""
10890
109−#: qml/Components/Dialogs.qml:208
91+#: qml/Components/Dialogs.qml:174
11092msgid "Are you sure you want to reboot?"
11193msgstr "Segur que voleu reiniciar?"
11294
113−#: qml/Components/Dialogs.qml:210
95+#: qml/Components/Dialogs.qml:176
11496msgid "No"
11597msgstr "No"
11698
117−#: qml/Components/Dialogs.qml:217
99+#: qml/Components/Dialogs.qml:183
118100msgid "Yes"
119101msgstr "Sí"
120102
121−#: qml/Components/Dialogs.qml:232
103+#: qml/Components/Dialogs.qml:198
122104msgctxt "Title: Power off/Restart dialog"
123105msgid "Power"
124106msgstr ""
125107
126−#: qml/Components/Dialogs.qml:233
108+#: qml/Components/Dialogs.qml:199
127109msgid ""
128110"Are you sure you would like\n"
129111"to power off?"
@@ -131,12 +113,12 @@ msgstr ""
131113"Segur que voleu\n"
132114"apagar?"
133115
134−#: qml/Components/Dialogs.qml:235
116+#: qml/Components/Dialogs.qml:201
135117msgctxt "Button: Power off the system"
136118msgid "Power off"
137119msgstr ""
138120
139−#: qml/Components/Dialogs.qml:244
121+#: qml/Components/Dialogs.qml:210
140122msgctxt "Button: Restart the system"
141123msgid "Restart"
142124msgstr ""
@@ -179,42 +161,58 @@ msgstr ""
179161msgid "Close all"
180162msgstr ""
181163
182−#: qml/Dash/DashPageHeader.qml:270
164+#: qml/Dash/DashPageHeader.qml:337
183165msgctxt "Button: Open the Ubuntu Store"
184166msgid "Store"
185167msgstr ""
186168
187−#: qml/Dash/DashPageHeader.qml:277
169+#: qml/Dash/DashPageHeader.qml:344
188170msgctxt "Button: Start a search in the current dash scope"
189171msgid "Search"
190172msgstr ""
191173
192−#: qml/Dash/DashPageHeader.qml:287
174+#: qml/Dash/DashPageHeader.qml:354
193175msgctxt "Button: Show the current dash scope settings"
194176msgid "Settings"
195177msgstr ""
196178
197−#: qml/Dash/DashPageHeader.qml:294
179+#: qml/Dash/DashPageHeader.qml:361
198180msgid "Remove from Favorites"
199181msgstr "Suprimeix dels preferits"
200182
201−#: qml/Dash/DashPageHeader.qml:294
183+#: qml/Dash/DashPageHeader.qml:361
202184msgid "Add to Favorites"
203185msgstr "Afig als preferits"
204186
205−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
187+#: qml/Dash/FiltersPopover.qml:60
188+msgid "Refine your results"
189+msgstr ""
190+
191+#: qml/Dash/FiltersPopover.qml:69
192+msgid "Reset"
193+msgstr ""
194+
195+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
206196msgid "See less"
207197msgstr "Mostra'n menys"
208198
209−#: qml/Dash/GenericScopeView.qml:567
199+#: qml/Dash/GenericScopeView.qml:570
210200msgid "See all"
211201msgstr "Mostra-ho tot"
212202
213−#: qml/Dash/GenericScopeView.qml:629
203+#: qml/Dash/GenericScopeView.qml:627
214204msgctxt "Label: Hint for dash search line edit"
215205msgid "Search"
216206msgstr ""
217207
208+#: qml/Dash/PageHeaderExtraPanel.qml:55
209+msgid "Recent Searches"
210+msgstr ""
211+
212+#: qml/Dash/PageHeaderExtraPanel.qml:66
213+msgid "Clear All"
214+msgstr ""
215+
218216#: qml/Dash/Previews/PreviewActionCombo.qml:35
219217msgid "More..."
220218msgstr "Més..."
@@ -282,11 +280,11 @@ msgstr ""
282280msgid "Tap to unlock"
283281msgstr ""
284282
285−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
283+#: qml/Greeter/NarrowView.qml:54
286284msgid "Sorry, incorrect passphrase."
287285msgstr "La contrasenya és incorrecta"
288286
289−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
287+#: qml/Greeter/NarrowView.qml:55
290288msgid "Sorry, incorrect passcode."
291289msgstr "El codi d'accés no és correcte"
292290
@@ -317,7 +315,7 @@ msgstr ""
317315msgid "Enter %1"
318316msgstr "Introduïu: %1"
319317
320−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
318+#: qml/Greeter/NarrowView.qml:117
321319msgid "Enter passphrase"
322320msgstr "Introduïu la contrasenya"
323321
@@ -355,62 +353,62 @@ msgstr "Feu un toc per tornar a la cridada..."
355353msgid "Conference"
356354msgstr "Conferència"
357355
358−#: qml/Panel/Indicators/MenuItemFactory.qml:752
356+#: qml/Panel/Indicators/MenuItemFactory.qml:761
359357msgid "Nothing is playing"
360358msgstr "No s'està reproduint res"
361359
362−#: qml/Panel/Indicators/MenuItemFactory.qml:881
360+#: qml/Panel/Indicators/MenuItemFactory.qml:890
363361#, qt-format
364362msgid "%1 hour"
365363msgid_plural "%1 hours"
366364msgstr[0] ""
367365msgstr[1] ""
368366
369−#: qml/Panel/Indicators/MenuItemFactory.qml:885
367+#: qml/Panel/Indicators/MenuItemFactory.qml:894
370368#, qt-format
371369msgid "%1 minute"
372370msgid_plural "%1 minutes"
373371msgstr[0] ""
374372msgstr[1] ""
375373
376−#: qml/Panel/Indicators/MenuItemFactory.qml:890
374+#: qml/Panel/Indicators/MenuItemFactory.qml:899
377375#, qt-format
378376msgid "%1 second"
379377msgid_plural "%1 seconds"
380378msgstr[0] ""
381379msgstr[1] ""
382380
383−#: qml/Panel/Indicators/MenuItemFactory.qml:893
381+#: qml/Panel/Indicators/MenuItemFactory.qml:902
384382msgid "0 seconds"
385383msgstr ""
386384
387385#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
388−#: qml/Panel/Indicators/MenuItemFactory.qml:895
386+#: qml/Panel/Indicators/MenuItemFactory.qml:904
389387#, qt-format
390388msgid "%1 remaining"
391389msgstr ""
392390
393−#: qml/Panel/Indicators/MenuItemFactory.qml:901
391+#: qml/Panel/Indicators/MenuItemFactory.qml:910
394392msgid "In queue…"
395393msgstr "A la cua..."
396394
397−#: qml/Panel/Indicators/MenuItemFactory.qml:905
395+#: qml/Panel/Indicators/MenuItemFactory.qml:914
398396msgid "Downloading"
399397msgstr "S'està baixant"
400398
401−#: qml/Panel/Indicators/MenuItemFactory.qml:907
399+#: qml/Panel/Indicators/MenuItemFactory.qml:916
402400msgid "Paused, tap to resume"
403401msgstr "En pausa, feu un toc per continuar"
404402
405−#: qml/Panel/Indicators/MenuItemFactory.qml:909
403+#: qml/Panel/Indicators/MenuItemFactory.qml:918
406404msgid "Canceled"
407405msgstr "S'ha cancel·lat"
408406
409−#: qml/Panel/Indicators/MenuItemFactory.qml:911
407+#: qml/Panel/Indicators/MenuItemFactory.qml:920
410408msgid "Finished"
411409msgstr "S'ha finalitzat"
412410
413−#: qml/Panel/Indicators/MenuItemFactory.qml:913
411+#: qml/Panel/Indicators/MenuItemFactory.qml:922
414412msgid "Failed, tap to retry"
415413msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
416414
@@ -430,253 +428,324 @@ msgctxt "Button: Call back on phone"
430428msgid "Call back"
431429msgstr ""
432430
433−#: qml/Tutorial/TutorialBottom.qml:28
434−msgid "Open special menus"
435−msgstr ""
436−
437−#: qml/Tutorial/TutorialBottom.qml:29
438−msgid "Swipe up from the bottom edge."
431+#: qml/Stages/SideStage.qml:76
432+msgid "Drag using 3 fingers any application from one window to the other"
439433msgstr ""
440434
441−#: qml/Tutorial/TutorialBottomFinish.qml:24
442−msgid "This action does different things for different apps"
435+#: qml/Tutorial/TutorialBottom.qml:78
436+msgid "Swipe up to add a contact"
443437msgstr ""
444438
445−#: qml/Tutorial/TutorialBottomFinish.qml:25
446−msgid "Tap here to finish."
439+#: qml/Tutorial/TutorialBottom.qml:80
440+msgid "Swipe up for favorite calculations"
447441msgstr ""
448442
449−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
450−#: qml/Tutorial/TutorialRight.qml:144
451−msgid "Tap here to continue."
443+#: qml/Tutorial/TutorialBottom.qml:82
444+msgid "Swipe up for recent calls"
452445msgstr ""
453446
454−#: qml/Tutorial/TutorialLeft.qml:26
455−msgid "Open the launcher"
447+#: qml/Tutorial/TutorialBottom.qml:84
448+msgid "Swipe up to create a message"
456449msgstr ""
457450
458−#: qml/Tutorial/TutorialLeft.qml:27
459−msgid "Short swipe from the left edge."
451+#: qml/Tutorial/TutorialBottom.qml:85
452+msgid "Swipe up to manage the app"
460453msgstr ""
461454
462−#: qml/Tutorial/TutorialLeftFinish.qml:24
463−msgid "These are the shortcuts to favorite apps"
455+#: qml/Tutorial/TutorialLeft.qml:47
456+msgid "Swipe from the left edge to open the launcher"
464457msgstr ""
465458
466−#: qml/Tutorial/TutorialPage.qml:178
467−msgid "You almost got it!"
459+#: qml/Tutorial/TutorialLeftLong.qml:47
460+msgid "Long swipe from the left edge to open the Today scope"
468461msgstr ""
469462
470−#: qml/Tutorial/TutorialPage.qml:195
471−msgid "Try again."
463+#: qml/Tutorial/TutorialRight.qml:54
464+msgid "Hover your mouse on the right edge to view your open apps"
472465msgstr ""
473466
474−#: qml/Tutorial/TutorialRight.qml:31
475−msgid "To view open apps"
467+#: qml/Tutorial/TutorialRight.qml:55
468+msgid "Short or long swipe from the right edge to view your open apps"
476469msgstr ""
477470
478−#: qml/Tutorial/TutorialRight.qml:32
479−msgid "Long swipe from the right edge."
471+#: qml/Tutorial/TutorialTop.qml:53
472+msgid "Swipe from the top right edge to open the notification bar"
480473msgstr ""
481474
482−#: qml/Tutorial/TutorialRight.qml:122
483−msgid "View all your running tasks."
475+#: qml/Tutorial/TutorialTop.qml:54
476+msgid "Swipe from the top edge to open the notification bar"
484477msgstr ""
485478
486−#: qml/Wizard/Page.qml:89
479+#: qml/Wizard/Page.qml:54
487480msgctxt "Button: Go back one page in the Wizard"
488481msgid "Back"
489482msgstr ""
490483
491484#: qml/Wizard/Pages/10-welcome.qml:27
492−msgid "Hi!"
493−msgstr "Hola!"
485+msgid "Language"
486+msgstr ""
494487
495−#: qml/Wizard/Pages/10-welcome.qml:44
496−msgid "Welcome to your Ubuntu device."
488+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
489+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
490+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
491+#: qml/Wizard/Pages/75-report-check.qml:84
492+#: qml/Wizard/Pages/passcode-desktop.qml:124
493+#: qml/Wizard/Pages/password-set.qml:141
494+msgid "Next"
497495msgstr ""
498496
499−#: qml/Wizard/Pages/10-welcome.qml:52
500−msgid "Let’s get started."
501−msgstr "Comencem."
497+#: qml/Wizard/Pages/30-wifi.qml:29
498+msgid "Connect to Wi‑Fi"
499+msgstr "Connecta't a la Wi-Fi"
502500
503−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
504−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
505−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
506−#: qml/Wizard/Pages/passwd-set.qml:90
507−msgid "Continue"
508−msgstr "Continua"
501+#: qml/Wizard/Pages/30-wifi.qml:130
502+msgid "Connected"
503+msgstr ""
509504
510−#: qml/Wizard/Pages/20-sim.qml:25
511−msgid "Add a SIM card and restart your device"
512−msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
505+#: qml/Wizard/Pages/30-wifi.qml:163
506+msgid "Available Wi-Fi networks"
507+msgstr ""
513508
514−#: qml/Wizard/Pages/20-sim.qml:59
515−msgid "Without it, you won’t be able to make calls or use text messaging."
516−msgstr "Sense ella, no podreu fer cridades o enviar missatges de text."
509+#: qml/Wizard/Pages/30-wifi.qml:164
510+msgid "No available Wi-Fi networks"
511+msgstr ""
517512
518−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
513+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
514+#: qml/Wizard/Pages/sim.qml:101
519515msgid "Skip"
520516msgstr "Omet"
521517
522−#: qml/Wizard/Pages/30-passwd-type.qml:39
523−msgid "Lock security"
524−msgstr "Seguretat del bloqueig"
518+#: qml/Wizard/Pages/40-location.qml:27
519+msgid "Location Services"
520+msgstr ""
525521
526−#: qml/Wizard/Pages/30-passwd-type.qml:79
527−msgid "Please select how you’d like to unlock your device."
522+#: qml/Wizard/Pages/40-location.qml:83
523+msgid ""
524+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
525+"(recommended)"
528526msgstr ""
529527
530−#: qml/Wizard/Pages/30-passwd-type.qml:102
531−msgctxt "Label: Type of security method"
532−msgid "Swipe"
528+#: qml/Wizard/Pages/40-location.qml:105
529+#, qt-format
530+msgid "By selecting this option you agree to the Nokia HERE %1."
531+msgstr ""
532+
533+#: qml/Wizard/Pages/40-location.qml:106
534+msgctxt "part of: Nokia HERE terms and conditions"
535+msgid "terms and conditions"
533536msgstr ""
534537
535−#: qml/Wizard/Pages/30-passwd-type.qml:103
536−msgctxt "Label: Description of security method"
537−msgid "No security"
538+#: qml/Wizard/Pages/40-location.qml:160
539+msgid "GPS only"
538540msgstr ""
539541
540−#: qml/Wizard/Pages/30-passwd-type.qml:105
542+#: qml/Wizard/Pages/40-location.qml:214
543+msgid "Don't use my location"
544+msgstr ""
545+
546+#: qml/Wizard/Pages/40-location.qml:260
547+msgid "You can change it later in System Settings."
548+msgstr ""
549+
550+#: qml/Wizard/Pages/50-timezone.qml:29
551+msgid "Time Zone"
552+msgstr ""
553+
554+#: qml/Wizard/Pages/50-timezone.qml:178
555+msgid "Enter your city"
556+msgstr ""
557+
558+#: qml/Wizard/Pages/60-account.qml:24
559+msgid "Personalize Your Device"
560+msgstr ""
561+
562+#: qml/Wizard/Pages/60-account.qml:48
563+msgid "Preferred Name"
564+msgstr ""
565+
566+#: qml/Wizard/Pages/70-passwd-type.qml:39
567+msgid "Lock Screen"
568+msgstr ""
569+
570+#: qml/Wizard/Pages/70-passwd-type.qml:101
541571msgctxt "Label: Type of security method"
542−msgid "Passcode"
572+msgid "Create new password"
543573msgstr ""
544574
545−#: qml/Wizard/Pages/30-passwd-type.qml:106
546−msgctxt "Label: Description of security method"
547−msgid "4 digits only"
575+#: qml/Wizard/Pages/70-passwd-type.qml:103
576+msgctxt "Label: Type of security method"
577+msgid "Create passcode (numbers only)"
548578msgstr ""
549579
550−#: qml/Wizard/Pages/30-passwd-type.qml:108
580+#: qml/Wizard/Pages/70-passwd-type.qml:105
551581msgctxt "Label: Type of security method"
552−msgid "Passphrase"
582+msgid "No lock code"
553583msgstr ""
554584
555−#: qml/Wizard/Pages/30-passwd-type.qml:109
556−msgctxt "Label: Description of security method"
557−msgid "Numbers and letters"
585+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
586+msgid "Privacy Policy"
558587msgstr ""
559588
560−#: qml/Wizard/Pages/40-wifi.qml:29
561−msgid "Connect to Wi‑Fi"
562−msgstr "Connecta't a la Wi-Fi"
589+#: qml/Wizard/Pages/75-report-check.qml:26
590+msgid "Help Us Improve"
591+msgstr ""
592+
593+#: qml/Wizard/Pages/75-report-check.qml:59
594+msgid "Improve system performance by sending us crashes and error reports."
595+msgstr ""
563596
564−#: qml/Wizard/Pages/40-wifi.qml:168
565−msgid "Available networks…"
566−msgstr "Xarxes disponibles..."
597+#: qml/Wizard/Pages/75-report-check.qml:60
598+msgid "Privacy policy"
599+msgstr ""
567600
568−#: qml/Wizard/Pages/40-wifi.qml:169
569−msgid "No available networks."
570−msgstr "No hi ha xarxes disponibles"
601+#: qml/Wizard/Pages/80-finished.qml:89
602+msgid "Welcome to Ubuntu"
603+msgstr ""
571604
572−#: qml/Wizard/Pages/50-location.qml:27
573−msgid "Location"
574−msgstr "Ubicació"
605+#: qml/Wizard/Pages/80-finished.qml:104
606+msgid "You are ready to use your device now"
607+msgstr ""
575608
576−#: qml/Wizard/Pages/50-location.qml:62
577−msgid "Let the phone detect your location:"
578−msgstr "Fes que el telèfon detecti la meua ubicació:"
609+#: qml/Wizard/Pages/80-finished.qml:124
610+msgid "Get Started"
611+msgstr ""
579612
580−#: qml/Wizard/Pages/50-location.qml:69
581−msgid "Using GPS only (less accurate)"
582−msgstr "Utilitza només el GPS (menys precís)"
613+#: qml/Wizard/Pages/here-terms.qml:25
614+msgid "Terms & Conditions"
615+msgstr "Condicions generals"
583616
584−#: qml/Wizard/Pages/50-location.qml:86
585−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
617+#: qml/Wizard/Pages/here-terms.qml:69
618+msgid "Your device uses positioning technologies provided by HERE."
586619msgstr ""
587−"Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "
588−"(recomanat)"
589620
590−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
591−#: qml/Wizard/Pages/50-location.qml:103
621+#: qml/Wizard/Pages/here-terms.qml:81
592622msgid ""
593−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
594−"conditions</a>."
623+"To provide you with positioning services and to improve their quality, HERE "
624+"collects information about nearby cell towers and Wi-Fi hotspots around your "
625+"current location whenever your position is being found."
595626msgstr ""
596−"Si seleccioneu esta opció, accepteu <a href='#'>les condicions generals del "
597−"servei Nokia HERE</a>."
598627
599−#: qml/Wizard/Pages/50-location.qml:112
600−msgid "Not at all"
601−msgstr "No"
628+#: qml/Wizard/Pages/here-terms.qml:93
629+msgid ""
630+"The information collected is used to analyze the service and to improve the "
631+"use of service, but not to identify you personally."
632+msgstr ""
602633
603−#: qml/Wizard/Pages/50-location.qml:124
604−msgid "You can change your mind later in <b>System Settings</b>."
634+#: qml/Wizard/Pages/here-terms.qml:106
635+#, qt-format
636+msgid "By continuing, you agree to the HERE platform %1 and %2."
605637msgstr ""
606−"Podeu canviar-ho més avant a l'aplicació <b>Paràmetres del sistema</b>"
607638
608−#: qml/Wizard/Pages/60-reporting.qml:26
609−msgid "Improving your experience"
610−msgstr "Millora de l'experiència"
639+#: qml/Wizard/Pages/here-terms.qml:107
640+msgid "Service Terms"
641+msgstr ""
611642
612−#: qml/Wizard/Pages/60-reporting.qml:46
613−msgid ""
614−"Your phone is set up to automatically report errors to Canonical and its "
615−"partners, the makers of the operating system."
643+#: qml/Wizard/Pages/passcode-confirm.qml:43
644+#: qml/Wizard/Pages/passcode-desktop.qml:80
645+msgid "Confirm passcode"
646+msgstr "Confirmeu el codi d'accés"
647+
648+#: qml/Wizard/Pages/passcode-confirm.qml:45
649+msgid "Incorrect passcode."
616650msgstr ""
617−"Este telèfon està configurat per enviar errors de manera automàtica a "
618−"Canonical i associats, els creadors del sistema operatiu."
619651
620−#: qml/Wizard/Pages/60-reporting.qml:53
621−msgid ""
622−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
623−"Privacy</b>"
652+#: qml/Wizard/Pages/passcode-confirm.qml:45
653+msgctxt "Enter the passcode again"
654+msgid "Please re-enter."
624655msgstr ""
625−"Podeu inhabilitar-ho a <b>Configuració del sistema</b>, a la secció "
626−"<b>Seguretat i privadesa</b>"
627656
628−#: qml/Wizard/Pages/80-finished.qml:24
629−msgid "All done"
630−msgstr "Tot fet"
657+#: qml/Wizard/Pages/passcode-desktop.qml:30
658+msgid "Lock Screen Passcode"
659+msgstr ""
631660
632−#: qml/Wizard/Pages/80-finished.qml:39
633−msgid "Nice work!"
634−msgstr "Bona faena!"
661+#: qml/Wizard/Pages/passcode-desktop.qml:56
662+msgid "Enter 4 numbers to setup your passcode"
663+msgstr ""
635664
636−#: qml/Wizard/Pages/80-finished.qml:46
637−msgid "Your device is now ready to use."
665+#: qml/Wizard/Pages/passcode-desktop.qml:65
666+#: qml/Wizard/Pages/passcode-set.qml:54
667+msgid "Choose passcode"
638668msgstr ""
639669
640−#: qml/Wizard/Pages/80-finished.qml:53
641−msgid "Finish"
642−msgstr "Finalitza"
670+#: qml/Wizard/Pages/passcode-desktop.qml:105
671+msgid "Passcode too short"
672+msgstr ""
643673
644−#: qml/Wizard/Pages/here-terms.qml:27
645−msgid "Terms & Conditions"
646−msgstr "Condicions generals"
674+#: qml/Wizard/Pages/passcode-desktop.qml:107
675+msgid "Passcodes match"
676+msgstr ""
647677
648−#: qml/Wizard/Pages/passwd-confirm.qml:49
649−msgid "Confirm passphrase"
650−msgstr "Confirmeu la contrasenya"
678+#: qml/Wizard/Pages/passcode-desktop.qml:109
679+msgid "Passcodes do not match"
680+msgstr ""
651681
652−#: qml/Wizard/Pages/passwd-confirm.qml:50
653−msgid "Confirm passcode"
654−msgstr "Confirmeu el codi d'accés"
682+#: qml/Wizard/Pages/passcode-set.qml:62
683+msgid "Passcode must be 4 characters long"
684+msgstr ""
655685
656−#: qml/Wizard/Pages/passwd-confirm.qml:53
657−#: qml/Wizard/Pages/passwd-confirm.qml:54
658−msgid "Please try again."
659−msgstr "Torneu-ho a intentar."
686+#: qml/Wizard/Pages/password-set.qml:30
687+msgid "Lock Screen Password"
688+msgstr ""
660689
661−#: qml/Wizard/Pages/passwd-set.qml:61
662−msgid "Choose your passcode"
663−msgstr "Trieu el codi d'accés"
690+#: qml/Wizard/Pages/password-set.qml:61
691+msgid "Enter at least 8 characters"
692+msgstr ""
664693
665−#: qml/Wizard/Pages/passwd-set.qml:68
666−msgid "Passphrase must be 4 characters long"
667−msgstr "La contrasenya ha de tindre 4 caràcters com a mínim"
694+#: qml/Wizard/Pages/password-set.qml:73
695+msgid "Choose password"
696+msgstr ""
668697
669−#. Translators: This is the arrow for "Back" buttons
670−#: qml/Wizard/StackButton.qml:39
671−#, qt-format
672−msgid "〈 %1"
673−msgstr "〈 %1"
698+#: qml/Wizard/Pages/password-set.qml:103
699+msgid "Confirm password"
700+msgstr ""
674701
675−#. Translators: This is the arrow for "Forward" buttons
676−#: qml/Wizard/StackButton.qml:42
677−#, qt-format
678−msgid "%1 〉"
679−msgstr "%1 〉"
702+#: qml/Wizard/Pages/sim.qml:27
703+msgid "No SIM card installed"
704+msgstr ""
705+
706+#: qml/Wizard/Pages/sim.qml:54
707+msgid "SIM card added"
708+msgstr ""
709+
710+#: qml/Wizard/Pages/sim.qml:55
711+msgid "You must restart the device to access the mobile network."
712+msgstr ""
713+
714+#: qml/Wizard/Pages/sim.qml:59
715+msgid "Restart"
716+msgstr "Reinicia"
717+
718+#: qml/Wizard/Pages/sim.qml:78
719+msgid "You won’t be able to make calls or use text messaging without a SIM."
720+msgstr ""
721+
722+#: qml/Wizard/Pages/sim.qml:90
723+msgid "To proceed with no SIM tap Skip."
724+msgstr ""
725+
726+#: qml/Wizard/PasswordMeter.qml:87
727+msgid "Passwords match"
728+msgstr ""
729+
730+#: qml/Wizard/PasswordMeter.qml:89
731+msgid "Passwords do not match"
732+msgstr ""
733+
734+#: qml/Wizard/PasswordMeter.qml:93
735+msgid "Strong password"
736+msgstr ""
737+
738+#: qml/Wizard/PasswordMeter.qml:95
739+msgid "Fair password"
740+msgstr ""
741+
742+#: qml/Wizard/PasswordMeter.qml:97
743+msgid "Weak password"
744+msgstr ""
745+
746+#: qml/Wizard/PasswordMeter.qml:99
747+msgid "Very weak password"
748+msgstr ""
680749
681750#~ msgid "Log out"
682751#~ msgstr "Ix"
@@ -684,6 +753,9 @@ msgstr "%1 〉"
684753#~ msgid "Shut down"
685754#~ msgstr "Apaga"
686755
756+#~ msgid "Are you sure you want to shut down?"
757+#~ msgstr "Segur que voleu apagar?"
758+
687759#~ msgid "Reboot"
688760#~ msgstr "Reinicia"
689761
@@ -693,9 +765,6 @@ msgstr "%1 〉"
693765#~ msgid "Power off"
694766#~ msgstr "Apaga"
695767
696−#~ msgid "Restart"
697−#~ msgstr "Reinicia"
698−
699768#~ msgid "Skip intro"
700769#~ msgstr "Omet la introducció"
701770
@@ -774,15 +843,113 @@ msgstr "%1 〉"
774843#~ msgid "Please re-enter"
775844#~ msgstr "Torneu-ho a introduir"
776845
846+#~ msgid "Hi!"
847+#~ msgstr "Hola!"
848+
777849#~ msgid "Welcome to your Ubuntu phone."
778850#~ msgstr "Vos donem la benvinguda al vostre telèfon Ubuntu."
779851
852+#~ msgid "Let’s get started."
853+#~ msgstr "Comencem."
854+
855+#~ msgid "Continue"
856+#~ msgstr "Continua"
857+
858+#~ msgid "Add a SIM card and restart your device"
859+#~ msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
860+
861+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
862+#~ msgstr "Sense ella, no podreu fer cridades o enviar missatges de text."
863+
864+#~ msgid "Lock security"
865+#~ msgstr "Seguretat del bloqueig"
866+
780867#~ msgid "Please select how you’d like to unlock your phone."
781868#~ msgstr "Seleccioneu com voleu desblocar el telèfon."
782869
870+#~ msgid "Available networks…"
871+#~ msgstr "Xarxes disponibles..."
872+
873+#~ msgid "No available networks."
874+#~ msgstr "No hi ha xarxes disponibles"
875+
876+#~ msgid "Location"
877+#~ msgstr "Ubicació"
878+
879+#~ msgid "Let the phone detect your location:"
880+#~ msgstr "Fes que el telèfon detecti la meua ubicació:"
881+
882+#~ msgid "Using GPS only (less accurate)"
883+#~ msgstr "Utilitza només el GPS (menys precís)"
884+
885+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
886+#~ msgstr ""
887+#~ "Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "
888+#~ "(recomanat)"
889+
890+#~ msgid ""
891+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
892+#~ "conditions</a>."
893+#~ msgstr ""
894+#~ "Si seleccioneu esta opció, accepteu <a href='#'>les condicions generals del "
895+#~ "servei Nokia HERE</a>."
896+
897+#~ msgid "Not at all"
898+#~ msgstr "No"
899+
900+#~ msgid "You can change your mind later in <b>System Settings</b>."
901+#~ msgstr ""
902+#~ "Podeu canviar-ho més avant a l'aplicació <b>Paràmetres del sistema</b>"
903+
904+#~ msgid "Improving your experience"
905+#~ msgstr "Millora de l'experiència"
906+
907+#~ msgid ""
908+#~ "Your phone is set up to automatically report errors to Canonical and its "
909+#~ "partners, the makers of the operating system."
910+#~ msgstr ""
911+#~ "Este telèfon està configurat per enviar errors de manera automàtica a "
912+#~ "Canonical i associats, els creadors del sistema operatiu."
913+
914+#~ msgid ""
915+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
916+#~ "Privacy</b>"
917+#~ msgstr ""
918+#~ "Podeu inhabilitar-ho a <b>Configuració del sistema</b>, a la secció "
919+#~ "<b>Seguretat i privadesa</b>"
920+
921+#~ msgid "All done"
922+#~ msgstr "Tot fet"
923+
924+#~ msgid "Nice work!"
925+#~ msgstr "Bona faena!"
926+
783927#~ msgid "Your phone is now ready to use."
784928#~ msgstr "Ja podeu utilitzar el vostre telèfon."
785929
930+#~ msgid "Finish"
931+#~ msgstr "Finalitza"
932+
933+#~ msgid "Confirm passphrase"
934+#~ msgstr "Confirmeu la contrasenya"
935+
936+#~ msgid "Please try again."
937+#~ msgstr "Torneu-ho a intentar."
938+
939+#~ msgid "Choose your passcode"
940+#~ msgstr "Trieu el codi d'accés"
941+
942+#~ msgid "Passphrase must be 4 characters long"
943+#~ msgstr "La contrasenya ha de tindre 4 caràcters com a mínim"
944+
945+#, qt-format
946+#~ msgid "〈 %1"
947+#~ msgstr "〈 %1"
948+
949+#, qt-format
950+#~ msgid "%1 〉"
951+#~ msgstr "%1 〉"
952+
786953#~ msgid "Type or say a command"
787954#~ msgstr "Escriviu o pronuncieu una ordre"
788955
po/ce.po+258−180
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1111"PO-Revision-Date: 2015-02-15 04:01+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Chechen <ce@li.org>\n"
@@ -15,8 +15,8 @@ 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: 2016-03-13 05:50+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19+"X-Generator: Launchpad (build 17958)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -73,64 +73,46 @@ msgctxt "Button: Log out from the system"
7373msgid "Log Out"
7474msgstr ""
7575
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
77−#: qml/Components/Dialogs.qml:253
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
7879msgid "Cancel"
7980msgstr ""
8081
8182#: qml/Components/Dialogs.qml:173
82−msgctxt "Title: Reboot/Shut down dialog"
83−msgid "Shut down"
84−msgstr ""
85−
86−#: qml/Components/Dialogs.qml:174
87−msgid "Are you sure you want to shut down?"
88−msgstr ""
89−
90−#: qml/Components/Dialogs.qml:176
91−msgctxt "Button: Reboot the system"
92−msgid "Reboot"
93−msgstr ""
94−
95−#: qml/Components/Dialogs.qml:185
96−msgctxt "Button: Shut down the system"
97−msgid "Shut down"
98−msgstr ""
99−
100−#: qml/Components/Dialogs.qml:207
10183msgctxt "Title: Reboot dialog"
10284msgid "Reboot"
10385msgstr ""
10486
105−#: qml/Components/Dialogs.qml:208
87+#: qml/Components/Dialogs.qml:174
10688msgid "Are you sure you want to reboot?"
10789msgstr ""
10890
109−#: qml/Components/Dialogs.qml:210
91+#: qml/Components/Dialogs.qml:176
11092msgid "No"
11193msgstr ""
11294
113−#: qml/Components/Dialogs.qml:217
95+#: qml/Components/Dialogs.qml:183
11496msgid "Yes"
11597msgstr ""
11698
117−#: qml/Components/Dialogs.qml:232
99+#: qml/Components/Dialogs.qml:198
118100msgctxt "Title: Power off/Restart dialog"
119101msgid "Power"
120102msgstr ""
121103
122−#: qml/Components/Dialogs.qml:233
104+#: qml/Components/Dialogs.qml:199
123105msgid ""
124106"Are you sure you would like\n"
125107"to power off?"
126108msgstr ""
127109
128−#: qml/Components/Dialogs.qml:235
110+#: qml/Components/Dialogs.qml:201
129111msgctxt "Button: Power off the system"
130112msgid "Power off"
131113msgstr ""
132114
133−#: qml/Components/Dialogs.qml:244
115+#: qml/Components/Dialogs.qml:210
134116msgctxt "Button: Restart the system"
135117msgid "Restart"
136118msgstr ""
@@ -173,42 +155,58 @@ msgstr ""
173155msgid "Close all"
174156msgstr ""
175157
176−#: qml/Dash/DashPageHeader.qml:270
158+#: qml/Dash/DashPageHeader.qml:337
177159msgctxt "Button: Open the Ubuntu Store"
178160msgid "Store"
179161msgstr ""
180162
181−#: qml/Dash/DashPageHeader.qml:277
163+#: qml/Dash/DashPageHeader.qml:344
182164msgctxt "Button: Start a search in the current dash scope"
183165msgid "Search"
184166msgstr ""
185167
186−#: qml/Dash/DashPageHeader.qml:287
168+#: qml/Dash/DashPageHeader.qml:354
187169msgctxt "Button: Show the current dash scope settings"
188170msgid "Settings"
189171msgstr ""
190172
191−#: qml/Dash/DashPageHeader.qml:294
173+#: qml/Dash/DashPageHeader.qml:361
192174msgid "Remove from Favorites"
193175msgstr ""
194176
195−#: qml/Dash/DashPageHeader.qml:294
177+#: qml/Dash/DashPageHeader.qml:361
196178msgid "Add to Favorites"
197179msgstr ""
198180
199−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
181+#: qml/Dash/FiltersPopover.qml:60
182+msgid "Refine your results"
183+msgstr ""
184+
185+#: qml/Dash/FiltersPopover.qml:69
186+msgid "Reset"
187+msgstr ""
188+
189+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
200190msgid "See less"
201191msgstr ""
202192
203−#: qml/Dash/GenericScopeView.qml:567
193+#: qml/Dash/GenericScopeView.qml:570
204194msgid "See all"
205195msgstr ""
206196
207−#: qml/Dash/GenericScopeView.qml:629
197+#: qml/Dash/GenericScopeView.qml:627
208198msgctxt "Label: Hint for dash search line edit"
209199msgid "Search"
210200msgstr ""
211201
202+#: qml/Dash/PageHeaderExtraPanel.qml:55
203+msgid "Recent Searches"
204+msgstr ""
205+
206+#: qml/Dash/PageHeaderExtraPanel.qml:66
207+msgid "Clear All"
208+msgstr ""
209+
212210#: qml/Dash/Previews/PreviewActionCombo.qml:35
213211msgid "More..."
214212msgstr ""
@@ -276,11 +274,11 @@ msgstr ""
276274msgid "Tap to unlock"
277275msgstr ""
278276
279−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
277+#: qml/Greeter/NarrowView.qml:54
280278msgid "Sorry, incorrect passphrase."
281279msgstr ""
282280
283−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
281+#: qml/Greeter/NarrowView.qml:55
284282msgid "Sorry, incorrect passcode."
285283msgstr ""
286284
@@ -305,7 +303,7 @@ msgstr ""
305303msgid "Enter %1"
306304msgstr ""
307305
308−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
306+#: qml/Greeter/NarrowView.qml:117
309307msgid "Enter passphrase"
310308msgstr ""
311309
@@ -343,62 +341,62 @@ msgstr ""
343341msgid "Conference"
344342msgstr ""
345343
346−#: qml/Panel/Indicators/MenuItemFactory.qml:752
344+#: qml/Panel/Indicators/MenuItemFactory.qml:761
347345msgid "Nothing is playing"
348346msgstr ""
349347
350−#: qml/Panel/Indicators/MenuItemFactory.qml:881
348+#: qml/Panel/Indicators/MenuItemFactory.qml:890
351349#, qt-format
352350msgid "%1 hour"
353351msgid_plural "%1 hours"
354352msgstr[0] ""
355353msgstr[1] ""
356354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:885
355+#: qml/Panel/Indicators/MenuItemFactory.qml:894
358356#, qt-format
359357msgid "%1 minute"
360358msgid_plural "%1 minutes"
361359msgstr[0] ""
362360msgstr[1] ""
363361
364−#: qml/Panel/Indicators/MenuItemFactory.qml:890
362+#: qml/Panel/Indicators/MenuItemFactory.qml:899
365363#, qt-format
366364msgid "%1 second"
367365msgid_plural "%1 seconds"
368366msgstr[0] ""
369367msgstr[1] ""
370368
371−#: qml/Panel/Indicators/MenuItemFactory.qml:893
369+#: qml/Panel/Indicators/MenuItemFactory.qml:902
372370msgid "0 seconds"
373371msgstr ""
374372
375373#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
376−#: qml/Panel/Indicators/MenuItemFactory.qml:895
374+#: qml/Panel/Indicators/MenuItemFactory.qml:904
377375#, qt-format
378376msgid "%1 remaining"
379377msgstr ""
380378
381−#: qml/Panel/Indicators/MenuItemFactory.qml:901
379+#: qml/Panel/Indicators/MenuItemFactory.qml:910
382380msgid "In queue…"
383381msgstr ""
384382
385−#: qml/Panel/Indicators/MenuItemFactory.qml:905
383+#: qml/Panel/Indicators/MenuItemFactory.qml:914
386384msgid "Downloading"
387385msgstr ""
388386
389−#: qml/Panel/Indicators/MenuItemFactory.qml:907
387+#: qml/Panel/Indicators/MenuItemFactory.qml:916
390388msgid "Paused, tap to resume"
391389msgstr ""
392390
393−#: qml/Panel/Indicators/MenuItemFactory.qml:909
391+#: qml/Panel/Indicators/MenuItemFactory.qml:918
394392msgid "Canceled"
395393msgstr ""
396394
397−#: qml/Panel/Indicators/MenuItemFactory.qml:911
395+#: qml/Panel/Indicators/MenuItemFactory.qml:920
398396msgid "Finished"
399397msgstr ""
400398
401−#: qml/Panel/Indicators/MenuItemFactory.qml:913
399+#: qml/Panel/Indicators/MenuItemFactory.qml:922
402400msgid "Failed, tap to retry"
403401msgstr ""
404402
@@ -418,241 +416,321 @@ msgctxt "Button: Call back on phone"
418416msgid "Call back"
419417msgstr ""
420418
421−#: qml/Tutorial/TutorialBottom.qml:28
422−msgid "Open special menus"
419+#: qml/Stages/SideStage.qml:76
420+msgid "Drag using 3 fingers any application from one window to the other"
423421msgstr ""
424422
425−#: qml/Tutorial/TutorialBottom.qml:29
426−msgid "Swipe up from the bottom edge."
423+#: qml/Tutorial/TutorialBottom.qml:78
424+msgid "Swipe up to add a contact"
427425msgstr ""
428426
429−#: qml/Tutorial/TutorialBottomFinish.qml:24
430−msgid "This action does different things for different apps"
427+#: qml/Tutorial/TutorialBottom.qml:80
428+msgid "Swipe up for favorite calculations"
431429msgstr ""
432430
433−#: qml/Tutorial/TutorialBottomFinish.qml:25
434−msgid "Tap here to finish."
431+#: qml/Tutorial/TutorialBottom.qml:82
432+msgid "Swipe up for recent calls"
435433msgstr ""
436434
437−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
438−#: qml/Tutorial/TutorialRight.qml:144
439−msgid "Tap here to continue."
435+#: qml/Tutorial/TutorialBottom.qml:84
436+msgid "Swipe up to create a message"
440437msgstr ""
441438
442−#: qml/Tutorial/TutorialLeft.qml:26
443−msgid "Open the launcher"
439+#: qml/Tutorial/TutorialBottom.qml:85
440+msgid "Swipe up to manage the app"
444441msgstr ""
445442
446−#: qml/Tutorial/TutorialLeft.qml:27
447−msgid "Short swipe from the left edge."
443+#: qml/Tutorial/TutorialLeft.qml:47
444+msgid "Swipe from the left edge to open the launcher"
448445msgstr ""
449446
450−#: qml/Tutorial/TutorialLeftFinish.qml:24
451−msgid "These are the shortcuts to favorite apps"
447+#: qml/Tutorial/TutorialLeftLong.qml:47
448+msgid "Long swipe from the left edge to open the Today scope"
452449msgstr ""
453450
454−#: qml/Tutorial/TutorialPage.qml:178
455−msgid "You almost got it!"
451+#: qml/Tutorial/TutorialRight.qml:54
452+msgid "Hover your mouse on the right edge to view your open apps"
456453msgstr ""
457454
458−#: qml/Tutorial/TutorialPage.qml:195
459−msgid "Try again."
455+#: qml/Tutorial/TutorialRight.qml:55
456+msgid "Short or long swipe from the right edge to view your open apps"
460457msgstr ""
461458
462−#: qml/Tutorial/TutorialRight.qml:31
463−msgid "To view open apps"
459+#: qml/Tutorial/TutorialTop.qml:53
460+msgid "Swipe from the top right edge to open the notification bar"
464461msgstr ""
465462
466−#: qml/Tutorial/TutorialRight.qml:32
467−msgid "Long swipe from the right edge."
463+#: qml/Tutorial/TutorialTop.qml:54
464+msgid "Swipe from the top edge to open the notification bar"
468465msgstr ""
469466
470−#: qml/Tutorial/TutorialRight.qml:122
471−msgid "View all your running tasks."
472−msgstr ""
473−
474−#: qml/Wizard/Page.qml:89
467+#: qml/Wizard/Page.qml:54
475468msgctxt "Button: Go back one page in the Wizard"
476469msgid "Back"
477470msgstr ""
478471
479472#: qml/Wizard/Pages/10-welcome.qml:27
480−msgid "Hi!"
473+msgid "Language"
481474msgstr ""
482475
483−#: qml/Wizard/Pages/10-welcome.qml:44
484−msgid "Welcome to your Ubuntu device."
476+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
477+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
478+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
479+#: qml/Wizard/Pages/75-report-check.qml:84
480+#: qml/Wizard/Pages/passcode-desktop.qml:124
481+#: qml/Wizard/Pages/password-set.qml:141
482+msgid "Next"
485483msgstr ""
486484
487−#: qml/Wizard/Pages/10-welcome.qml:52
488−msgid "Let’s get started."
485+#: qml/Wizard/Pages/30-wifi.qml:29
486+msgid "Connect to Wi‑Fi"
489487msgstr ""
490488
491−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
492−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
493−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
494−#: qml/Wizard/Pages/passwd-set.qml:90
495−msgid "Continue"
489+#: qml/Wizard/Pages/30-wifi.qml:130
490+msgid "Connected"
496491msgstr ""
497492
498−#: qml/Wizard/Pages/20-sim.qml:25
499−msgid "Add a SIM card and restart your device"
493+#: qml/Wizard/Pages/30-wifi.qml:163
494+msgid "Available Wi-Fi networks"
500495msgstr ""
501496
502−#: qml/Wizard/Pages/20-sim.qml:59
503−msgid "Without it, you won’t be able to make calls or use text messaging."
497+#: qml/Wizard/Pages/30-wifi.qml:164
498+msgid "No available Wi-Fi networks"
504499msgstr ""
505500
506−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
501+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
502+#: qml/Wizard/Pages/sim.qml:101
507503msgid "Skip"
508504msgstr ""
509505
510−#: qml/Wizard/Pages/30-passwd-type.qml:39
511−msgid "Lock security"
506+#: qml/Wizard/Pages/40-location.qml:27
507+msgid "Location Services"
512508msgstr ""
513509
514−#: qml/Wizard/Pages/30-passwd-type.qml:79
515−msgid "Please select how you’d like to unlock your device."
510+#: qml/Wizard/Pages/40-location.qml:83
511+msgid ""
512+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
513+"(recommended)"
516514msgstr ""
517515
518−#: qml/Wizard/Pages/30-passwd-type.qml:102
519−msgctxt "Label: Type of security method"
520−msgid "Swipe"
516+#: qml/Wizard/Pages/40-location.qml:105
517+#, qt-format
518+msgid "By selecting this option you agree to the Nokia HERE %1."
519+msgstr ""
520+
521+#: qml/Wizard/Pages/40-location.qml:106
522+msgctxt "part of: Nokia HERE terms and conditions"
523+msgid "terms and conditions"
524+msgstr ""
525+
526+#: qml/Wizard/Pages/40-location.qml:160
527+msgid "GPS only"
528+msgstr ""
529+
530+#: qml/Wizard/Pages/40-location.qml:214
531+msgid "Don't use my location"
532+msgstr ""
533+
534+#: qml/Wizard/Pages/40-location.qml:260
535+msgid "You can change it later in System Settings."
536+msgstr ""
537+
538+#: qml/Wizard/Pages/50-timezone.qml:29
539+msgid "Time Zone"
540+msgstr ""
541+
542+#: qml/Wizard/Pages/50-timezone.qml:178
543+msgid "Enter your city"
521544msgstr ""
522545
523−#: qml/Wizard/Pages/30-passwd-type.qml:103
524−msgctxt "Label: Description of security method"
525−msgid "No security"
546+#: qml/Wizard/Pages/60-account.qml:24
547+msgid "Personalize Your Device"
526548msgstr ""
527549
528−#: qml/Wizard/Pages/30-passwd-type.qml:105
550+#: qml/Wizard/Pages/60-account.qml:48
551+msgid "Preferred Name"
552+msgstr ""
553+
554+#: qml/Wizard/Pages/70-passwd-type.qml:39
555+msgid "Lock Screen"
556+msgstr ""
557+
558+#: qml/Wizard/Pages/70-passwd-type.qml:101
529559msgctxt "Label: Type of security method"
530−msgid "Passcode"
560+msgid "Create new password"
531561msgstr ""
532562
533−#: qml/Wizard/Pages/30-passwd-type.qml:106
534−msgctxt "Label: Description of security method"
535−msgid "4 digits only"
563+#: qml/Wizard/Pages/70-passwd-type.qml:103
564+msgctxt "Label: Type of security method"
565+msgid "Create passcode (numbers only)"
536566msgstr ""
537567
538−#: qml/Wizard/Pages/30-passwd-type.qml:108
568+#: qml/Wizard/Pages/70-passwd-type.qml:105
539569msgctxt "Label: Type of security method"
540−msgid "Passphrase"
570+msgid "No lock code"
541571msgstr ""
542572
543−#: qml/Wizard/Pages/30-passwd-type.qml:109
544−msgctxt "Label: Description of security method"
545−msgid "Numbers and letters"
573+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
574+msgid "Privacy Policy"
546575msgstr ""
547576
548−#: qml/Wizard/Pages/40-wifi.qml:29
549−msgid "Connect to Wi‑Fi"
577+#: qml/Wizard/Pages/75-report-check.qml:26
578+msgid "Help Us Improve"
550579msgstr ""
551580
552−#: qml/Wizard/Pages/40-wifi.qml:168
553−msgid "Available networks…"
581+#: qml/Wizard/Pages/75-report-check.qml:59
582+msgid "Improve system performance by sending us crashes and error reports."
554583msgstr ""
555584
556−#: qml/Wizard/Pages/40-wifi.qml:169
557−msgid "No available networks."
585+#: qml/Wizard/Pages/75-report-check.qml:60
586+msgid "Privacy policy"
558587msgstr ""
559588
560−#: qml/Wizard/Pages/50-location.qml:27
561−msgid "Location"
589+#: qml/Wizard/Pages/80-finished.qml:89
590+msgid "Welcome to Ubuntu"
562591msgstr ""
563592
564−#: qml/Wizard/Pages/50-location.qml:62
565−msgid "Let the phone detect your location:"
593+#: qml/Wizard/Pages/80-finished.qml:104
594+msgid "You are ready to use your device now"
595+msgstr ""
596+
597+#: qml/Wizard/Pages/80-finished.qml:124
598+msgid "Get Started"
599+msgstr ""
600+
601+#: qml/Wizard/Pages/here-terms.qml:25
602+msgid "Terms & Conditions"
566603msgstr ""
567604
568−#: qml/Wizard/Pages/50-location.qml:69
569−msgid "Using GPS only (less accurate)"
605+#: qml/Wizard/Pages/here-terms.qml:69
606+msgid "Your device uses positioning technologies provided by HERE."
570607msgstr ""
571608
572−#: qml/Wizard/Pages/50-location.qml:86
573−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
609+#: qml/Wizard/Pages/here-terms.qml:81
610+msgid ""
611+"To provide you with positioning services and to improve their quality, HERE "
612+"collects information about nearby cell towers and Wi-Fi hotspots around your "
613+"current location whenever your position is being found."
574614msgstr ""
575615
576−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
577−#: qml/Wizard/Pages/50-location.qml:103
616+#: qml/Wizard/Pages/here-terms.qml:93
578617msgid ""
579−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
580−"conditions</a>."
618+"The information collected is used to analyze the service and to improve the "
619+"use of service, but not to identify you personally."
581620msgstr ""
582621
583−#: qml/Wizard/Pages/50-location.qml:112
584−msgid "Not at all"
622+#: qml/Wizard/Pages/here-terms.qml:106
623+#, qt-format
624+msgid "By continuing, you agree to the HERE platform %1 and %2."
585625msgstr ""
586626
587−#: qml/Wizard/Pages/50-location.qml:124
588−msgid "You can change your mind later in <b>System Settings</b>."
627+#: qml/Wizard/Pages/here-terms.qml:107
628+msgid "Service Terms"
589629msgstr ""
590630
591−#: qml/Wizard/Pages/60-reporting.qml:26
592−msgid "Improving your experience"
631+#: qml/Wizard/Pages/passcode-confirm.qml:43
632+#: qml/Wizard/Pages/passcode-desktop.qml:80
633+msgid "Confirm passcode"
593634msgstr ""
594635
595−#: qml/Wizard/Pages/60-reporting.qml:46
596−msgid ""
597−"Your phone is set up to automatically report errors to Canonical and its "
598−"partners, the makers of the operating system."
636+#: qml/Wizard/Pages/passcode-confirm.qml:45
637+msgid "Incorrect passcode."
599638msgstr ""
600639
601−#: qml/Wizard/Pages/60-reporting.qml:53
602−msgid ""
603−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
604−"Privacy</b>"
640+#: qml/Wizard/Pages/passcode-confirm.qml:45
641+msgctxt "Enter the passcode again"
642+msgid "Please re-enter."
605643msgstr ""
606644
607−#: qml/Wizard/Pages/80-finished.qml:24
608−msgid "All done"
645+#: qml/Wizard/Pages/passcode-desktop.qml:30
646+msgid "Lock Screen Passcode"
609647msgstr ""
610648
611−#: qml/Wizard/Pages/80-finished.qml:39
612−msgid "Nice work!"
649+#: qml/Wizard/Pages/passcode-desktop.qml:56
650+msgid "Enter 4 numbers to setup your passcode"
613651msgstr ""
614652
615−#: qml/Wizard/Pages/80-finished.qml:46
616−msgid "Your device is now ready to use."
653+#: qml/Wizard/Pages/passcode-desktop.qml:65
654+#: qml/Wizard/Pages/passcode-set.qml:54
655+msgid "Choose passcode"
617656msgstr ""
618657
619−#: qml/Wizard/Pages/80-finished.qml:53
620−msgid "Finish"
658+#: qml/Wizard/Pages/passcode-desktop.qml:105
659+msgid "Passcode too short"
621660msgstr ""
622661
623−#: qml/Wizard/Pages/here-terms.qml:27
624−msgid "Terms & Conditions"
662+#: qml/Wizard/Pages/passcode-desktop.qml:107
663+msgid "Passcodes match"
625664msgstr ""
626665
627−#: qml/Wizard/Pages/passwd-confirm.qml:49
628−msgid "Confirm passphrase"
666+#: qml/Wizard/Pages/passcode-desktop.qml:109
667+msgid "Passcodes do not match"
629668msgstr ""
630669
631−#: qml/Wizard/Pages/passwd-confirm.qml:50
632−msgid "Confirm passcode"
670+#: qml/Wizard/Pages/passcode-set.qml:62
671+msgid "Passcode must be 4 characters long"
633672msgstr ""
634673
635−#: qml/Wizard/Pages/passwd-confirm.qml:53
636−#: qml/Wizard/Pages/passwd-confirm.qml:54
637−msgid "Please try again."
674+#: qml/Wizard/Pages/password-set.qml:30
675+msgid "Lock Screen Password"
638676msgstr ""
639677
640−#: qml/Wizard/Pages/passwd-set.qml:61
641−msgid "Choose your passcode"
678+#: qml/Wizard/Pages/password-set.qml:61
679+msgid "Enter at least 8 characters"
642680msgstr ""
643681
644−#: qml/Wizard/Pages/passwd-set.qml:68
645−msgid "Passphrase must be 4 characters long"
682+#: qml/Wizard/Pages/password-set.qml:73
683+msgid "Choose password"
646684msgstr ""
647685
648−#. Translators: This is the arrow for "Back" buttons
649−#: qml/Wizard/StackButton.qml:39
650−#, qt-format
651−msgid "〈 %1"
686+#: qml/Wizard/Pages/password-set.qml:103
687+msgid "Confirm password"
652688msgstr ""
653689
654−#. Translators: This is the arrow for "Forward" buttons
655−#: qml/Wizard/StackButton.qml:42
656−#, qt-format
657−msgid "%1 〉"
690+#: qml/Wizard/Pages/sim.qml:27
691+msgid "No SIM card installed"
692+msgstr ""
693+
694+#: qml/Wizard/Pages/sim.qml:54
695+msgid "SIM card added"
696+msgstr ""
697+
698+#: qml/Wizard/Pages/sim.qml:55
699+msgid "You must restart the device to access the mobile network."
700+msgstr ""
701+
702+#: qml/Wizard/Pages/sim.qml:59
703+msgid "Restart"
704+msgstr ""
705+
706+#: qml/Wizard/Pages/sim.qml:78
707+msgid "You won’t be able to make calls or use text messaging without a SIM."
708+msgstr ""
709+
710+#: qml/Wizard/Pages/sim.qml:90
711+msgid "To proceed with no SIM tap Skip."
712+msgstr ""
713+
714+#: qml/Wizard/PasswordMeter.qml:87
715+msgid "Passwords match"
716+msgstr ""
717+
718+#: qml/Wizard/PasswordMeter.qml:89
719+msgid "Passwords do not match"
720+msgstr ""
721+
722+#: qml/Wizard/PasswordMeter.qml:93
723+msgid "Strong password"
724+msgstr ""
725+
726+#: qml/Wizard/PasswordMeter.qml:95
727+msgid "Fair password"
728+msgstr ""
729+
730+#: qml/Wizard/PasswordMeter.qml:97
731+msgid "Weak password"
732+msgstr ""
733+
734+#: qml/Wizard/PasswordMeter.qml:99
735+msgid "Very weak password"
658736msgstr ""
po/ckb.po+258−180
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\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,8 +15,8 @@ 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: 2016-03-13 05:51+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:08+0000\n"
19+"X-Generator: Launchpad (build 17958)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -73,64 +73,46 @@ msgctxt "Button: Log out from the system"
7373msgid "Log Out"
7474msgstr ""
7575
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
77−#: qml/Components/Dialogs.qml:253
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
7879msgid "Cancel"
7980msgstr ""
8081
8182#: qml/Components/Dialogs.qml:173
82−msgctxt "Title: Reboot/Shut down dialog"
83−msgid "Shut down"
84−msgstr ""
85−
86−#: qml/Components/Dialogs.qml:174
87−msgid "Are you sure you want to shut down?"
88−msgstr ""
89−
90−#: qml/Components/Dialogs.qml:176
91−msgctxt "Button: Reboot the system"
92−msgid "Reboot"
93−msgstr ""
94−
95−#: qml/Components/Dialogs.qml:185
96−msgctxt "Button: Shut down the system"
97−msgid "Shut down"
98−msgstr ""
99−
100−#: qml/Components/Dialogs.qml:207
10183msgctxt "Title: Reboot dialog"
10284msgid "Reboot"
10385msgstr ""
10486
105−#: qml/Components/Dialogs.qml:208
87+#: qml/Components/Dialogs.qml:174
10688msgid "Are you sure you want to reboot?"
10789msgstr ""
10890
109−#: qml/Components/Dialogs.qml:210
91+#: qml/Components/Dialogs.qml:176
11092msgid "No"
11193msgstr ""
11294
113−#: qml/Components/Dialogs.qml:217
95+#: qml/Components/Dialogs.qml:183
11496msgid "Yes"
11597msgstr ""
11698
117−#: qml/Components/Dialogs.qml:232
99+#: qml/Components/Dialogs.qml:198
118100msgctxt "Title: Power off/Restart dialog"
119101msgid "Power"
120102msgstr ""
121103
122−#: qml/Components/Dialogs.qml:233
104+#: qml/Components/Dialogs.qml:199
123105msgid ""
124106"Are you sure you would like\n"
125107"to power off?"
126108msgstr ""
127109
128−#: qml/Components/Dialogs.qml:235
110+#: qml/Components/Dialogs.qml:201
129111msgctxt "Button: Power off the system"
130112msgid "Power off"
131113msgstr ""
132114
133−#: qml/Components/Dialogs.qml:244
115+#: qml/Components/Dialogs.qml:210
134116msgctxt "Button: Restart the system"
135117msgid "Restart"
136118msgstr ""
@@ -173,42 +155,58 @@ msgstr ""
173155msgid "Close all"
174156msgstr ""
175157
176−#: qml/Dash/DashPageHeader.qml:270
158+#: qml/Dash/DashPageHeader.qml:337
177159msgctxt "Button: Open the Ubuntu Store"
178160msgid "Store"
179161msgstr ""
180162
181−#: qml/Dash/DashPageHeader.qml:277
163+#: qml/Dash/DashPageHeader.qml:344
182164msgctxt "Button: Start a search in the current dash scope"
183165msgid "Search"
184166msgstr ""
185167
186−#: qml/Dash/DashPageHeader.qml:287
168+#: qml/Dash/DashPageHeader.qml:354
187169msgctxt "Button: Show the current dash scope settings"
188170msgid "Settings"
189171msgstr ""
190172
191−#: qml/Dash/DashPageHeader.qml:294
173+#: qml/Dash/DashPageHeader.qml:361
192174msgid "Remove from Favorites"
193175msgstr ""
194176
195−#: qml/Dash/DashPageHeader.qml:294
177+#: qml/Dash/DashPageHeader.qml:361
196178msgid "Add to Favorites"
197179msgstr ""
198180
199−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
181+#: qml/Dash/FiltersPopover.qml:60
182+msgid "Refine your results"
183+msgstr ""
184+
185+#: qml/Dash/FiltersPopover.qml:69
186+msgid "Reset"
187+msgstr ""
188+
189+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
200190msgid "See less"
201191msgstr ""
202192
203−#: qml/Dash/GenericScopeView.qml:567
193+#: qml/Dash/GenericScopeView.qml:570
204194msgid "See all"
205195msgstr ""
206196
207−#: qml/Dash/GenericScopeView.qml:629
197+#: qml/Dash/GenericScopeView.qml:627
208198msgctxt "Label: Hint for dash search line edit"
209199msgid "Search"
210200msgstr ""
211201
202+#: qml/Dash/PageHeaderExtraPanel.qml:55
203+msgid "Recent Searches"
204+msgstr ""
205+
206+#: qml/Dash/PageHeaderExtraPanel.qml:66
207+msgid "Clear All"
208+msgstr ""
209+
212210#: qml/Dash/Previews/PreviewActionCombo.qml:35
213211msgid "More..."
214212msgstr ""
@@ -276,11 +274,11 @@ msgstr ""
276274msgid "Tap to unlock"
277275msgstr ""
278276
279−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
277+#: qml/Greeter/NarrowView.qml:54
280278msgid "Sorry, incorrect passphrase."
281279msgstr ""
282280
283−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
281+#: qml/Greeter/NarrowView.qml:55
284282msgid "Sorry, incorrect passcode."
285283msgstr ""
286284
@@ -305,7 +303,7 @@ msgstr ""
305303msgid "Enter %1"
306304msgstr ""
307305
308−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
306+#: qml/Greeter/NarrowView.qml:117
309307msgid "Enter passphrase"
310308msgstr ""
311309
@@ -343,62 +341,62 @@ msgstr ""
343341msgid "Conference"
344342msgstr ""
345343
346−#: qml/Panel/Indicators/MenuItemFactory.qml:752
344+#: qml/Panel/Indicators/MenuItemFactory.qml:761
347345msgid "Nothing is playing"
348346msgstr ""
349347
350−#: qml/Panel/Indicators/MenuItemFactory.qml:881
348+#: qml/Panel/Indicators/MenuItemFactory.qml:890
351349#, qt-format
352350msgid "%1 hour"
353351msgid_plural "%1 hours"
354352msgstr[0] ""
355353msgstr[1] ""
356354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:885
355+#: qml/Panel/Indicators/MenuItemFactory.qml:894
358356#, qt-format
359357msgid "%1 minute"
360358msgid_plural "%1 minutes"
361359msgstr[0] ""
362360msgstr[1] ""
363361
364−#: qml/Panel/Indicators/MenuItemFactory.qml:890
362+#: qml/Panel/Indicators/MenuItemFactory.qml:899
365363#, qt-format
366364msgid "%1 second"
367365msgid_plural "%1 seconds"
368366msgstr[0] ""
369367msgstr[1] ""
370368
371−#: qml/Panel/Indicators/MenuItemFactory.qml:893
369+#: qml/Panel/Indicators/MenuItemFactory.qml:902
372370msgid "0 seconds"
373371msgstr ""
374372
375373#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
376−#: qml/Panel/Indicators/MenuItemFactory.qml:895
374+#: qml/Panel/Indicators/MenuItemFactory.qml:904
377375#, qt-format
378376msgid "%1 remaining"
379377msgstr ""
380378
381−#: qml/Panel/Indicators/MenuItemFactory.qml:901
379+#: qml/Panel/Indicators/MenuItemFactory.qml:910
382380msgid "In queue…"
383381msgstr ""
384382
385−#: qml/Panel/Indicators/MenuItemFactory.qml:905
383+#: qml/Panel/Indicators/MenuItemFactory.qml:914
386384msgid "Downloading"
387385msgstr ""
388386
389−#: qml/Panel/Indicators/MenuItemFactory.qml:907
387+#: qml/Panel/Indicators/MenuItemFactory.qml:916
390388msgid "Paused, tap to resume"
391389msgstr ""
392390
393−#: qml/Panel/Indicators/MenuItemFactory.qml:909
391+#: qml/Panel/Indicators/MenuItemFactory.qml:918
394392msgid "Canceled"
395393msgstr ""
396394
397−#: qml/Panel/Indicators/MenuItemFactory.qml:911
395+#: qml/Panel/Indicators/MenuItemFactory.qml:920
398396msgid "Finished"
399397msgstr ""
400398
401−#: qml/Panel/Indicators/MenuItemFactory.qml:913
399+#: qml/Panel/Indicators/MenuItemFactory.qml:922
402400msgid "Failed, tap to retry"
403401msgstr ""
404402
@@ -418,243 +416,323 @@ msgctxt "Button: Call back on phone"
418416msgid "Call back"
419417msgstr ""
420418
421−#: qml/Tutorial/TutorialBottom.qml:28
422−msgid "Open special menus"
419+#: qml/Stages/SideStage.qml:76
420+msgid "Drag using 3 fingers any application from one window to the other"
423421msgstr ""
424422
425−#: qml/Tutorial/TutorialBottom.qml:29
426−msgid "Swipe up from the bottom edge."
423+#: qml/Tutorial/TutorialBottom.qml:78
424+msgid "Swipe up to add a contact"
427425msgstr ""
428426
429−#: qml/Tutorial/TutorialBottomFinish.qml:24
430−msgid "This action does different things for different apps"
427+#: qml/Tutorial/TutorialBottom.qml:80
428+msgid "Swipe up for favorite calculations"
431429msgstr ""
432430
433−#: qml/Tutorial/TutorialBottomFinish.qml:25
434−msgid "Tap here to finish."
431+#: qml/Tutorial/TutorialBottom.qml:82
432+msgid "Swipe up for recent calls"
435433msgstr ""
436434
437−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
438−#: qml/Tutorial/TutorialRight.qml:144
439−msgid "Tap here to continue."
435+#: qml/Tutorial/TutorialBottom.qml:84
436+msgid "Swipe up to create a message"
440437msgstr ""
441438
442−#: qml/Tutorial/TutorialLeft.qml:26
443−msgid "Open the launcher"
439+#: qml/Tutorial/TutorialBottom.qml:85
440+msgid "Swipe up to manage the app"
444441msgstr ""
445442
446−#: qml/Tutorial/TutorialLeft.qml:27
447−msgid "Short swipe from the left edge."
443+#: qml/Tutorial/TutorialLeft.qml:47
444+msgid "Swipe from the left edge to open the launcher"
448445msgstr ""
449446
450−#: qml/Tutorial/TutorialLeftFinish.qml:24
451−msgid "These are the shortcuts to favorite apps"
447+#: qml/Tutorial/TutorialLeftLong.qml:47
448+msgid "Long swipe from the left edge to open the Today scope"
452449msgstr ""
453450
454−#: qml/Tutorial/TutorialPage.qml:178
455−msgid "You almost got it!"
451+#: qml/Tutorial/TutorialRight.qml:54
452+msgid "Hover your mouse on the right edge to view your open apps"
456453msgstr ""
457454
458−#: qml/Tutorial/TutorialPage.qml:195
459−msgid "Try again."
455+#: qml/Tutorial/TutorialRight.qml:55
456+msgid "Short or long swipe from the right edge to view your open apps"
460457msgstr ""
461458
462−#: qml/Tutorial/TutorialRight.qml:31
463−msgid "To view open apps"
459+#: qml/Tutorial/TutorialTop.qml:53
460+msgid "Swipe from the top right edge to open the notification bar"
464461msgstr ""
465462
466−#: qml/Tutorial/TutorialRight.qml:32
467−msgid "Long swipe from the right edge."
463+#: qml/Tutorial/TutorialTop.qml:54
464+msgid "Swipe from the top edge to open the notification bar"
468465msgstr ""
469466
470−#: qml/Tutorial/TutorialRight.qml:122
471−msgid "View all your running tasks."
472−msgstr ""
473−
474−#: qml/Wizard/Page.qml:89
467+#: qml/Wizard/Page.qml:54
475468msgctxt "Button: Go back one page in the Wizard"
476469msgid "Back"
477470msgstr ""
478471
479472#: qml/Wizard/Pages/10-welcome.qml:27
480−msgid "Hi!"
473+msgid "Language"
481474msgstr ""
482475
483−#: qml/Wizard/Pages/10-welcome.qml:44
484−msgid "Welcome to your Ubuntu device."
476+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
477+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
478+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
479+#: qml/Wizard/Pages/75-report-check.qml:84
480+#: qml/Wizard/Pages/passcode-desktop.qml:124
481+#: qml/Wizard/Pages/password-set.qml:141
482+msgid "Next"
485483msgstr ""
486484
487−#: qml/Wizard/Pages/10-welcome.qml:52
488−msgid "Let’s get started."
485+#: qml/Wizard/Pages/30-wifi.qml:29
486+msgid "Connect to Wi‑Fi"
489487msgstr ""
490488
491−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
492−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
493−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
494−#: qml/Wizard/Pages/passwd-set.qml:90
495−msgid "Continue"
489+#: qml/Wizard/Pages/30-wifi.qml:130
490+msgid "Connected"
496491msgstr ""
497492
498−#: qml/Wizard/Pages/20-sim.qml:25
499−msgid "Add a SIM card and restart your device"
493+#: qml/Wizard/Pages/30-wifi.qml:163
494+msgid "Available Wi-Fi networks"
500495msgstr ""
501496
502−#: qml/Wizard/Pages/20-sim.qml:59
503−msgid "Without it, you won’t be able to make calls or use text messaging."
497+#: qml/Wizard/Pages/30-wifi.qml:164
498+msgid "No available Wi-Fi networks"
504499msgstr ""
505500
506−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
501+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
502+#: qml/Wizard/Pages/sim.qml:101
507503msgid "Skip"
508504msgstr ""
509505
510−#: qml/Wizard/Pages/30-passwd-type.qml:39
511−msgid "Lock security"
506+#: qml/Wizard/Pages/40-location.qml:27
507+msgid "Location Services"
512508msgstr ""
513509
514−#: qml/Wizard/Pages/30-passwd-type.qml:79
515−msgid "Please select how you’d like to unlock your device."
510+#: qml/Wizard/Pages/40-location.qml:83
511+msgid ""
512+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
513+"(recommended)"
516514msgstr ""
517515
518−#: qml/Wizard/Pages/30-passwd-type.qml:102
519−msgctxt "Label: Type of security method"
520−msgid "Swipe"
516+#: qml/Wizard/Pages/40-location.qml:105
517+#, qt-format
518+msgid "By selecting this option you agree to the Nokia HERE %1."
519+msgstr ""
520+
521+#: qml/Wizard/Pages/40-location.qml:106
522+msgctxt "part of: Nokia HERE terms and conditions"
523+msgid "terms and conditions"
524+msgstr ""
525+
526+#: qml/Wizard/Pages/40-location.qml:160
527+msgid "GPS only"
528+msgstr ""
529+
530+#: qml/Wizard/Pages/40-location.qml:214
531+msgid "Don't use my location"
532+msgstr ""
533+
534+#: qml/Wizard/Pages/40-location.qml:260
535+msgid "You can change it later in System Settings."
536+msgstr ""
537+
538+#: qml/Wizard/Pages/50-timezone.qml:29
539+msgid "Time Zone"
540+msgstr ""
541+
542+#: qml/Wizard/Pages/50-timezone.qml:178
543+msgid "Enter your city"
521544msgstr ""
522545
523−#: qml/Wizard/Pages/30-passwd-type.qml:103
524−msgctxt "Label: Description of security method"
525−msgid "No security"
546+#: qml/Wizard/Pages/60-account.qml:24
547+msgid "Personalize Your Device"
526548msgstr ""
527549
528−#: qml/Wizard/Pages/30-passwd-type.qml:105
550+#: qml/Wizard/Pages/60-account.qml:48
551+msgid "Preferred Name"
552+msgstr ""
553+
554+#: qml/Wizard/Pages/70-passwd-type.qml:39
555+msgid "Lock Screen"
556+msgstr ""
557+
558+#: qml/Wizard/Pages/70-passwd-type.qml:101
529559msgctxt "Label: Type of security method"
530−msgid "Passcode"
560+msgid "Create new password"
531561msgstr ""
532562
533−#: qml/Wizard/Pages/30-passwd-type.qml:106
534−msgctxt "Label: Description of security method"
535−msgid "4 digits only"
563+#: qml/Wizard/Pages/70-passwd-type.qml:103
564+msgctxt "Label: Type of security method"
565+msgid "Create passcode (numbers only)"
536566msgstr ""
537567
538−#: qml/Wizard/Pages/30-passwd-type.qml:108
568+#: qml/Wizard/Pages/70-passwd-type.qml:105
539569msgctxt "Label: Type of security method"
540−msgid "Passphrase"
570+msgid "No lock code"
541571msgstr ""
542572
543−#: qml/Wizard/Pages/30-passwd-type.qml:109
544−msgctxt "Label: Description of security method"
545−msgid "Numbers and letters"
573+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
574+msgid "Privacy Policy"
546575msgstr ""
547576
548−#: qml/Wizard/Pages/40-wifi.qml:29
549−msgid "Connect to Wi‑Fi"
577+#: qml/Wizard/Pages/75-report-check.qml:26
578+msgid "Help Us Improve"
550579msgstr ""
551580
552−#: qml/Wizard/Pages/40-wifi.qml:168
553−msgid "Available networks…"
581+#: qml/Wizard/Pages/75-report-check.qml:59
582+msgid "Improve system performance by sending us crashes and error reports."
554583msgstr ""
555584
556−#: qml/Wizard/Pages/40-wifi.qml:169
557−msgid "No available networks."
585+#: qml/Wizard/Pages/75-report-check.qml:60
586+msgid "Privacy policy"
558587msgstr ""
559588
560−#: qml/Wizard/Pages/50-location.qml:27
561−msgid "Location"
589+#: qml/Wizard/Pages/80-finished.qml:89
590+msgid "Welcome to Ubuntu"
562591msgstr ""
563592
564−#: qml/Wizard/Pages/50-location.qml:62
565−msgid "Let the phone detect your location:"
593+#: qml/Wizard/Pages/80-finished.qml:104
594+msgid "You are ready to use your device now"
595+msgstr ""
596+
597+#: qml/Wizard/Pages/80-finished.qml:124
598+msgid "Get Started"
599+msgstr ""
600+
601+#: qml/Wizard/Pages/here-terms.qml:25
602+msgid "Terms & Conditions"
566603msgstr ""
567604
568−#: qml/Wizard/Pages/50-location.qml:69
569−msgid "Using GPS only (less accurate)"
605+#: qml/Wizard/Pages/here-terms.qml:69
606+msgid "Your device uses positioning technologies provided by HERE."
570607msgstr ""
571608
572−#: qml/Wizard/Pages/50-location.qml:86
573−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
609+#: qml/Wizard/Pages/here-terms.qml:81
610+msgid ""
611+"To provide you with positioning services and to improve their quality, HERE "
612+"collects information about nearby cell towers and Wi-Fi hotspots around your "
613+"current location whenever your position is being found."
574614msgstr ""
575615
576−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
577−#: qml/Wizard/Pages/50-location.qml:103
616+#: qml/Wizard/Pages/here-terms.qml:93
578617msgid ""
579−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
580−"conditions</a>."
618+"The information collected is used to analyze the service and to improve the "
619+"use of service, but not to identify you personally."
581620msgstr ""
582621
583−#: qml/Wizard/Pages/50-location.qml:112
584−msgid "Not at all"
622+#: qml/Wizard/Pages/here-terms.qml:106
623+#, qt-format
624+msgid "By continuing, you agree to the HERE platform %1 and %2."
585625msgstr ""
586626
587−#: qml/Wizard/Pages/50-location.qml:124
588−msgid "You can change your mind later in <b>System Settings</b>."
627+#: qml/Wizard/Pages/here-terms.qml:107
628+msgid "Service Terms"
589629msgstr ""
590630
591−#: qml/Wizard/Pages/60-reporting.qml:26
592−msgid "Improving your experience"
631+#: qml/Wizard/Pages/passcode-confirm.qml:43
632+#: qml/Wizard/Pages/passcode-desktop.qml:80
633+msgid "Confirm passcode"
593634msgstr ""
594635
595−#: qml/Wizard/Pages/60-reporting.qml:46
596−msgid ""
597−"Your phone is set up to automatically report errors to Canonical and its "
598−"partners, the makers of the operating system."
636+#: qml/Wizard/Pages/passcode-confirm.qml:45
637+msgid "Incorrect passcode."
599638msgstr ""
600639
601−#: qml/Wizard/Pages/60-reporting.qml:53
602−msgid ""
603−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
604−"Privacy</b>"
640+#: qml/Wizard/Pages/passcode-confirm.qml:45
641+msgctxt "Enter the passcode again"
642+msgid "Please re-enter."
605643msgstr ""
606644
607−#: qml/Wizard/Pages/80-finished.qml:24
608−msgid "All done"
645+#: qml/Wizard/Pages/passcode-desktop.qml:30
646+msgid "Lock Screen Passcode"
609647msgstr ""
610648
611−#: qml/Wizard/Pages/80-finished.qml:39
612−msgid "Nice work!"
649+#: qml/Wizard/Pages/passcode-desktop.qml:56
650+msgid "Enter 4 numbers to setup your passcode"
613651msgstr ""
614652
615−#: qml/Wizard/Pages/80-finished.qml:46
616−msgid "Your device is now ready to use."
653+#: qml/Wizard/Pages/passcode-desktop.qml:65
654+#: qml/Wizard/Pages/passcode-set.qml:54
655+msgid "Choose passcode"
617656msgstr ""
618657
619−#: qml/Wizard/Pages/80-finished.qml:53
620−msgid "Finish"
658+#: qml/Wizard/Pages/passcode-desktop.qml:105
659+msgid "Passcode too short"
621660msgstr ""
622661
623−#: qml/Wizard/Pages/here-terms.qml:27
624−msgid "Terms & Conditions"
662+#: qml/Wizard/Pages/passcode-desktop.qml:107
663+msgid "Passcodes match"
625664msgstr ""
626665
627−#: qml/Wizard/Pages/passwd-confirm.qml:49
628−msgid "Confirm passphrase"
666+#: qml/Wizard/Pages/passcode-desktop.qml:109
667+msgid "Passcodes do not match"
629668msgstr ""
630669
631−#: qml/Wizard/Pages/passwd-confirm.qml:50
632−msgid "Confirm passcode"
670+#: qml/Wizard/Pages/passcode-set.qml:62
671+msgid "Passcode must be 4 characters long"
633672msgstr ""
634673
635−#: qml/Wizard/Pages/passwd-confirm.qml:53
636−#: qml/Wizard/Pages/passwd-confirm.qml:54
637−msgid "Please try again."
674+#: qml/Wizard/Pages/password-set.qml:30
675+msgid "Lock Screen Password"
638676msgstr ""
639677
640−#: qml/Wizard/Pages/passwd-set.qml:61
641−msgid "Choose your passcode"
678+#: qml/Wizard/Pages/password-set.qml:61
679+msgid "Enter at least 8 characters"
642680msgstr ""
643681
644−#: qml/Wizard/Pages/passwd-set.qml:68
645−msgid "Passphrase must be 4 characters long"
682+#: qml/Wizard/Pages/password-set.qml:73
683+msgid "Choose password"
646684msgstr ""
647685
648−#. Translators: This is the arrow for "Back" buttons
649−#: qml/Wizard/StackButton.qml:39
650−#, qt-format
651−msgid "〈 %1"
686+#: qml/Wizard/Pages/password-set.qml:103
687+msgid "Confirm password"
652688msgstr ""
653689
654−#. Translators: This is the arrow for "Forward" buttons
655−#: qml/Wizard/StackButton.qml:42
656−#, qt-format
657−msgid "%1 〉"
690+#: qml/Wizard/Pages/sim.qml:27
691+msgid "No SIM card installed"
692+msgstr ""
693+
694+#: qml/Wizard/Pages/sim.qml:54
695+msgid "SIM card added"
696+msgstr ""
697+
698+#: qml/Wizard/Pages/sim.qml:55
699+msgid "You must restart the device to access the mobile network."
700+msgstr ""
701+
702+#: qml/Wizard/Pages/sim.qml:59
703+msgid "Restart"
704+msgstr ""
705+
706+#: qml/Wizard/Pages/sim.qml:78
707+msgid "You won’t be able to make calls or use text messaging without a SIM."
708+msgstr ""
709+
710+#: qml/Wizard/Pages/sim.qml:90
711+msgid "To proceed with no SIM tap Skip."
712+msgstr ""
713+
714+#: qml/Wizard/PasswordMeter.qml:87
715+msgid "Passwords match"
716+msgstr ""
717+
718+#: qml/Wizard/PasswordMeter.qml:89
719+msgid "Passwords do not match"
720+msgstr ""
721+
722+#: qml/Wizard/PasswordMeter.qml:93
723+msgid "Strong password"
724+msgstr ""
725+
726+#: qml/Wizard/PasswordMeter.qml:95
727+msgid "Fair password"
728+msgstr ""
729+
730+#: qml/Wizard/PasswordMeter.qml:97
731+msgid "Weak password"
732+msgstr ""
733+
734+#: qml/Wizard/PasswordMeter.qml:99
735+msgid "Very weak password"
658736msgstr ""
659737
660738#~ msgid "Top edge"
po/cs.po+476−234
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1111"PO-Revision-Date: 2015-07-07 10:44+0000\n"
1212"Last-Translator: Vojtěch Daněk <vdanek@outlook.com>\n"
1313"Language-Team: Czech <cs@li.org>\n"
@@ -15,8 +15,8 @@ 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: 2016-03-13 05:50+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19+"X-Generator: Launchpad (build 17958)\n"
2020"Language: cs\n"
2121
2222#: plugins/IntegratedLightDM/Greeter.cpp:112
@@ -77,53 +77,35 @@ msgctxt "Button: Log out from the system"
7777msgid "Log Out"
7878msgstr "Odhlásit"
7979
80−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
81−#: qml/Components/Dialogs.qml:253
80+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
81+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
82+#: qml/Wizard/Pages/passcode-set.qml:32
8283msgid "Cancel"
8384msgstr "Zrušit"
8485
8586#: qml/Components/Dialogs.qml:173
86−msgctxt "Title: Reboot/Shut down dialog"
87−msgid "Shut down"
88−msgstr "Vypnout"
89−
90−#: qml/Components/Dialogs.qml:174
91−msgid "Are you sure you want to shut down?"
92−msgstr "Jste si jistí, že chcete zařízení vypnout?"
93−
94−#: qml/Components/Dialogs.qml:176
95−msgctxt "Button: Reboot the system"
96−msgid "Reboot"
97−msgstr "Restartovat"
98−
99−#: qml/Components/Dialogs.qml:185
100−msgctxt "Button: Shut down the system"
101−msgid "Shut down"
102−msgstr "Vypnout"
103−
104−#: qml/Components/Dialogs.qml:207
10587msgctxt "Title: Reboot dialog"
10688msgid "Reboot"
10789msgstr "Restartovat"
10890
109−#: qml/Components/Dialogs.qml:208
91+#: qml/Components/Dialogs.qml:174
11092msgid "Are you sure you want to reboot?"
11193msgstr "Jste si jistí, že chcete zařízení restartovat?"
11294
113−#: qml/Components/Dialogs.qml:210
95+#: qml/Components/Dialogs.qml:176
11496msgid "No"
11597msgstr "Ne"
11698
117−#: qml/Components/Dialogs.qml:217
99+#: qml/Components/Dialogs.qml:183
118100msgid "Yes"
119101msgstr "Ano"
120102
121−#: qml/Components/Dialogs.qml:232
103+#: qml/Components/Dialogs.qml:198
122104msgctxt "Title: Power off/Restart dialog"
123105msgid "Power"
124106msgstr "Vypnutí"
125107
126−#: qml/Components/Dialogs.qml:233
108+#: qml/Components/Dialogs.qml:199
127109msgid ""
128110"Are you sure you would like\n"
129111"to power off?"
@@ -131,12 +113,12 @@ msgstr ""
131113"Jste si jistí, že chcete\n"
132114"telefon vypnout?"
133115
134−#: qml/Components/Dialogs.qml:235
116+#: qml/Components/Dialogs.qml:201
135117msgctxt "Button: Power off the system"
136118msgid "Power off"
137119msgstr "Vypnutí"
138120
139−#: qml/Components/Dialogs.qml:244
121+#: qml/Components/Dialogs.qml:210
140122msgctxt "Button: Restart the system"
141123msgid "Restart"
142124msgstr "Reboot"
@@ -179,42 +161,58 @@ msgstr ""
179161msgid "Close all"
180162msgstr ""
181163
182−#: qml/Dash/DashPageHeader.qml:270
164+#: qml/Dash/DashPageHeader.qml:337
183165msgctxt "Button: Open the Ubuntu Store"
184166msgid "Store"
185167msgstr "Obchod"
186168
187−#: qml/Dash/DashPageHeader.qml:277
169+#: qml/Dash/DashPageHeader.qml:344
188170msgctxt "Button: Start a search in the current dash scope"
189171msgid "Search"
190172msgstr "Hledat"
191173
192−#: qml/Dash/DashPageHeader.qml:287
174+#: qml/Dash/DashPageHeader.qml:354
193175msgctxt "Button: Show the current dash scope settings"
194176msgid "Settings"
195177msgstr "Nastavení"
196178
197−#: qml/Dash/DashPageHeader.qml:294
179+#: qml/Dash/DashPageHeader.qml:361
198180msgid "Remove from Favorites"
199181msgstr "Odstranit z oblíbených"
200182
201−#: qml/Dash/DashPageHeader.qml:294
183+#: qml/Dash/DashPageHeader.qml:361
202184msgid "Add to Favorites"
203185msgstr "Přidat do oblíbených"
204186
205−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
187+#: qml/Dash/FiltersPopover.qml:60
188+msgid "Refine your results"
189+msgstr ""
190+
191+#: qml/Dash/FiltersPopover.qml:69
192+msgid "Reset"
193+msgstr ""
194+
195+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
206196msgid "See less"
207197msgstr "Zobrazit méně"
208198
209−#: qml/Dash/GenericScopeView.qml:567
199+#: qml/Dash/GenericScopeView.qml:570
210200msgid "See all"
211201msgstr "Zobrazit vše"
212202
213−#: qml/Dash/GenericScopeView.qml:629
203+#: qml/Dash/GenericScopeView.qml:627
214204msgctxt "Label: Hint for dash search line edit"
215205msgid "Search"
216206msgstr "Hledat"
217207
208+#: qml/Dash/PageHeaderExtraPanel.qml:55
209+msgid "Recent Searches"
210+msgstr ""
211+
212+#: qml/Dash/PageHeaderExtraPanel.qml:66
213+msgid "Clear All"
214+msgstr ""
215+
218216#: qml/Dash/Previews/PreviewActionCombo.qml:35
219217msgid "More..."
220218msgstr "Více..."
@@ -282,11 +280,11 @@ msgstr "Znovu"
282280msgid "Tap to unlock"
283281msgstr "Klepnout pro odemčení"
284282
285−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
283+#: qml/Greeter/NarrowView.qml:54
286284msgid "Sorry, incorrect passphrase."
287285msgstr "Zadali jste špatné heslo."
288286
289−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
287+#: qml/Greeter/NarrowView.qml:55
290288msgid "Sorry, incorrect passcode."
291289msgstr "Zadali jste špatné heslo."
292290
@@ -315,7 +313,7 @@ msgstr ""
315313msgid "Enter %1"
316314msgstr "Vložte %1"
317315
318−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
316+#: qml/Greeter/NarrowView.qml:117
319317msgid "Enter passphrase"
320318msgstr "Vložte heslo"
321319
@@ -353,11 +351,11 @@ msgstr "Klepnutím se vrátíte k hovoru..."
353351msgid "Conference"
354352msgstr "Konferenční hovor"
355353
356−#: qml/Panel/Indicators/MenuItemFactory.qml:752
354+#: qml/Panel/Indicators/MenuItemFactory.qml:761
357355msgid "Nothing is playing"
358356msgstr "Nic se nepřehrává"
359357
360−#: qml/Panel/Indicators/MenuItemFactory.qml:881
358+#: qml/Panel/Indicators/MenuItemFactory.qml:890
361359#, qt-format
362360msgid "%1 hour"
363361msgid_plural "%1 hours"
@@ -365,7 +363,7 @@ msgstr[0] "%1 hodina"
365363msgstr[1] "%1 hodiny"
366364msgstr[2] "%1 hodin"
367365
368−#: qml/Panel/Indicators/MenuItemFactory.qml:885
366+#: qml/Panel/Indicators/MenuItemFactory.qml:894
369367#, qt-format
370368msgid "%1 minute"
371369msgid_plural "%1 minutes"
@@ -373,7 +371,7 @@ msgstr[0] "%1 minuta"
373371msgstr[1] "%1 minuty"
374372msgstr[2] "%1 minut"
375373
376−#: qml/Panel/Indicators/MenuItemFactory.qml:890
374+#: qml/Panel/Indicators/MenuItemFactory.qml:899
377375#, qt-format
378376msgid "%1 second"
379377msgid_plural "%1 seconds"
@@ -381,37 +379,37 @@ msgstr[0] "%1 sekunda"
381379msgstr[1] "%1 sekundy"
382380msgstr[2] "%1 sekund"
383381
384−#: qml/Panel/Indicators/MenuItemFactory.qml:893
382+#: qml/Panel/Indicators/MenuItemFactory.qml:902
385383msgid "0 seconds"
386384msgstr "0 sekund"
387385
388386#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
389−#: qml/Panel/Indicators/MenuItemFactory.qml:895
387+#: qml/Panel/Indicators/MenuItemFactory.qml:904
390388#, qt-format
391389msgid "%1 remaining"
392390msgstr "Zbývá %1"
393391
394−#: qml/Panel/Indicators/MenuItemFactory.qml:901
392+#: qml/Panel/Indicators/MenuItemFactory.qml:910
395393msgid "In queue…"
396394msgstr "Ve frontě..."
397395
398−#: qml/Panel/Indicators/MenuItemFactory.qml:905
396+#: qml/Panel/Indicators/MenuItemFactory.qml:914
399397msgid "Downloading"
400398msgstr "Stahování"
401399
402−#: qml/Panel/Indicators/MenuItemFactory.qml:907
400+#: qml/Panel/Indicators/MenuItemFactory.qml:916
403401msgid "Paused, tap to resume"
404402msgstr "Pauza, pro pokračování klepněte"
405403
406−#: qml/Panel/Indicators/MenuItemFactory.qml:909
404+#: qml/Panel/Indicators/MenuItemFactory.qml:918
407405msgid "Canceled"
408406msgstr "Zrušeno"
409407
410−#: qml/Panel/Indicators/MenuItemFactory.qml:911
408+#: qml/Panel/Indicators/MenuItemFactory.qml:920
411409msgid "Finished"
412410msgstr "Dokončeno"
413411
414−#: qml/Panel/Indicators/MenuItemFactory.qml:913
412+#: qml/Panel/Indicators/MenuItemFactory.qml:922
415413msgid "Failed, tap to retry"
416414msgstr "Nezdařilo se, opakujte klepnutím"
417415
@@ -431,251 +429,324 @@ msgctxt "Button: Call back on phone"
431429msgid "Call back"
432430msgstr ""
433431
434−#: qml/Tutorial/TutorialBottom.qml:28
435−msgid "Open special menus"
436−msgstr "Otevřít speciální menu"
437−
438−#: qml/Tutorial/TutorialBottom.qml:29
439−msgid "Swipe up from the bottom edge."
440−msgstr "Potáhněte prstem z dola nahoru."
432+#: qml/Stages/SideStage.qml:76
433+msgid "Drag using 3 fingers any application from one window to the other"
434+msgstr ""
441435
442−#: qml/Tutorial/TutorialBottomFinish.qml:24
443−msgid "This action does different things for different apps"
444−msgstr "Tato akce vyvolá různé reakce v rozdílných aplikacích"
436+#: qml/Tutorial/TutorialBottom.qml:78
437+msgid "Swipe up to add a contact"
438+msgstr ""
445439
446−#: qml/Tutorial/TutorialBottomFinish.qml:25
447−msgid "Tap here to finish."
448−msgstr "Klepněte zde pro dokončení."
440+#: qml/Tutorial/TutorialBottom.qml:80
441+msgid "Swipe up for favorite calculations"
442+msgstr ""
449443
450−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
451−#: qml/Tutorial/TutorialRight.qml:144
452−msgid "Tap here to continue."
453−msgstr "Klepněte zde pro pokračování."
444+#: qml/Tutorial/TutorialBottom.qml:82
445+msgid "Swipe up for recent calls"
446+msgstr ""
454447
455−#: qml/Tutorial/TutorialLeft.qml:26
456−msgid "Open the launcher"
457−msgstr "Otevřete launcher"
448+#: qml/Tutorial/TutorialBottom.qml:84
449+msgid "Swipe up to create a message"
450+msgstr ""
458451
459−#: qml/Tutorial/TutorialLeft.qml:27
460−msgid "Short swipe from the left edge."
461−msgstr "Potáhněte krátce z levého okraje."
452+#: qml/Tutorial/TutorialBottom.qml:85
453+msgid "Swipe up to manage the app"
454+msgstr ""
462455
463−#: qml/Tutorial/TutorialLeftFinish.qml:24
464−msgid "These are the shortcuts to favorite apps"
465−msgstr "Zde jsou odkazy na vaše oblíbené aplikace"
456+#: qml/Tutorial/TutorialLeft.qml:47
457+msgid "Swipe from the left edge to open the launcher"
458+msgstr ""
466459
467−#: qml/Tutorial/TutorialPage.qml:178
468−msgid "You almost got it!"
469−msgstr "Už to skoro máte!"
460+#: qml/Tutorial/TutorialLeftLong.qml:47
461+msgid "Long swipe from the left edge to open the Today scope"
462+msgstr ""
470463
471−#: qml/Tutorial/TutorialPage.qml:195
472−msgid "Try again."
473−msgstr "Zkuste to znovu."
464+#: qml/Tutorial/TutorialRight.qml:54
465+msgid "Hover your mouse on the right edge to view your open apps"
466+msgstr ""
474467
475−#: qml/Tutorial/TutorialRight.qml:31
476−msgid "To view open apps"
477−msgstr "K zobrazení otevřených aplikací"
468+#: qml/Tutorial/TutorialRight.qml:55
469+msgid "Short or long swipe from the right edge to view your open apps"
470+msgstr ""
478471
479−#: qml/Tutorial/TutorialRight.qml:32
480−msgid "Long swipe from the right edge."
481−msgstr "Potáhněte dlouho z pravého okraje."
472+#: qml/Tutorial/TutorialTop.qml:53
473+msgid "Swipe from the top right edge to open the notification bar"
474+msgstr ""
482475
483−#: qml/Tutorial/TutorialRight.qml:122
484−msgid "View all your running tasks."
485−msgstr "Zobrazíte všechny běžící procesy."
476+#: qml/Tutorial/TutorialTop.qml:54
477+msgid "Swipe from the top edge to open the notification bar"
478+msgstr ""
486479
487−#: qml/Wizard/Page.qml:89
480+#: qml/Wizard/Page.qml:54
488481msgctxt "Button: Go back one page in the Wizard"
489482msgid "Back"
490483msgstr "Zpět"
491484
492485#: qml/Wizard/Pages/10-welcome.qml:27
493−msgid "Hi!"
494−msgstr "Ahoj!"
486+msgid "Language"
487+msgstr ""
495488
496−#: qml/Wizard/Pages/10-welcome.qml:44
497−msgid "Welcome to your Ubuntu device."
489+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
490+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
491+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
492+#: qml/Wizard/Pages/75-report-check.qml:84
493+#: qml/Wizard/Pages/passcode-desktop.qml:124
494+#: qml/Wizard/Pages/password-set.qml:141
495+msgid "Next"
498496msgstr ""
499497
500−#: qml/Wizard/Pages/10-welcome.qml:52
501−msgid "Let’s get started."
502−msgstr "Začněme."
498+#: qml/Wizard/Pages/30-wifi.qml:29
499+msgid "Connect to Wi‑Fi"
500+msgstr "Připojte se k Wi-Fi"
503501
504−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
505−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
506−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
507−#: qml/Wizard/Pages/passwd-set.qml:90
508−msgid "Continue"
509−msgstr "Pokračovat"
502+#: qml/Wizard/Pages/30-wifi.qml:130
503+msgid "Connected"
504+msgstr ""
510505
511−#: qml/Wizard/Pages/20-sim.qml:25
512−msgid "Add a SIM card and restart your device"
513−msgstr "Vložte SIM kartu a restartujte své zařízení"
506+#: qml/Wizard/Pages/30-wifi.qml:163
507+msgid "Available Wi-Fi networks"
508+msgstr ""
514509
515−#: qml/Wizard/Pages/20-sim.qml:59
516−msgid "Without it, you won’t be able to make calls or use text messaging."
517−msgstr "Bez ni nebudete moci telefonovat nebo posílat textové zprávy."
510+#: qml/Wizard/Pages/30-wifi.qml:164
511+msgid "No available Wi-Fi networks"
512+msgstr ""
518513
519−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
514+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
515+#: qml/Wizard/Pages/sim.qml:101
520516msgid "Skip"
521517msgstr "Přeskočit"
522518
523−#: qml/Wizard/Pages/30-passwd-type.qml:39
524−msgid "Lock security"
525−msgstr "Bezpečnostní uzamčení"
519+#: qml/Wizard/Pages/40-location.qml:27
520+msgid "Location Services"
521+msgstr ""
522+
523+#: qml/Wizard/Pages/40-location.qml:83
524+msgid ""
525+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
526+"(recommended)"
527+msgstr ""
528+
529+#: qml/Wizard/Pages/40-location.qml:105
530+#, qt-format
531+msgid "By selecting this option you agree to the Nokia HERE %1."
532+msgstr ""
526533
527−#: qml/Wizard/Pages/30-passwd-type.qml:79
528−msgid "Please select how you’d like to unlock your device."
534+#: qml/Wizard/Pages/40-location.qml:106
535+msgctxt "part of: Nokia HERE terms and conditions"
536+msgid "terms and conditions"
529537msgstr ""
530538
531−#: qml/Wizard/Pages/30-passwd-type.qml:102
532−msgctxt "Label: Type of security method"
533−msgid "Swipe"
534−msgstr "Potažením prstu"
539+#: qml/Wizard/Pages/40-location.qml:160
540+msgid "GPS only"
541+msgstr ""
542+
543+#: qml/Wizard/Pages/40-location.qml:214
544+msgid "Don't use my location"
545+msgstr ""
535546
536−#: qml/Wizard/Pages/30-passwd-type.qml:103
537−msgctxt "Label: Description of security method"
538−msgid "No security"
539−msgstr "Bez zabezpečení"
547+#: qml/Wizard/Pages/40-location.qml:260
548+msgid "You can change it later in System Settings."
549+msgstr ""
540550
541−#: qml/Wizard/Pages/30-passwd-type.qml:105
551+#: qml/Wizard/Pages/50-timezone.qml:29
552+msgid "Time Zone"
553+msgstr ""
554+
555+#: qml/Wizard/Pages/50-timezone.qml:178
556+msgid "Enter your city"
557+msgstr ""
558+
559+#: qml/Wizard/Pages/60-account.qml:24
560+msgid "Personalize Your Device"
561+msgstr ""
562+
563+#: qml/Wizard/Pages/60-account.qml:48
564+msgid "Preferred Name"
565+msgstr ""
566+
567+#: qml/Wizard/Pages/70-passwd-type.qml:39
568+msgid "Lock Screen"
569+msgstr ""
570+
571+#: qml/Wizard/Pages/70-passwd-type.qml:101
542572msgctxt "Label: Type of security method"
543−msgid "Passcode"
544−msgstr "Číselné heslo"
573+msgid "Create new password"
574+msgstr ""
545575
546−#: qml/Wizard/Pages/30-passwd-type.qml:106
547−msgctxt "Label: Description of security method"
548−msgid "4 digits only"
549−msgstr "Pouze 4 čísla"
576+#: qml/Wizard/Pages/70-passwd-type.qml:103
577+msgctxt "Label: Type of security method"
578+msgid "Create passcode (numbers only)"
579+msgstr ""
550580
551−#: qml/Wizard/Pages/30-passwd-type.qml:108
581+#: qml/Wizard/Pages/70-passwd-type.qml:105
552582msgctxt "Label: Type of security method"
553−msgid "Passphrase"
554−msgstr "Heslo"
583+msgid "No lock code"
584+msgstr ""
555585
556−#: qml/Wizard/Pages/30-passwd-type.qml:109
557−msgctxt "Label: Description of security method"
558−msgid "Numbers and letters"
559−msgstr "Čísla a písmena"
586+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
587+msgid "Privacy Policy"
588+msgstr ""
560589
561−#: qml/Wizard/Pages/40-wifi.qml:29
562−msgid "Connect to Wi‑Fi"
563−msgstr "Připojte se k Wi-Fi"
590+#: qml/Wizard/Pages/75-report-check.qml:26
591+msgid "Help Us Improve"
592+msgstr ""
564593
565−#: qml/Wizard/Pages/40-wifi.qml:168
566−msgid "Available networks…"
567−msgstr "Dostupné sítě..."
594+#: qml/Wizard/Pages/75-report-check.qml:59
595+msgid "Improve system performance by sending us crashes and error reports."
596+msgstr ""
568597
569−#: qml/Wizard/Pages/40-wifi.qml:169
570−msgid "No available networks."
571−msgstr "Žádná dostupná síť."
598+#: qml/Wizard/Pages/75-report-check.qml:60
599+msgid "Privacy policy"
600+msgstr ""
572601
573−#: qml/Wizard/Pages/50-location.qml:27
574−msgid "Location"
575−msgstr "Umístění"
602+#: qml/Wizard/Pages/80-finished.qml:89
603+msgid "Welcome to Ubuntu"
604+msgstr ""
576605
577−#: qml/Wizard/Pages/50-location.qml:62
578−msgid "Let the phone detect your location:"
579−msgstr "Povolte telefonu zjistit, kde se zrovna nacházíte:"
606+#: qml/Wizard/Pages/80-finished.qml:104
607+msgid "You are ready to use your device now"
608+msgstr ""
609+
610+#: qml/Wizard/Pages/80-finished.qml:124
611+msgid "Get Started"
612+msgstr ""
580613
581−#: qml/Wizard/Pages/50-location.qml:69
582−msgid "Using GPS only (less accurate)"
583−msgstr "Používat pouze GPS (méně přesné)"
614+#: qml/Wizard/Pages/here-terms.qml:25
615+msgid "Terms & Conditions"
616+msgstr "Pravidla a podmínky"
584617
585−#: qml/Wizard/Pages/50-location.qml:86
586−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
587−msgstr "Používat GPS, anonymní Wi-Fi a datovou síť (doporučeno)"
618+#: qml/Wizard/Pages/here-terms.qml:69
619+msgid "Your device uses positioning technologies provided by HERE."
620+msgstr ""
588621
589−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
590−#: qml/Wizard/Pages/50-location.qml:103
622+#: qml/Wizard/Pages/here-terms.qml:81
591623msgid ""
592−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
593−"conditions</a>."
624+"To provide you with positioning services and to improve their quality, HERE "
625+"collects information about nearby cell towers and Wi-Fi hotspots around your "
626+"current location whenever your position is being found."
594627msgstr ""
595−"Zvolením této možnosti souhlasíte s <a href='#'>pravidly a podmínkami</a> "
596−"Nokia HERE."
597628
598−#: qml/Wizard/Pages/50-location.qml:112
599−msgid "Not at all"
600−msgstr "V žádném případě"
629+#: qml/Wizard/Pages/here-terms.qml:93
630+msgid ""
631+"The information collected is used to analyze the service and to improve the "
632+"use of service, but not to identify you personally."
633+msgstr ""
601634
602−#: qml/Wizard/Pages/50-location.qml:124
603−msgid "You can change your mind later in <b>System Settings</b>."
635+#: qml/Wizard/Pages/here-terms.qml:106
636+#, qt-format
637+msgid "By continuing, you agree to the HERE platform %1 and %2."
604638msgstr ""
605−"Pokud změníte názor, můžete nastavení změnit v <b>Nastavení systému</b>."
606639
607−#: qml/Wizard/Pages/60-reporting.qml:26
608−msgid "Improving your experience"
609−msgstr "Zlepšete své zkušenosti"
640+#: qml/Wizard/Pages/here-terms.qml:107
641+msgid "Service Terms"
642+msgstr ""
610643
611−#: qml/Wizard/Pages/60-reporting.qml:46
612−msgid ""
613−"Your phone is set up to automatically report errors to Canonical and its "
614−"partners, the makers of the operating system."
644+#: qml/Wizard/Pages/passcode-confirm.qml:43
645+#: qml/Wizard/Pages/passcode-desktop.qml:80
646+msgid "Confirm passcode"
647+msgstr "Potvrdit číselné heslo"
648+
649+#: qml/Wizard/Pages/passcode-confirm.qml:45
650+msgid "Incorrect passcode."
615651msgstr ""
616−"Váš telefon je nastaven tak, aby automaticky odesílal informace o chybách "
617−"společnosti Canonical a partnerům, kteří stvořili tento operační systém."
618652
619−#: qml/Wizard/Pages/60-reporting.qml:53
620−msgid ""
621−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
622−"Privacy</b>"
653+#: qml/Wizard/Pages/passcode-confirm.qml:45
654+msgctxt "Enter the passcode again"
655+msgid "Please re-enter."
623656msgstr ""
624−"To může být vypnuto v <b>Nastavení systému</b> v <b>Zabezpečení a "
625−"soukromí</b>"
626657
627−#: qml/Wizard/Pages/80-finished.qml:24
628−msgid "All done"
629−msgstr "Vše je hotovo"
658+#: qml/Wizard/Pages/passcode-desktop.qml:30
659+msgid "Lock Screen Passcode"
660+msgstr ""
630661
631−#: qml/Wizard/Pages/80-finished.qml:39
632−msgid "Nice work!"
633−msgstr "Skvělá práce!"
662+#: qml/Wizard/Pages/passcode-desktop.qml:56
663+msgid "Enter 4 numbers to setup your passcode"
664+msgstr ""
634665
635−#: qml/Wizard/Pages/80-finished.qml:46
636−msgid "Your device is now ready to use."
666+#: qml/Wizard/Pages/passcode-desktop.qml:65
667+#: qml/Wizard/Pages/passcode-set.qml:54
668+msgid "Choose passcode"
637669msgstr ""
638670
639−#: qml/Wizard/Pages/80-finished.qml:53
640−msgid "Finish"
641−msgstr "Dokončit"
671+#: qml/Wizard/Pages/passcode-desktop.qml:105
672+msgid "Passcode too short"
673+msgstr ""
642674
643−#: qml/Wizard/Pages/here-terms.qml:27
644−msgid "Terms & Conditions"
645−msgstr "Pravidla a podmínky"
675+#: qml/Wizard/Pages/passcode-desktop.qml:107
676+msgid "Passcodes match"
677+msgstr ""
646678
647−#: qml/Wizard/Pages/passwd-confirm.qml:49
648−msgid "Confirm passphrase"
649−msgstr "Potvrdit heslo"
679+#: qml/Wizard/Pages/passcode-desktop.qml:109
680+msgid "Passcodes do not match"
681+msgstr ""
650682
651−#: qml/Wizard/Pages/passwd-confirm.qml:50
652−msgid "Confirm passcode"
653−msgstr "Potvrdit číselné heslo"
683+#: qml/Wizard/Pages/passcode-set.qml:62
684+msgid "Passcode must be 4 characters long"
685+msgstr ""
654686
655−#: qml/Wizard/Pages/passwd-confirm.qml:53
656−#: qml/Wizard/Pages/passwd-confirm.qml:54
657−msgid "Please try again."
658−msgstr "Zkuste to, prosím, znovu."
687+#: qml/Wizard/Pages/password-set.qml:30
688+msgid "Lock Screen Password"
689+msgstr ""
659690
660−#: qml/Wizard/Pages/passwd-set.qml:61
661−msgid "Choose your passcode"
662−msgstr "Zvolte své heslo"
691+#: qml/Wizard/Pages/password-set.qml:61
692+msgid "Enter at least 8 characters"
693+msgstr ""
663694
664−#: qml/Wizard/Pages/passwd-set.qml:68
665−msgid "Passphrase must be 4 characters long"
666−msgstr "Heslo musí být alespoň 4 znaky dlouhé"
695+#: qml/Wizard/Pages/password-set.qml:73
696+msgid "Choose password"
697+msgstr ""
667698
668−#. Translators: This is the arrow for "Back" buttons
669−#: qml/Wizard/StackButton.qml:39
670−#, qt-format
671−msgid "〈 %1"
672−msgstr "〈 %1"
699+#: qml/Wizard/Pages/password-set.qml:103
700+msgid "Confirm password"
701+msgstr ""
673702
674−#. Translators: This is the arrow for "Forward" buttons
675−#: qml/Wizard/StackButton.qml:42
676−#, qt-format
677−msgid "%1 〉"
678−msgstr "%1 〉"
703+#: qml/Wizard/Pages/sim.qml:27
704+msgid "No SIM card installed"
705+msgstr ""
706+
707+#: qml/Wizard/Pages/sim.qml:54
708+msgid "SIM card added"
709+msgstr ""
710+
711+#: qml/Wizard/Pages/sim.qml:55
712+msgid "You must restart the device to access the mobile network."
713+msgstr ""
714+
715+#: qml/Wizard/Pages/sim.qml:59
716+msgid "Restart"
717+msgstr "Reboot"
718+
719+#: qml/Wizard/Pages/sim.qml:78
720+msgid "You won’t be able to make calls or use text messaging without a SIM."
721+msgstr ""
722+
723+#: qml/Wizard/Pages/sim.qml:90
724+msgid "To proceed with no SIM tap Skip."
725+msgstr ""
726+
727+#: qml/Wizard/PasswordMeter.qml:87
728+msgid "Passwords match"
729+msgstr ""
730+
731+#: qml/Wizard/PasswordMeter.qml:89
732+msgid "Passwords do not match"
733+msgstr ""
734+
735+#: qml/Wizard/PasswordMeter.qml:93
736+msgid "Strong password"
737+msgstr ""
738+
739+#: qml/Wizard/PasswordMeter.qml:95
740+msgid "Fair password"
741+msgstr ""
742+
743+#: qml/Wizard/PasswordMeter.qml:97
744+msgid "Weak password"
745+msgstr ""
746+
747+#: qml/Wizard/PasswordMeter.qml:99
748+msgid "Very weak password"
749+msgstr ""
679750
680751#~ msgid "Try swiping from the right edge to unlock the phone"
681752#~ msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."
@@ -728,6 +799,21 @@ msgstr "%1 〉"
728799#~ msgid "Store"
729800#~ msgstr "Obchod"
730801
802+#~ msgctxt "Title: Reboot/Shut down dialog"
803+#~ msgid "Shut down"
804+#~ msgstr "Vypnout"
805+
806+#~ msgid "Are you sure you want to shut down?"
807+#~ msgstr "Jste si jistí, že chcete zařízení vypnout?"
808+
809+#~ msgctxt "Button: Reboot the system"
810+#~ msgid "Reboot"
811+#~ msgstr "Restartovat"
812+
813+#~ msgctxt "Button: Shut down the system"
814+#~ msgid "Shut down"
815+#~ msgstr "Vypnout"
816+
731817#~ msgid "Please re-enter"
732818#~ msgstr "Vložte znovu"
733819
@@ -737,15 +823,174 @@ msgstr "%1 〉"
737823#~ msgid "Roaming"
738824#~ msgstr "Roaming"
739825
826+#~ msgid "This action does different things for different apps"
827+#~ msgstr "Tato akce vyvolá různé reakce v rozdílných aplikacích"
828+
829+#~ msgid "Tap here to finish."
830+#~ msgstr "Klepněte zde pro dokončení."
831+
832+#~ msgid "Open special menus"
833+#~ msgstr "Otevřít speciální menu"
834+
835+#~ msgid "Swipe up from the bottom edge."
836+#~ msgstr "Potáhněte prstem z dola nahoru."
837+
838+#~ msgid "Tap here to continue."
839+#~ msgstr "Klepněte zde pro pokračování."
840+
841+#~ msgid "These are the shortcuts to favorite apps"
842+#~ msgstr "Zde jsou odkazy na vaše oblíbené aplikace"
843+
844+#~ msgid "Open the launcher"
845+#~ msgstr "Otevřete launcher"
846+
847+#~ msgid "Short swipe from the left edge."
848+#~ msgstr "Potáhněte krátce z levého okraje."
849+
850+#~ msgid "You almost got it!"
851+#~ msgstr "Už to skoro máte!"
852+
853+#~ msgid "Try again."
854+#~ msgstr "Zkuste to znovu."
855+
856+#~ msgid "To view open apps"
857+#~ msgstr "K zobrazení otevřených aplikací"
858+
859+#~ msgid "Long swipe from the right edge."
860+#~ msgstr "Potáhněte dlouho z pravého okraje."
861+
862+#~ msgid "View all your running tasks."
863+#~ msgstr "Zobrazíte všechny běžící procesy."
864+
865+#~ msgid "Hi!"
866+#~ msgstr "Ahoj!"
867+
740868#~ msgid "Welcome to your Ubuntu phone."
741869#~ msgstr "Vítejte ve vašem Ubuntu telefonu."
742870
871+#~ msgid "Let’s get started."
872+#~ msgstr "Začněme."
873+
874+#~ msgid "Continue"
875+#~ msgstr "Pokračovat"
876+
877+#~ msgid "Add a SIM card and restart your device"
878+#~ msgstr "Vložte SIM kartu a restartujte své zařízení"
879+
880+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
881+#~ msgstr "Bez ni nebudete moci telefonovat nebo posílat textové zprávy."
882+
883+#~ msgid "Lock security"
884+#~ msgstr "Bezpečnostní uzamčení"
885+
743886#~ msgid "Please select how you’d like to unlock your phone."
744887#~ msgstr "Zvolte, prosím, jak chcete svůj telefon odemykat."
745888
889+#~ msgctxt "Label: Type of security method"
890+#~ msgid "Swipe"
891+#~ msgstr "Potažením prstu"
892+
893+#~ msgctxt "Label: Description of security method"
894+#~ msgid "No security"
895+#~ msgstr "Bez zabezpečení"
896+
897+#~ msgctxt "Label: Type of security method"
898+#~ msgid "Passcode"
899+#~ msgstr "Číselné heslo"
900+
901+#~ msgctxt "Label: Description of security method"
902+#~ msgid "4 digits only"
903+#~ msgstr "Pouze 4 čísla"
904+
905+#~ msgctxt "Label: Type of security method"
906+#~ msgid "Passphrase"
907+#~ msgstr "Heslo"
908+
909+#~ msgctxt "Label: Description of security method"
910+#~ msgid "Numbers and letters"
911+#~ msgstr "Čísla a písmena"
912+
913+#~ msgid "Available networks…"
914+#~ msgstr "Dostupné sítě..."
915+
916+#~ msgid "No available networks."
917+#~ msgstr "Žádná dostupná síť."
918+
919+#~ msgid "Location"
920+#~ msgstr "Umístění"
921+
922+#~ msgid "Let the phone detect your location:"
923+#~ msgstr "Povolte telefonu zjistit, kde se zrovna nacházíte:"
924+
925+#~ msgid "Using GPS only (less accurate)"
926+#~ msgstr "Používat pouze GPS (méně přesné)"
927+
928+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
929+#~ msgstr "Používat GPS, anonymní Wi-Fi a datovou síť (doporučeno)"
930+
931+#~ msgid ""
932+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
933+#~ "conditions</a>."
934+#~ msgstr ""
935+#~ "Zvolením této možnosti souhlasíte s <a href='#'>pravidly a podmínkami</a> "
936+#~ "Nokia HERE."
937+
938+#~ msgid "Not at all"
939+#~ msgstr "V žádném případě"
940+
941+#~ msgid "You can change your mind later in <b>System Settings</b>."
942+#~ msgstr ""
943+#~ "Pokud změníte názor, můžete nastavení změnit v <b>Nastavení systému</b>."
944+
945+#~ msgid "Improving your experience"
946+#~ msgstr "Zlepšete své zkušenosti"
947+
948+#~ msgid ""
949+#~ "Your phone is set up to automatically report errors to Canonical and its "
950+#~ "partners, the makers of the operating system."
951+#~ msgstr ""
952+#~ "Váš telefon je nastaven tak, aby automaticky odesílal informace o chybách "
953+#~ "společnosti Canonical a partnerům, kteří stvořili tento operační systém."
954+
955+#~ msgid ""
956+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
957+#~ "Privacy</b>"
958+#~ msgstr ""
959+#~ "To může být vypnuto v <b>Nastavení systému</b> v <b>Zabezpečení a "
960+#~ "soukromí</b>"
961+
962+#~ msgid "All done"
963+#~ msgstr "Vše je hotovo"
964+
965+#~ msgid "Nice work!"
966+#~ msgstr "Skvělá práce!"
967+
746968#~ msgid "Your phone is now ready to use."
747969#~ msgstr "Váš telefon je nyní připraven k použití."
748970
971+#~ msgid "Finish"
972+#~ msgstr "Dokončit"
973+
974+#~ msgid "Confirm passphrase"
975+#~ msgstr "Potvrdit heslo"
976+
977+#~ msgid "Please try again."
978+#~ msgstr "Zkuste to, prosím, znovu."
979+
980+#~ msgid "Choose your passcode"
981+#~ msgstr "Zvolte své heslo"
982+
983+#~ msgid "Passphrase must be 4 characters long"
984+#~ msgstr "Heslo musí být alespoň 4 znaky dlouhé"
985+
986+#, qt-format
987+#~ msgid "〈 %1"
988+#~ msgstr "〈 %1"
989+
990+#, qt-format
991+#~ msgid "%1 〉"
992+#~ msgstr "%1 〉"
993+
749994#~ msgid "Log out"
750995#~ msgstr "Odhlásit se"
751996
@@ -785,9 +1030,6 @@ msgstr "%1 〉"
7851030#~ msgid "%a %d %b %l:%M %p"
7861031#~ msgstr "%a %b. %d %l:%M %p"
7871032
788−#~ msgid "Restart"
789−#~ msgstr "Reboot"
790−
7911033#~ msgid "Settings"
7921034#~ msgstr "Nastavení"
7931035
po/cy.po+476−231
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1111"PO-Revision-Date: 2015-07-31 13:21+0000\n"
1212"Last-Translator: Owen Llywelyn <owen.llywelyn@gmail.com>\n"
1313"Language-Team: Welsh <cy@li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
1818"2 : 3;\n"
19−"X-Launchpad-Export-Date: 2016-03-13 05:51+0000\n"
20−"X-Generator: Launchpad (build 17939)\n"
19+"X-Launchpad-Export-Date: 2016-03-24 06:08+0000\n"
20+"X-Generator: Launchpad (build 17958)\n"
2121
2222#: plugins/IntegratedLightDM/Greeter.cpp:112
2323msgid "Password: "
@@ -78,53 +78,35 @@ msgctxt "Button: Log out from the system"
7878msgid "Log Out"
7979msgstr "Allgofnodi"
8080
81−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
82−#: qml/Components/Dialogs.qml:253
81+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
82+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
83+#: qml/Wizard/Pages/passcode-set.qml:32
8384msgid "Cancel"
8485msgstr "Diddymu"
8586
8687#: qml/Components/Dialogs.qml:173
87−msgctxt "Title: Reboot/Shut down dialog"
88−msgid "Shut down"
89−msgstr "Diffodd"
90−
91−#: qml/Components/Dialogs.qml:174
92−msgid "Are you sure you want to shut down?"
93−msgstr "Ydych chi'n sicr eich bod am ddiffodd?"
94−
95−#: qml/Components/Dialogs.qml:176
96−msgctxt "Button: Reboot the system"
97−msgid "Reboot"
98−msgstr "Ailgychwyn"
99−
100−#: qml/Components/Dialogs.qml:185
101−msgctxt "Button: Shut down the system"
102−msgid "Shut down"
103−msgstr "Diffodd"
104−
105−#: qml/Components/Dialogs.qml:207
10688msgctxt "Title: Reboot dialog"
10789msgid "Reboot"
10890msgstr "Ailgychwyn"
10991
110−#: qml/Components/Dialogs.qml:208
92+#: qml/Components/Dialogs.qml:174
11193msgid "Are you sure you want to reboot?"
11294msgstr "Ydych chi'n sicr eich bod am ailgychwyn?"
11395
114−#: qml/Components/Dialogs.qml:210
96+#: qml/Components/Dialogs.qml:176
11597msgid "No"
11698msgstr "Na"
11799
118−#: qml/Components/Dialogs.qml:217
100+#: qml/Components/Dialogs.qml:183
119101msgid "Yes"
120102msgstr "Ydw"
121103
122−#: qml/Components/Dialogs.qml:232
104+#: qml/Components/Dialogs.qml:198
123105msgctxt "Title: Power off/Restart dialog"
124106msgid "Power"
125107msgstr "Pŵer"
126108
127−#: qml/Components/Dialogs.qml:233
109+#: qml/Components/Dialogs.qml:199
128110msgid ""
129111"Are you sure you would like\n"
130112"to power off?"
@@ -132,12 +114,12 @@ msgstr ""
132114"Ydych chi'n sicr eich bod am\n"
133115"ddiffodd y pŵer?"
134116
135−#: qml/Components/Dialogs.qml:235
117+#: qml/Components/Dialogs.qml:201
136118msgctxt "Button: Power off the system"
137119msgid "Power off"
138120msgstr "Diffodd y pŵer"
139121
140−#: qml/Components/Dialogs.qml:244
122+#: qml/Components/Dialogs.qml:210
141123msgctxt "Button: Restart the system"
142124msgid "Restart"
143125msgstr "Ailgychwyn"
@@ -180,42 +162,58 @@ msgstr ""
180162msgid "Close all"
181163msgstr ""
182164
183−#: qml/Dash/DashPageHeader.qml:270
165+#: qml/Dash/DashPageHeader.qml:337
184166msgctxt "Button: Open the Ubuntu Store"
185167msgid "Store"
186168msgstr "Marchnad"
187169
188−#: qml/Dash/DashPageHeader.qml:277
170+#: qml/Dash/DashPageHeader.qml:344
189171msgctxt "Button: Start a search in the current dash scope"
190172msgid "Search"
191173msgstr "Chwilio"
192174
193−#: qml/Dash/DashPageHeader.qml:287
175+#: qml/Dash/DashPageHeader.qml:354
194176msgctxt "Button: Show the current dash scope settings"
195177msgid "Settings"
196178msgstr "Gosodiadau"
197179
198−#: qml/Dash/DashPageHeader.qml:294
180+#: qml/Dash/DashPageHeader.qml:361
199181msgid "Remove from Favorites"
200182msgstr "Tynnu o Ffefrynnau"
201183
202−#: qml/Dash/DashPageHeader.qml:294
184+#: qml/Dash/DashPageHeader.qml:361
203185msgid "Add to Favorites"
204186msgstr "Ychwanegu at Ffefrynnau"
205187
206−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
188+#: qml/Dash/FiltersPopover.qml:60
189+msgid "Refine your results"
190+msgstr ""
191+
192+#: qml/Dash/FiltersPopover.qml:69
193+msgid "Reset"
194+msgstr ""
195+
196+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
207197msgid "See less"
208198msgstr "Gweld llai"
209199
210−#: qml/Dash/GenericScopeView.qml:567
200+#: qml/Dash/GenericScopeView.qml:570
211201msgid "See all"
212202msgstr "Gweld y cyfan"
213203
214−#: qml/Dash/GenericScopeView.qml:629
204+#: qml/Dash/GenericScopeView.qml:627
215205msgctxt "Label: Hint for dash search line edit"
216206msgid "Search"
217207msgstr "Chwilio"
218208
209+#: qml/Dash/PageHeaderExtraPanel.qml:55
210+msgid "Recent Searches"
211+msgstr ""
212+
213+#: qml/Dash/PageHeaderExtraPanel.qml:66
214+msgid "Clear All"
215+msgstr ""
216+
219217#: qml/Dash/Previews/PreviewActionCombo.qml:35
220218msgid "More..."
221219msgstr "Mwy..."
@@ -283,11 +281,11 @@ msgstr "Ailgynnig"
283281msgid "Tap to unlock"
284282msgstr "Tapiwch i ddatgloi"
285283
286−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
284+#: qml/Greeter/NarrowView.qml:54
287285msgid "Sorry, incorrect passphrase."
288286msgstr "Cyfrinair anghywir"
289287
290−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
288+#: qml/Greeter/NarrowView.qml:55
291289msgid "Sorry, incorrect passcode."
292290msgstr "Cod cyfrinachol anghywir"
293291
@@ -316,7 +314,7 @@ msgstr ""
316314msgid "Enter %1"
317315msgstr "Rhowch %1"
318316
319−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
317+#: qml/Greeter/NarrowView.qml:117
320318msgid "Enter passphrase"
321319msgstr "Rhowch gyfrinair"
322320
@@ -354,11 +352,11 @@ msgstr "Tapiwch i ffonio nôl"
354352msgid "Conference"
355353msgstr "Cydalwad"
356354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:752
355+#: qml/Panel/Indicators/MenuItemFactory.qml:761
358356msgid "Nothing is playing"
359357msgstr "Dim byd yn chwarae"
360358
361−#: qml/Panel/Indicators/MenuItemFactory.qml:881
359+#: qml/Panel/Indicators/MenuItemFactory.qml:890
362360#, qt-format
363361msgid "%1 hour"
364362msgid_plural "%1 hours"
@@ -367,7 +365,7 @@ msgstr[1] "%1 awr"
367365msgstr[2] "%1 awr"
368366msgstr[3] "%1 awr"
369367
370−#: qml/Panel/Indicators/MenuItemFactory.qml:885
368+#: qml/Panel/Indicators/MenuItemFactory.qml:894
371369#, qt-format
372370msgid "%1 minute"
373371msgid_plural "%1 minutes"
@@ -376,7 +374,7 @@ msgstr[1] "%1 munud"
376374msgstr[2] "%1 munud"
377375msgstr[3] "%1 munud"
378376
379−#: qml/Panel/Indicators/MenuItemFactory.qml:890
377+#: qml/Panel/Indicators/MenuItemFactory.qml:899
380378#, qt-format
381379msgid "%1 second"
382380msgid_plural "%1 seconds"
@@ -385,37 +383,37 @@ msgstr[1] "%1 eiliad"
385383msgstr[2] "%1 eiliad"
386384msgstr[3] "%1 eiliad"
387385
388−#: qml/Panel/Indicators/MenuItemFactory.qml:893
386+#: qml/Panel/Indicators/MenuItemFactory.qml:902
389387msgid "0 seconds"
390388msgstr "0 eiliad"
391389
392390#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
393−#: qml/Panel/Indicators/MenuItemFactory.qml:895
391+#: qml/Panel/Indicators/MenuItemFactory.qml:904
394392#, qt-format
395393msgid "%1 remaining"
396394msgstr "%1 yn weddill"
397395
398−#: qml/Panel/Indicators/MenuItemFactory.qml:901
396+#: qml/Panel/Indicators/MenuItemFactory.qml:910
399397msgid "In queue…"
400398msgstr "Mewn ciw..."
401399
402−#: qml/Panel/Indicators/MenuItemFactory.qml:905
400+#: qml/Panel/Indicators/MenuItemFactory.qml:914
403401msgid "Downloading"
404402msgstr "Yn llwytho i lawr"
405403
406−#: qml/Panel/Indicators/MenuItemFactory.qml:907
404+#: qml/Panel/Indicators/MenuItemFactory.qml:916
407405msgid "Paused, tap to resume"
408406msgstr "Seibiwyd, tapiwch i ailafael ynddi"
409407
410−#: qml/Panel/Indicators/MenuItemFactory.qml:909
408+#: qml/Panel/Indicators/MenuItemFactory.qml:918
411409msgid "Canceled"
412410msgstr "Diddymwyd"
413411
414−#: qml/Panel/Indicators/MenuItemFactory.qml:911
412+#: qml/Panel/Indicators/MenuItemFactory.qml:920
415413msgid "Finished"
416414msgstr "Wedi gorffen"
417415
418−#: qml/Panel/Indicators/MenuItemFactory.qml:913
416+#: qml/Panel/Indicators/MenuItemFactory.qml:922
419417msgid "Failed, tap to retry"
420418msgstr "Methwyd, tapiwch i geisio eto"
421419
@@ -435,251 +433,324 @@ msgctxt "Button: Call back on phone"
435433msgid "Call back"
436434msgstr ""
437435
438−#: qml/Tutorial/TutorialBottom.qml:28
439−msgid "Open special menus"
440−msgstr "Agor dewislenni arbennig"
441−
442−#: qml/Tutorial/TutorialBottom.qml:29
443−msgid "Swipe up from the bottom edge."
444−msgstr "Trawiwch i fyny o'r ymyl gwaelod."
436+#: qml/Stages/SideStage.qml:76
437+msgid "Drag using 3 fingers any application from one window to the other"
438+msgstr ""
445439
446−#: qml/Tutorial/TutorialBottomFinish.qml:24
447−msgid "This action does different things for different apps"
448−msgstr "Mae'r weithred hon yn gwneud pethau gwahanol mewn apiau gwahanol"
440+#: qml/Tutorial/TutorialBottom.qml:78
441+msgid "Swipe up to add a contact"
442+msgstr ""
449443
450−#: qml/Tutorial/TutorialBottomFinish.qml:25
451−msgid "Tap here to finish."
452−msgstr "Tapiwch yma i orffen"
444+#: qml/Tutorial/TutorialBottom.qml:80
445+msgid "Swipe up for favorite calculations"
446+msgstr ""
453447
454−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
455−#: qml/Tutorial/TutorialRight.qml:144
456−msgid "Tap here to continue."
457−msgstr "Tapiwch yma i barhau."
448+#: qml/Tutorial/TutorialBottom.qml:82
449+msgid "Swipe up for recent calls"
450+msgstr ""
458451
459−#: qml/Tutorial/TutorialLeft.qml:26
460−msgid "Open the launcher"
461−msgstr "Agor y lansiwr"
452+#: qml/Tutorial/TutorialBottom.qml:84
453+msgid "Swipe up to create a message"
454+msgstr ""
462455
463−#: qml/Tutorial/TutorialLeft.qml:27
464−msgid "Short swipe from the left edge."
465−msgstr "Trawiad byr o'r ymyl chwith."
456+#: qml/Tutorial/TutorialBottom.qml:85
457+msgid "Swipe up to manage the app"
458+msgstr ""
466459
467−#: qml/Tutorial/TutorialLeftFinish.qml:24
468−msgid "These are the shortcuts to favorite apps"
469−msgstr "Rhain yw'r llwybrau byr i'ch hoff apiau"
460+#: qml/Tutorial/TutorialLeft.qml:47
461+msgid "Swipe from the left edge to open the launcher"
462+msgstr ""
470463
471−#: qml/Tutorial/TutorialPage.qml:178
472−msgid "You almost got it!"
473−msgstr "Bron â bod!"
464+#: qml/Tutorial/TutorialLeftLong.qml:47
465+msgid "Long swipe from the left edge to open the Today scope"
466+msgstr ""
474467
475−#: qml/Tutorial/TutorialPage.qml:195
476−msgid "Try again."
477−msgstr "Ceisiwch eto."
468+#: qml/Tutorial/TutorialRight.qml:54
469+msgid "Hover your mouse on the right edge to view your open apps"
470+msgstr ""
478471
479−#: qml/Tutorial/TutorialRight.qml:31
480−msgid "To view open apps"
481−msgstr "I weld apiau sydd ar agor"
472+#: qml/Tutorial/TutorialRight.qml:55
473+msgid "Short or long swipe from the right edge to view your open apps"
474+msgstr ""
482475
483−#: qml/Tutorial/TutorialRight.qml:32
484−msgid "Long swipe from the right edge."
485−msgstr "Trawiad hir o'r ymyl dde."
476+#: qml/Tutorial/TutorialTop.qml:53
477+msgid "Swipe from the top right edge to open the notification bar"
478+msgstr ""
486479
487−#: qml/Tutorial/TutorialRight.qml:122
488−msgid "View all your running tasks."
489−msgstr "Gweld pob tasg sy'n rhedeg."
480+#: qml/Tutorial/TutorialTop.qml:54
481+msgid "Swipe from the top edge to open the notification bar"
482+msgstr ""
490483
491−#: qml/Wizard/Page.qml:89
484+#: qml/Wizard/Page.qml:54
492485msgctxt "Button: Go back one page in the Wizard"
493486msgid "Back"
494487msgstr "Nôl"
495488
496489#: qml/Wizard/Pages/10-welcome.qml:27
497−msgid "Hi!"
498−msgstr "Shwmae!"
490+msgid "Language"
491+msgstr ""
499492
500−#: qml/Wizard/Pages/10-welcome.qml:44
501−msgid "Welcome to your Ubuntu device."
493+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
494+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
495+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
496+#: qml/Wizard/Pages/75-report-check.qml:84
497+#: qml/Wizard/Pages/passcode-desktop.qml:124
498+#: qml/Wizard/Pages/password-set.qml:141
499+msgid "Next"
502500msgstr ""
503501
504−#: qml/Wizard/Pages/10-welcome.qml:52
505−msgid "Let’s get started."
506−msgstr "Beth am gychwyn."
502+#: qml/Wizard/Pages/30-wifi.qml:29
503+msgid "Connect to Wi‑Fi"
504+msgstr "Cysylltu â diwifr"
507505
508−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
509−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
510−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
511−#: qml/Wizard/Pages/passwd-set.qml:90
512−msgid "Continue"
513−msgstr "Parhau"
506+#: qml/Wizard/Pages/30-wifi.qml:130
507+msgid "Connected"
508+msgstr ""
514509
515−#: qml/Wizard/Pages/20-sim.qml:25
516−msgid "Add a SIM card and restart your device"
517−msgstr "Ychwanegwch gerdyn SIM ac ailgychwyn y ddyfais"
510+#: qml/Wizard/Pages/30-wifi.qml:163
511+msgid "Available Wi-Fi networks"
512+msgstr ""
518513
519−#: qml/Wizard/Pages/20-sim.qml:59
520−msgid "Without it, you won’t be able to make calls or use text messaging."
521−msgstr "Hebddo bydd dim modd gwneud galwadau na defnyddio negeseuon testun."
514+#: qml/Wizard/Pages/30-wifi.qml:164
515+msgid "No available Wi-Fi networks"
516+msgstr ""
522517
523−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
518+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
519+#: qml/Wizard/Pages/sim.qml:101
524520msgid "Skip"
525521msgstr "Neidio"
526522
527−#: qml/Wizard/Pages/30-passwd-type.qml:39
528−msgid "Lock security"
529−msgstr "Diogelwch cloi"
523+#: qml/Wizard/Pages/40-location.qml:27
524+msgid "Location Services"
525+msgstr ""
530526
531−#: qml/Wizard/Pages/30-passwd-type.qml:79
532−msgid "Please select how you’d like to unlock your device."
527+#: qml/Wizard/Pages/40-location.qml:83
528+msgid ""
529+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
530+"(recommended)"
533531msgstr ""
534532
535−#: qml/Wizard/Pages/30-passwd-type.qml:102
536−msgctxt "Label: Type of security method"
537−msgid "Swipe"
538−msgstr "Trawio"
533+#: qml/Wizard/Pages/40-location.qml:105
534+#, qt-format
535+msgid "By selecting this option you agree to the Nokia HERE %1."
536+msgstr ""
539537
540−#: qml/Wizard/Pages/30-passwd-type.qml:103
541−msgctxt "Label: Description of security method"
542−msgid "No security"
543−msgstr "Dim diogelwch"
538+#: qml/Wizard/Pages/40-location.qml:106
539+msgctxt "part of: Nokia HERE terms and conditions"
540+msgid "terms and conditions"
541+msgstr ""
542+
543+#: qml/Wizard/Pages/40-location.qml:160
544+msgid "GPS only"
545+msgstr ""
546+
547+#: qml/Wizard/Pages/40-location.qml:214
548+msgid "Don't use my location"
549+msgstr ""
550+
551+#: qml/Wizard/Pages/40-location.qml:260
552+msgid "You can change it later in System Settings."
553+msgstr ""
554+
555+#: qml/Wizard/Pages/50-timezone.qml:29
556+msgid "Time Zone"
557+msgstr ""
544558
545−#: qml/Wizard/Pages/30-passwd-type.qml:105
559+#: qml/Wizard/Pages/50-timezone.qml:178
560+msgid "Enter your city"
561+msgstr ""
562+
563+#: qml/Wizard/Pages/60-account.qml:24
564+msgid "Personalize Your Device"
565+msgstr ""
566+
567+#: qml/Wizard/Pages/60-account.qml:48
568+msgid "Preferred Name"
569+msgstr ""
570+
571+#: qml/Wizard/Pages/70-passwd-type.qml:39
572+msgid "Lock Screen"
573+msgstr ""
574+
575+#: qml/Wizard/Pages/70-passwd-type.qml:101
546576msgctxt "Label: Type of security method"
547−msgid "Passcode"
548−msgstr "Cod cyfrinachol"
577+msgid "Create new password"
578+msgstr ""
549579
550−#: qml/Wizard/Pages/30-passwd-type.qml:106
551−msgctxt "Label: Description of security method"
552−msgid "4 digits only"
553−msgstr "4 digid yn unig"
580+#: qml/Wizard/Pages/70-passwd-type.qml:103
581+msgctxt "Label: Type of security method"
582+msgid "Create passcode (numbers only)"
583+msgstr ""
554584
555−#: qml/Wizard/Pages/30-passwd-type.qml:108
585+#: qml/Wizard/Pages/70-passwd-type.qml:105
556586msgctxt "Label: Type of security method"
557−msgid "Passphrase"
558−msgstr "Cyfrinair"
587+msgid "No lock code"
588+msgstr ""
559589
560−#: qml/Wizard/Pages/30-passwd-type.qml:109
561−msgctxt "Label: Description of security method"
562−msgid "Numbers and letters"
563−msgstr "Rhifau a llythrennau"
590+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
591+msgid "Privacy Policy"
592+msgstr ""
564593
565−#: qml/Wizard/Pages/40-wifi.qml:29
566−msgid "Connect to Wi‑Fi"
567−msgstr "Cysylltu â diwifr"
594+#: qml/Wizard/Pages/75-report-check.qml:26
595+msgid "Help Us Improve"
596+msgstr ""
568597
569−#: qml/Wizard/Pages/40-wifi.qml:168
570−msgid "Available networks…"
571−msgstr "Rhwydweithiau sydd ar gael..."
598+#: qml/Wizard/Pages/75-report-check.qml:59
599+msgid "Improve system performance by sending us crashes and error reports."
600+msgstr ""
572601
573−#: qml/Wizard/Pages/40-wifi.qml:169
574−msgid "No available networks."
575−msgstr "Dim rhwydweithiau ar gael"
602+#: qml/Wizard/Pages/75-report-check.qml:60
603+msgid "Privacy policy"
604+msgstr ""
576605
577−#: qml/Wizard/Pages/50-location.qml:27
578−msgid "Location"
579−msgstr "Lleoliad"
606+#: qml/Wizard/Pages/80-finished.qml:89
607+msgid "Welcome to Ubuntu"
608+msgstr ""
580609
581−#: qml/Wizard/Pages/50-location.qml:62
582−msgid "Let the phone detect your location:"
583−msgstr "Caniatáu'r ffôn i ganfod eich lleoliad:"
610+#: qml/Wizard/Pages/80-finished.qml:104
611+msgid "You are ready to use your device now"
612+msgstr ""
613+
614+#: qml/Wizard/Pages/80-finished.qml:124
615+msgid "Get Started"
616+msgstr ""
617+
618+#: qml/Wizard/Pages/here-terms.qml:25
619+msgid "Terms & Conditions"
620+msgstr "Amodau a Thelerau"
584621
585−#: qml/Wizard/Pages/50-location.qml:69
586−msgid "Using GPS only (less accurate)"
587−msgstr "Defnyddio GPS yn unig (llai cywir)"
622+#: qml/Wizard/Pages/here-terms.qml:69
623+msgid "Your device uses positioning technologies provided by HERE."
624+msgstr ""
588625
589−#: qml/Wizard/Pages/50-location.qml:86
590−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
626+#: qml/Wizard/Pages/here-terms.qml:81
627+msgid ""
628+"To provide you with positioning services and to improve their quality, HERE "
629+"collects information about nearby cell towers and Wi-Fi hotspots around your "
630+"current location whenever your position is being found."
591631msgstr ""
592−"Defnyddio GPS, diwifr dienw a gwybodaeth rhwydwaith cellog (argymellir hwn)"
593632
594−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
595−#: qml/Wizard/Pages/50-location.qml:103
633+#: qml/Wizard/Pages/here-terms.qml:93
596634msgid ""
597−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
598−"conditions</a>."
635+"The information collected is used to analyze the service and to improve the "
636+"use of service, but not to identify you personally."
599637msgstr ""
600−"Drwy ddewis yr opsiwn yma rydych yn cytuno i <a href='#'>dermau ac "
601−"amodau</a> Nokia HERE."
602638
603−#: qml/Wizard/Pages/50-location.qml:112
604−msgid "Not at all"
605−msgstr "Dim o gwbl"
639+#: qml/Wizard/Pages/here-terms.qml:106
640+#, qt-format
641+msgid "By continuing, you agree to the HERE platform %1 and %2."
642+msgstr ""
606643
607−#: qml/Wizard/Pages/50-location.qml:124
608−msgid "You can change your mind later in <b>System Settings</b>."
609−msgstr "Gallwch newid hwn eto yn <b>Gosodiadau System</b>."
644+#: qml/Wizard/Pages/here-terms.qml:107
645+msgid "Service Terms"
646+msgstr ""
610647
611−#: qml/Wizard/Pages/60-reporting.qml:26
612−msgid "Improving your experience"
613−msgstr "Gwella eich profiad"
648+#: qml/Wizard/Pages/passcode-confirm.qml:43
649+#: qml/Wizard/Pages/passcode-desktop.qml:80
650+msgid "Confirm passcode"
651+msgstr "Cadarnhau cod cyfrinachol"
614652
615−#: qml/Wizard/Pages/60-reporting.qml:46
616−msgid ""
617−"Your phone is set up to automatically report errors to Canonical and its "
618−"partners, the makers of the operating system."
653+#: qml/Wizard/Pages/passcode-confirm.qml:45
654+msgid "Incorrect passcode."
619655msgstr ""
620−"Cyfluniwyd eich ffôn i adrodd gwallau i Canonical a'i bartneriaid, "
621−"gwneuthurwyr y system weithredu."
622656
623−#: qml/Wizard/Pages/60-reporting.qml:53
624−msgid ""
625−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
626−"Privacy</b>"
657+#: qml/Wizard/Pages/passcode-confirm.qml:45
658+msgctxt "Enter the passcode again"
659+msgid "Please re-enter."
627660msgstr ""
628−"Gellir analluogi hwn yn <b>Gosodiadau System</b> dan <b>Diogelwch a "
629−"Phreifatwydd</b>"
630661
631−#: qml/Wizard/Pages/80-finished.qml:24
632−msgid "All done"
633−msgstr "Wedi gorffen"
662+#: qml/Wizard/Pages/passcode-desktop.qml:30
663+msgid "Lock Screen Passcode"
664+msgstr ""
634665
635−#: qml/Wizard/Pages/80-finished.qml:39
636−msgid "Nice work!"
637−msgstr "Da iawn!"
666+#: qml/Wizard/Pages/passcode-desktop.qml:56
667+msgid "Enter 4 numbers to setup your passcode"
668+msgstr ""
638669
639−#: qml/Wizard/Pages/80-finished.qml:46
640−msgid "Your device is now ready to use."
670+#: qml/Wizard/Pages/passcode-desktop.qml:65
671+#: qml/Wizard/Pages/passcode-set.qml:54
672+msgid "Choose passcode"
641673msgstr ""
642674
643−#: qml/Wizard/Pages/80-finished.qml:53
644−msgid "Finish"
645−msgstr "Gorffen"
675+#: qml/Wizard/Pages/passcode-desktop.qml:105
676+msgid "Passcode too short"
677+msgstr ""
646678
647−#: qml/Wizard/Pages/here-terms.qml:27
648−msgid "Terms & Conditions"
649−msgstr "Amodau a Thelerau"
679+#: qml/Wizard/Pages/passcode-desktop.qml:107
680+msgid "Passcodes match"
681+msgstr ""
650682
651−#: qml/Wizard/Pages/passwd-confirm.qml:49
652−msgid "Confirm passphrase"
653−msgstr "Cadarnhau cyfrinair"
683+#: qml/Wizard/Pages/passcode-desktop.qml:109
684+msgid "Passcodes do not match"
685+msgstr ""
654686
655−#: qml/Wizard/Pages/passwd-confirm.qml:50
656−msgid "Confirm passcode"
657−msgstr "Cadarnhau cod cyfrinachol"
687+#: qml/Wizard/Pages/passcode-set.qml:62
688+msgid "Passcode must be 4 characters long"
689+msgstr ""
658690
659−#: qml/Wizard/Pages/passwd-confirm.qml:53
660−#: qml/Wizard/Pages/passwd-confirm.qml:54
661−msgid "Please try again."
662−msgstr "Rhowch gynnig arall arni"
691+#: qml/Wizard/Pages/password-set.qml:30
692+msgid "Lock Screen Password"
693+msgstr ""
663694
664−#: qml/Wizard/Pages/passwd-set.qml:61
665−msgid "Choose your passcode"
666−msgstr "Dewiswch eich cod cyfrinachol"
695+#: qml/Wizard/Pages/password-set.qml:61
696+msgid "Enter at least 8 characters"
697+msgstr ""
667698
668−#: qml/Wizard/Pages/passwd-set.qml:68
669−msgid "Passphrase must be 4 characters long"
670−msgstr "Dylai cyfrinair fod yn bedwar nod"
699+#: qml/Wizard/Pages/password-set.qml:73
700+msgid "Choose password"
701+msgstr ""
671702
672−#. Translators: This is the arrow for "Back" buttons
673−#: qml/Wizard/StackButton.qml:39
674−#, qt-format
675−msgid "〈 %1"
676−msgstr "〈 %1"
703+#: qml/Wizard/Pages/password-set.qml:103
704+msgid "Confirm password"
705+msgstr ""
677706
678−#. Translators: This is the arrow for "Forward" buttons
679−#: qml/Wizard/StackButton.qml:42
680−#, qt-format
681−msgid "%1 〉"
682−msgstr "%1 〉"
707+#: qml/Wizard/Pages/sim.qml:27
708+msgid "No SIM card installed"
709+msgstr ""
710+
711+#: qml/Wizard/Pages/sim.qml:54
712+msgid "SIM card added"
713+msgstr ""
714+
715+#: qml/Wizard/Pages/sim.qml:55
716+msgid "You must restart the device to access the mobile network."
717+msgstr ""
718+
719+#: qml/Wizard/Pages/sim.qml:59
720+msgid "Restart"
721+msgstr ""
722+
723+#: qml/Wizard/Pages/sim.qml:78
724+msgid "You won’t be able to make calls or use text messaging without a SIM."
725+msgstr ""
726+
727+#: qml/Wizard/Pages/sim.qml:90
728+msgid "To proceed with no SIM tap Skip."
729+msgstr ""
730+
731+#: qml/Wizard/PasswordMeter.qml:87
732+msgid "Passwords match"
733+msgstr ""
734+
735+#: qml/Wizard/PasswordMeter.qml:89
736+msgid "Passwords do not match"
737+msgstr ""
738+
739+#: qml/Wizard/PasswordMeter.qml:93
740+msgid "Strong password"
741+msgstr ""
742+
743+#: qml/Wizard/PasswordMeter.qml:95
744+msgid "Fair password"
745+msgstr ""
746+
747+#: qml/Wizard/PasswordMeter.qml:97
748+msgid "Weak password"
749+msgstr ""
750+
751+#: qml/Wizard/PasswordMeter.qml:99
752+msgid "Very weak password"
753+msgstr ""
683754
684755#~ msgid "%a %l:%M %p"
685756#~ msgstr "%a %l:%M %p"
@@ -711,17 +782,191 @@ msgstr "%1 〉"
711782#~ msgid "Tomorrow %H:%M"
712783#~ msgstr "Yfory %H:%M"
713784
785+#~ msgid "Are you sure you want to shut down?"
786+#~ msgstr "Ydych chi'n sicr eich bod am ddiffodd?"
787+
788+#~ msgctxt "Button: Shut down the system"
789+#~ msgid "Shut down"
790+#~ msgstr "Diffodd"
791+
792+#~ msgctxt "Title: Reboot/Shut down dialog"
793+#~ msgid "Shut down"
794+#~ msgstr "Diffodd"
795+
796+#~ msgctxt "Button: Reboot the system"
797+#~ msgid "Reboot"
798+#~ msgstr "Ailgychwyn"
799+
800+#~ msgid "This action does different things for different apps"
801+#~ msgstr "Mae'r weithred hon yn gwneud pethau gwahanol mewn apiau gwahanol"
802+
714803#~ msgid "Unlock SIM"
715804#~ msgstr "Datgloi SIM"
716805
717806#~ msgid "Roaming"
718807#~ msgstr "Crwydrol"
719808
809+#~ msgid "Try again."
810+#~ msgstr "Ceisiwch eto."
811+
812+#~ msgid "Short swipe from the left edge."
813+#~ msgstr "Trawiad byr o'r ymyl chwith."
814+
815+#~ msgid "Open the launcher"
816+#~ msgstr "Agor y lansiwr"
817+
818+#~ msgid "Tap here to continue."
819+#~ msgstr "Tapiwch yma i barhau."
820+
821+#~ msgid "These are the shortcuts to favorite apps"
822+#~ msgstr "Rhain yw'r llwybrau byr i'ch hoff apiau"
823+
824+#~ msgid "Swipe up from the bottom edge."
825+#~ msgstr "Trawiwch i fyny o'r ymyl gwaelod."
826+
827+#~ msgid "Open special menus"
828+#~ msgstr "Agor dewislenni arbennig"
829+
830+#~ msgid "Tap here to finish."
831+#~ msgstr "Tapiwch yma i orffen"
832+
833+#~ msgid "You almost got it!"
834+#~ msgstr "Bron â bod!"
835+
836+#~ msgid "To view open apps"
837+#~ msgstr "I weld apiau sydd ar agor"
838+
839+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
840+#~ msgstr "Hebddo bydd dim modd gwneud galwadau na defnyddio negeseuon testun."
841+
842+#~ msgid "Add a SIM card and restart your device"
843+#~ msgstr "Ychwanegwch gerdyn SIM ac ailgychwyn y ddyfais"
844+
845+#~ msgid "View all your running tasks."
846+#~ msgstr "Gweld pob tasg sy'n rhedeg."
847+
848+#~ msgid "Long swipe from the right edge."
849+#~ msgstr "Trawiad hir o'r ymyl dde."
850+
851+#~ msgid "Hi!"
852+#~ msgstr "Shwmae!"
853+
854+#~ msgid "Let’s get started."
855+#~ msgstr "Beth am gychwyn."
856+
857+#~ msgid "Continue"
858+#~ msgstr "Parhau"
859+
720860#~ msgid "Welcome to your Ubuntu phone."
721861#~ msgstr "Croeso i'ch ffôn Ubuntu."
722862
863+#~ msgid "Lock security"
864+#~ msgstr "Diogelwch cloi"
865+
723866#~ msgid "Please select how you’d like to unlock your phone."
724867#~ msgstr "Dewiswch sut yr hoffech ddatgloi'r ffôn."
725868
869+#~ msgctxt "Label: Description of security method"
870+#~ msgid "No security"
871+#~ msgstr "Dim diogelwch"
872+
873+#~ msgctxt "Label: Type of security method"
874+#~ msgid "Swipe"
875+#~ msgstr "Trawio"
876+
877+#~ msgctxt "Label: Description of security method"
878+#~ msgid "4 digits only"
879+#~ msgstr "4 digid yn unig"
880+
881+#~ msgctxt "Label: Type of security method"
882+#~ msgid "Passcode"
883+#~ msgstr "Cod cyfrinachol"
884+
885+#~ msgctxt "Label: Type of security method"
886+#~ msgid "Passphrase"
887+#~ msgstr "Cyfrinair"
888+
889+#~ msgctxt "Label: Description of security method"
890+#~ msgid "Numbers and letters"
891+#~ msgstr "Rhifau a llythrennau"
892+
893+#~ msgid "Improving your experience"
894+#~ msgstr "Gwella eich profiad"
895+
896+#~ msgid "You can change your mind later in <b>System Settings</b>."
897+#~ msgstr "Gallwch newid hwn eto yn <b>Gosodiadau System</b>."
898+
899+#~ msgid ""
900+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
901+#~ "conditions</a>."
902+#~ msgstr ""
903+#~ "Drwy ddewis yr opsiwn yma rydych yn cytuno i <a href='#'>dermau ac "
904+#~ "amodau</a> Nokia HERE."
905+
906+#~ msgid "Not at all"
907+#~ msgstr "Dim o gwbl"
908+
909+#~ msgid "Available networks…"
910+#~ msgstr "Rhwydweithiau sydd ar gael..."
911+
912+#~ msgid "No available networks."
913+#~ msgstr "Dim rhwydweithiau ar gael"
914+
915+#~ msgid "Location"
916+#~ msgstr "Lleoliad"
917+
918+#~ msgid "Let the phone detect your location:"
919+#~ msgstr "Caniatáu'r ffôn i ganfod eich lleoliad:"
920+
921+#~ msgid "Using GPS only (less accurate)"
922+#~ msgstr "Defnyddio GPS yn unig (llai cywir)"
923+
924+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
925+#~ msgstr ""
926+#~ "Defnyddio GPS, diwifr dienw a gwybodaeth rhwydwaith cellog (argymellir hwn)"
927+
928+#~ msgid ""
929+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
930+#~ "Privacy</b>"
931+#~ msgstr ""
932+#~ "Gellir analluogi hwn yn <b>Gosodiadau System</b> dan <b>Diogelwch a "
933+#~ "Phreifatwydd</b>"
934+
935+#~ msgid ""
936+#~ "Your phone is set up to automatically report errors to Canonical and its "
937+#~ "partners, the makers of the operating system."
938+#~ msgstr ""
939+#~ "Cyfluniwyd eich ffôn i adrodd gwallau i Canonical a'i bartneriaid, "
940+#~ "gwneuthurwyr y system weithredu."
941+
942+#~ msgid "Nice work!"
943+#~ msgstr "Da iawn!"
944+
945+#~ msgid "All done"
946+#~ msgstr "Wedi gorffen"
947+
948+#~ msgid "Finish"
949+#~ msgstr "Gorffen"
950+
726951#~ msgid "Your phone is now ready to use."
727952#~ msgstr "Mae eich ffôn yn barod i'w ddefnyddio"
953+
954+#~ msgid "Confirm passphrase"
955+#~ msgstr "Cadarnhau cyfrinair"
956+
957+#~ msgid "Please try again."
958+#~ msgstr "Rhowch gynnig arall arni"
959+
960+#, qt-format
961+#~ msgid "〈 %1"
962+#~ msgstr "〈 %1"
963+
964+#, qt-format
965+#~ msgid "%1 〉"
966+#~ msgstr "%1 〉"
967+
968+#~ msgid "Choose your passcode"
969+#~ msgstr "Dewiswch eich cod cyfrinachol"
970+
971+#~ msgid "Passphrase must be 4 characters long"
972+#~ msgstr "Dylai cyfrinair fod yn bedwar nod"
po/da.po+477−232
@@ -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: 2016-03-10 22:48+0000\n"
11+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1212"PO-Revision-Date: 2015-07-06 12:05+0000\n"
1313"Last-Translator: Folmer Fredslund <Unknown>\n"
1414"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -16,8 +16,8 @@ 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: 2016-03-13 05:50+0000\n"
20−"X-Generator: Launchpad (build 17939)\n"
19+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
20+"X-Generator: Launchpad (build 17958)\n"
2121
2222#: plugins/IntegratedLightDM/Greeter.cpp:112
2323msgid "Password: "
@@ -78,53 +78,35 @@ msgctxt "Button: Log out from the system"
7878msgid "Log Out"
7979msgstr "Log af"
8080
81−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
82−#: qml/Components/Dialogs.qml:253
81+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
82+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
83+#: qml/Wizard/Pages/passcode-set.qml:32
8384msgid "Cancel"
8485msgstr "Annullér"
8586
8687#: qml/Components/Dialogs.qml:173
87−msgctxt "Title: Reboot/Shut down dialog"
88−msgid "Shut down"
89−msgstr "Luk ned"
90−
91−#: qml/Components/Dialogs.qml:174
92−msgid "Are you sure you want to shut down?"
93−msgstr "Er du sikker på du vil lukke ned?"
94−
95−#: qml/Components/Dialogs.qml:176
96−msgctxt "Button: Reboot the system"
97−msgid "Reboot"
98−msgstr "Genstart"
99−
100−#: qml/Components/Dialogs.qml:185
101−msgctxt "Button: Shut down the system"
102−msgid "Shut down"
103−msgstr "Luk ned"
104−
105−#: qml/Components/Dialogs.qml:207
10688msgctxt "Title: Reboot dialog"
10789msgid "Reboot"
10890msgstr "Genstart"
10991
110−#: qml/Components/Dialogs.qml:208
92+#: qml/Components/Dialogs.qml:174
11193msgid "Are you sure you want to reboot?"
11294msgstr "Er du sikker på du vil genstarte?"
11395
114−#: qml/Components/Dialogs.qml:210
96+#: qml/Components/Dialogs.qml:176
11597msgid "No"
11698msgstr "Nej"
11799
118−#: qml/Components/Dialogs.qml:217
100+#: qml/Components/Dialogs.qml:183
119101msgid "Yes"
120102msgstr "Ja"
121103
122−#: qml/Components/Dialogs.qml:232
104+#: qml/Components/Dialogs.qml:198
123105msgctxt "Title: Power off/Restart dialog"
124106msgid "Power"
125107msgstr "Sluk/genstart"
126108
127−#: qml/Components/Dialogs.qml:233
109+#: qml/Components/Dialogs.qml:199
128110msgid ""
129111"Are you sure you would like\n"
130112"to power off?"
@@ -132,12 +114,12 @@ msgstr ""
132114"Er du sikker på at du vil\n"
133115"slukke enheden?"
134116
135−#: qml/Components/Dialogs.qml:235
117+#: qml/Components/Dialogs.qml:201
136118msgctxt "Button: Power off the system"
137119msgid "Power off"
138120msgstr "Luk ned"
139121
140−#: qml/Components/Dialogs.qml:244
122+#: qml/Components/Dialogs.qml:210
141123msgctxt "Button: Restart the system"
142124msgid "Restart"
143125msgstr "Genstart"
@@ -180,42 +162,58 @@ msgstr ""
180162msgid "Close all"
181163msgstr ""
182164
183−#: qml/Dash/DashPageHeader.qml:270
165+#: qml/Dash/DashPageHeader.qml:337
184166msgctxt "Button: Open the Ubuntu Store"
185167msgid "Store"
186168msgstr "Butik"
187169
188−#: qml/Dash/DashPageHeader.qml:277
170+#: qml/Dash/DashPageHeader.qml:344
189171msgctxt "Button: Start a search in the current dash scope"
190172msgid "Search"
191173msgstr "Søg"
192174
193−#: qml/Dash/DashPageHeader.qml:287
175+#: qml/Dash/DashPageHeader.qml:354
194176msgctxt "Button: Show the current dash scope settings"
195177msgid "Settings"
196178msgstr "Indstillinger"
197179
198−#: qml/Dash/DashPageHeader.qml:294
180+#: qml/Dash/DashPageHeader.qml:361
199181msgid "Remove from Favorites"
200182msgstr "Fjern fra Favoritter"
201183
202−#: qml/Dash/DashPageHeader.qml:294
184+#: qml/Dash/DashPageHeader.qml:361
203185msgid "Add to Favorites"
204186msgstr "Tilføj til Favoritter"
205187
206−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
188+#: qml/Dash/FiltersPopover.qml:60
189+msgid "Refine your results"
190+msgstr ""
191+
192+#: qml/Dash/FiltersPopover.qml:69
193+msgid "Reset"
194+msgstr ""
195+
196+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
207197msgid "See less"
208198msgstr "Vis mindre"
209199
210−#: qml/Dash/GenericScopeView.qml:567
200+#: qml/Dash/GenericScopeView.qml:570
211201msgid "See all"
212202msgstr "Se alle"
213203
214−#: qml/Dash/GenericScopeView.qml:629
204+#: qml/Dash/GenericScopeView.qml:627
215205msgctxt "Label: Hint for dash search line edit"
216206msgid "Search"
217207msgstr "Søg"
218208
209+#: qml/Dash/PageHeaderExtraPanel.qml:55
210+msgid "Recent Searches"
211+msgstr ""
212+
213+#: qml/Dash/PageHeaderExtraPanel.qml:66
214+msgid "Clear All"
215+msgstr ""
216+
219217#: qml/Dash/Previews/PreviewActionCombo.qml:35
220218msgid "More..."
221219msgstr "Mere..."
@@ -283,11 +281,11 @@ msgstr "Forsøg igen"
283281msgid "Tap to unlock"
284282msgstr "Tap for at låse op"
285283
286−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
284+#: qml/Greeter/NarrowView.qml:54
287285msgid "Sorry, incorrect passphrase."
288286msgstr "Beklager, forkert adgangsfrase."
289287
290−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
288+#: qml/Greeter/NarrowView.qml:55
291289msgid "Sorry, incorrect passcode."
292290msgstr "Beklager, forkert adgangskode."
293291
@@ -316,7 +314,7 @@ msgstr ""
316314msgid "Enter %1"
317315msgstr "Indtast %1"
318316
319−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
317+#: qml/Greeter/NarrowView.qml:117
320318msgid "Enter passphrase"
321319msgstr "Angiv adgangsfrase"
322320
@@ -354,62 +352,62 @@ msgstr "Tryk for at vende tilbage til opkaldet..."
354352msgid "Conference"
355353msgstr "Konference"
356354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:752
355+#: qml/Panel/Indicators/MenuItemFactory.qml:761
358356msgid "Nothing is playing"
359357msgstr "Intet afspilles"
360358
361−#: qml/Panel/Indicators/MenuItemFactory.qml:881
359+#: qml/Panel/Indicators/MenuItemFactory.qml:890
362360#, qt-format
363361msgid "%1 hour"
364362msgid_plural "%1 hours"
365363msgstr[0] "%1 time"
366364msgstr[1] "%1 timer"
367365
368−#: qml/Panel/Indicators/MenuItemFactory.qml:885
366+#: qml/Panel/Indicators/MenuItemFactory.qml:894
369367#, qt-format
370368msgid "%1 minute"
371369msgid_plural "%1 minutes"
372370msgstr[0] "%1 minut"
373371msgstr[1] "%1 minutter"
374372
375−#: qml/Panel/Indicators/MenuItemFactory.qml:890
373+#: qml/Panel/Indicators/MenuItemFactory.qml:899
376374#, qt-format
377375msgid "%1 second"
378376msgid_plural "%1 seconds"
379377msgstr[0] "%1 sekund"
380378msgstr[1] "%1 sekunder"
381379
382−#: qml/Panel/Indicators/MenuItemFactory.qml:893
380+#: qml/Panel/Indicators/MenuItemFactory.qml:902
383381msgid "0 seconds"
384382msgstr "0 sekunder"
385383
386384#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
387−#: qml/Panel/Indicators/MenuItemFactory.qml:895
385+#: qml/Panel/Indicators/MenuItemFactory.qml:904
388386#, qt-format
389387msgid "%1 remaining"
390388msgstr "%1 tilbage"
391389
392−#: qml/Panel/Indicators/MenuItemFactory.qml:901
390+#: qml/Panel/Indicators/MenuItemFactory.qml:910
393391msgid "In queue…"
394392msgstr "I kø…"
395393
396−#: qml/Panel/Indicators/MenuItemFactory.qml:905
394+#: qml/Panel/Indicators/MenuItemFactory.qml:914
397395msgid "Downloading"
398396msgstr "Henter"
399397
400−#: qml/Panel/Indicators/MenuItemFactory.qml:907
398+#: qml/Panel/Indicators/MenuItemFactory.qml:916
401399msgid "Paused, tap to resume"
402400msgstr "På pause - tryk for at fortsætte"
403401
404−#: qml/Panel/Indicators/MenuItemFactory.qml:909
402+#: qml/Panel/Indicators/MenuItemFactory.qml:918
405403msgid "Canceled"
406404msgstr "Annulleret"
407405
408−#: qml/Panel/Indicators/MenuItemFactory.qml:911
406+#: qml/Panel/Indicators/MenuItemFactory.qml:920
409407msgid "Finished"
410408msgstr "Færdig"
411409
412−#: qml/Panel/Indicators/MenuItemFactory.qml:913
410+#: qml/Panel/Indicators/MenuItemFactory.qml:922
413411msgid "Failed, tap to retry"
414412msgstr "Mislykkedes - tryk for at prøve igen"
415413
@@ -429,253 +427,324 @@ msgctxt "Button: Call back on phone"
429427msgid "Call back"
430428msgstr ""
431429
432−#: qml/Tutorial/TutorialBottom.qml:28
433−msgid "Open special menus"
434−msgstr "Åben specialmenuer"
435−
436−#: qml/Tutorial/TutorialBottom.qml:29
437−msgid "Swipe up from the bottom edge."
438−msgstr "Swipe op fra den nedre kant."
430+#: qml/Stages/SideStage.qml:76
431+msgid "Drag using 3 fingers any application from one window to the other"
432+msgstr ""
439433
440−#: qml/Tutorial/TutorialBottomFinish.qml:24
441−msgid "This action does different things for different apps"
442−msgstr "Denne handling gør forskellige ting i forskellige apps"
434+#: qml/Tutorial/TutorialBottom.qml:78
435+msgid "Swipe up to add a contact"
436+msgstr ""
443437
444−#: qml/Tutorial/TutorialBottomFinish.qml:25
445−msgid "Tap here to finish."
446−msgstr "Tryk her for at afslutte."
438+#: qml/Tutorial/TutorialBottom.qml:80
439+msgid "Swipe up for favorite calculations"
440+msgstr ""
447441
448−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
449−#: qml/Tutorial/TutorialRight.qml:144
450−msgid "Tap here to continue."
451−msgstr "Tryk her for at fortsætte."
442+#: qml/Tutorial/TutorialBottom.qml:82
443+msgid "Swipe up for recent calls"
444+msgstr ""
452445
453−#: qml/Tutorial/TutorialLeft.qml:26
454−msgid "Open the launcher"
455−msgstr "Åbn opstarteren"
446+#: qml/Tutorial/TutorialBottom.qml:84
447+msgid "Swipe up to create a message"
448+msgstr ""
456449
457−#: qml/Tutorial/TutorialLeft.qml:27
458−msgid "Short swipe from the left edge."
459−msgstr "Kort swipe fra den venstre kant."
450+#: qml/Tutorial/TutorialBottom.qml:85
451+msgid "Swipe up to manage the app"
452+msgstr ""
460453
461−#: qml/Tutorial/TutorialLeftFinish.qml:24
462−msgid "These are the shortcuts to favorite apps"
463−msgstr "Disse er genveje til favorit-apps"
454+#: qml/Tutorial/TutorialLeft.qml:47
455+msgid "Swipe from the left edge to open the launcher"
456+msgstr ""
464457
465−#: qml/Tutorial/TutorialPage.qml:178
466−msgid "You almost got it!"
467−msgstr "Du havde den næsten!"
458+#: qml/Tutorial/TutorialLeftLong.qml:47
459+msgid "Long swipe from the left edge to open the Today scope"
460+msgstr ""
468461
469−#: qml/Tutorial/TutorialPage.qml:195
470−msgid "Try again."
471−msgstr "Prøv igen."
462+#: qml/Tutorial/TutorialRight.qml:54
463+msgid "Hover your mouse on the right edge to view your open apps"
464+msgstr ""
472465
473−#: qml/Tutorial/TutorialRight.qml:31
474−msgid "To view open apps"
475−msgstr "For at se åbne apps"
466+#: qml/Tutorial/TutorialRight.qml:55
467+msgid "Short or long swipe from the right edge to view your open apps"
468+msgstr ""
476469
477−#: qml/Tutorial/TutorialRight.qml:32
478−msgid "Long swipe from the right edge."
479−msgstr "Langt swipe fra den højre kant."
470+#: qml/Tutorial/TutorialTop.qml:53
471+msgid "Swipe from the top right edge to open the notification bar"
472+msgstr ""
480473
481−#: qml/Tutorial/TutorialRight.qml:122
482−msgid "View all your running tasks."
483−msgstr "Se alle dine kørende opgaver."
474+#: qml/Tutorial/TutorialTop.qml:54
475+msgid "Swipe from the top edge to open the notification bar"
476+msgstr ""
484477
485−#: qml/Wizard/Page.qml:89
478+#: qml/Wizard/Page.qml:54
486479msgctxt "Button: Go back one page in the Wizard"
487480msgid "Back"
488481msgstr "Tilbage"
489482
490483#: qml/Wizard/Pages/10-welcome.qml:27
491−msgid "Hi!"
492−msgstr "Hej!"
484+msgid "Language"
485+msgstr ""
493486
494−#: qml/Wizard/Pages/10-welcome.qml:44
495−msgid "Welcome to your Ubuntu device."
487+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
488+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
489+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
490+#: qml/Wizard/Pages/75-report-check.qml:84
491+#: qml/Wizard/Pages/passcode-desktop.qml:124
492+#: qml/Wizard/Pages/password-set.qml:141
493+msgid "Next"
496494msgstr ""
497495
498−#: qml/Wizard/Pages/10-welcome.qml:52
499−msgid "Let’s get started."
500−msgstr "Lad os komme i gang."
496+#: qml/Wizard/Pages/30-wifi.qml:29
497+msgid "Connect to Wi‑Fi"
498+msgstr "Tilslut til Wi-Fi"
501499
502−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
503−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
504−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
505−#: qml/Wizard/Pages/passwd-set.qml:90
506−msgid "Continue"
507−msgstr "Fortsæt"
500+#: qml/Wizard/Pages/30-wifi.qml:130
501+msgid "Connected"
502+msgstr ""
508503
509−#: qml/Wizard/Pages/20-sim.qml:25
510−msgid "Add a SIM card and restart your device"
511−msgstr "Indsæt et SIM-kort og genstart din enhed"
504+#: qml/Wizard/Pages/30-wifi.qml:163
505+msgid "Available Wi-Fi networks"
506+msgstr ""
512507
513−#: qml/Wizard/Pages/20-sim.qml:59
514−msgid "Without it, you won’t be able to make calls or use text messaging."
508+#: qml/Wizard/Pages/30-wifi.qml:164
509+msgid "No available Wi-Fi networks"
515510msgstr ""
516−"Uden denne vil du ikke være i stand til at foretage opkald eller sende "
517−"tekstbeskeder."
518511
519−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
512+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
513+#: qml/Wizard/Pages/sim.qml:101
520514msgid "Skip"
521515msgstr "Spring over"
522516
523−#: qml/Wizard/Pages/30-passwd-type.qml:39
524−msgid "Lock security"
525−msgstr "Låsesikkerhed"
517+#: qml/Wizard/Pages/40-location.qml:27
518+msgid "Location Services"
519+msgstr ""
526520
527−#: qml/Wizard/Pages/30-passwd-type.qml:79
528−msgid "Please select how you’d like to unlock your device."
521+#: qml/Wizard/Pages/40-location.qml:83
522+msgid ""
523+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
524+"(recommended)"
529525msgstr ""
530526
531−#: qml/Wizard/Pages/30-passwd-type.qml:102
532−msgctxt "Label: Type of security method"
533−msgid "Swipe"
534−msgstr "Swipe"
527+#: qml/Wizard/Pages/40-location.qml:105
528+#, qt-format
529+msgid "By selecting this option you agree to the Nokia HERE %1."
530+msgstr ""
535531
536−#: qml/Wizard/Pages/30-passwd-type.qml:103
537−msgctxt "Label: Description of security method"
538−msgid "No security"
539−msgstr "Ingen sikkerhed"
532+#: qml/Wizard/Pages/40-location.qml:106
533+msgctxt "part of: Nokia HERE terms and conditions"
534+msgid "terms and conditions"
535+msgstr ""
540536
541−#: qml/Wizard/Pages/30-passwd-type.qml:105
537+#: qml/Wizard/Pages/40-location.qml:160
538+msgid "GPS only"
539+msgstr ""
540+
541+#: qml/Wizard/Pages/40-location.qml:214
542+msgid "Don't use my location"
543+msgstr ""
544+
545+#: qml/Wizard/Pages/40-location.qml:260
546+msgid "You can change it later in System Settings."
547+msgstr ""
548+
549+#: qml/Wizard/Pages/50-timezone.qml:29
550+msgid "Time Zone"
551+msgstr ""
552+
553+#: qml/Wizard/Pages/50-timezone.qml:178
554+msgid "Enter your city"
555+msgstr ""
556+
557+#: qml/Wizard/Pages/60-account.qml:24
558+msgid "Personalize Your Device"
559+msgstr ""
560+
561+#: qml/Wizard/Pages/60-account.qml:48
562+msgid "Preferred Name"
563+msgstr ""
564+
565+#: qml/Wizard/Pages/70-passwd-type.qml:39
566+msgid "Lock Screen"
567+msgstr ""
568+
569+#: qml/Wizard/Pages/70-passwd-type.qml:101
542570msgctxt "Label: Type of security method"
543−msgid "Passcode"
544−msgstr "Adgangskode"
571+msgid "Create new password"
572+msgstr ""
545573
546−#: qml/Wizard/Pages/30-passwd-type.qml:106
547−msgctxt "Label: Description of security method"
548−msgid "4 digits only"
549−msgstr "Kun 4 tal"
574+#: qml/Wizard/Pages/70-passwd-type.qml:103
575+msgctxt "Label: Type of security method"
576+msgid "Create passcode (numbers only)"
577+msgstr ""
550578
551−#: qml/Wizard/Pages/30-passwd-type.qml:108
579+#: qml/Wizard/Pages/70-passwd-type.qml:105
552580msgctxt "Label: Type of security method"
553−msgid "Passphrase"
554−msgstr "Adgangsfrase"
581+msgid "No lock code"
582+msgstr ""
555583
556−#: qml/Wizard/Pages/30-passwd-type.qml:109
557−msgctxt "Label: Description of security method"
558−msgid "Numbers and letters"
559−msgstr "Tal og bogstaver"
584+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
585+msgid "Privacy Policy"
586+msgstr ""
560587
561−#: qml/Wizard/Pages/40-wifi.qml:29
562−msgid "Connect to Wi‑Fi"
563−msgstr "Tilslut til Wi-Fi"
588+#: qml/Wizard/Pages/75-report-check.qml:26
589+msgid "Help Us Improve"
590+msgstr ""
564591
565−#: qml/Wizard/Pages/40-wifi.qml:168
566−msgid "Available networks…"
567−msgstr "Tilgængelige netværk..."
592+#: qml/Wizard/Pages/75-report-check.qml:59
593+msgid "Improve system performance by sending us crashes and error reports."
594+msgstr ""
595+
596+#: qml/Wizard/Pages/75-report-check.qml:60
597+msgid "Privacy policy"
598+msgstr ""
568599
569−#: qml/Wizard/Pages/40-wifi.qml:169
570−msgid "No available networks."
571−msgstr "Ingen tilgængelige netværk."
600+#: qml/Wizard/Pages/80-finished.qml:89
601+msgid "Welcome to Ubuntu"
602+msgstr ""
572603
573−#: qml/Wizard/Pages/50-location.qml:27
574−msgid "Location"
575−msgstr "Placering"
604+#: qml/Wizard/Pages/80-finished.qml:104
605+msgid "You are ready to use your device now"
606+msgstr ""
576607
577−#: qml/Wizard/Pages/50-location.qml:62
578−msgid "Let the phone detect your location:"
579−msgstr "Lad telefonen bestemme din placering:"
608+#: qml/Wizard/Pages/80-finished.qml:124
609+msgid "Get Started"
610+msgstr ""
580611
581−#: qml/Wizard/Pages/50-location.qml:69
582−msgid "Using GPS only (less accurate)"
583−msgstr "Kun ved brug af GPS (mindre præcis)"
612+#: qml/Wizard/Pages/here-terms.qml:25
613+msgid "Terms & Conditions"
614+msgstr "Betingelser og vilkår"
584615
585−#: qml/Wizard/Pages/50-location.qml:86
586−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
616+#: qml/Wizard/Pages/here-terms.qml:69
617+msgid "Your device uses positioning technologies provided by HERE."
587618msgstr ""
588−"Ved brug af GPS, anonymiseret Wi-Fi og telenetværksinformation (anbefalet)"
589619
590−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
591−#: qml/Wizard/Pages/50-location.qml:103
620+#: qml/Wizard/Pages/here-terms.qml:81
592621msgid ""
593−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
594−"conditions</a>."
622+"To provide you with positioning services and to improve their quality, HERE "
623+"collects information about nearby cell towers and Wi-Fi hotspots around your "
624+"current location whenever your position is being found."
595625msgstr ""
596−"Ved at vælge dette siger du ja til Nokia HERE's <a href='#'>betingelser og "
597−"vilkår</a>."
598626
599−#: qml/Wizard/Pages/50-location.qml:112
600−msgid "Not at all"
601−msgstr "Slet ikke"
627+#: qml/Wizard/Pages/here-terms.qml:93
628+msgid ""
629+"The information collected is used to analyze the service and to improve the "
630+"use of service, but not to identify you personally."
631+msgstr ""
602632
603−#: qml/Wizard/Pages/50-location.qml:124
604−msgid "You can change your mind later in <b>System Settings</b>."
605−msgstr "Du kan fortryde senere i <b>Systemindstillinger</b>."
633+#: qml/Wizard/Pages/here-terms.qml:106
634+#, qt-format
635+msgid "By continuing, you agree to the HERE platform %1 and %2."
636+msgstr ""
606637
607−#: qml/Wizard/Pages/60-reporting.qml:26
608−msgid "Improving your experience"
609−msgstr "Forbedrer din oplevelse"
638+#: qml/Wizard/Pages/here-terms.qml:107
639+msgid "Service Terms"
640+msgstr ""
610641
611−#: qml/Wizard/Pages/60-reporting.qml:46
612−msgid ""
613−"Your phone is set up to automatically report errors to Canonical and its "
614−"partners, the makers of the operating system."
642+#: qml/Wizard/Pages/passcode-confirm.qml:43
643+#: qml/Wizard/Pages/passcode-desktop.qml:80
644+msgid "Confirm passcode"
645+msgstr "Bekræft adgangskode"
646+
647+#: qml/Wizard/Pages/passcode-confirm.qml:45
648+msgid "Incorrect passcode."
615649msgstr ""
616−"Din telefon er sat op til automatisk at rapportere fejl til Canonical og "
617−"deres partnere, skaberne af operativsystemet."
618650
619−#: qml/Wizard/Pages/60-reporting.qml:53
620−msgid ""
621−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
622−"Privacy</b>"
651+#: qml/Wizard/Pages/passcode-confirm.qml:45
652+msgctxt "Enter the passcode again"
653+msgid "Please re-enter."
623654msgstr ""
624−"Dette kan slås fra i <b>Systemindstillinger</b> under <b>Sikkerhed &amp; "
625−"privatliv</b>"
626655
627−#: qml/Wizard/Pages/80-finished.qml:24
628−msgid "All done"
629−msgstr "Helt færdig"
656+#: qml/Wizard/Pages/passcode-desktop.qml:30
657+msgid "Lock Screen Passcode"
658+msgstr ""
630659
631−#: qml/Wizard/Pages/80-finished.qml:39
632−msgid "Nice work!"
633−msgstr "Godt arbejde!"
660+#: qml/Wizard/Pages/passcode-desktop.qml:56
661+msgid "Enter 4 numbers to setup your passcode"
662+msgstr ""
634663
635−#: qml/Wizard/Pages/80-finished.qml:46
636−msgid "Your device is now ready to use."
664+#: qml/Wizard/Pages/passcode-desktop.qml:65
665+#: qml/Wizard/Pages/passcode-set.qml:54
666+msgid "Choose passcode"
637667msgstr ""
638668
639−#: qml/Wizard/Pages/80-finished.qml:53
640−msgid "Finish"
641−msgstr "Afslut"
669+#: qml/Wizard/Pages/passcode-desktop.qml:105
670+msgid "Passcode too short"
671+msgstr ""
642672
643−#: qml/Wizard/Pages/here-terms.qml:27
644−msgid "Terms & Conditions"
645−msgstr "Betingelser og vilkår"
673+#: qml/Wizard/Pages/passcode-desktop.qml:107
674+msgid "Passcodes match"
675+msgstr ""
646676
647−#: qml/Wizard/Pages/passwd-confirm.qml:49
648−msgid "Confirm passphrase"
649−msgstr "Bekæft adgangsfrase"
677+#: qml/Wizard/Pages/passcode-desktop.qml:109
678+msgid "Passcodes do not match"
679+msgstr ""
650680
651−#: qml/Wizard/Pages/passwd-confirm.qml:50
652−msgid "Confirm passcode"
653−msgstr "Bekræft adgangskode"
681+#: qml/Wizard/Pages/passcode-set.qml:62
682+msgid "Passcode must be 4 characters long"
683+msgstr ""
654684
655−#: qml/Wizard/Pages/passwd-confirm.qml:53
656−#: qml/Wizard/Pages/passwd-confirm.qml:54
657−msgid "Please try again."
658−msgstr "Forsøg venligst igen."
685+#: qml/Wizard/Pages/password-set.qml:30
686+msgid "Lock Screen Password"
687+msgstr ""
659688
660−#: qml/Wizard/Pages/passwd-set.qml:61
661−msgid "Choose your passcode"
662−msgstr "Vælg din adgangskode"
689+#: qml/Wizard/Pages/password-set.qml:61
690+msgid "Enter at least 8 characters"
691+msgstr ""
663692
664−#: qml/Wizard/Pages/passwd-set.qml:68
665−msgid "Passphrase must be 4 characters long"
666−msgstr "Adgangsfrasen skal være mindst 4 tegn"
693+#: qml/Wizard/Pages/password-set.qml:73
694+msgid "Choose password"
695+msgstr ""
667696
668−#. Translators: This is the arrow for "Back" buttons
669−#: qml/Wizard/StackButton.qml:39
670−#, qt-format
671−msgid "〈 %1"
672−msgstr "〈 %1"
697+#: qml/Wizard/Pages/password-set.qml:103
698+msgid "Confirm password"
699+msgstr ""
673700
674−#. Translators: This is the arrow for "Forward" buttons
675−#: qml/Wizard/StackButton.qml:42
676−#, qt-format
677−msgid "%1 〉"
678−msgstr "%1 〉"
701+#: qml/Wizard/Pages/sim.qml:27
702+msgid "No SIM card installed"
703+msgstr ""
704+
705+#: qml/Wizard/Pages/sim.qml:54
706+msgid "SIM card added"
707+msgstr ""
708+
709+#: qml/Wizard/Pages/sim.qml:55
710+msgid "You must restart the device to access the mobile network."
711+msgstr ""
712+
713+#: qml/Wizard/Pages/sim.qml:59
714+msgid "Restart"
715+msgstr ""
716+
717+#: qml/Wizard/Pages/sim.qml:78
718+msgid "You won’t be able to make calls or use text messaging without a SIM."
719+msgstr ""
720+
721+#: qml/Wizard/Pages/sim.qml:90
722+msgid "To proceed with no SIM tap Skip."
723+msgstr ""
724+
725+#: qml/Wizard/PasswordMeter.qml:87
726+msgid "Passwords match"
727+msgstr ""
728+
729+#: qml/Wizard/PasswordMeter.qml:89
730+msgid "Passwords do not match"
731+msgstr ""
732+
733+#: qml/Wizard/PasswordMeter.qml:93
734+msgid "Strong password"
735+msgstr ""
736+
737+#: qml/Wizard/PasswordMeter.qml:95
738+msgid "Fair password"
739+msgstr ""
740+
741+#: qml/Wizard/PasswordMeter.qml:97
742+msgid "Weak password"
743+msgstr ""
744+
745+#: qml/Wizard/PasswordMeter.qml:99
746+msgid "Very weak password"
747+msgstr ""
679748
680749#~ msgid "Close"
681750#~ msgstr "Luk"
@@ -732,24 +801,200 @@ msgstr "%1 〉"
732801#~ "Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
733802#~ "på skærmen for at starte"
734803
804+#~ msgid "Are you sure you want to shut down?"
805+#~ msgstr "Er du sikker på du vil lukke ned?"
806+
735807#~ msgid "Unlock SIM"
736808#~ msgstr "Lås SIM-kort op"
737809
810+#~ msgid "This action does different things for different apps"
811+#~ msgstr "Denne handling gør forskellige ting i forskellige apps"
812+
738813#~ msgid "Please re-enter"
739814#~ msgstr "Vær venlig at genindtaste"
740815
816+#~ msgid "To view open apps"
817+#~ msgstr "For at se åbne apps"
818+
819+#~ msgid "You almost got it!"
820+#~ msgstr "Du havde den næsten!"
821+
741822#~ msgid "Please select how you’d like to unlock your phone."
742823#~ msgstr "Vælg venligst hvordan du ønsker at låse din telefon op."
743824
825+#~ msgid "Available networks…"
826+#~ msgstr "Tilgængelige netværk..."
827+
828+#~ msgid "No available networks."
829+#~ msgstr "Ingen tilgængelige netværk."
830+
831+#~ msgid "Improving your experience"
832+#~ msgstr "Forbedrer din oplevelse"
833+
834+#~ msgid ""
835+#~ "Your phone is set up to automatically report errors to Canonical and its "
836+#~ "partners, the makers of the operating system."
837+#~ msgstr ""
838+#~ "Din telefon er sat op til automatisk at rapportere fejl til Canonical og "
839+#~ "deres partnere, skaberne af operativsystemet."
840+
841+#~ msgid "All done"
842+#~ msgstr "Helt færdig"
843+
844+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
845+#~ msgstr ""
846+#~ "Ved brug af GPS, anonymiseret Wi-Fi og telenetværksinformation (anbefalet)"
847+
848+#~ msgid "Not at all"
849+#~ msgstr "Slet ikke"
850+
851+#~ msgid "Using GPS only (less accurate)"
852+#~ msgstr "Kun ved brug af GPS (mindre præcis)"
853+
854+#~ msgid "Nice work!"
855+#~ msgstr "Godt arbejde!"
856+
744857#~ msgid "Your phone is now ready to use."
745858#~ msgstr "Din telefon er nu klar til brug."
746859
860+#~ msgid ""
861+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
862+#~ "conditions</a>."
863+#~ msgstr ""
864+#~ "Ved at vælge dette siger du ja til Nokia HERE's <a href='#'>betingelser og "
865+#~ "vilkår</a>."
866+
867+#~ msgid "Choose your passcode"
868+#~ msgstr "Vælg din adgangskode"
869+
870+#, qt-format
871+#~ msgid "%1 〉"
872+#~ msgstr "%1 〉"
873+
874+#, qt-format
875+#~ msgid "〈 %1"
876+#~ msgstr "〈 %1"
877+
878+#~ msgid "Swipe up from the bottom edge."
879+#~ msgstr "Swipe op fra den nedre kant."
880+
881+#~ msgid "Short swipe from the left edge."
882+#~ msgstr "Kort swipe fra den venstre kant."
883+
884+#~ msgid "Tap here to continue."
885+#~ msgstr "Tryk her for at fortsætte."
886+
887+#~ msgid "These are the shortcuts to favorite apps"
888+#~ msgstr "Disse er genveje til favorit-apps"
889+
890+#~ msgid "Open special menus"
891+#~ msgstr "Åben specialmenuer"
892+
893+#~ msgid "Tap here to finish."
894+#~ msgstr "Tryk her for at afslutte."
895+
896+#~ msgid "Add a SIM card and restart your device"
897+#~ msgstr "Indsæt et SIM-kort og genstart din enhed"
898+
899+#~ msgid "Long swipe from the right edge."
900+#~ msgstr "Langt swipe fra den højre kant."
901+
902+#~ msgid "View all your running tasks."
903+#~ msgstr "Se alle dine kørende opgaver."
904+
905+#~ msgid "Try again."
906+#~ msgstr "Prøv igen."
907+
908+#~ msgid "Let’s get started."
909+#~ msgstr "Lad os komme i gang."
910+
747911#~ msgid "Welcome to your Ubuntu phone."
748912#~ msgstr "Velkommen til din Ubuntu-telefon."
749913
914+#~ msgid "You can change your mind later in <b>System Settings</b>."
915+#~ msgstr "Du kan fortryde senere i <b>Systemindstillinger</b>."
916+
917+#~ msgid "Let the phone detect your location:"
918+#~ msgstr "Lad telefonen bestemme din placering:"
919+
920+#~ msgid ""
921+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
922+#~ "Privacy</b>"
923+#~ msgstr ""
924+#~ "Dette kan slås fra i <b>Systemindstillinger</b> under <b>Sikkerhed &amp; "
925+#~ "privatliv</b>"
926+
927+#~ msgctxt "Button: Shut down the system"
928+#~ msgid "Shut down"
929+#~ msgstr "Luk ned"
930+
931+#~ msgctxt "Title: Reboot/Shut down dialog"
932+#~ msgid "Shut down"
933+#~ msgstr "Luk ned"
934+
935+#~ msgctxt "Button: Reboot the system"
936+#~ msgid "Reboot"
937+#~ msgstr "Genstart"
938+
750939#~ msgid "Roaming"
751940#~ msgstr "Roaming"
752941
942+#~ msgctxt "Label: Type of security method"
943+#~ msgid "Passcode"
944+#~ msgstr "Adgangskode"
945+
946+#~ msgid "Lock security"
947+#~ msgstr "Låsesikkerhed"
948+
949+#~ msgctxt "Label: Description of security method"
950+#~ msgid "No security"
951+#~ msgstr "Ingen sikkerhed"
952+
953+#~ msgctxt "Label: Type of security method"
954+#~ msgid "Swipe"
955+#~ msgstr "Swipe"
956+
957+#~ msgid "Hi!"
958+#~ msgstr "Hej!"
959+
960+#~ msgid "Finish"
961+#~ msgstr "Afslut"
962+
963+#~ msgid "Confirm passphrase"
964+#~ msgstr "Bekæft adgangsfrase"
965+
966+#~ msgctxt "Label: Description of security method"
967+#~ msgid "4 digits only"
968+#~ msgstr "Kun 4 tal"
969+
970+#~ msgid "Location"
971+#~ msgstr "Placering"
972+
973+#~ msgid "Passphrase must be 4 characters long"
974+#~ msgstr "Adgangsfrasen skal være mindst 4 tegn"
975+
976+#~ msgid "Please try again."
977+#~ msgstr "Forsøg venligst igen."
978+
979+#~ msgctxt "Label: Type of security method"
980+#~ msgid "Passphrase"
981+#~ msgstr "Adgangsfrase"
982+
983+#~ msgctxt "Label: Description of security method"
984+#~ msgid "Numbers and letters"
985+#~ msgstr "Tal og bogstaver"
986+
987+#~ msgid "Open the launcher"
988+#~ msgstr "Åbn opstarteren"
989+
990+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
991+#~ msgstr ""
992+#~ "Uden denne vil du ikke være i stand til at foretage opkald eller sende "
993+#~ "tekstbeskeder."
994+
995+#~ msgid "Continue"
996+#~ msgstr "Fortsæt"
997+
753998#~ msgid "%a %d %b %H:%M"
754999#~ msgstr "%a %b. %d %H:%M"
7551000
po/de.po+485−246
@@ -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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
1111"PO-Revision-Date: 2016-03-13 15:41+0000\n"
1212"Last-Translator: schuko24 <gerdsaenger@t-online.de>\n"
1313"Language-Team: German <de@li.org>\n"
@@ -15,8 +15,8 @@ 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: 2016-03-14 05:42+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19+"X-Generator: Launchpad (build 17958)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -77,53 +77,35 @@ msgctxt "Button: Log out from the system"
7777msgid "Log Out"
7878msgstr "Abmelden"
7979
80−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
81−#: qml/Components/Dialogs.qml:253
80+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
81+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
82+#: qml/Wizard/Pages/passcode-set.qml:32
8283msgid "Cancel"
8384msgstr "Abbrechen"
8485
8586#: qml/Components/Dialogs.qml:173
86−msgctxt "Title: Reboot/Shut down dialog"
87−msgid "Shut down"
88−msgstr "Ausschalten"
89−
90−#: qml/Components/Dialogs.qml:174
91−msgid "Are you sure you want to shut down?"
92−msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"
93−
94−#: qml/Components/Dialogs.qml:176
95−msgctxt "Button: Reboot the system"
96−msgid "Reboot"
97−msgstr "Neustarten"
98−
99−#: qml/Components/Dialogs.qml:185
100−msgctxt "Button: Shut down the system"
101−msgid "Shut down"
102−msgstr "Ausschalten"
103−
104−#: qml/Components/Dialogs.qml:207
10587msgctxt "Title: Reboot dialog"
10688msgid "Reboot"
10789msgstr "Neustarten"
10890
109−#: qml/Components/Dialogs.qml:208
91+#: qml/Components/Dialogs.qml:174
11092msgid "Are you sure you want to reboot?"
11193msgstr "Sind Sie sicher, dass Sie neu starten wollen?"
11294
113−#: qml/Components/Dialogs.qml:210
95+#: qml/Components/Dialogs.qml:176
11496msgid "No"
11597msgstr "Nein"
11698
117−#: qml/Components/Dialogs.qml:217
99+#: qml/Components/Dialogs.qml:183
118100msgid "Yes"
119101msgstr "Ja"
120102
121−#: qml/Components/Dialogs.qml:232
103+#: qml/Components/Dialogs.qml:198
122104msgctxt "Title: Power off/Restart dialog"
123105msgid "Power"
124106msgstr "Ausschalten"
125107
126−#: qml/Components/Dialogs.qml:233
108+#: qml/Components/Dialogs.qml:199
127109msgid ""
128110"Are you sure you would like\n"
129111"to power off?"
@@ -131,12 +113,12 @@ msgstr ""
131113"Sind Sie sicher, dass Sie das\n"
132114"Gerät ausschalten wollen?"
133115
134−#: qml/Components/Dialogs.qml:235
116+#: qml/Components/Dialogs.qml:201
135117msgctxt "Button: Power off the system"
136118msgid "Power off"
137119msgstr "Ausschalten"
138120
139−#: qml/Components/Dialogs.qml:244
121+#: qml/Components/Dialogs.qml:210
140122msgctxt "Button: Restart the system"
141123msgid "Restart"
142124msgstr "Neustarten"
@@ -181,42 +163,58 @@ msgstr "Jetzt verbinden!"
181163msgid "Close all"
182164msgstr "Alle schließen"
183165
184−#: qml/Dash/DashPageHeader.qml:270
166+#: qml/Dash/DashPageHeader.qml:337
185167msgctxt "Button: Open the Ubuntu Store"
186168msgid "Store"
187169msgstr "Speichern"
188170
189−#: qml/Dash/DashPageHeader.qml:277
171+#: qml/Dash/DashPageHeader.qml:344
190172msgctxt "Button: Start a search in the current dash scope"
191173msgid "Search"
192174msgstr "Suchen"
193175
194−#: qml/Dash/DashPageHeader.qml:287
176+#: qml/Dash/DashPageHeader.qml:354
195177msgctxt "Button: Show the current dash scope settings"
196178msgid "Settings"
197179msgstr "Einstellungen"
198180
199−#: qml/Dash/DashPageHeader.qml:294
181+#: qml/Dash/DashPageHeader.qml:361
200182msgid "Remove from Favorites"
201183msgstr "Aus den Favoriten entfernen"
202184
203−#: qml/Dash/DashPageHeader.qml:294
185+#: qml/Dash/DashPageHeader.qml:361
204186msgid "Add to Favorites"
205187msgstr "Zu Favoriten hinzufügen"
206188
207−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
189+#: qml/Dash/FiltersPopover.qml:60
190+msgid "Refine your results"
191+msgstr ""
192+
193+#: qml/Dash/FiltersPopover.qml:69
194+msgid "Reset"
195+msgstr ""
196+
197+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
208198msgid "See less"
209199msgstr "Weniger ansehen"
210200
211−#: qml/Dash/GenericScopeView.qml:567
201+#: qml/Dash/GenericScopeView.qml:570
212202msgid "See all"
213203msgstr "Alle anzeigen"
214204
215−#: qml/Dash/GenericScopeView.qml:629
205+#: qml/Dash/GenericScopeView.qml:627
216206msgctxt "Label: Hint for dash search line edit"
217207msgid "Search"
218208msgstr "Suchen"
219209
210+#: qml/Dash/PageHeaderExtraPanel.qml:55
211+msgid "Recent Searches"
212+msgstr ""
213+
214+#: qml/Dash/PageHeaderExtraPanel.qml:66
215+msgid "Clear All"
216+msgstr ""
217+
220218#: qml/Dash/Previews/PreviewActionCombo.qml:35
221219msgid "More..."
222220msgstr "Mehr …"
@@ -286,11 +284,11 @@ msgstr "Erneut versuchen"
286284msgid "Tap to unlock"
287285msgstr "Zum Entsperren tippen"
288286
289−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
287+#: qml/Greeter/NarrowView.qml:54
290288msgid "Sorry, incorrect passphrase."
291289msgstr "Entschuldigung, falsches Passwort."
292290
293−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
291+#: qml/Greeter/NarrowView.qml:55
294292msgid "Sorry, incorrect passcode."
295293msgstr "Falsche PIN"
296294
@@ -319,7 +317,7 @@ msgstr ""
319317msgid "Enter %1"
320318msgstr "%1 eingeben"
321319
322−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
320+#: qml/Greeter/NarrowView.qml:117
323321msgid "Enter passphrase"
324322msgstr "Passphrase eingeben"
325323
@@ -357,62 +355,62 @@ msgstr "Tippen, um zum Anruf zurückzugehen …"
357355msgid "Conference"
358356msgstr "Konferenz"
359357
360−#: qml/Panel/Indicators/MenuItemFactory.qml:752
358+#: qml/Panel/Indicators/MenuItemFactory.qml:761
361359msgid "Nothing is playing"
362360msgstr "Nichts wird abgespielt"
363361
364−#: qml/Panel/Indicators/MenuItemFactory.qml:881
362+#: qml/Panel/Indicators/MenuItemFactory.qml:890
365363#, qt-format
366364msgid "%1 hour"
367365msgid_plural "%1 hours"
368366msgstr[0] "%1 Stunde"
369367msgstr[1] "%1 Stunden"
370368
371−#: qml/Panel/Indicators/MenuItemFactory.qml:885
369+#: qml/Panel/Indicators/MenuItemFactory.qml:894
372370#, qt-format
373371msgid "%1 minute"
374372msgid_plural "%1 minutes"
375373msgstr[0] "%1 Minute"
376374msgstr[1] "%1 Minuten"
377375
378−#: qml/Panel/Indicators/MenuItemFactory.qml:890
376+#: qml/Panel/Indicators/MenuItemFactory.qml:899
379377#, qt-format
380378msgid "%1 second"
381379msgid_plural "%1 seconds"
382380msgstr[0] "%1 Sekunde"
383381msgstr[1] "%1 Sekunden"
384382
385−#: qml/Panel/Indicators/MenuItemFactory.qml:893
383+#: qml/Panel/Indicators/MenuItemFactory.qml:902
386384msgid "0 seconds"
387385msgstr "0 Sekunden"
388386
389387#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
390−#: qml/Panel/Indicators/MenuItemFactory.qml:895
388+#: qml/Panel/Indicators/MenuItemFactory.qml:904
391389#, qt-format
392390msgid "%1 remaining"
393391msgstr "%1 verbleibend"
394392
395−#: qml/Panel/Indicators/MenuItemFactory.qml:901
393+#: qml/Panel/Indicators/MenuItemFactory.qml:910
396394msgid "In queue…"
397395msgstr "In Warteschlange …"
398396
399−#: qml/Panel/Indicators/MenuItemFactory.qml:905
397+#: qml/Panel/Indicators/MenuItemFactory.qml:914
400398msgid "Downloading"
401399msgstr "Wird heruntergeladen"
402400
403−#: qml/Panel/Indicators/MenuItemFactory.qml:907
401+#: qml/Panel/Indicators/MenuItemFactory.qml:916
404402msgid "Paused, tap to resume"
405403msgstr "Pausiert, tippen Sie zum fortsetzen"
406404
407−#: qml/Panel/Indicators/MenuItemFactory.qml:909
405+#: qml/Panel/Indicators/MenuItemFactory.qml:918
408406msgid "Canceled"
409407msgstr "Abgebrochen"
410408
411−#: qml/Panel/Indicators/MenuItemFactory.qml:911
409+#: qml/Panel/Indicators/MenuItemFactory.qml:920
412410msgid "Finished"
413411msgstr "Erledigt"
414412
415−#: qml/Panel/Indicators/MenuItemFactory.qml:913
413+#: qml/Panel/Indicators/MenuItemFactory.qml:922
416414msgid "Failed, tap to retry"
417415msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
418416
@@ -432,253 +430,324 @@ msgctxt "Button: Call back on phone"
432430msgid "Call back"
433431msgstr "Zurückrufen"
434432
435−#: qml/Tutorial/TutorialBottom.qml:28
436−msgid "Open special menus"
437−msgstr "Spezielle Menüs öffnen"
438−
439−#: qml/Tutorial/TutorialBottom.qml:29
440−msgid "Swipe up from the bottom edge."
441−msgstr "Wischen Sie von der unteren Bildschirmkante nach oben."
433+#: qml/Stages/SideStage.qml:76
434+msgid "Drag using 3 fingers any application from one window to the other"
435+msgstr ""
442436
443−#: qml/Tutorial/TutorialBottomFinish.qml:24
444−msgid "This action does different things for different apps"
437+#: qml/Tutorial/TutorialBottom.qml:78
438+msgid "Swipe up to add a contact"
445439msgstr ""
446−"Diese Aktion bewirkt verschiedene Dinge in verschiedenen Anwendungen."
447440
448−#: qml/Tutorial/TutorialBottomFinish.qml:25
449−msgid "Tap here to finish."
450−msgstr "Zum Beenden hier tippen."
441+#: qml/Tutorial/TutorialBottom.qml:80
442+msgid "Swipe up for favorite calculations"
443+msgstr ""
451444
452−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
453−#: qml/Tutorial/TutorialRight.qml:144
454−msgid "Tap here to continue."
455−msgstr "Zum Fortfahren hier tippen."
445+#: qml/Tutorial/TutorialBottom.qml:82
446+msgid "Swipe up for recent calls"
447+msgstr ""
456448
457−#: qml/Tutorial/TutorialLeft.qml:26
458−msgid "Open the launcher"
459−msgstr "Öffnen Sie den Starter."
449+#: qml/Tutorial/TutorialBottom.qml:84
450+msgid "Swipe up to create a message"
451+msgstr ""
460452
461−#: qml/Tutorial/TutorialLeft.qml:27
462−msgid "Short swipe from the left edge."
463−msgstr "Kurzer Wisch von der linken Bildschirmkante."
453+#: qml/Tutorial/TutorialBottom.qml:85
454+msgid "Swipe up to manage the app"
455+msgstr ""
464456
465−#: qml/Tutorial/TutorialLeftFinish.qml:24
466−msgid "These are the shortcuts to favorite apps"
467−msgstr "Dies sind die Verknüpfungen zu Ihren favorisierten Anwendungen."
457+#: qml/Tutorial/TutorialLeft.qml:47
458+msgid "Swipe from the left edge to open the launcher"
459+msgstr ""
468460
469−#: qml/Tutorial/TutorialPage.qml:178
470−msgid "You almost got it!"
471−msgstr "Fast geschafft!"
461+#: qml/Tutorial/TutorialLeftLong.qml:47
462+msgid "Long swipe from the left edge to open the Today scope"
463+msgstr ""
472464
473−#: qml/Tutorial/TutorialPage.qml:195
474−msgid "Try again."
475−msgstr "Versuchen Sie es noch einmal."
465+#: qml/Tutorial/TutorialRight.qml:54
466+msgid "Hover your mouse on the right edge to view your open apps"
467+msgstr ""
476468
477−#: qml/Tutorial/TutorialRight.qml:31
478−msgid "To view open apps"
479−msgstr "Zum Ansehen offener Anwendungen"
469+#: qml/Tutorial/TutorialRight.qml:55
470+msgid "Short or long swipe from the right edge to view your open apps"
471+msgstr ""
480472
481−#: qml/Tutorial/TutorialRight.qml:32
482−msgid "Long swipe from the right edge."
483−msgstr "Langer Wisch von der rechten Bildschirmkante."
473+#: qml/Tutorial/TutorialTop.qml:53
474+msgid "Swipe from the top right edge to open the notification bar"
475+msgstr ""
484476
485−#: qml/Tutorial/TutorialRight.qml:122
486−msgid "View all your running tasks."
487−msgstr "Sehen Sie alle Ihre laufenden Anwendungen."
477+#: qml/Tutorial/TutorialTop.qml:54
478+msgid "Swipe from the top edge to open the notification bar"
479+msgstr ""
488480
489−#: qml/Wizard/Page.qml:89
481+#: qml/Wizard/Page.qml:54
490482msgctxt "Button: Go back one page in the Wizard"
491483msgid "Back"
492484msgstr "Zurück"
493485
494486#: qml/Wizard/Pages/10-welcome.qml:27
495−msgid "Hi!"
496−msgstr "Hallo!"
487+msgid "Language"
488+msgstr ""
497489
498−#: qml/Wizard/Pages/10-welcome.qml:44
499−msgid "Welcome to your Ubuntu device."
500−msgstr "Willkommen auf Ihrem Ubuntu-Gerät."
490+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
491+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
492+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
493+#: qml/Wizard/Pages/75-report-check.qml:84
494+#: qml/Wizard/Pages/passcode-desktop.qml:124
495+#: qml/Wizard/Pages/password-set.qml:141
496+msgid "Next"
497+msgstr ""
501498
502−#: qml/Wizard/Pages/10-welcome.qml:52
503−msgid "Let’s get started."
504−msgstr "Fangen wir an!"
499+#: qml/Wizard/Pages/30-wifi.qml:29
500+msgid "Connect to Wi‑Fi"
501+msgstr "Mit WLAN verbinden"
505502
506−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
507−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
508−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
509−#: qml/Wizard/Pages/passwd-set.qml:90
510−msgid "Continue"
511−msgstr "Weiter"
503+#: qml/Wizard/Pages/30-wifi.qml:130
504+msgid "Connected"
505+msgstr ""
512506
513−#: qml/Wizard/Pages/20-sim.qml:25
514−msgid "Add a SIM card and restart your device"
515−msgstr "SIM-Karte einlegen und Gerät neustarten"
507+#: qml/Wizard/Pages/30-wifi.qml:163
508+msgid "Available Wi-Fi networks"
509+msgstr ""
516510
517−#: qml/Wizard/Pages/20-sim.qml:59
518−msgid "Without it, you won’t be able to make calls or use text messaging."
519−msgstr "Ohne SIM funktionieren Anrufe und Nachrichten nicht."
511+#: qml/Wizard/Pages/30-wifi.qml:164
512+msgid "No available Wi-Fi networks"
513+msgstr ""
520514
521−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
515+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
516+#: qml/Wizard/Pages/sim.qml:101
522517msgid "Skip"
523518msgstr "Überspringen"
524519
525−#: qml/Wizard/Pages/30-passwd-type.qml:39
526−msgid "Lock security"
527−msgstr "Sicherheit nach dem Sperren"
520+#: qml/Wizard/Pages/40-location.qml:27
521+msgid "Location Services"
522+msgstr ""
523+
524+#: qml/Wizard/Pages/40-location.qml:83
525+msgid ""
526+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
527+"(recommended)"
528+msgstr ""
528529
529−#: qml/Wizard/Pages/30-passwd-type.qml:79
530−msgid "Please select how you’d like to unlock your device."
531−msgstr "Bitte wählen Sie, wie Sie dieses Gerät entsperren möchten."
530+#: qml/Wizard/Pages/40-location.qml:105
531+#, qt-format
532+msgid "By selecting this option you agree to the Nokia HERE %1."
533+msgstr ""
532534
533−#: qml/Wizard/Pages/30-passwd-type.qml:102
534−msgctxt "Label: Type of security method"
535−msgid "Swipe"
536−msgstr "Wischen"
535+#: qml/Wizard/Pages/40-location.qml:106
536+msgctxt "part of: Nokia HERE terms and conditions"
537+msgid "terms and conditions"
538+msgstr ""
537539
538−#: qml/Wizard/Pages/30-passwd-type.qml:103
539−msgctxt "Label: Description of security method"
540−msgid "No security"
541−msgstr "Keine Sicherheitssperre"
540+#: qml/Wizard/Pages/40-location.qml:160
541+msgid "GPS only"
542+msgstr ""
543+
544+#: qml/Wizard/Pages/40-location.qml:214
545+msgid "Don't use my location"
546+msgstr ""
547+
548+#: qml/Wizard/Pages/40-location.qml:260
549+msgid "You can change it later in System Settings."
550+msgstr ""
551+
552+#: qml/Wizard/Pages/50-timezone.qml:29
553+msgid "Time Zone"
554+msgstr ""
555+
556+#: qml/Wizard/Pages/50-timezone.qml:178
557+msgid "Enter your city"
558+msgstr ""
559+
560+#: qml/Wizard/Pages/60-account.qml:24
561+msgid "Personalize Your Device"
562+msgstr ""
563+
564+#: qml/Wizard/Pages/60-account.qml:48
565+msgid "Preferred Name"
566+msgstr ""
542567
543−#: qml/Wizard/Pages/30-passwd-type.qml:105
568+#: qml/Wizard/Pages/70-passwd-type.qml:39
569+msgid "Lock Screen"
570+msgstr ""
571+
572+#: qml/Wizard/Pages/70-passwd-type.qml:101
544573msgctxt "Label: Type of security method"
545−msgid "Passcode"
546−msgstr "PIN"
574+msgid "Create new password"
575+msgstr ""
547576
548−#: qml/Wizard/Pages/30-passwd-type.qml:106
549−msgctxt "Label: Description of security method"
550−msgid "4 digits only"
551−msgstr "nur vier Ziffern"
577+#: qml/Wizard/Pages/70-passwd-type.qml:103
578+msgctxt "Label: Type of security method"
579+msgid "Create passcode (numbers only)"
580+msgstr ""
552581
553−#: qml/Wizard/Pages/30-passwd-type.qml:108
582+#: qml/Wizard/Pages/70-passwd-type.qml:105
554583msgctxt "Label: Type of security method"
555−msgid "Passphrase"
556−msgstr "Kennwort"
584+msgid "No lock code"
585+msgstr ""
557586
558−#: qml/Wizard/Pages/30-passwd-type.qml:109
559−msgctxt "Label: Description of security method"
560−msgid "Numbers and letters"
561−msgstr "Ziffern und Buchstaben"
587+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
588+msgid "Privacy Policy"
589+msgstr ""
562590
563−#: qml/Wizard/Pages/40-wifi.qml:29
564−msgid "Connect to Wi‑Fi"
565−msgstr "Mit WLAN verbinden"
591+#: qml/Wizard/Pages/75-report-check.qml:26
592+msgid "Help Us Improve"
593+msgstr ""
566594
567−#: qml/Wizard/Pages/40-wifi.qml:168
568−msgid "Available networks…"
569−msgstr "Verfügbare Netzwerke …"
595+#: qml/Wizard/Pages/75-report-check.qml:59
596+msgid "Improve system performance by sending us crashes and error reports."
597+msgstr ""
570598
571−#: qml/Wizard/Pages/40-wifi.qml:169
572−msgid "No available networks."
573−msgstr "Keine verfügbaren Netzwerke."
599+#: qml/Wizard/Pages/75-report-check.qml:60
600+msgid "Privacy policy"
601+msgstr ""
574602
575−#: qml/Wizard/Pages/50-location.qml:27
576−msgid "Location"
577−msgstr "Position"
603+#: qml/Wizard/Pages/80-finished.qml:89
604+msgid "Welcome to Ubuntu"
605+msgstr ""
578606
579−#: qml/Wizard/Pages/50-location.qml:62
580−msgid "Let the phone detect your location:"
581−msgstr "Dem Telefon erlauben, Ihre Position zu bestimmen:"
607+#: qml/Wizard/Pages/80-finished.qml:104
608+msgid "You are ready to use your device now"
609+msgstr ""
582610
583−#: qml/Wizard/Pages/50-location.qml:69
584−msgid "Using GPS only (less accurate)"
585−msgstr "Nur durch GPS (ungenauer)"
611+#: qml/Wizard/Pages/80-finished.qml:124
612+msgid "Get Started"
613+msgstr ""
586614
587−#: qml/Wizard/Pages/50-location.qml:86
588−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
615+#: qml/Wizard/Pages/here-terms.qml:25
616+msgid "Terms & Conditions"
617+msgstr "Nutzungsbedingungen"
618+
619+#: qml/Wizard/Pages/here-terms.qml:69
620+msgid "Your device uses positioning technologies provided by HERE."
589621msgstr ""
590−"Durch GPS sowie anonymisierte WLAN- und Mobilfunknetz-Daten (empfohlen)"
591622
592−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
593−#: qml/Wizard/Pages/50-location.qml:103
623+#: qml/Wizard/Pages/here-terms.qml:81
594624msgid ""
595−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
596−"conditions</a>."
625+"To provide you with positioning services and to improve their quality, HERE "
626+"collects information about nearby cell towers and Wi-Fi hotspots around your "
627+"current location whenever your position is being found."
597628msgstr ""
598−"Mit dem Auswählen dieser Option stimmen Sie den Nokia HERE <a "
599−"href='#'>allgemeinen Geschäftsbedingungen</a> zu."
600629
601−#: qml/Wizard/Pages/50-location.qml:112
602−msgid "Not at all"
603−msgstr "Gar nicht"
630+#: qml/Wizard/Pages/here-terms.qml:93
631+msgid ""
632+"The information collected is used to analyze the service and to improve the "
633+"use of service, but not to identify you personally."
634+msgstr ""
604635
605−#: qml/Wizard/Pages/50-location.qml:124
606−msgid "You can change your mind later in <b>System Settings</b>."
636+#: qml/Wizard/Pages/here-terms.qml:106
637+#, qt-format
638+msgid "By continuing, you agree to the HERE platform %1 and %2."
607639msgstr ""
608−"Sie können Ihre Meinung später in den <b>Systemeinstellungen</b> ändern."
609640
610−#: qml/Wizard/Pages/60-reporting.qml:26
611−msgid "Improving your experience"
612−msgstr "Verbessert Ihre Erfahrung mit diesem Produkt"
641+#: qml/Wizard/Pages/here-terms.qml:107
642+msgid "Service Terms"
643+msgstr ""
613644
614−#: qml/Wizard/Pages/60-reporting.qml:46
615−msgid ""
616−"Your phone is set up to automatically report errors to Canonical and its "
617−"partners, the makers of the operating system."
645+#: qml/Wizard/Pages/passcode-confirm.qml:43
646+#: qml/Wizard/Pages/passcode-desktop.qml:80
647+msgid "Confirm passcode"
648+msgstr "PIN bestätigen"
649+
650+#: qml/Wizard/Pages/passcode-confirm.qml:45
651+msgid "Incorrect passcode."
618652msgstr ""
619−"Ihr Telefon ist so eingestellt, dass es automatisch Fehlerberichte an "
620−"Canonical und seine Partner, die Hersteller des Betriebssystems, sendet."
621653
622−#: qml/Wizard/Pages/60-reporting.qml:53
623−msgid ""
624−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
625−"Privacy</b>"
654+#: qml/Wizard/Pages/passcode-confirm.qml:45
655+msgctxt "Enter the passcode again"
656+msgid "Please re-enter."
626657msgstr ""
627−"Dies kann in den <b>Systemeinstellungen</b> unter <b>Sicherheit &amp; "
628−"Datenschutz</b> deaktiviert werden"
629658
630−#: qml/Wizard/Pages/80-finished.qml:24
631−msgid "All done"
632−msgstr "Alles erledigt"
659+#: qml/Wizard/Pages/passcode-desktop.qml:30
660+msgid "Lock Screen Passcode"
661+msgstr ""
633662
634−#: qml/Wizard/Pages/80-finished.qml:39
635−msgid "Nice work!"
636−msgstr "Gute Arbeit!"
663+#: qml/Wizard/Pages/passcode-desktop.qml:56
664+msgid "Enter 4 numbers to setup your passcode"
665+msgstr ""
637666
638−#: qml/Wizard/Pages/80-finished.qml:46
639−msgid "Your device is now ready to use."
640−msgstr "Ihr Gerät ist nun einsatzbereit."
667+#: qml/Wizard/Pages/passcode-desktop.qml:65
668+#: qml/Wizard/Pages/passcode-set.qml:54
669+msgid "Choose passcode"
670+msgstr ""
641671
642−#: qml/Wizard/Pages/80-finished.qml:53
643−msgid "Finish"
644−msgstr "Beenden"
672+#: qml/Wizard/Pages/passcode-desktop.qml:105
673+msgid "Passcode too short"
674+msgstr ""
645675
646−#: qml/Wizard/Pages/here-terms.qml:27
647−msgid "Terms & Conditions"
648−msgstr "Nutzungsbedingungen"
676+#: qml/Wizard/Pages/passcode-desktop.qml:107
677+msgid "Passcodes match"
678+msgstr ""
649679
650−#: qml/Wizard/Pages/passwd-confirm.qml:49
651−msgid "Confirm passphrase"
652−msgstr "Passwort bestätigen"
680+#: qml/Wizard/Pages/passcode-desktop.qml:109
681+msgid "Passcodes do not match"
682+msgstr ""
653683
654−#: qml/Wizard/Pages/passwd-confirm.qml:50
655−msgid "Confirm passcode"
656−msgstr "PIN bestätigen"
684+#: qml/Wizard/Pages/passcode-set.qml:62
685+msgid "Passcode must be 4 characters long"
686+msgstr ""
657687
658−#: qml/Wizard/Pages/passwd-confirm.qml:53
659−#: qml/Wizard/Pages/passwd-confirm.qml:54
660−msgid "Please try again."
661−msgstr "Bitte versuchen Sie es erneut."
688+#: qml/Wizard/Pages/password-set.qml:30
689+msgid "Lock Screen Password"
690+msgstr ""
662691
663−#: qml/Wizard/Pages/passwd-set.qml:61
664−msgid "Choose your passcode"
665−msgstr "Wählen Sie Ihre PIN"
692+#: qml/Wizard/Pages/password-set.qml:61
693+msgid "Enter at least 8 characters"
694+msgstr ""
666695
667−#: qml/Wizard/Pages/passwd-set.qml:68
668−msgid "Passphrase must be 4 characters long"
669−msgstr "Passwörter müssen 4 Buchstaben lang sein"
696+#: qml/Wizard/Pages/password-set.qml:73
697+msgid "Choose password"
698+msgstr ""
670699
671−#. Translators: This is the arrow for "Back" buttons
672−#: qml/Wizard/StackButton.qml:39
673−#, qt-format
674−msgid "〈 %1"
675−msgstr "〈 %1"
700+#: qml/Wizard/Pages/password-set.qml:103
701+msgid "Confirm password"
702+msgstr ""
676703
677−#. Translators: This is the arrow for "Forward" buttons
678−#: qml/Wizard/StackButton.qml:42
679−#, qt-format
680−msgid "%1 〉"
681−msgstr "%1 〉"
704+#: qml/Wizard/Pages/sim.qml:27
705+msgid "No SIM card installed"
706+msgstr ""
707+
708+#: qml/Wizard/Pages/sim.qml:54
709+msgid "SIM card added"
710+msgstr ""
711+
712+#: qml/Wizard/Pages/sim.qml:55
713+msgid "You must restart the device to access the mobile network."
714+msgstr ""
715+
716+#: qml/Wizard/Pages/sim.qml:59
717+msgid "Restart"
718+msgstr "Neustarten"
719+
720+#: qml/Wizard/Pages/sim.qml:78
721+msgid "You won’t be able to make calls or use text messaging without a SIM."
722+msgstr ""
723+
724+#: qml/Wizard/Pages/sim.qml:90
725+msgid "To proceed with no SIM tap Skip."
726+msgstr ""
727+
728+#: qml/Wizard/PasswordMeter.qml:87
729+msgid "Passwords match"
730+msgstr ""
731+
732+#: qml/Wizard/PasswordMeter.qml:89
733+msgid "Passwords do not match"
734+msgstr ""
735+
736+#: qml/Wizard/PasswordMeter.qml:93
737+msgid "Strong password"
738+msgstr ""
739+
740+#: qml/Wizard/PasswordMeter.qml:95
741+msgid "Fair password"
742+msgstr ""
743+
744+#: qml/Wizard/PasswordMeter.qml:97
745+msgid "Weak password"
746+msgstr ""
747+
748+#: qml/Wizard/PasswordMeter.qml:99
749+msgid "Very weak password"
750+msgstr ""
682751
683752#~ msgid "Confirm"
684753#~ msgstr "Bestätigen"
@@ -771,8 +840,8 @@ msgstr "%1 〉"
771840#~ msgid "Settings"
772841#~ msgstr "Einstellungen"
773842
774−#~ msgid "Restart"
775−#~ msgstr "Neustarten"
843+#~ msgid "Are you sure you want to shut down?"
844+#~ msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"
776845
777846#~ msgid "Unlock SIM"
778847#~ msgstr "SIM-Karte entsperren"
@@ -783,15 +852,188 @@ msgstr "%1 〉"
783852#~ msgid "Please re-enter"
784853#~ msgstr "Bitte erneut eingeben"
785854
855+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
856+#~ msgstr "Ohne SIM funktionieren Anrufe und Nachrichten nicht."
857+
858+#~ msgid "Add a SIM card and restart your device"
859+#~ msgstr "SIM-Karte einlegen und Gerät neustarten"
860+
861+#~ msgid "Hi!"
862+#~ msgstr "Hallo!"
863+
786864#~ msgid "Welcome to your Ubuntu phone."
787865#~ msgstr "Willkommen zu Ihrem Ubuntu-Telefon."
788866
867+#~ msgid "Let’s get started."
868+#~ msgstr "Fangen wir an!"
869+
870+#~ msgid "Continue"
871+#~ msgstr "Weiter"
872+
789873#~ msgid "Please select how you’d like to unlock your phone."
790874#~ msgstr "Bitte wählen Sie aus, wie Sie Ihr Telefon entsperren wollen."
791875
876+#~ msgid "Available networks…"
877+#~ msgstr "Verfügbare Netzwerke …"
878+
879+#~ msgid "Improving your experience"
880+#~ msgstr "Verbessert Ihre Erfahrung mit diesem Produkt"
881+
882+#~ msgid "You can change your mind later in <b>System Settings</b>."
883+#~ msgstr ""
884+#~ "Sie können Ihre Meinung später in den <b>Systemeinstellungen</b> ändern."
885+
886+#~ msgid ""
887+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
888+#~ "conditions</a>."
889+#~ msgstr ""
890+#~ "Mit dem Auswählen dieser Option stimmen Sie den Nokia HERE <a "
891+#~ "href='#'>allgemeinen Geschäftsbedingungen</a> zu."
892+
893+#~ msgid "Not at all"
894+#~ msgstr "Gar nicht"
895+
896+#~ msgid ""
897+#~ "Your phone is set up to automatically report errors to Canonical and its "
898+#~ "partners, the makers of the operating system."
899+#~ msgstr ""
900+#~ "Ihr Telefon ist so eingestellt, dass es automatisch Fehlerberichte an "
901+#~ "Canonical und seine Partner, die Hersteller des Betriebssystems, sendet."
902+
903+#~ msgid "No available networks."
904+#~ msgstr "Keine verfügbaren Netzwerke."
905+
906+#~ msgid "Location"
907+#~ msgstr "Position"
908+
909+#~ msgid "Let the phone detect your location:"
910+#~ msgstr "Dem Telefon erlauben, Ihre Position zu bestimmen:"
911+
912+#~ msgid "Using GPS only (less accurate)"
913+#~ msgstr "Nur durch GPS (ungenauer)"
914+
915+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
916+#~ msgstr ""
917+#~ "Durch GPS sowie anonymisierte WLAN- und Mobilfunknetz-Daten (empfohlen)"
918+
919+#~ msgid "Nice work!"
920+#~ msgstr "Gute Arbeit!"
921+
792922#~ msgid "Your phone is now ready to use."
793923#~ msgstr "Ihr Telefon ist nun einsatzbereit."
794924
925+#~ msgid "Confirm passphrase"
926+#~ msgstr "Passwort bestätigen"
927+
928+#~ msgid "Choose your passcode"
929+#~ msgstr "Wählen Sie Ihre PIN"
930+
931+#~ msgid "Please try again."
932+#~ msgstr "Bitte versuchen Sie es erneut."
933+
934+#, qt-format
935+#~ msgid "〈 %1"
936+#~ msgstr "〈 %1"
937+
938+#, qt-format
939+#~ msgid "%1 〉"
940+#~ msgstr "%1 〉"
941+
942+#~ msgid "Passphrase must be 4 characters long"
943+#~ msgstr "Passwörter müssen 4 Buchstaben lang sein"
944+
945+#~ msgid "Lock security"
946+#~ msgstr "Sicherheit nach dem Sperren"
947+
948+#~ msgid ""
949+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
950+#~ "Privacy</b>"
951+#~ msgstr ""
952+#~ "Dies kann in den <b>Systemeinstellungen</b> unter <b>Sicherheit &amp; "
953+#~ "Datenschutz</b> deaktiviert werden"
954+
955+#~ msgid "All done"
956+#~ msgstr "Alles erledigt"
957+
958+#~ msgid "Finish"
959+#~ msgstr "Beenden"
960+
961+#~ msgid "Try again."
962+#~ msgstr "Versuchen Sie es noch einmal."
963+
964+#~ msgid "This action does different things for different apps"
965+#~ msgstr ""
966+#~ "Diese Aktion bewirkt verschiedene Dinge in verschiedenen Anwendungen."
967+
968+#~ msgid "View all your running tasks."
969+#~ msgstr "Sehen Sie alle Ihre laufenden Anwendungen."
970+
971+#~ msgid "Open special menus"
972+#~ msgstr "Spezielle Menüs öffnen"
973+
974+#~ msgid "You almost got it!"
975+#~ msgstr "Fast geschafft!"
976+
977+#~ msgid "To view open apps"
978+#~ msgstr "Zum Ansehen offener Anwendungen"
979+
980+#~ msgid "Tap here to finish."
981+#~ msgstr "Zum Beenden hier tippen."
982+
983+#~ msgid "Tap here to continue."
984+#~ msgstr "Zum Fortfahren hier tippen."
985+
986+#~ msgid "Long swipe from the right edge."
987+#~ msgstr "Langer Wisch von der rechten Bildschirmkante."
988+
989+#~ msgid "Short swipe from the left edge."
990+#~ msgstr "Kurzer Wisch von der linken Bildschirmkante."
991+
992+#~ msgid "Open the launcher"
993+#~ msgstr "Öffnen Sie den Starter."
994+
995+#~ msgid "These are the shortcuts to favorite apps"
996+#~ msgstr "Dies sind die Verknüpfungen zu Ihren favorisierten Anwendungen."
997+
998+#~ msgid "Swipe up from the bottom edge."
999+#~ msgstr "Wischen Sie von der unteren Bildschirmkante nach oben."
1000+
1001+#~ msgctxt "Button: Shut down the system"
1002+#~ msgid "Shut down"
1003+#~ msgstr "Ausschalten"
1004+
1005+#~ msgctxt "Title: Reboot/Shut down dialog"
1006+#~ msgid "Shut down"
1007+#~ msgstr "Ausschalten"
1008+
1009+#~ msgctxt "Label: Description of security method"
1010+#~ msgid "No security"
1011+#~ msgstr "Keine Sicherheitssperre"
1012+
1013+#~ msgctxt "Label: Type of security method"
1014+#~ msgid "Swipe"
1015+#~ msgstr "Wischen"
1016+
1017+#~ msgctxt "Label: Description of security method"
1018+#~ msgid "4 digits only"
1019+#~ msgstr "nur vier Ziffern"
1020+
1021+#~ msgctxt "Label: Type of security method"
1022+#~ msgid "Passcode"
1023+#~ msgstr "PIN"
1024+
1025+#~ msgctxt "Label: Type of security method"
1026+#~ msgid "Passphrase"
1027+#~ msgstr "Kennwort"
1028+
1029+#~ msgctxt "Label: Description of security method"
1030+#~ msgid "Numbers and letters"
1031+#~ msgstr "Ziffern und Buchstaben"
1032+
1033+#~ msgctxt "Button: Reboot the system"
1034+#~ msgid "Reboot"
1035+#~ msgstr "Neustarten"
1036+
7951037#~ msgid "%a %H:%M"
7961038#~ msgstr "%a %k:%M"
7971039
@@ -825,14 +1067,11 @@ msgstr "%1 〉"
8251067#~ msgid "Call back"
8261068#~ msgstr "Zurückrufen"
8271069
828−#~ msgid "Re-dock, save your work and close these apps to continue."
829−#~ msgstr ""
830−#~ "Wieder andocken, Änderungen speichern und die Anwendungen zum Fortfahren "
831−#~ "schließen"
1070+#~ msgid "Your device is now ready to use."
1071+#~ msgstr "Ihr Gerät ist nun einsatzbereit."
8321072
833−#~ msgid ""
834−#~ "Your device is now connected to an external display. Use this screen as a "
835−#~ "touch pad to interact with the mouse."
836−#~ msgstr ""
837−#~ "Ihr Gerät ist nun mit einer externen Anzeige verbunden. Benutzen Sie diesen "
838−#~ "Bildschirm als Touchpad zur Steuerung des Mauszeigers."
1073+#~ msgid "Welcome to your Ubuntu device."
1074+#~ msgstr "Willkommen auf Ihrem Ubuntu-Gerät."
1075+
1076+#~ msgid "Please select how you’d like to unlock your device."
1077+#~ msgstr "Bitte wählen Sie, wie Sie dieses Gerät entsperren möchten."
po/el.po+479−237

This diff is too big to show here.

po/en_AU.po+476−244

This diff is too big to show here.

po/en_GB.po+489−246

This diff is too big to show here.

po/eo.po+303−191

This diff is too big to show here.

po/es.po+481−220

This diff is too big to show here.

po/eu.po+476−234

This diff is too big to show here.

po/fa.po+486−246

This diff is too big to show here.

po/fi.po+486−247

This diff is too big to show here.

po/fo.po+258−180

This diff is too big to show here.

po/fr.po+493−252

This diff is too big to show here.

po/ga.po+461−232

This diff is too big to show here.

po/gd.po+492−249

This diff is too big to show here.

po/gl.po+490−247

This diff is too big to show here.

po/gv.po+261−183

This diff is too big to show here.

po/he.po+401−212

This diff is too big to show here.

po/hi.po+258−180

This diff is too big to show here.

po/hr.po+489−242

This diff is too big to show here.

po/hu.po+485−223

This diff is too big to show here.

po/hy.po+261−183

This diff is too big to show here.

po/ia.po+488−239

This diff is too big to show here.

po/id.po+261−183

This diff is too big to show here.

po/is.po+261−183

This diff is too big to show here.

po/it.po+490−240

This diff is too big to show here.

po/ja.po+273−183

This diff is too big to show here.

po/km.po+333−197

This diff is too big to show here.

po/kn.po+258−180

This diff is too big to show here.

po/ko.po+485−242

This diff is too big to show here.

po/ku.po+261−180

This diff is too big to show here.

po/ky.po+258−180

This diff is too big to show here.

po/lo.po+258−180

This diff is too big to show here.

po/lt.po+258−180

This diff is too big to show here.

po/lv.po+474−232

This diff is too big to show here.

po/ml.po+258−180

This diff is too big to show here.

po/mr.po+258−180

This diff is too big to show here.

po/ms.po+476−237

This diff is too big to show here.

po/my.po+266−181

This diff is too big to show here.

po/nb.po+486−247

This diff is too big to show here.

po/ne.po+258−180

This diff is too big to show here.

po/nl.po+497−241

This diff is too big to show here.

po/nn.po+258−180

This diff is too big to show here.

po/oc.po+258−180

This diff is too big to show here.

po/or.po+258−180

This diff is too big to show here.

po/pa.po+476−234

This diff is too big to show here.

po/pl.po+492−251

This diff is too big to show here.

po/pt.po+495−251

This diff is too big to show here.

po/pt_BR.po+476−234

This diff is too big to show here.

po/ro.po+478−236

This diff is too big to show here.

po/ru.po+476−239

This diff is too big to show here.

po/shn.po+258−180

This diff is too big to show here.

po/si.po+261−183

This diff is too big to show here.

po/sk.po+488−234

This diff is too big to show here.

po/sl.po+477−247

This diff is too big to show here.

po/sq.po+395−210

This diff is too big to show here.

po/sr.po+500−249

This diff is too big to show here.

po/sv.po+497−253

This diff is too big to show here.

po/sw.po+409−214

This diff is too big to show here.

po/ta.po+258−180

This diff is too big to show here.

po/te.po+258−180

This diff is too big to show here.

po/th.po+258−180

This diff is too big to show here.

po/tr.po+477−235

This diff is too big to show here.

po/ug.po+458−230

This diff is too big to show here.

po/uk.po+491−247

This diff is too big to show here.

po/unity8.pot+256−178

This diff is too big to show here.

po/ur.po+258−180

This diff is too big to show here.

po/uz.po+258−180

This diff is too big to show here.

po/vi.po+258−180

This diff is too big to show here.

po/wo.po+476−234

This diff is too big to show here.

po/xh.po+258−180

This diff is too big to show here.

po/zh_CN.po+483−237

This diff is too big to show here.

po/zh_HK.po+258−180

This diff is too big to show here.

po/zh_TW.po+484−236

This diff is too big to show here.

qml/Components/Dialogs.qml+6−47

This diff is too big to show here.

qml/Components/InputMethod.qml+4−1

This diff is too big to show here.

qml/Components/Showable.qml+10

This diff is too big to show here.

qml/Components/Unity8Settings.qmldeleted−50

This diff is too big to show here.

qml/Dash/DashContent.qml+2−2

This diff is too big to show here.

qml/Dash/DashNavigation.qml+159−78

This diff is too big to show here.

qml/Dash/DashNavigationButton.qmldeleted−233

This diff is too big to show here.

qml/Dash/DashNavigationHeader.qmlnew file+73

This diff is too big to show here.

qml/Dash/DashNavigationList.qml+33−85

This diff is too big to show here.

qml/Dash/DashPageHeader.qml+140−131

This diff is too big to show here.

qml/Dash/Filters/FilterOptionSelector.qmlnew file+91

This diff is too big to show here.

qml/Dash/Filters/FilterRangeInput.qmlnew file+136

This diff is too big to show here.

qml/Dash/Filters/FilterValueSlider.qmlnew file+87

This diff is too big to show here.

qml/Dash/Filters/FilterWidget.qmlnew file+29

This diff is too big to show here.

qml/Dash/Filters/FilterWidgetFactory.qmlnew file+80

This diff is too big to show here.

qml/Dash/FiltersPopover.qmlnew file+105

This diff is too big to show here.

qml/Dash/GenericScopeView.qml+77−47

This diff is too big to show here.

qml/Dash/PageHeaderExtraPanel.qmlnew file+176

This diff is too big to show here.

qml/Greeter/Greeter.qml+17−6

This diff is too big to show here.

qml/Launcher/Launcher.qml+2−3

This diff is too big to show here.

qml/OrientedShell.qml+27−17

This diff is too big to show here.

qml/Panel/IndicatorItemRow.qml+5−2

This diff is too big to show here.

qml/Panel/Indicators/MenuItemFactory.qml+16−3

This diff is too big to show here.

qml/Panel/IndicatorsMenu.qml−2

This diff is too big to show here.

qml/Shell.qml+84−53

This diff is too big to show here.

qml/Stages/AbstractStage.qml+5−1

This diff is too big to show here.

qml/Stages/ApplicationWindow.qml+7−3

This diff is too big to show here.

qml/Stages/DesktopStage.qml+75−12

This diff is too big to show here.

qml/Stages/PhoneStage.qml+15−6

This diff is too big to show here.

qml/Stages/SideStage.qmlnew file+118

This diff is too big to show here.

qml/Stages/SpreadDelegate.qml+11−1

This diff is too big to show here.

qml/Stages/StagedFullscreenPolicy.qmlnew file+58

This diff is too big to show here.

qml/Stages/SurfaceContainer.qml+14

This diff is too big to show here.

qml/Stages/TabletSideStageTouchGesture.qmlnew file+154

This diff is too big to show here.

qml/Stages/TabletStage.qml+405−172

This diff is too big to show here.

qml/Stages/TransformedTabletSpreadDelegate.qml+84−56

This diff is too big to show here.

qml/Stages/WindowResizeArea.qml+2−2

This diff is too big to show here.

qml/Stages/WindowedFullscreenPolicy.qmlnew file+41

This diff is too big to show here.

qml/Stages/graphics/sidestage_drag.svgnew file+207

This diff is too big to show here.

qml/Stages/graphics/sidestage_open.svgnew file+181

This diff is too big to show here.

qml/Tutorial/Arrow.qmldeleted−56

This diff is too big to show here.

qml/Tutorial/InactivityTimer.qmlnew file+62

This diff is too big to show here.

qml/Tutorial/Slider.qmldeleted−123

This diff is too big to show here.

qml/Tutorial/Tutorial.qml+39−14

This diff is too big to show here.

qml/Tutorial/TutorialBottom.qml+86−66

This diff is too big to show here.

qml/Tutorial/TutorialBottomFinish.qmldeleted−41

This diff is too big to show here.

qml/Tutorial/TutorialContent.qml+227−55

This diff is too big to show here.

qml/Tutorial/TutorialLeft.qml+21−68

This diff is too big to show here.

qml/Tutorial/TutorialLeftLong.qmlnew file+54

This diff is too big to show here.

qml/Tutorial/TutorialPage.qml+62−186

This diff is too big to show here.

qml/Tutorial/TutorialRight.qml+30−192

This diff is too big to show here.

qml/Tutorial/TutorialTop.qmlnew file+61

This diff is too big to show here.

qml/Tutorial/graphics/arrow.svgnew file+19

This diff is too big to show here.

qml/Tutorial/graphics/background1.pngnew file

Binary file not shown.

qml/Tutorial/graphics/background2.pngnew file

Binary file not shown.

qml/Tutorial/graphics/camera.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/chevron.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/dialer.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/facebook.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/gallery.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/tick.pngdeleted

Binary file not shown.

qml/Wizard/CheckableSetting.qml+11−3

This diff is too big to show here.

qml/Wizard/Page.qml+261−44

This diff is too big to show here.

qml/Wizard/Pages.qml+75−31

This diff is too big to show here.

qml/Wizard/Pages/10-welcome.qml+128−48

This diff is too big to show here.

qml/Wizard/Pages/20-sim.qmldeleted−77

This diff is too big to show here.

qml/Wizard/Pages/30-passwd-type.qmldeleted−140

This diff is too big to show here.

qml/Wizard/Pages/30-wifi.qmlnew file+210

This diff is too big to show here.

qml/Wizard/Pages/40-location.qmlnew file+290

This diff is too big to show here.

qml/Wizard/Pages/40-wifi.qmldeleted−219

This diff is too big to show here.

qml/Wizard/Pages/50-location.qmldeleted−150

This diff is too big to show here.

qml/Wizard/Pages/50-timezone.qmlnew file+275

This diff is too big to show here.

qml/Wizard/Pages/60-reporting.qml → qml/Wizard/Pages/60-account.qmlrenamed+30−20

This diff is too big to show here.

qml/Wizard/Pages/70-passwd-type.qmlnew file+166

This diff is too big to show here.

qml/Wizard/Pages/75-report-check.qmlnew file+91

This diff is too big to show here.

qml/Wizard/Pages/80-finished.qml+94−16

This diff is too big to show here.

qml/Wizard/Pages/data/Desktop_header_bkg.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/Desktop_splash_screen_bkg.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/Phone_header_bkg.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/Phone_splash_screen_bkg.pngnew file

Binary file not shown.

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

Binary file not shown.

qml/Wizard/Pages/data/meet_ubuntu_simcard@30.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/map.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/pin.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-1.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-10.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-11.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-2.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-3.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-3.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-4.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-4.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-6.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-7.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-8.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-9.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-9.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_0.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_1.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_10.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_10.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_11.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_12.75.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_12.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_13.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_2.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_3.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_3.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_4.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_4.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.75.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_6.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_6.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_7.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_8.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_8.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_9.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_9.pngnew file

Binary file not shown.

qml/Wizard/Pages/here-terms.qml+71−66

This diff is too big to show here.

qml/Wizard/Pages/passwd-confirm.qml → qml/Wizard/Pages/passcode-confirm.qmlrenamed+13−30

This diff is too big to show here.

qml/Wizard/Pages/passcode-desktop.qmlnew file+132

This diff is too big to show here.

qml/Wizard/Pages/passwd-set.qml → qml/Wizard/Pages/passcode-set.qmlrenamed+13−29

This diff is too big to show here.

qml/Wizard/Pages/password-set.qmlnew file+149

This diff is too big to show here.

qml/Wizard/Pages/sim.qmlnew file+108

This diff is too big to show here.

qml/Wizard/PasswordMeter.qmlnew file+106

This diff is too big to show here.

qml/Wizard/StackButton.qml+7−12

This diff is too big to show here.

qml/Wizard/Wizard.qml−9

This diff is too big to show here.

qml/Tutorial/TutorialLeftFinish.qml → qml/Wizard/WizardTextField.qmlrenamed+5−21

This diff is too big to show here.

src/MouseTouchAdaptor.cpp+53−9

This diff is too big to show here.

src/MouseTouchAdaptor.h+5−3

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators.py−2

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_tutorial.pydeleted−57

This diff is too big to show here.

tests/autopilot/unity8/tutorial.pydeleted−73

This diff is too big to show here.

tests/libs/UbuntuGestures/tst_TouchRegistry.cpp+59

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.cpp+60−3

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.h+30−5

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.qmltypes+5

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml+1

This diff is too big to show here.

tests/mocks/QMenuModel/QDBusActionGroup.qml+5−5

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/plugin.cpp+1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt+2

This diff is too big to show here.

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

This diff is too big to show here.

qml/Tutorial/Tick.qml → tests/mocks/Ubuntu/SystemSettings/Diagnostics/MockDiagnostics.qmlrenamed+4−9

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockKeyboardPlugin.qmlnew file+21

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml+2−2

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/qmldir+1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp+1−1

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/TimeDate/MockTimeDate.qmlnew file+25

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationInfo.cpp+21−3

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationInfo.h+6−2

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.cpp+13−26

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.h−8

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurface.cpp+32

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurface.h+10−3

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.cpp+28−5

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Unity/Application/Session.cpp+26−1

This diff is too big to show here.

tests/mocks/Unity/Application/Session.h+7

This diff is too big to show here.

tests/mocks/Unity/Application/resources/MirSurfaceItem.qml+59

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Unity/Indicators/ModelActionRootState.qml+26−4

This diff is too big to show here.

tests/mocks/Unity/fake_filters.cppnew file+125

This diff is too big to show here.

tests/mocks/Unity/fake_filters.hnew file+46

This diff is too big to show here.

tests/mocks/Unity/fake_navigation.cpp+9−10

This diff is too big to show here.

tests/mocks/Unity/fake_optionselectorfilter.cppnew file+65

This diff is too big to show here.

tests/mocks/Unity/fake_optionselectorfilter.hnew file+52

This diff is too big to show here.

tests/mocks/Unity/fake_optionselectoroptions.cppnew file+77

This diff is too big to show here.

tests/mocks/Unity/fake_optionselectoroptions.hnew file+47

This diff is too big to show here.

tests/mocks/Unity/fake_rangeinputfilter.cppnew file+167

This diff is too big to show here.

tests/mocks/Unity/fake_rangeinputfilter.hnew file+79

This diff is too big to show here.

tests/mocks/Unity/fake_scope.cpp+52−27

This diff is too big to show here.

tests/mocks/Unity/fake_scope.h+20−7

This diff is too big to show here.

tests/mocks/Unity/fake_unity_plugin.cpp+7

This diff is too big to show here.

tests/mocks/Unity/fake_valuesliderfilter.cppnew file+84

This diff is too big to show here.

tests/mocks/Unity/fake_valuesliderfilter.hnew file+55

This diff is too big to show here.

tests/mocks/Unity/fake_valueslidervalues.cppnew file+51

This diff is too big to show here.

tests/mocks/Unity/fake_valueslidervalues.hnew file+36

This diff is too big to show here.

tests/mocks/Utils/CMakeLists.txt+3−2

This diff is too big to show here.

tests/mocks/Utils/Utils.qmltypes+2−2

This diff is too big to show here.

tests/mocks/Utils/plugin.cpp+14−2

This diff is too big to show here.

tests/mocks/Utils/windowstatestorage.cpp+13

This diff is too big to show here.

tests/mocks/Utils/windowstatestorage.h+4

This diff is too big to show here.

tests/mocks/Wizard/CMakeLists.txt+6−1

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.cpp+4−2

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.h+2−2

This diff is too big to show here.

tests/mocks/Wizard/mockplugin.cpp+7−8

This diff is too big to show here.

tests/plugins/AccountsService/PropertiesServer.cpp+10

This diff is too big to show here.

tests/plugins/AccountsService/PropertiesServer.h−1

This diff is too big to show here.

tests/plugins/AccountsService/client.cpp+67

This diff is too big to show here.

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

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/CMakeLists.txt+7−1

This diff is too big to show here.

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

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.h+13−1

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp−56

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGestureArea.cppnew file+270

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGestureArea.qmlnew file+90

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/CMakeLists.txt+4

This diff is too big to show here.

tests/qmltests/Components/tst_PhysicalKeysMapper.qml+3−3

This diff is too big to show here.

tests/qmltests/Dash/Filters/tst_FilterOptionSelector.qmlnew file+96

This diff is too big to show here.

tests/qmltests/Dash/Filters/tst_FilterRangeInput.qmlnew file+247

This diff is too big to show here.

tests/qmltests/Dash/Filters/tst_FilterValueSlider.qmlnew file+101

This diff is too big to show here.

tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qmlnew file+58

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Dash/tst_DashContent.qml+165−152

This diff is too big to show here.

tests/qmltests/Dash/tst_DashPageHeader.qml+24−15

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Greeter/tst_Greeter.qml+7−1

This diff is too big to show here.

tests/qmltests/Stages/tst_DesktopStage.qml−2

This diff is too big to show here.

tests/qmltests/Stages/tst_TabletStage.qml+143

This diff is too big to show here.

tests/qmltests/Stages/tst_WindowResizeArea.qml+7

This diff is too big to show here.

tests/qmltests/Tutorial/tst_Tutorial.qml+611−193

This diff is too big to show here.

tests/qmltests/Wizard/tst_Wizard.qml+126−214

This diff is too big to show here.

tests/qmltests/tst_OrientedShell.qml+126−15

This diff is too big to show here.

tests/qmltests/tst_Shell.qml+129−8

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml−22

This diff is too big to show here.

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

This diff is too big to show here.