da7370f · unity8 · git.iko.soy

git.iko.soy/unity8

Merged with trunk

commitda7370f0fd448e5ea96e9401cbc4296be2f7c048 authorFederico Gimenez <fgimenez@canonical.com> dateWed 15 Apr 2015, 10:30 (12 years ago) parenta321ca7 7478eb8

522 files changed+39670−17113

compare with xenial

unifiedsplit

CMakeLists.txt+13−5

@@ -54,6 +54,7 @@ find_package(Qt5Quick 5.2 REQUIRED)

5454find_package(Qt5Gui 5.2 REQUIRED)

5555find_package(Qt5DBus 5.2 REQUIRED)

5656find_package(Qt5Concurrent 5.2 REQUIRED)

57+find_package(Qt5Sql 5.2 REQUIRED)

5758

5859# Standard install paths

5960include(GNUInstallDirs)

@@ -97,10 +98,6 @@ add_definitions(-DQT_NO_KEYWORDS)

9798# Save a few container detach and conversions

9899add_definitions(-DQT_STRICT_ITERATORS)

99100

100−# Tests

101−include(CTest)

102−enable_testing()

103−

104101# Autopilot tests

105102include(autopilot)

106103declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)

@@ -108,6 +105,8 @@ declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)

108105set(SHELL_APP unity8)

109106set(DASH_APP unity8-dash)

110107set(SCOPE_TOOL unity-scope-tool)

108+set(INDICATORS_CLIENT_APP indicators-client)

109+set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)

111110

112111include_directories(

113112 ${CMAKE_SOURCE_DIR}/include

@@ -120,7 +119,16 @@ add_subdirectory(libs)

120119add_subdirectory(src)

121120add_subdirectory(tools)

122121add_subdirectory(qml)

123−add_subdirectory(tests)

122+

123+# Tests

124+if (NOT NO_TESTS)

125+ include(CTest)

126+ enable_testing()

127+ add_subdirectory(tests)

128+else()

129+ message(STATUS "Tests disabled")

130+endif()

131+

124132add_subdirectory(plugins)

125133

126134#

CODING+6−6

@@ -24,7 +24,7 @@ $ ./build.sh --setup

2424

2525 this will:

2626 - install the required dependencies to build, as well as run on the desktop

27− - it should also install unity-scope-home and unity-lens-application which

27+ - it should also install unity-scope-home and unity-lens-application which

2828 are technically "recommends", not strict dependencies

2929

3030build Unity 8

@@ -104,8 +104,8 @@ Notes

104104 - it's unsafe - anyone can connect to your device

105105 - with TCP the Nexus 10 doesn't drop the adb connection when locking

106106 the screen

107−- exporting ANDROID_SERIAL=$your_device_serial or

108− ANDROID_SERIAL=$your_device_ip:5555 will make adb not complain about

107+- exporting ANDROID_SERIAL=$your_device_serial or

108+ ANDROID_SERIAL=$your_device_ip:5555 will make adb not complain about

109109 multiple devices

110110- you can export TARGET_IP=$your_device_ip TARGET_SSH_PORT=22 for run_on_device.sh

111111 to not use adb forwarding - useful if you use multiple devices

@@ -186,12 +186,12 @@ $ make install

186186

187187To see the list of existing autopilot tests you can do

188188

189−$ PYTHONPATH=../tests/autopilot autopilot list unity8

189+$ PYTHONPATH=../tests/autopilot autopilot3 list unity8

190190

191191And then run a single test with

192192

193−$ PYTHONPATH=../tests/autopilot autopilot run unity8.some.very.long.test.name

193+$ PYTHONPATH=../tests/autopilot autopilot3 run unity8.some.very.long.test.name

194194

195195or run them all with

196196

197−$ PYTHONPATH=../tests/autopilot autopilot run unity8

197+$ PYTHONPATH=../tests/autopilot autopilot3 run unity8

build.sh+4−1

@@ -61,7 +61,10 @@ install_dependencies() {

6161}

6262

6363mk_build_deps() {

64− [ ! -f unity8-build-deps*deb -o $CODE_DIR/debian/control -nt unity8-build-deps*deb ] && mk-build-deps --install --root-cmd sudo $CODE_DIR/debian/control

64+ if [ ! -f control -o $CODE_DIR/debian/control -nt control ]; then

65+ sed 's/\:native//g' $CODE_DIR/debian/control > control

66+ mk-build-deps --install --root-cmd sudo control

67+ fi

6568}

6669

6770if [ -f "/usr/bin/ccache" ] ; then

cmake/modules/QmlTest.cmake+4−1

@@ -28,7 +28,7 @@ endif()

2828

2929set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)

3030

31−set(test_env UNITY_TESTING=1)

31+set(test_env LC_ALL=C UNITY_TESTING=1)

3232

3333macro(add_manual_qml_test SUBPATH COMPONENT_NAME)

3434 set(options NO_ADD_TEST NO_TARGETS)

@@ -153,7 +153,9 @@ endmacro(add_qml_test_internal)

153153

154154macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)

155155 set(testCommand

156+ ${ENVVAR}

156157 LD_LIBRARY_PATH=${LD_PATH}

158+ dbus-launch

157159 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

158160 -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml

159161 -o -,txt)

@@ -171,6 +173,7 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)

171173 ${ENVVAR}

172174 LD_LIBRARY_PATH=${LD_PATH}

173175 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum

176+ dbus-launch

174177 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

175178 -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml

176179 -o -,txt)

cmake/modules/autopilot.cmake−8

@@ -13,12 +13,4 @@ function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)

1313

1414 add_dependencies(autopilot autopilot-${TEST_NAME})

1515

16− add_custom_target(autopilot2-${TEST_NAME}

17− COMMAND UNITY_TESTING=1 LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}

18− WORKING_DIRECTORY ${WORKING_DIR}

19− DEPENDS fake_install

20− )

21−

22− add_dependencies(autopilot autopilot2-${TEST_NAME})

23−

2416endfunction()

data/CMakeLists.txt+3−1

@@ -1,13 +1,15 @@

11# generate desktop files

22configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)

33configure_file(${DASH_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop @ONLY)

4+configure_file(${INDICATORS_CLIENT_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop @ONLY)

56# install desktop files

67install(FILES

78 ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop

89 ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop

10+ ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop

911 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

1012 )

1113

12−# install url dispatcher files

14+install(FILES com.canonical.Unity8.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)

1315install(FILES unity8-dash.url-dispatcher DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)

com.canonical.Unity8.gschema.xml → data/com.canonical.Unity8.gschema.xmlrenamed

The content is the same.

data/indicators-client.desktop.innew file+9

@@ -0,0 +1,9 @@

1+[Desktop Entry]

2+Type=Application

3+Name=Indicators Client

4+Comment=Application for testing the Indicators system

5+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/indicators-client

6+Terminal=false

7+Icon=

8+NoDisplay=false

9+X-Ubuntu-Touch=true

data/unity-mock-indicator-service.confnew file+7

@@ -0,0 +1,7 @@

1+description "Unity Shell v8 Mock Indicator"

2+author "Nick Dedekind <nick.dedekind@canonical.com>"

4+respawn

5+respawn limit 2 10

7+exec ${BINARY:-unity-mock-indicator-service} $ARGS

debian/changelog+421

@@ -1,3 +1,424 @@

1+unity8 (8.02+15.04.20150409.1-0ubuntu1) vivid; urgency=medium

3+ [ Albert Astals Cid ]

4+ * Focus the shutdown dialog (LP: #1417991)

5+ * Make url-dispatching scope activation when the dash is not on the

6+ main scopes (LP: #1364306)

7+ * We use autopilot3 now

9+ [ CI Train Bot ]

10+ * New rebuild forced.

11+ * Resync trunk. added: po/or.po

12+

13+ [ Daniel d'Andrada ]

14+ * Make tst_PreviewListView and tst_GenericScopeView work in out-of-

15+ source builds

16+ * MouseArea that shows the indicators panel should cover the

17+ indicators bar only (LP: #1439318)

18+ * Surface gets active focus also with mouse clicks

19+

20+ [ Josh Arenson ]

21+ * Add a mode option to unity8 for selecting greeter mode in the future

22+ * Remove PkgConfig include from Launcher plugin to fix cross-compile

23+ (LP: #1437702)

24+

25+ [ Leo Arias ]

26+ * Fixed the check for string in the lock screen test. (LP: #1434518)

27+

28+ [ Michael Terry ]

29+ * Make sure the edge tutorial is destroyed when we receive a call

30+ during the wizard. (LP: #1436349)

31+ * Skip parts of the edge tutorial that require a touch device (like

32+ spread and bottom edge). (LP: #1434712)

33+

34+ [ Michael Zanetti ]

35+ * Don't hide stages just because they're empty (LP: #1439615)

36+ * [Launcher] fix bug where an item would disappear even though the app

37+ is running (LP: #1438172)

38+

39+ [ Nick Dedekind ]

40+ * Fixed autopilot test failures related to udev input failure for

41+ power button.

42+ * Made improvements for laggy indicator backends (lp#1390136). (LP:

43+ #1390136)

44+

45+ [ Pete Woods ]

46+ * GPS only goes active when the Dash is in the foreground (LP:

47+ #1434379)

48+

49+ [ handsome_feng<445865575@qq.com> ]

50+ * Modified the wrong time format in ScreenGrabber (LP: #1436006)

51+

52+ -- CI Train Bot <ci-train-bot@canonical.com> Thu, 09 Apr 2015 14:01:11 +0000

53+

54+unity8 (8.02+15.04.20150320-0ubuntu1) vivid; urgency=medium

55+

56+ [ Albert Astals Cid ]

57+ * Fix regression making pan not possible in Zoomable Image (LP:

58+ #1433506)

59+ * Make sure m_firstVisibleIndex is correctly set after processing

60+ changeSet.removes (LP: #1433056)

61+ * make pot_file

62+

63+ [ Daniel d'Andrada ]

64+ * Don't show the rotating rect in "make tryFoo".

65+

66+ [ Michael Zanetti ]

67+ * make pinlockscreen adjust better to larger displays

68+

69+ -- CI Train Bot <ci-train-bot@canonical.com> Fri, 20 Mar 2015 11:56:41 +0000

70+

71+unity8 (8.02+15.04.20150318-0ubuntu1) vivid; urgency=medium

72+

73+ [ Albert Astals Cid ]

74+ * Add some context to tr calls (LP: #1431497)

75+ * Require binaries and .pc files we call from code

76+ * Test: More stubborn flick to the end

77+

78+ [ Andrea Cimitan ]

79+ * Refactor PreviewOverlay to fix weird zoom out/in animations when

80+ previewing images from the Previews

81+

82+ [ CI Train Bot ]

83+ * Resync trunk.

84+

85+ [ Charles Kerr ]

86+ * Re-enable a rotation lock test now that the bug that broke that test

87+ has been fixed. (LP: #1410915)

88+

89+ [ Daniel d'Andrada ]

90+ * Darkened area behind indicators menu should eat input until it fully

91+ disappears (LP: #1417967)

92+ * DesktopStage - fix focus switch when user taps on window (LP:

93+ #1431325)

94+ * Fix warnings when launching tutorial

95+ * Make MouseTouchAdaptor controllable from within QML

96+ * Make tst_Shell absorb tst_TabletShell

97+

98+ [ Leo Arias ]

99+ * Changed the autopilot dependencies so they do not require qt4. (LP:

100+ #1429158)

101+ * Drop the support for python2 in autopilot tests. (LP: #1429163)

102+ * Stop using the deprecated toolkit emulators namespace in autopilot

103+ tests. (LP: #1341681)

104+

105+ [ Michael Terry ]

106+ * Don't close wizard & edge tutorial when the unity8-dash closes (LP:

107+ #1425484)

108+ * Don't let the wizard sit indefinitely, waiting for a wizard page to

109+ finish preparing itself. (LP: #1425737)

110+ * Fix two broken qmluitest files by waiting for everything to settle

111+ before starting the tests.

112+ * Only call unlockAllModems once the wizard is done. (LP: #1425161)

113+ (LP: #1425161)

114+ * When we are locking the user out from too many login failures,

115+ notice when time passes even if the device is suspended. (LP:

116+ #1396817) (LP: #1396817)

117+

118+ [ Michael Zanetti ]

119+ * Add a mouse area to the indicators panel so we can open them by

120+ clicking. (LP: #1417650)

121+ * fix launcher not reacting to first click when revealed by mouse

122+ hover, add tests

123+ * performance improvements (LP: #1430233, #1425087)

124+

125+ [ Michał Sawicz ]

126+ * Remove the activity indicator from tests

127+ * Use targets instead of custom ld arguments for linking

128+

129+ [ Mirco Müller ]

130+ * Updated the visuals of the SwipeToAct-widget for incoming-call snap-

131+ decision notifications according to new design-spec.

132+ * Updated the visuals of the SwipeToAct-widget for incoming-call snap-

133+ decision notifications according to new design-spec.

134+

135+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 18 Mar 2015 10:19:06 +0000

136+

137+unity8 (8.02+15.04.20150302-0ubuntu2) vivid; urgency=medium

138+

139+ * No-change rebuild against Qt 5.4.1.

140+

141+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Wed, 11 Mar 2015 10:27:23 +0200

142+

143+unity8 (8.02+15.04.20150302-0ubuntu1) vivid; urgency=medium

144+

145+ [ Albert Astals ]

146+ * Don't precache items that are outisde the 1.5*height buffering area

147+ (LP: #1410131)

148+

149+ [ Albert Astals Cid ]

150+ * Don't precache items that are outisde the 1.5*height buffering area

151+ (LP: #1410131)

152+

153+ [ Chris Townsend ]

154+ * Add a wrapper for handling the

155+ /org/gnome/SessionManager/EndSessionDialog DBus object used by

156+ indicator-session. This allows indicator-session to properly talk to

157+ the Unity 8 session management functions. (LP: #1392187)

158+ * Allow for proper logout session management. This uses the

159+ EndSession() Upstart DBus method on the current session bus. (LP:

160+ #1360316)

161+ * Make the Unity 8 session dialogs behave in the same fashion as Unity

162+ 7. From indicator-session: Clicking "Log Out" will now present a

163+ dialog to "Lock", "Log Out", or "Cancel". Clicking "Shut Down" will

164+ now present a dialog to "Reboot", "Shut Down", or "Cancel". (LP:

165+ #1416074)

166+

167+ [ Daniel d'Andrada ]

168+ * Add NO_TESTS cmake option to skip tests and therefore speed up

169+ builds

170+ * Remove enums and properties that doesn't exist in the real

171+ ApplicationManager

172+ * Stabilize some Shell qml tests

173+

174+ [ Josh Arenson ]

175+ * Create a PhysicalKeyMapper to handle all physical/hardware keys (LP:

176+ #1390393)

177+

178+ [ Michael Terry ]

179+ * Make the draggable part of the right edge (during the tutorial) a

180+ constant size, instead of having it grow and shrink as the spread

181+ peeks out from the side.

182+

183+ [ Michał Sawicz ]

184+ * Create a PhysicalKeyMapper to handle all physical/hardware keys (LP:

185+ #1390393)

186+

187+ [ Robert Bruce Park ]

188+ * Launchpad automatic translations update.

189+

190+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 02 Mar 2015 12:11:21 +0000

191+

192+unity8 (8.02+15.04.20150226-0ubuntu1) vivid; urgency=medium

193+

194+ [ CI Train Bot ]

195+ * New rebuild forced.

196+

197+ [ Pete Woods ]

198+ * Only set scopes active when the screen is on (LP: #1422879)

199+

200+ -- CI Train Bot <ci-train-bot@canonical.com> Thu, 26 Feb 2015 19:39:54 +0000

201+

202+unity8 (8.02+15.04.20150224-0ubuntu1) vivid; urgency=medium

203+

204+ [ Albert Astals Cid ]

205+ * Dash manage hint should not be visible in previews+test (LP:

206+ #1422260)

207+ * Do not declare the hostname property twice

208+ * Fix some warnings in Mock Notifications

209+ * Make qmluittests pass with Qt 5.4

210+ * Preserve the aspect ratio for the card attribute images (LP:

211+ #1411751)

212+ * Update qmltypes

213+

214+ [ Andrea Cimitan ]

215+ * Add maximumLineCount for subtitle label in cards (LP: #1414870)

216+

217+ [ Michael Terry ]

218+ * Move the gschema file to data/ and install it via cmake, not dpkg.

219+ * Refactor the greeter code to be more compartmented and isolatable.

220+ * Silence a couple qml warnings. (LP: #1423286)

221+ * Wait for libqofono to finish initializing before we decide whether

222+ to skip the wizard's SIM page or not.

223+

224+ [ Michael Zanetti ]

225+ * enable revealing the launcher by hitting the left edge using the

226+ mouse

227+

228+ [ Ying-Chun Liu ]

229+ * Add Autopilot Notification helper.

230+

231+ -- CI Train Bot <ci-train-bot@canonical.com> Tue, 24 Feb 2015 10:17:16 +0000

232+

233+unity8 (8.02+15.04.20150216.1-0ubuntu1) vivid; urgency=medium

234+

235+ [ Andrea Cimitan ]

236+ * Fix temp scopes opening temp scopes, correctly close previously

237+ opened temp scope with its preview (LP: #1410337)

238+ * Set sourcesize for scopes images in manage dash

239+

240+ [ CI Train Bot ]

241+ * Resync trunk

242+

243+ [ Albert Astals Cid ]

244+ * Test for bug #1316660 (LP: #1316660)

245+ * Hardcode tranlsation for internal.location field (LP: #1393438)

246+ * Make sure the height it's the height it will have

247+

248+ [ Michael Zanetti ]

249+ * Cleanup cmake warning about missing Qt5Sql module

250+

251+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 16 Feb 2015 13:14:26 +0000

252+

253+unity8 (8.02+15.04.20150211-0ubuntu2) vivid; urgency=medium

254+

255+ * No-change rebuild against Qt 5.4.0.

256+

257+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 13 Feb 2015 15:17:18 +0200

258+

259+unity8 (8.02+15.04.20150211-0ubuntu1) vivid; urgency=medium

260+

261+ [ Michael Terry ]

262+ * Redesign tutorial to match latest spec (just removing obsolete pages

263+ and redesigning look, no new pages yet)

264+ * Add new right-edge and bottom-edge screens to the first-boot edge

265+ tutorial (LP: #1383297)

266+ * Support switching the indicator profile on the fly, as the greeter

267+ appears and disappears. (But don't use it yet, not until the

268+ settings panel to control this is in place.)

269+ * Clip the infographic to its bounding box, instead of letting it

270+ bleed past the welcome page (visible when dragging the welcome page

271+ to the side).

272+

273+ [ Michael Zanetti ]

274+ * Add an AccountService based launcher model to be used with split

275+ greeter

276+ * Launcher fixes for windowed mode

277+ * save and restore window size and position

278+ * Fix resizing windows when making it smaller than minSize and then

279+ larger again.

280+

281+ [ handsome_feng<445865575@qq.com> ]

282+ * makes the header fully reveal when tapping the search icon. (LP:

283+ #1379327)

284+

285+ [ Mirco Müller ]

286+ * Allow swipe-to-dismiss for contracted snap-decision notifications,

287+ interactive notifications and ephemeral notifications. (LP:

288+ #1355422, #1334855)

289+

290+ [ Daniel d'Andrada ]

291+ * Make indicators bar eat all events

292+ * Improve Launcher tests, making them more reliable

293+ * Tapping on a surface gives it active focus

294+

295+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 11 Feb 2015 17:13:16 +0000

296+

297+unity8 (8.02+15.04.20150123.3-0ubuntu1) vivid; urgency=low

298+

299+ [ Sebastien Bacher ]

300+ * Set text hint property for the messaging menus inline reply widget

301+ (LP: #1389234)

302+

303+ [ Ying-Chun Liu ]

304+ * Added an initial set of autopilot tests for the display indicator.

305+

306+ [ Nick Dedekind ]

307+ * Removed filtering the indicator model by visibility.

308+

309+ [ Michael Zanetti ]

310+ * fixes left edge drag when in spread

311+

312+ [ Albert Astals Cid ]

313+ * Fix ninja build in a different way The previous one was adding rpath

314+ to some .so that broke our tests that use LD_LIBRARY_PATH to change

315+ which one is picked up

316+

317+ [ Leo Arias ]

318+ * Added an initial set of autopilot tests for the display indicator.

319+

320+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 23 Jan 2015 12:12:41 +0000

321+

322+unity8 (8.02+15.04.20150121.2-0ubuntu1) vivid; urgency=low

323+

324+ [ Michael Terry ]

325+ * Don't show any power dialogs while the screen is off. This is a

326+ band-aid to avoid the symptom, while we still investigate the source

327+ of why the screen doesn't turn on (and why we seem to not handle the

328+ power-button-release event). (LP: #1409003, #1410830)

329+ * Don't refocus the dialer-app when a call is started by the user.

330+ Because of how qtmir works, this would cause the dialer-app to

331+ unfocus momentarily, causing interface oddities for the user. (LP:

332+ #1413065)

333+

334+ [ CI Train Bot ]

335+ * Resync trunk

336+

337+ [ Albert Astals Cid ]

338+ * Build with ninja

339+ * Fixes for Table Preview Widget (LP: #1410420)

340+

341+ [ Michael Zanetti ]

342+ * Add support for earpiece media buttons (LP: #1398427)

343+ * Add a WindowMoveResizeArea and tests for it

344+

345+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 21 Jan 2015 18:33:18 +0000

346+

347+unity8 (8.02+15.04.20150113.1-0ubuntu1) vivid; urgency=low

348+

349+ [ Andrea Cimitan ]

350+ * support background on horizontal cards with summary (LP: #1393008)

351+

352+ [ Gerry Boland ]

353+ * DashCommunicator: replace QDBusInterface with a non-blocking

354+ simplification which does not introspect the service on creation

355+ (LP: #1403508)

356+

357+ [ Leo Arias ]

358+ * Added an autopilot test for the edges demo.

359+

360+ [ Albert Astals ]

361+ * Don't show the manage dash pull up arrow on temp scopes (LP:

362+ #1401869)

363+ * Remove hack, newer Qt already support keyClick(char)

364+ * Tests: Add Qt 5.5 removal TODOs

365+ * Make sure we use fPIC when compiling files for the static library

366+ too

367+ * Make sure changing a scope doesn't trigger creation/destruction of

368+ delegates until it's finished (LP: #1410122)

369+

370+ [ Michael Zanetti ]

371+ * patch debian/control file before using it to make it work with mk-

372+ build-deps

373+

374+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 13 Jan 2015 20:58:08 +0000

375+

376+unity8 (8.02+15.04.20150109.2-0ubuntu1) vivid; urgency=low

377+

378+ [ Michał Sawicz ]

379+ * We don't need the SIGSTOP in main() any more.

380+ * Add a test to make sure the shell always starts disabled until it is

381+ enabled by a complete PAM interaction.

382+

383+ [ Leo Arias ]

384+ * Added an autopilot test for the edges demo.

385+

386+ [ Nick Dedekind ]

387+ * Unhook Lights interface from indicator widgets (LP: #1385331)

388+

389+ [ Albert Astals ]

390+ * Fix going to scopes when the Manage Dash is open (LP: #1403464)

391+ * QSortFilterProxyModelQML -> UnitySortFilterProxyModelQML

392+ * Clip the Scopes List header

393+ * Fix ScopesList not being under finger

394+ * Make waitForRendering with no item fail instead of crash

395+ * Disable Dash horizontal scroll while Navigation InverseMouseArea is

396+ pressed (LP: #1403048)

397+ * Test: Make sure the mouse area is enabled before clicking into it

398+ * Test: We actually need to click on the customBackButton and not on

399+ backButton

400+ * Test: By default mouseX act on the middle

401+

402+ [ Michael Terry ]

403+ * Don't block handling power events on loading the greeter's qml and

404+ the background image.

405+ * Show OSK above the wizard. (LP: #1401213)

406+ * Unify the name of the Greeter DBus test, make it use our standard

407+ binary test macro (which also nicely exports xml results), and make

408+ the test a little more robust against timing issues.

409+ * Add a test to make sure the shell always starts disabled until it is

410+ enabled by a complete PAM interaction.

411+

412+ [ Martin Pitt ]

413+ * tests: Fix Notify.Notification.add_action invocation to work also

414+ with unpatched libnotify API. (LP: #1223401)

415+

416+ [ Rodney Dawes ]

417+ * Depend on :native version of g++ to allow cross-compiling to work.

418+ (LP: #1353855)

419+

420+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 09 Jan 2015 10:43:06 +0000

421+

1422unity8 (8.02+15.04.20141216.1-0ubuntu1) vivid; urgency=low

2423

3424 [ Ubuntu daily release ]

debian/control+19−19

@@ -10,8 +10,10 @@ Build-Depends: cmake,

1010 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),

1111# We rely on C++11 features, and to prevent from ABI breaks

1212# in libstdc++ causing us issues, we explicitly select a G++

13−# version.

14− g++-4.9,

13+# version. To allow cross-compiling to work, we also must

14+# append :native to g++-4.9 so we don't try to run armhf g++

15+# on an x86 CPU for eaxmple, when cross-compiling.

16+ g++-4.9:native,

1517 libconnectivity-qt1-dev,

1618 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],

1719 libgl1-mesa-dri,

@@ -22,21 +24,20 @@ Build-Depends: cmake,

2224 libpam0g-dev,

2325 libpay2-dev,

2426 libpulse-dev,

25− libqmenumodel-dev (>= 0.2.8),

27+ libqmenumodel-dev (>= 0.2.9),

2628 libqt5xmlpatterns5-dev,

2729 libsystemsettings-dev,

28− libunity-api-dev (>= 7.94),

30+ libunity-api-dev (>= 7.96),

2931 libusermetricsoutput1-dev,

3032 libxcb1-dev,

3133 pkg-config,

32− python-setuptools,

3334 python3-all:any,

3435 python3-setuptools,

35− python:any (>= 2.7),

3636 qml-module-qt-labs-folderlistmodel,

3737 qml-module-qtquick-layouts,

3838 qml-module-qtquick-xmllistmodel,

3939 qml-module-qtquick2,

40+ qml-module-qtsysteminfo,

4041 qml-module-qttest,

4142 qt5-default,

4243 qtbase5-dev (>= 5.2.1),

@@ -46,7 +47,7 @@ Build-Depends: cmake,

4647 qtdeclarative5-dev-tools,

4748 qtdeclarative5-private-dev (>= 5.2.1),

4849 qtdeclarative5-qtmultimedia-plugin,

49− qtdeclarative5-ubuntu-settings-components (>= 0.4),

50+ qtdeclarative5-ubuntu-settings-components (>= 0.6),

5051 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),

5152 qtdeclarative5-ubuntu-web-plugin,

5253 ttf-ubuntu-font-family,

@@ -61,7 +62,7 @@ X-Ubuntu-Use-Langpack: yes

6162

6263Package: indicators-client

6364Architecture: amd64 armhf i386

64−Depends: qmenumodel-qml (>= 0.2.8),

65+Depends: qmenumodel-qml (>= 0.2.9),

6566 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),

6667 unity8 (= ${binary:Version}),

6768 ${misc:Depends},

@@ -75,6 +76,9 @@ Depends: unity8-common (= ${source:Version}),

7576 unity8-private (= ${binary:Version}),

7677 ${misc:Depends},

7778 ${shlibs:Depends},

79+# We do call pkg-config libunity-scopes from the code

80+ pkg-config,

81+ libunity-scopes-dev,

7882Description: Development tool for Unity scopes

7983 This package contains the development tool for new generation Unity scopes, based

8084 on Unity8.

@@ -85,9 +89,10 @@ Provides: indicator-renderer,

8589Depends: gsettings-desktop-schemas,

8690 libcap2-bin,

8791 libglib2.0-bin,

88− qmenumodel-qml (>= 0.2.8),

92+ qmenumodel-qml (>= 0.2.9),

8993 qml-module-qt-labs-folderlistmodel,

9094 qml-module-qtquick-xmllistmodel,

95+ qml-module-qtsysteminfo,

9196 qtdeclarative5-gsettings1.0,

9297 qtdeclarative5-qtmir-plugin (>= 0.4.4),

9398 qtdeclarative5-ubuntu-telephony0.1,

@@ -114,7 +119,7 @@ Description: Unity 8 shell

114119Package: unity8-common

115120Architecture: all

116121Depends: qml-module-qtquick-layouts,

117− qtdeclarative5-ubuntu-settings-components (>= 0.4),

122+ qtdeclarative5-ubuntu-settings-components (>= 0.6),

118123 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

119124 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),

120125 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,

@@ -122,7 +127,7 @@ Depends: qml-module-qtquick-layouts,

122127 unity-application-impl-4,

123128 unity-notifications-impl-3,

124129 unity-plugin-scopes | unity-scopes-impl,

125− unity-scopes-impl-4,

130+ unity-scopes-impl-6,

126131 unity8-fake-env | unity-application-impl,

127132 ${misc:Depends},

128133Breaks: unity8 (<< 7.86),

@@ -135,20 +140,16 @@ Description: Unity 8 shell (common files)

135140

136141Package: unity8-autopilot

137142Architecture: all

138−Depends: gir1.2-glib-2.0,

143+Depends: autopilot-qt5 (>= 1.4),

144+ gir1.2-glib-2.0,

139145 gir1.2-notify-0.7,

140− libautopilot-qt (>= 1.4),

141146 libqt5test5,

142147 libqt5widgets5,

143− python-autopilot,

144− python-evdev,

145− python-fixtures,

146− python-gi,

147− python-mock,

148148 python3-autopilot,

149149 python3-evdev,

150150 python3-fixtures,

151151 python3-gi,

152+ qttestability-autopilot (>= 1.4),

152153 ubuntu-ui-toolkit-autopilot,

153154 unity-scope-click,

154155 unity8 (= ${source:Version}),

@@ -156,7 +157,6 @@ Depends: gir1.2-glib-2.0,

156157 url-dispatcher-tools,

157158 ${misc:Depends},

158159 ${python3:Depends},

159− ${python:Depends},

160160 ${shlibs:Depends},

161161Description: Test package for Unity 8 shell

162162 Autopilot tests for the unity8 package

debian/indicators-client.install+1

@@ -1 +1,2 @@

1+usr/share/applications/indicators-client.desktop

12/usr/bin/indicators-client

debian/rules+2−2

@@ -14,7 +14,7 @@ export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9

1414export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9

1515

1616%:

17− dh $@ --parallel --fail-missing --with python2,python3

17+ dh $@ --parallel --fail-missing --with python3

1818

1919override_dh_auto_clean:

2020 dh_auto_clean

@@ -32,7 +32,7 @@ override_dh_auto_build:

3232override_dh_install:

3333 # install autopilot tests

3434 cd tests/autopilot; \

35− set -ex; for python in $(shell pyversions -r) $(shell py3versions -r); do \

35+ set -ex; for python in $(shell py3versions -r); do \

3636 $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \

3737 done; \

3838 cd $(CURDIR)

debian/unity8-autopilot.install+3−1

@@ -1,2 +1,4 @@

1+data/unity-mock-indicator-service.conf usr/share/upstart/sessions/

2+usr/bin/unity-mock-indicator-service

13usr/lib/python*/*/unity*

2−usr/share/unity8/unlock-device

4+usr/share/unity8/unlock-device

debian/unity8-common.install+1−1

@@ -1,7 +1,7 @@

1+usr/share/glib-2.0/schemas

12usr/share/locale

23usr/share/unity8/Components

34usr/share/unity8/Dash

45usr/share/unity8/Notifications

56usr/share/unity8/graphics

6−com.canonical.Unity8.gschema.xml usr/share/glib-2.0/schemas/

77var/lib/polkit-1/localauthority/10-vendor.d

debian/unity8-private.install+1

@@ -1,6 +1,7 @@

11usr/lib/*/libunity8-private.*

22usr/lib/*/unity8/qml/AccountsService

33usr/lib/*/unity8/qml/Dash

4+usr/lib/*/unity8/qml/Greeter

45usr/lib/*/unity8/qml/LightDM

56usr/lib/*/unity8/qml/Lights

67usr/lib/*/unity8/qml/Powerd

debian/unity8.install+1

@@ -10,5 +10,6 @@ usr/share/unity8/Launcher

1010usr/share/unity8/Panel

1111usr/share/unity8/Shell.qml

1212usr/share/unity8/Stages

13+usr/share/unity8/Tutorial

1314usr/share/unity8/Wizard

1415usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher

include/paths.h.in+1−6

@@ -92,12 +92,7 @@ inline QString mockPluginsDir() {

9292

9393inline QStringList shellDataDirs() {

9494 QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);

95− if (!isRunningInstalled()) {

96− if (getenv("UNITY_TEST_ENV")==nullptr) {

97− dirs.prepend("@CMAKE_BINARY_DIR@/share");

98− }

99− }

100− else {

95+ if (isRunningInstalled()) {

10196 // append so by default we use xdg files.

10297 dirs.append(qmlDirectory());

10398 }

plugins/AccountsService/AccountsService.cpp+1−1

@@ -152,7 +152,7 @@ void AccountsService::updateEnableIndicatorsWhileLocked()

152152

153153void AccountsService::updateBackgroundFile()

154154{

155− auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();

155+ QString backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();

156156 if (m_backgroundFile != backgroundFile) {

157157 m_backgroundFile = backgroundFile;

158158 Q_EMIT backgroundFileChanged();

plugins/AccountsService/AccountsService.qmltypes+3

@@ -29,5 +29,8 @@ Module {

2929 Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }

3030 Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }

3131 Property { name: "failedLogins"; type: "uint" }

32+ Property { name: "hereEnabled"; type: "bool" }

33+ Property { name: "hereLicensePath"; type: "string"; isReadonly: true }

34+ Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }

3235 }

3336}

plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+20−2

@@ -25,7 +25,8 @@

2525AccountsServiceDBusAdaptor::AccountsServiceDBusAdaptor(QObject* parent)

2626 : QObject(parent),

2727 m_accountsManager(nullptr),

28− m_users()

28+ m_users(),

29+ m_ignoreNextChanged(false)

2930{

3031 QDBusConnection connection = QDBusConnection::SM_BUSNAME();

3132 QDBusConnectionInterface *interface = connection.interface();

@@ -57,6 +58,15 @@ void AccountsServiceDBusAdaptor::setUserProperty(const QString &user, const QStr

5758 }

5859}

5960

61+void AccountsServiceDBusAdaptor::setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value)

62+{

63+ QDBusInterface *iface = getUserInterface(user);

64+ if (iface != nullptr && iface->isValid()) {

65+ // The value needs to be carefully wrapped

66+ iface->asyncCall("Set", interface, property, QVariant::fromValue(QDBusVariant(value)));

67+ }

68+}

69+

6070void AccountsServiceDBusAdaptor::propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid)

6171{

6272 // Merge changed and invalidated together

@@ -66,11 +76,19 @@ void AccountsServiceDBusAdaptor::propertiesChangedSlot(const QString &interface,

6676 combined.removeDuplicates();

6777

6878 Q_EMIT propertiesChanged(getUserForPath(message().path()), interface, combined);

79+

80+ // In case a non-builtin property changes, we're getting propertiesChanged *and* changed

81+ // As the generic changed requires asking back over DBus, it's quite slow to process.

82+ // We don't want to trigger that when we know it's not a built-in property change.

83+ m_ignoreNextChanged = true;

6984}

7085

7186void AccountsServiceDBusAdaptor::maybeChangedSlot()

7287{

73− Q_EMIT maybeChanged(getUserForPath(message().path()));

88+ if (!m_ignoreNextChanged) {

89+ Q_EMIT maybeChanged(getUserForPath(message().path()));

90+ }

91+ m_ignoreNextChanged = false;

7492}

7593

7694QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path)

plugins/AccountsService/AccountsServiceDBusAdaptor.h+14

@@ -19,6 +19,7 @@

1919#ifndef UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H

2020#define UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H

2121

22+#include <QDBusArgument>

2223#include <QDBusContext>

2324#include <QDBusInterface>

2425#include <QMap>

@@ -33,7 +34,18 @@ public:

3334 explicit AccountsServiceDBusAdaptor(QObject *parent = 0);

3435

3536 Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &interface, const QString &property);

37+

38+ template <typename T>

39+ inline T getUserProperty(const QString &user, const QString &interface, const QString &property) {

40+ QVariant variant = getUserProperty(user, interface, property);

41+ if (variant.isValid() && variant.canConvert<QDBusArgument>()) {

42+ return qdbus_cast<T>(variant.value<QDBusArgument>());

43+ }

44+ return T();

45+ }

46+

3647 Q_INVOKABLE void setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value);

48+ Q_INVOKABLE void setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value);

3749

3850Q_SIGNALS:

3951 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

@@ -49,6 +61,8 @@ private:

4961

5062 QDBusInterface *m_accountsManager;

5163 QMap<QString, QDBusInterface *> m_users;

64+

65+ bool m_ignoreNextChanged;

5266};

5367

5468#endif

plugins/AccountsService/com.canonical.unity.AccountsService.xml+1−2

@@ -14,8 +14,7 @@

1414 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>

1515 </property>

1616

17−

18− <property name="launcher-items" type="aa{sv}" access="readwrite">

17+ <property name="LauncherItems" type="aa{sv}" access="readwrite">

1918 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>

2019 </property>

2120

plugins/CMakeLists.txt+1

@@ -12,6 +12,7 @@ macro(add_unity8_plugin PLUGIN VERSION PATH)

1212endmacro()

1313

1414add_subdirectory(AccountsService)

15+add_subdirectory(Greeter)

1516add_subdirectory(LightDM)

1617add_subdirectory(Lights)

1718add_subdirectory(Dash)

plugins/Dash/CardAttributes.qml+2

@@ -49,6 +49,8 @@ GridLayout {

4949 Icon {

5050 id: icon

5151 height: units.gu(2)

52+ // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293

53+ width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth

5254 source: "icon" in modelData && modelData["icon"] || ""

5355 color: grid.color

5456 }

plugins/Dash/CardCreator.js+6−1

@@ -224,6 +224,8 @@ var kTitleLabelCode = 'Label { \n\

224224

225225// %1 is used as extra anchors of emblemIcon

226226// %2 is used as color of emblemIcon

227+// FIXME The width code is a

228+// Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293

227229var kEmblemIconCode = 'Icon { \n\

228230 id: emblemIcon; \n\

229231 objectName: "emblemIcon"; \n\

@@ -235,6 +237,7 @@ var kEmblemIconCode = 'Icon { \n\

235237 source: cardData && cardData["emblem"] || ""; \n\

236238 color: %2; \n\

237239 height: source != "" ? titleLabel.font.pixelSize : 0; \n\

240+ width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth; \n\

238241 }\n';

239242

240243// %1 is used as anchors of touchdown effect

@@ -255,6 +258,7 @@ var kSubtitleLabelCode = 'Label { \n\

255258 anchors { %1 } \n\

256259 anchors.topMargin: units.dp(2); \n\

257260 elide: Text.ElideRight; \n\

261+ maximumLineCount: 1; \n\

258262 fontSize: "x-small"; \n\

259263 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\

260264 color: %2; \n\

@@ -320,7 +324,8 @@ function cardString(template, components) {

320324 var hasSummary = components["summary"] || false;

321325 var artAndSummary = hasArt && hasSummary;

322326 var isHorizontal = template["card-layout"] === "horizontal";

323− var hasBackground = !isHorizontal && (template["card-background"] || components["background"] || artAndSummary);

327+ var hasBackground = (!isHorizontal && (template["card-background"] || components["background"] || artAndSummary)) ||

328+ (hasSummary && (template["card-background"] || components["background"]));

324329 var hasTitle = components["title"] || false;

325330 var hasMascot = components["mascot"] || false;

326331 var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;

plugins/Dash/Dash.qmltypes+17−1

@@ -15,9 +15,25 @@ Module {

1515 Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }

1616 Property { name: "columnSpacing"; type: "double" }

1717 Property { name: "rowSpacing"; type: "double" }

18+ Property { name: "cacheBuffer"; type: "int" }

1819 Property { name: "displayMarginBeginning"; type: "double" }

1920 Property { name: "displayMarginEnd"; type: "double" }

2021 }

22+ Component {

23+ name: "CroppedImageSizer"

24+ prototype: "QObject"

25+ exports: ["Dash/CroppedImageSizer 0.1"]

26+ exportMetaObjectRevisions: [0]

27+ Property { name: "source"; type: "QUrl" }

28+ Property { name: "width"; type: "double" }

29+ Property { name: "height"; type: "double" }

30+ Property { name: "sourceSize"; type: "QSize"; isReadonly: true }

31+ Signal { name: "inputParamsChanged" }

32+ Method {

33+ name: "setImageSize"

34+ Parameter { name: "imageSize"; type: "QSize" }

35+ }

36+ }

2137 Component {

2238 name: "HorizontalJournal"

2339 defaultProperty: "data"

@@ -40,7 +56,7 @@ Module {

4056 Property { name: "forceNoClip"; type: "bool" }

4157 Property { name: "stickyHeaderHeight"; type: "int"; isReadonly: true }

4258 Property { name: "headerItemShownHeight"; type: "double"; isReadonly: true }

43− Property { name: "cacheBuffer"; type: "double" }

59+ Property { name: "cacheBuffer"; type: "int" }

4460 Signal { name: "headerChanged" }

4561 Method { name: "positionAtBeginning" }

4662 Method { name: "showHeader" }

plugins/Dash/listviewwithpageheader.cpp+7−8

@@ -973,14 +973,13 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool

973973 }

974974 if (growDown) {

975975 adjustMinYExtent();

976− } else if (remove.index <= m_firstVisibleIndex) {

977− if (!m_visibleItems.isEmpty()) {

978− // We removed the first item that is the one that positions the rest

979− // position the new first item correctly

980− m_visibleItems.first()->setY(oldFirstValidIndexPos);

981− } else {

982− m_firstVisibleIndex = -1;

983− }

976+ } else if (remove.index <= m_firstVisibleIndex && !m_visibleItems.isEmpty()) {

977+ m_visibleItems.first()->setY(oldFirstValidIndexPos);

978+ }

979+ if (m_visibleItems.isEmpty()) {

980+ m_firstVisibleIndex = -1;

981+ } else {

982+ m_firstVisibleIndex -= qMax(0, m_firstVisibleIndex - remove.index);

984983 }

985984 } else if (remove.index + remove.count <= m_firstVisibleIndex) {

986985 m_firstVisibleIndex -= remove.count;

plugins/Greeter/CMakeLists.txtnew file+6

@@ -0,0 +1,6 @@

1+macro(add_unity8_greeter_plugin PLUGIN VERSION PATH)

2+ export_qmlfiles(${PLUGIN} ${PATH} DESTINATION ${SHELL_INSTALL_QML}/Greeter TARGET_PREFIX Greeter ${ARGN})

3+ export_qmlplugin(${PLUGIN} ${VERSION} ${PATH} DESTINATION ${SHELL_INSTALL_QML}/Greeter TARGET_PREFIX Greeter ${ARGN})

4+endmacro()

6+add_subdirectory(Unity)

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

@@ -0,0 +1 @@

1+add_subdirectory(Launcher)

plugins/Greeter/Unity/Launcher/CMakeLists.txtnew file+37

@@ -0,0 +1,37 @@

1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)

2+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)

3+pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

5+add_definitions(-DSM_BUSNAME=systemBus)

7+include_directories(

8+ ${CMAKE_CURRENT_SOURCE_DIR}

9+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService

10+ ${GSETTINGS_QT_INCLUDE_DIRS}

11+ ${libunity8-private_SOURCE_DIR}

12+)

13+

14+set(QMLLAUNCHERPLUGINAS_SRC

15+ plugin.cpp

16+ launchermodelas.cpp

17+ launcheritem.cpp

18+ quicklistmodel.cpp

19+ quicklistentry.cpp

20+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

21+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

22+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

23+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

24+ )

25+

26+add_library(UnityLauncherAS-qml MODULE

27+ ${QMLLAUNCHERPLUGINAS_SRC}

28+ )

29+

30+target_link_libraries(UnityLauncherAS-qml

31+ unity8-private

32+ ${GSETTINGS_QT_LDFLAGS}

33+ )

34+

35+qt5_use_modules(UnityLauncherAS-qml DBus Qml Gui)

36+

37+add_unity8_greeter_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncherAS-qml)

plugins/Greeter/Unity/Launcher/Launcher.qmltypesnew file+182

@@ -0,0 +1,182 @@

1+import QtQuick.tooling 1.1

3+// This file describes the plugin-supplied types contained in the library.

4+// It is used for QML tooling purposes only.

5+//

6+// This file was auto-generated by:

7+// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 plugins/Greeter'

9+Module {

10+ Component {

11+ name: "LauncherItem"

12+ prototype: "unity::shell::launcher::LauncherItemInterface"

13+ exports: ["Unity.Launcher/LauncherItem 0.1"]

14+ isCreatable: false

15+ exportMetaObjectRevisions: [0]

16+ }

17+ Component {

18+ name: "LauncherModel"

19+ prototype: "unity::shell::launcher::LauncherModelInterface"

20+ exports: ["Unity.Launcher/LauncherModel 0.1"]

21+ isCreatable: false

22+ isSingleton: true

23+ exportMetaObjectRevisions: [0]

24+ Method {

25+ name: "requestRemove"

26+ Parameter { name: "appId"; type: "string" }

27+ }

28+ Method { name: "refresh" }

29+ Method {

30+ name: "get"

31+ type: "unity::shell::launcher::LauncherItemInterface*"

32+ Parameter { name: "index"; type: "int" }

33+ }

34+ Method {

35+ name: "move"

36+ Parameter { name: "oldIndex"; type: "int" }

37+ Parameter { name: "newIndex"; type: "int" }

38+ }

39+ Method {

40+ name: "pin"

41+ Parameter { name: "appId"; type: "string" }

42+ Parameter { name: "index"; type: "int" }

43+ }

44+ Method {

45+ name: "pin"

46+ Parameter { name: "appId"; type: "string" }

47+ }

48+ Method {

49+ name: "quickListActionInvoked"

50+ Parameter { name: "appId"; type: "string" }

51+ Parameter { name: "actionIndex"; type: "int" }

52+ }

53+ Method {

54+ name: "setUser"

55+ Parameter { name: "username"; type: "string" }

56+ }

57+ Method {

58+ name: "getUrlForAppId"

59+ type: "string"

60+ Parameter { name: "appId"; type: "string" }

61+ }

62+ }

63+ Component {

64+ name: "QuickListModel"

65+ prototype: "unity::shell::launcher::QuickListModelInterface"

66+ exports: ["Unity.Launcher/QuickListModel 0.1"]

67+ isCreatable: false

68+ exportMetaObjectRevisions: [0]

69+ }

70+ Component {

71+ name: "unity::shell::launcher::LauncherItemInterface"

72+ prototype: "QObject"

73+ exports: ["Unity.Launcher/LauncherItemInterface 0.1"]

74+ isCreatable: false

75+ exportMetaObjectRevisions: [0]

76+ Property { name: "appId"; type: "string"; isReadonly: true }

77+ Property { name: "name"; type: "string"; isReadonly: true }

78+ Property { name: "icon"; type: "string"; isReadonly: true }

79+ Property { name: "pinned"; type: "bool"; isReadonly: true }

80+ Property { name: "running"; type: "bool"; isReadonly: true }

81+ Property { name: "recent"; type: "bool"; isReadonly: true }

82+ Property { name: "progress"; type: "int"; isReadonly: true }

83+ Property { name: "count"; type: "int"; isReadonly: true }

84+ Property { name: "countVisible"; type: "bool"; isReadonly: true }

85+ Property { name: "focused"; type: "bool"; isReadonly: true }

86+ Property {

87+ name: "quickList"

88+ type: "unity::shell::launcher::QuickListModelInterface"

89+ isReadonly: true

90+ isPointer: true

91+ }

92+ Signal {

93+ name: "nameChanged"

94+ Parameter { name: "name"; type: "string" }

95+ }

96+ Signal {

97+ name: "iconChanged"

98+ Parameter { name: "icon"; type: "string" }

99+ }

100+ Signal {

101+ name: "pinnedChanged"

102+ Parameter { name: "pinned"; type: "bool" }

103+ }

104+ Signal {

105+ name: "runningChanged"

106+ Parameter { name: "running"; type: "bool" }

107+ }

108+ Signal {

109+ name: "recentChanged"

110+ Parameter { name: "running"; type: "bool" }

111+ }

112+ Signal {

113+ name: "progressChanged"

114+ Parameter { name: "progress"; type: "int" }

115+ }

116+ Signal {

117+ name: "countChanged"

118+ Parameter { name: "count"; type: "int" }

119+ }

120+ Signal {

121+ name: "countVisibleChanged"

122+ Parameter { name: "countVisible"; type: "bool" }

123+ }

124+ Signal {

125+ name: "focusedChanged"

126+ Parameter { name: "focused"; type: "bool" }

127+ }

128+ }

129+ Component {

130+ name: "unity::shell::launcher::LauncherModelInterface"

131+ prototype: "QAbstractListModel"

132+ exports: ["Unity.Launcher/LauncherModelInterface 0.1"]

133+ isCreatable: false

134+ exportMetaObjectRevisions: [0]

135+ Property {

136+ name: "applicationManager"

137+ type: "unity::shell::application::ApplicationManagerInterface"

138+ isPointer: true

139+ }

140+ Property { name: "onlyPinned"; type: "bool" }

141+ Signal { name: "hint" }

142+ Method {

143+ name: "move"

144+ Parameter { name: "oldIndex"; type: "int" }

145+ Parameter { name: "newIndex"; type: "int" }

146+ }

147+ Method {

148+ name: "get"

149+ type: "unity::shell::launcher::LauncherItemInterface*"

150+ Parameter { name: "index"; type: "int" }

151+ }

152+ Method {

153+ name: "pin"

154+ Parameter { name: "appId"; type: "string" }

155+ Parameter { name: "index"; type: "int" }

156+ }

157+ Method {

158+ name: "pin"

159+ Parameter { name: "appId"; type: "string" }

160+ }

161+ Method {

162+ name: "requestRemove"

163+ Parameter { name: "appId"; type: "string" }

164+ }

165+ Method {

166+ name: "quickListActionInvoked"

167+ Parameter { name: "appId"; type: "string" }

168+ Parameter { name: "actionIndex"; type: "int" }

169+ }

170+ Method {

171+ name: "setUser"

172+ Parameter { name: "username"; type: "string" }

173+ }

174+ }

175+ Component {

176+ name: "unity::shell::launcher::QuickListModelInterface"

177+ prototype: "QAbstractListModel"

178+ exports: ["Unity.Launcher/QuickListInterface 0.1"]

179+ isCreatable: false

180+ exportMetaObjectRevisions: [0]

181+ }

182+}

plugins/Greeter/Unity/Launcher/launcheritem.cppnew file+171

@@ -0,0 +1,171 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "launcheritem.h"

18+#include "quicklistmodel.h"

19+

20+#include <libintl.h>

21+

22+LauncherItem::LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent) :

23+ LauncherItemInterface(parent),

24+ m_appId(appId),

25+ m_name(name),

26+ m_icon(icon),

27+ m_pinned(false),

28+ m_running(false),

29+ m_recent(false),

30+ m_progress(-1),

31+ m_count(0),

32+ m_countVisible(false),

33+ m_focused(false),

34+ m_quickList(new QuickListModel(this))

35+{

36+ QuickListEntry nameAction;

37+ nameAction.setActionId("launch_item");

38+ nameAction.setText(m_name);

39+ m_quickList->appendAction(nameAction);

40+}

41+

42+QString LauncherItem::appId() const

43+{

44+ return m_appId;

45+}

46+

47+QString LauncherItem::name() const

48+{

49+ return m_name;

50+}

51+

52+void LauncherItem::setName(const QString &name)

53+{

54+ if (m_name != name) {

55+ m_name = name;

56+ QuickListEntry entry;

57+ entry.setActionId("launch_item");

58+ entry.setText(m_name);

59+ m_quickList->updateAction(entry);

60+ Q_EMIT nameChanged(name);

61+ }

62+}

63+

64+QString LauncherItem::icon() const

65+{

66+ return m_icon;

67+}

68+

69+void LauncherItem::setIcon(const QString &icon)

70+{

71+ if (m_icon != icon) {

72+ m_icon = icon;

73+ Q_EMIT iconChanged(icon);

74+ }

75+}

76+

77+bool LauncherItem::pinned() const

78+{

79+ return m_pinned;

80+}

81+

82+void LauncherItem::setPinned(bool pinned)

83+{

84+ if (m_pinned != pinned) {

85+ m_pinned = pinned;

86+ Q_EMIT pinnedChanged(pinned);

87+ }

88+}

89+

90+bool LauncherItem::running() const

91+{

92+ return m_running;

93+}

94+

95+void LauncherItem::setRunning(bool running)

96+{

97+ if (m_running != running) {

98+ m_running = running;

99+ Q_EMIT runningChanged(running);

100+ }

101+}

102+

103+bool LauncherItem::recent() const

104+{

105+ return m_recent;

106+}

107+

108+void LauncherItem::setRecent(bool recent)

109+{

110+ if (m_recent != recent) {

111+ m_recent = recent;

112+ Q_EMIT recentChanged(recent);

113+ }

114+}

115+

116+int LauncherItem::progress() const

117+{

118+ return m_progress;

119+}

120+

121+void LauncherItem::setProgress(int progress)

122+{

123+ if (m_progress != progress) {

124+ m_progress = progress;

125+ Q_EMIT progressChanged(progress);

126+ }

127+}

128+

129+int LauncherItem::count() const

130+{

131+ return m_count;

132+}

133+

134+void LauncherItem::setCount(int count)

135+{

136+ if (m_count != count) {

137+ m_count = count;

138+ Q_EMIT countChanged(count);

139+ }

140+}

141+

142+bool LauncherItem::countVisible() const

143+{

144+ return m_countVisible;

145+}

146+

147+void LauncherItem::setCountVisible(bool countVisible)

148+{

149+ if (m_countVisible != countVisible) {

150+ m_countVisible = countVisible;

151+ Q_EMIT countVisibleChanged(countVisible);

152+ }

153+}

154+

155+bool LauncherItem::focused() const

156+{

157+ return m_focused;

158+}

159+

160+void LauncherItem::setFocused(bool focused)

161+{

162+ if (m_focused != focused) {

163+ m_focused = focused;

164+ Q_EMIT focusedChanged(focused);

165+ }

166+}

167+

168+unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const

169+{

170+ return m_quickList;

171+}

plugins/Greeter/Unity/Launcher/launcheritem.hnew file+74

@@ -0,0 +1,74 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef LAUNCHERITEM_H

18+#define LAUNCHERITEM_H

19+

20+#include "quicklistmodel.h"

21+

22+#include <unity/shell/launcher/LauncherItemInterface.h>

23+

24+class QuickListModel;

25+

26+using namespace unity::shell::launcher;

27+

28+class LauncherItem: public LauncherItemInterface

29+{

30+ Q_OBJECT

31+public:

32+ LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent = 0);

33+

34+ QString appId() const override;

35+ QString name() const override;

36+ QString icon() const override;

37+ bool pinned() const override;

38+ bool running() const override;

39+ bool recent() const override;

40+ int progress() const override;

41+ int count() const override;

42+ bool countVisible() const override;

43+ bool focused() const override;

44+

45+ unity::shell::launcher::QuickListModelInterface *quickList() const override;

46+

47+private:

48+ void setName(const QString &name);

49+ void setIcon(const QString &icon);

50+ void setPinned(bool pinned);

51+ void setRunning(bool running);

52+ void setRecent(bool recent);

53+ void setProgress(int progress);

54+ void setCount(int count);

55+ void setCountVisible(bool countVisible);

56+ void setFocused(bool focused);

57+

58+private:

59+ QString m_appId;

60+ QString m_name;

61+ QString m_icon;

62+ bool m_pinned;

63+ bool m_running;

64+ bool m_recent;

65+ int m_progress;

66+ int m_count;

67+ bool m_countVisible;

68+ bool m_focused;

69+ QuickListModel *m_quickList;

70+

71+ friend class LauncherModel;

72+};

73+

74+#endif // LAUNCHERITEM_H

plugins/Greeter/Unity/Launcher/launchermodelas.cppnew file+277

@@ -0,0 +1,277 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "launchermodelas.h"

18+#include "launcheritem.h"

19+#include "AccountsServiceDBusAdaptor.h"

20+#include <unity/shell/application/ApplicationInfoInterface.h>

21+

22+#include <QDesktopServices>

23+#include <QDebug>

24+#include <QDBusArgument>

25+

26+using namespace unity::shell::application;

27+

28+LauncherModel::LauncherModel(QObject *parent):

29+ LauncherModelInterface(parent),

30+ m_accounts(new AccountsServiceDBusAdaptor(this)),

31+ m_onlyPinned(true)

32+{

33+ connect(m_accounts, &AccountsServiceDBusAdaptor::propertiesChanged, this, &LauncherModel::propertiesChanged);

34+ refresh();

35+}

36+

37+LauncherModel::~LauncherModel()

38+{

39+ while (!m_list.empty()) {

40+ m_list.takeFirst()->deleteLater();

41+ }

42+}

43+

44+int LauncherModel::rowCount(const QModelIndex &parent) const

45+{

46+ Q_UNUSED(parent)

47+ return m_list.count();

48+}

49+

50+QVariant LauncherModel::data(const QModelIndex &index, int role) const

51+{

52+ LauncherItem *item = m_list.at(index.row());

53+ switch(role) {

54+ case RoleAppId:

55+ return item->appId();

56+ case RoleName:

57+ return item->name();

58+ case RoleIcon:

59+ return item->icon();

60+ case RolePinned:

61+ return item->pinned();

62+ case RoleCount:

63+ return item->count();

64+ case RoleCountVisible:

65+ return item->countVisible();

66+ case RoleProgress:

67+ return item->progress();

68+ case RoleFocused:

69+ return item->focused();

70+ }

71+

72+ return QVariant();

73+}

74+

75+unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const

76+{

77+ if (index < 0 || index >= m_list.count()) {

78+ return 0;

79+ }

80+ return m_list.at(index);

81+}

82+

83+void LauncherModel::move(int oldIndex, int newIndex)

84+{

85+ Q_UNUSED(oldIndex)

86+ Q_UNUSED(newIndex)

87+ qWarning() << "This is a read only implementation. Cannot move items.";

88+}

89+

90+void LauncherModel::pin(const QString &appId, int index)

91+{

92+ Q_UNUSED(appId)

93+ Q_UNUSED(index)

94+ qWarning() << "This is a read only implementation. Cannot pin items";

95+}

96+

97+void LauncherModel::requestRemove(const QString &appId)

98+{

99+ Q_UNUSED(appId)

100+ qWarning() << "This is a read only implementation. Cannot remove items";

101+}

102+

103+void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex)

104+{

105+ int index = findApplication(appId);

106+ if (index < 0) {

107+ return;

108+ }

109+

110+ LauncherItem *item = m_list.at(index);

111+ QuickListModel *model = qobject_cast<QuickListModel*>(item->quickList());

112+ if (model) {

113+ QString actionId = model->get(actionIndex).actionId();

114+

115+ // Check if this is one of the launcher actions we handle ourselves

116+ if (actionId == "launch_item") {

117+ QDesktopServices::openUrl(getUrlForAppId(appId));

118+

119+ // Nope, we don't know this action, let the backend forward it to the application

120+ } else {

121+ // TODO: forward quicklist action to app, possibly via m_dbusIface

122+ }

123+ }

124+}

125+

126+void LauncherModel::setUser(const QString &username)

127+{

128+ if (m_user != username) {

129+ m_user = username;

130+ refresh();

131+ }

132+}

133+

134+QString LauncherModel::getUrlForAppId(const QString &appId) const

135+{

136+ // appId is either an appId or a legacy app name. Let's find out which

137+ if (appId.isEmpty()) {

138+ return QString();

139+ }

140+

141+ if (!appId.contains("_")) {

142+ return "application:///" + appId + ".desktop";

143+ }

144+

145+ QStringList parts = appId.split('_');

146+ QString package = parts.value(0);

147+ QString app = parts.value(1, "first-listed-app");

148+ return "appid://" + package + "/" + app + "/current-user-version";

149+}

150+

151+ApplicationManagerInterface *LauncherModel::applicationManager() const

152+{

153+ return nullptr;

154+}

155+

156+void LauncherModel::setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager)

157+{

158+ Q_UNUSED(appManager)

159+ qWarning() << "This plugin syncs all its states from AccountsService. Not using ApplicationManager.";

160+ return;

161+}

162+

163+bool LauncherModel::onlyPinned() const

164+{

165+ return m_onlyPinned;

166+}

167+

168+void LauncherModel::setOnlyPinned(bool onlyPinned)

169+{

170+ if (m_onlyPinned != onlyPinned) {

171+ m_onlyPinned = onlyPinned;

172+ Q_EMIT onlyPinnedChanged();

173+ refresh();

174+ }

175+}

176+

177+int LauncherModel::findApplication(const QString &appId)

178+{

179+ for (int i = 0; i < m_list.count(); ++i) {

180+ LauncherItem *item = m_list.at(i);

181+ if (item->appId() == appId) {

182+ return i;

183+ }

184+ }

185+ return -1;

186+}

187+

188+typedef QList<QVariantMap> VariantMapList;

189+void LauncherModel::refresh()

190+{

191+ QList<QVariantMap> items;

192+

193+ if (m_accounts && !m_user.isEmpty()) {

194+ items = m_accounts->getUserProperty<VariantMapList>(m_user, "com.canonical.unity.AccountsService", "LauncherItems");

195+ }

196+

197+ // First walk through all the existing items and see if we need to remove something

198+ QList<LauncherItem*> toBeRemoved;

199+

200+ Q_FOREACH (LauncherItem* item, m_list) {

201+ bool found = false;

202+ Q_FOREACH(const QVariant &asItem, items) {

203+ if (asItem.toMap().value("id").toString() == item->appId()) {

204+ // Only keep and update it if we either show unpinned or it is pinned

205+ if (!m_onlyPinned || asItem.toMap().value("pinned").toBool()) {

206+ found = true;

207+ item->setName(asItem.toMap().value("name").toString());

208+ item->setIcon(asItem.toMap().value("icon").toString());

209+ item->setCount(asItem.toMap().value("count").toInt());

210+ item->setCountVisible(asItem.toMap().value("countVisible").toBool());

211+ int idx = m_list.indexOf(item);

212+ Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);

213+ }

214+ break;

215+ }

216+ }

217+ if (!found) {

218+ toBeRemoved.append(item);

219+ }

220+ }

221+

222+ Q_FOREACH (LauncherItem* item, toBeRemoved) {

223+ int idx = m_list.indexOf(item);

224+ beginRemoveRows(QModelIndex(), idx, idx);

225+ m_list.takeAt(idx)->deleteLater();

226+ endRemoveRows();

227+ }

228+

229+ // Now walk through list and see if we need to add something

230+ int skipped = 0;

231+ for (int asIndex = 0; asIndex < items.count(); ++asIndex) {

232+ QVariant entry = items.at(asIndex);

233+

234+ if (m_onlyPinned && !entry.toMap().value("pinned").toBool()) {

235+ // Skipping it as we only show pinned and it is not

236+ skipped++;

237+ continue;

238+ }

239+ int newPosition = asIndex - skipped;

240+

241+ int itemIndex = -1;

242+ for (int i = 0; i < m_list.count(); ++i) {

243+ if (m_list.at(i)->appId() == entry.toMap().value("id").toString()) {

244+ itemIndex = i;

245+ break;

246+ }

247+ }

248+

249+ if (itemIndex == -1) {

250+ // Need to add it. Just add it into the addedIndex to keep same ordering as the list in AS.

251+ LauncherItem *item = new LauncherItem(entry.toMap().value("id").toString(),

252+ entry.toMap().value("name").toString(),

253+ entry.toMap().value("icon").toString(),

254+ this);

255+ item->setPinned(true);

256+ item->setCount(entry.toMap().value("count").toInt());

257+ item->setCountVisible(entry.toMap().value("countVisible").toBool());

258+ beginInsertRows(QModelIndex(), newPosition, newPosition);

259+ m_list.insert(newPosition, item);

260+ endInsertRows();

261+ } else if (itemIndex != newPosition) {

262+ // The item is already there, but it is in a different place than in the settings.

263+ // Move it to the addedIndex

264+ beginMoveRows(QModelIndex(), itemIndex, itemIndex, QModelIndex(), newPosition);

265+ m_list.move(itemIndex, newPosition);

266+ endMoveRows();

267+ }

268+ }

269+}

270+

271+void LauncherModel::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)

272+{

273+ if (user != m_user || interface != "com.canonical.unity.AccountsService" || !changed.contains("LauncherItems")) {

274+ return;

275+ }

276+ refresh();

277+}

plugins/Greeter/Unity/Launcher/launchermodelas.hnew file+75

@@ -0,0 +1,75 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef LAUNCHERMODEL_H

18+#define LAUNCHERMODEL_H

19+

20+#include <unity/shell/launcher/LauncherModelInterface.h>

21+#include <unity/shell/application/ApplicationManagerInterface.h>

22+

23+#include <QAbstractListModel>

24+

25+class LauncherItem;

26+class GSettings;

27+class AccountsServiceDBusAdaptor;

28+

29+using namespace unity::shell::launcher;

30+using namespace unity::shell::application;

31+

32+class LauncherModel: public LauncherModelInterface

33+{

34+ Q_OBJECT

35+

36+public:

37+ LauncherModel(QObject *parent = 0);

38+ ~LauncherModel();

39+

40+ int rowCount(const QModelIndex &parent = QModelIndex()) const;

41+

42+ QVariant data(const QModelIndex &index, int role) const;

43+

44+ Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const;

45+ Q_INVOKABLE void move(int oldIndex, int newIndex);

46+ Q_INVOKABLE void pin(const QString &appId, int index = -1);

47+ Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);

48+ Q_INVOKABLE void setUser(const QString &username);

49+ Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;

50+

51+ unity::shell::application::ApplicationManagerInterface* applicationManager() const;

52+ void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);

53+

54+ bool onlyPinned() const override;

55+ void setOnlyPinned(bool onlyPinned) override;

56+

57+ int findApplication(const QString &appId);

58+

59+public Q_SLOTS:

60+ void requestRemove(const QString &appId) override;

61+ Q_INVOKABLE void refresh();

62+

63+private Q_SLOTS:

64+ void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

65+

66+private:

67+ QString m_user;

68+ QList<LauncherItem*> m_list;

69+ AccountsServiceDBusAdaptor *m_accounts;

70+ bool m_onlyPinned;

71+

72+ friend class LauncherModelASTest;

73+};

74+

75+#endif // LAUNCHERMODEL_H

plugins/Greeter/Unity/Launcher/plugin.cppnew file+46

@@ -0,0 +1,46 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+// Qt

18+#include <QtQml/qqml.h>

19+

20+// self

21+#include "plugin.h"

22+

23+// local

24+#include "launchermodelas.h"

25+#include "launcheritem.h"

26+

27+

28+using namespace unity::shell::launcher;

29+

30+static QObject* modelProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)

31+{

32+ return new LauncherModel();

33+}

34+

35+void UnityLauncherPlugin::registerTypes(const char *uri)

36+{

37+ Q_ASSERT(uri == QLatin1String("Unity.Launcher"));

38+

39+ qmlRegisterUncreatableType<LauncherModelInterface>(uri, 0, 1, "LauncherModelInterface", "Abstract Interface. Cannot be instantiated.");

40+ qmlRegisterUncreatableType<LauncherItemInterface>(uri, 0, 1, "LauncherItemInterface", "Abstract Interface. Cannot be instantiated.");

41+ qmlRegisterUncreatableType<QuickListModelInterface>(uri, 0, 1, "QuickListInterface", "Abstract Interface. Cannot be instantiated.");

42+

43+ qmlRegisterSingletonType<LauncherModel>(uri, 0, 1, "LauncherModel", modelProvider);

44+ qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", "Can't create new Launcher Items in QML. Get them from the LauncherModel.");

45+ qmlRegisterUncreatableType<QuickListModel>(uri, 0, 1, "QuickListModel", "Can't create a QuickListModel in QML. Get them from the LauncherItems.");

46+}

tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp → plugins/Greeter/Unity/Launcher/plugin.hrenamed+13−14

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -12,22 +12,21 @@

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

19−#include "../UsersModelPrivate.h"

17+#ifndef UNITY_LAUNCHER_PLUGIN_H

18+#define UNITY_LAUNCHER_PLUGIN_H

2019

21−namespace QLightDM

22−{

20+#include <QtQml/QQmlEngine>

21+#include <QtQml/QQmlExtensionPlugin>

2322

24−UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

25− : q_ptr(parent)

23+class UnityLauncherPlugin : public QQmlExtensionPlugin

2624{

27− entries =

28− {

29− { "has-pin", "Has PIN", 0, 0, false, false, 0, 0 },

30− };

31−}

25+ Q_OBJECT

26+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

27+

28+public:

29+ void registerTypes(const char *uri);

30+};

3231

33−}

32+#endif

plugins/Greeter/Unity/Launcher/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module Unity.Launcher

2+plugin UnityLauncherAS-qml

3+typeinfo Launcher.qmltypes

tests/mocks/LightDM/single-pin/GreeterPrivate.cpp → plugins/Greeter/Unity/Launcher/quicklistentry.cpprenamed+28−18

@@ -1,5 +1,4 @@

1−/*

32 *

43 * This program is free software; you can redistribute it and/or modify

54 * it under the terms of the GNU General Public License as published by

@@ -12,35 +11,46 @@

1211 *

1312 * You should have received a copy of the GNU General Public License

1413 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− *

16− * Author: Michael Terry <michael.terry@canonical.com>

1714 */

1815

19−#include "../Greeter.h"

20−#include "../GreeterPrivate.h"

16+#include "quicklistentry.h"

17+

18+QuickListEntry::QuickListEntry()

19+{

20+

21+}

22+

23+QString QuickListEntry::actionId() const

24+{

25+ return m_actionId;

26+}

2127

22−namespace QLightDM

28+void QuickListEntry::setActionId(const QString &actionId)

2329{

30+ m_actionId = actionId;

31+}

2432

25−GreeterPrivate::GreeterPrivate(Greeter* parent)

26− : authenticated(false),

27− authenticationUser(),

28− q_ptr(parent)

33+QString QuickListEntry::text() const

2934{

35+ return m_text;

3036}

3137

32−void GreeterPrivate::handleAuthenticate()

38+void QuickListEntry::setText(const QString &text)

3339{

34− Q_Q(Greeter);

35− Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);

40+ m_text = text;

3641}

3742

38−void GreeterPrivate::handleRespond(const QString &response)

43+QString QuickListEntry::icon() const

3944{

40− Q_Q(Greeter);

45+ return m_icon;

46+}

4147

42− authenticated = (response == "1234");

43− q->sendAuthenticationComplete();

48+void QuickListEntry::setIcon(const QString &icon)

49+{

50+ m_icon = icon;

4451}

4552

53+bool QuickListEntry::clickable() const

54+{

55+ return !m_actionId.isEmpty();

4656}

plugins/Greeter/Unity/Launcher/quicklistentry.hnew file+43

@@ -0,0 +1,43 @@

2+ *

3+ * This program is free software; you can redistribute it and/or modify

4+ * it under the terms of the GNU General Public License as published by

5+ * the Free Software Foundation; version 3.

6+ *

7+ * This program is distributed in the hope that it will be useful,

8+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

9+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

10+ * GNU General Public License for more details.

11+ *

12+ * You should have received a copy of the GNU General Public License

13+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

14+ */

15+

16+#ifndef QUICKLISTENTRY_H

17+#define QUICKLISTENTRY_H

18+

19+#include <QString>

20+

21+class QuickListEntry

22+{

23+public:

24+ QuickListEntry();

25+

26+ QString actionId() const;

27+ void setActionId(const QString &actionId);

28+

29+ QString text() const;

30+ void setText(const QString &text);

31+

32+ QString icon() const;

33+ void setIcon(const QString &icon);

34+

35+ bool clickable() const;

36+

37+private:

38+ QString m_actionId;

39+ QString m_text;

40+ QString m_icon;

41+};

42+

43+#endif // QUICKLISTENTRY

plugins/Greeter/Unity/Launcher/quicklistmodel.cppnew file+70

@@ -0,0 +1,70 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "quicklistmodel.h"

18+

19+QuickListModel::QuickListModel(QObject *parent) :

20+ QuickListModelInterface(parent)

21+{

22+

23+}

24+

25+QuickListModel::~QuickListModel()

26+{

27+

28+}

29+

30+void QuickListModel::appendAction(const QuickListEntry &entry)

31+{

32+ beginInsertRows(QModelIndex(), m_list.count(), m_list.count());

33+ m_list.append(entry);

34+ endInsertRows();

35+}

36+

37+void QuickListModel::updateAction(const QuickListEntry &entry)

38+{

39+ for (int i = 0; i < m_list.count(); ++i) {

40+ if (m_list.at(i).actionId() == entry.actionId()) {

41+ m_list.replace(i, entry);

42+ Q_EMIT dataChanged(index(i), index(i));

43+ return;

44+ }

45+ }

46+}

47+

48+QuickListEntry QuickListModel::get(int index) const

49+{

50+ return m_list.at(index);

51+}

52+

53+int QuickListModel::rowCount(const QModelIndex &index) const

54+{

55+ Q_UNUSED(index)

56+ return m_list.count();

57+}

58+

59+QVariant QuickListModel::data(const QModelIndex &index, int role) const

60+{

61+ switch (role) {

62+ case RoleLabel:

63+ return m_list.at(index.row()).text();

64+ case RoleIcon:

65+ return m_list.at(index.row()).icon();

66+ case RoleClickable:

67+ return m_list.at(index.row()).clickable();

68+ }

69+ return QVariant();

70+}

plugins/Greeter/Unity/Launcher/quicklistmodel.hnew file+55

@@ -0,0 +1,55 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef QUICKLISTMODEL_H

18+#define QUICKLISTMODEL_H

19+

20+#include "quicklistentry.h"

21+

22+#include <unity/shell/launcher/QuickListModelInterface.h>

23+

24+using namespace unity::shell::launcher;

25+

26+class QuickListModel: public QuickListModelInterface

27+{

28+ Q_OBJECT

29+

30+public:

31+ explicit QuickListModel(QObject *parent = 0);

32+

33+ ~QuickListModel();

34+

35+ void appendAction(const QuickListEntry &entry);

36+

37+ /**

38+ * @brief Update an existing action

39+ * @param entry The new, updated entry

40+ *

41+ * This will only do something if entry.actionId is found in the model.

42+ * To add a new entry, use appendAction().

43+ */

44+ void updateAction(const QuickListEntry &entry);

45+

46+ QuickListEntry get(int index) const;

47+

48+ int rowCount(const QModelIndex &parent = QModelIndex()) const;

49+ QVariant data(const QModelIndex &index, int role) const;

50+

51+private:

52+ QList<QuickListEntry> m_list;

53+};

54+

55+#endif // QUICKLISTMODEL_H

plugins/LightDM/CMakeLists.txt+4−4

@@ -1,9 +1,9 @@

1−# Dependencies

2−include(FindPkgConfig)

31pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

42# TODO: Once we split out a separate greeter process, uncomment these lines

53#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)

5+add_subdirectory(liblightdm)

77include_directories(

88 ${CMAKE_CURRENT_SOURCE_DIR}

99 ${CMAKE_CURRENT_BINARY_DIR}

@@ -15,7 +15,7 @@ include_directories(

1515)

1616

1717set(QMLPLUGIN_SRC

18− ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins

18+ ../Utils/unitysortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins

1919 DBusGreeter.cpp

2020 DBusGreeterList.cpp

2121 Greeter.cpp

@@ -28,7 +28,7 @@ add_library(LightDM-qml MODULE

2828 )

2929

3030target_link_libraries(LightDM-qml

31− MockLightDM-demo

31+ integratedLightDM

3232 unity8-private

3333# TODO: Once we split out a separate greeter process, uncomment these lines

3434# ${LIBLIGHTDM_LDFLAGS}

plugins/LightDM/Greeter.cpp+1−19

@@ -17,26 +17,8 @@

1717 */

1818

1919#include "Greeter.h"

20+#include "GreeterPrivate.h"

2021#include <libintl.h>

21−#include <QLightDM/Greeter>

22−

23−class GreeterPrivate

24−{

25−public:

26− explicit GreeterPrivate(Greeter *parent);

27−

28− QLightDM::Greeter *m_greeter;

29− bool m_active;

30− bool wasPrompted;

31− bool promptless;

32−

33−protected:

34− Greeter * const q_ptr;

35−

36−private:

37− Q_DECLARE_PUBLIC(Greeter)

38−};

39−

4022

4123GreeterPrivate::GreeterPrivate(Greeter* parent)

4224 : m_greeter(new QLightDM::Greeter(parent)),

plugins/LightDM/Greeter.h+1−1

@@ -68,7 +68,7 @@ Q_SIGNALS:

6868 // should switch to this user if possible.

6969 void requestAuthenticationUser(const QString &user);

7070

71−private:

71+protected:

7272 GreeterPrivate * const d_ptr;

7373

7474 Q_DECLARE_PRIVATE(Greeter)

plugins/LightDM/GreeterPrivate.hnew file+39

@@ -0,0 +1,39 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef UNITY_GREETER_PRIVATE_H

18+#define UNITY_GREETER_PRIVATE_H

19+

20+#include <QLightDM/Greeter>

21+

22+class GreeterPrivate

23+{

24+public:

25+ explicit GreeterPrivate(Greeter *parent);

26+

27+ QLightDM::Greeter *m_greeter;

28+ bool m_active;

29+ bool wasPrompted;

30+ bool promptless;

31+

32+protected:

33+ Greeter * const q_ptr;

34+

35+private:

36+ Q_DECLARE_PUBLIC(Greeter)

37+};

38+

39+#endif // UNITY_GREETER_PRIVATE_H

plugins/LightDM/LightDM.qmltypes+2−2

@@ -114,7 +114,7 @@ Module {

114114 Method { name: "invalidate" }

115115 }

116116 Component {

117− name: "QSortFilterProxyModelQML"

117+ name: "UnitySortFilterProxyModelQML"

118118 prototype: "QSortFilterProxyModel"

119119 Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }

120120 Property { name: "totalCount"; type: "int"; isReadonly: true }

@@ -242,7 +242,7 @@ Module {

242242 }

243243 Component {

244244 name: "UsersModel"

245− prototype: "QSortFilterProxyModelQML"

245+ prototype: "UnitySortFilterProxyModelQML"

246246 exports: ["LightDM/Users 0.1"]

247247 isCreatable: false

248248 isSingleton: true

plugins/LightDM/UsersModel.cpp+1−1

@@ -58,7 +58,7 @@ QVariant MangleModel::data(const QModelIndex &index, int role) const

5858// **** Now we continue with actual UsersModel class ****

5959

6060UsersModel::UsersModel(QObject* parent)

61− : QSortFilterProxyModelQML(parent)

61+ : UnitySortFilterProxyModelQML(parent)

6262{

6363 setModel(new MangleModel(this));

6464 setSortCaseSensitivity(Qt::CaseInsensitive);

plugins/LightDM/UsersModel.h+2−2

@@ -23,10 +23,10 @@

2323#ifndef UNITY_USERSMODEL_H

2424#define UNITY_USERSMODEL_H

2525

26−#include <qsortfilterproxymodelqml.h>

26+#include <unitysortfilterproxymodelqml.h>

2727#include <QtCore/QObject>

2828

29−class UsersModel : public QSortFilterProxyModelQML

29+class UsersModel : public UnitySortFilterProxyModelQML

3030{

3131 Q_OBJECT

3232

tests/mocks/LightDM/demo/CMakeLists.txt → plugins/LightDM/liblightdm/CMakeLists.txtrenamed+6−5

@@ -1,14 +1,14 @@

11pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

33set(LibLightDM_SOURCES

4− ../Greeter.cpp

5− ../UsersModel.cpp

4+ Greeter.cpp

5+ UsersModel.cpp

66 GreeterPrivate.cpp

77 UsersModelPrivate.cpp

88 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

99 )

1010

11−add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})

11+add_library(integratedLightDM STATIC ${LibLightDM_SOURCES})

1212add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})

1313

1414include_directories(

@@ -16,7 +16,7 @@ include_directories(

1616 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

1717)

1818

19−target_link_libraries(MockLightDM-demo

19+target_link_libraries(integratedLightDM

2020 ${LIBUSERMETRICSOUTPUT_LDFLAGS}

2121 -lpam

2222)

@@ -25,9 +25,10 @@ target_link_libraries(MockLightDM-demo-shared

2525 -lpam

2626)

2727

28−qt5_use_modules(MockLightDM-demo Concurrent Gui)

28+qt5_use_modules(integratedLightDM Concurrent Gui)

2929qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)

3030

31+set_target_properties(integratedLightDM PROPERTIES COMPILE_FLAGS -fPIC)

3132set_target_properties(MockLightDM-demo-shared PROPERTIES

3233 OUTPUT_NAME lightdm-qt5-2)

3334

tests/mocks/LightDM/Greeter.cpp → plugins/LightDM/liblightdm/Greeter.cpprenamed+7−1

@@ -16,6 +16,13 @@

1616 * Author: Michael Terry <michael.terry@canonical.com>

1717 */

1818

19+

20+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

21+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB

22+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm

23+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */

24+

25+

1926#include "Greeter.h"

2027#include "GreeterPrivate.h"

2128#include <QtCore/QCoreApplication>

@@ -128,7 +135,6 @@ void Greeter::authenticate(const QString &username)

128135

129136 d->authenticated = false;

130137 d->authenticationUser = username;

131− d->twoFactorDone = false;

132138 d->handleAuthenticate();

133139}

134140

tests/mocks/LightDM/Greeter.h → plugins/LightDM/liblightdm/Greeter.hrenamed+4−2

@@ -24,6 +24,10 @@

2424#include <QtCore/QObject>

2525#include <QtCore/QVariant>

2626

27+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

28+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB

29+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm

30+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */

2731

2832namespace QLightDM

2933{

@@ -43,8 +47,6 @@ class Q_DECL_EXPORT Greeter : public QObject

4347 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)

4448 Q_PROPERTY(bool locked READ lockHint CONSTANT)

4549

46− Q_PROPERTY(QString hostname READ hostname CONSTANT)

47−

4850 Q_ENUMS(PromptType MessageType)

4951

5052public:

tests/mocks/LightDM/demo/GreeterPrivate.cpp → plugins/LightDM/liblightdm/GreeterPrivate.cpprenamed+2−2

@@ -16,8 +16,8 @@

1616 * Author: Michael Terry <michael.terry@canonical.com>

1717 */

1818

19−#include "../Greeter.h"

20−#include "../GreeterPrivate.h"

19+#include "Greeter.h"

20+#include "GreeterPrivate.h"

2121#include <QFuture>

2222#include <QFutureInterface>

2323#include <QFutureWatcher>

tests/mocks/LightDM/GreeterPrivate.h → plugins/LightDM/liblightdm/GreeterPrivate.hrenamed−1

@@ -35,7 +35,6 @@ public:

3535 // These variables may not be used by all subclasses, that's no problem

3636 bool authenticated;

3737 QString authenticationUser;

38− bool twoFactorDone;

3938

4039 void handleAuthenticate();

4140 void handleRespond(const QString &response);

tests/mocks/LightDM/UsersModel.cpp → plugins/LightDM/liblightdm/UsersModel.cpprenamed+6

@@ -16,6 +16,12 @@

1616 * Author: Michael Terry <michael.terry@canonical.com>

1717 */

1818

19+

20+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

21+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB

22+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm

23+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */

24+

1925// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.

2026// To use the same method of setting role name that it does, we

2127// set our compatibility to Qt4 here too.

tests/mocks/LightDM/UsersModel.h → plugins/LightDM/liblightdm/UsersModel.hrenamed+4

@@ -24,6 +24,10 @@

2424#include <QtCore/QSharedDataPointer>

2525#include <QAbstractListModel>

2626

27+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

28+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB

29+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm

30+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */

2731

2832namespace QLightDM

2933{

tests/mocks/LightDM/demo/UsersModelPrivate.cpp → plugins/LightDM/liblightdm/UsersModelPrivate.cpprenamed+1−1

@@ -16,7 +16,7 @@

1616 * Author: Michael Terry <michael.terry@canonical.com>

1717 */

1818

19−#include "../UsersModelPrivate.h"

19+#include "UsersModelPrivate.h"

2020

2121#include <QDir>

2222#include <QSettings>

tests/mocks/LightDM/UsersModelPrivate.h → plugins/LightDM/liblightdm/UsersModelPrivate.hrenamed

The content is the same.

plugins/Lights/CMakeLists.txt−2

@@ -1,5 +1,3 @@

1−include(FindPkgConfig)

2−

31pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)

42pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)

plugins/Lights/Lights.cpp+9−24

@@ -44,12 +44,20 @@ Lights::~Lights()

4444

4545void Lights::setState(Lights::State newState)

4646{

47+ if (!init()) {

48+ qWarning() << "No lights device";

49+ return;

50+ }

51+

4752 if (m_state != newState) {

4853 if (newState == Lights::On) {

4954 turnOn();

5055 } else {

5156 turnOff();

5257 }

58+

59+ m_state = newState;

60+ Q_EMIT stateChanged(m_state);

5361 }

5462}

5563

@@ -115,6 +123,7 @@ bool Lights::init()

115123 err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);

116124 if (err == 0) {

117125 m_lightDevice = (light_device_t*)device;

126+ turnOff();

118127 return true;

119128 } else {

120129 qWarning() << "Failed to access notification lights";

@@ -127,15 +136,6 @@ bool Lights::init()

127136

128137void Lights::turnOn()

129138{

130− if (!init()) {

131− qWarning() << "No lights device";

132− return;

133− }

134−

135− if (m_state == Lights::On) {

136− return;

137− }

138−

139139 // pulse

140140 light_state_t state;

141141 memset(&state, 0, sizeof(light_state_t));

@@ -147,23 +147,11 @@ void Lights::turnOn()

147147

148148 if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {

149149 qWarning() << "Failed to turn the light off";

150− } else {

151− m_state = Lights::On;

152− Q_EMIT stateChanged(m_state);

153150 }

154151}

155152

156153void Lights::turnOff()

157154{

158− if (!init()) {

159− qWarning() << "No lights device";

160− return;

161− }

162−

163− if (m_state == Lights::Off) {

164− return;

165− }

166−

167155 light_state_t state;

168156 memset(&state, 0, sizeof(light_state_t));

169157 state.color = 0x00000000;

@@ -174,8 +162,5 @@ void Lights::turnOff()

174162

175163 if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {

176164 qWarning() << "Failed to turn the light off";

177− } else {

178− m_state = Lights::Off;

179− Q_EMIT stateChanged(m_state);

180165 }

181166}

plugins/Powerd/CMakeLists.txt−2

@@ -1,5 +1,3 @@

1−include(FindPkgConfig)

2−

31pkg_search_module(GIO REQUIRED gio-2.0)

53include_directories(

plugins/ScreenGrabber/ScreenGrabber.qmltypes+1−1

@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1

44// It is used for QML tooling purposes only.

55//

66// This file was auto-generated by:

7−// 'qmlplugindump -nonrelocatable ScreenGrabber 0.1 plugins'

7+// 'qmlplugindump -notrelocatable ScreenGrabber 0.1 plugins'

99Module {

1010 Component {

plugins/ScreenGrabber/screengrabber.cpp+1−1

@@ -81,7 +81,7 @@ void ScreenGrabber::captureAndSave()

8181QString ScreenGrabber::makeFileName()

8282{

8383 QString fileName(fileNamePrefix);

84− fileName.append(QDateTime::currentDateTime().toString("yyyymmdd_hhmmsszzz"));

84+ fileName.append(QDateTime::currentDateTime().toString("yyyyMMdd_hhmmsszzz"));

8585 fileName.append(".");

8686 fileName.append(getFormat());

8787 return fileName;

plugins/Ubuntu/Gestures/Gestures.qmltypes+15−1

@@ -33,7 +33,8 @@ Module {

3333 "Rightwards": 0,

3434 "Leftwards": 1,

3535 "Downwards": 2,

36− "Upwards": 3

36+ "Upwards": 3,

37+ "Horizontal": 4

3738 }

3839 }

3940 Method {

@@ -151,4 +152,17 @@ Module {

151152 exportMetaObjectRevisions: [0]

152153 Signal { name: "pressedOutside" }

153154 }

155+ Component {

156+ name: "TouchGate"

157+ defaultProperty: "data"

158+ prototype: "QQuickItem"

159+ exports: ["Ubuntu.Gestures/TouchGate 0.1"]

160+ exportMetaObjectRevisions: [0]

161+ Property { name: "targetItem"; type: "QQuickItem"; isPointer: true }

162+ Signal {

163+ name: "targetItemChanged"

164+ Parameter { name: "item"; type: "QQuickItem"; isPointer: true }

165+ }

166+ Signal { name: "pressed" }

167+ }

154168}

plugins/Unity/DashCommunicator/dashconnection.cpp+30

@@ -19,12 +19,42 @@

1919#include <QDBusInterface>

2020#include <QDBusPendingCall>

2121

22+/* The default implementation of AbstractDBusServiceMonitor creates a QDBusInterface when the service

23+ * appears on the bus.

24+ *

25+ * On construction QDBusInterface synchronously introspects the service, which will block the GUI

26+ * thread of this process if the service is busy. QDBusAbstractInterface does not perform this

27+ * introspection, so let's subclass that and avoid the blocking scenario.

28+ *

29+ * However we lose Qt's wrapping of the DBus service with a MetaObject, with the result that we

30+ * cannot easily connect to DBus signals with the usual connect() calls. So this approach only

31+ * suited to push communication with the DBus service.

32+ */

33+class AsyncDBusInterface : public QDBusAbstractInterface

34+{

35+public:

36+ AsyncDBusInterface(const QString &service, const QString &path,

37+ const QString &interface, const QDBusConnection &connection,

38+ QObject *parent = 0)

39+ : QDBusAbstractInterface(service, path, interface.toLatin1().data(), connection, parent)

40+ {}

41+ ~AsyncDBusInterface() = default;

42+};

43+

44+

2245DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):

2346 AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)

2447{

2548

2649}

2750

51+/* Override the default implementation to create a non-blocking DBus interface (see note above). */

52+QDBusAbstractInterface* DashConnection::createInterface(const QString &service, const QString &path,

53+ const QString &interface, const QDBusConnection &connection)

54+{

55+ return new AsyncDBusInterface(service, path, interface, connection);

56+}

57+

2858void DashConnection::setCurrentScope(int index, bool animate, bool isSwipe)

2959{

3060 if (dbusInterface()) {

plugins/Unity/DashCommunicator/dashconnection.h+4−1

@@ -20,7 +20,6 @@

2020// local

2121#include "abstractdbusservicemonitor.h"

2222

23−

2423class DashConnection: public AbstractDBusServiceMonitor

2524{

2625 Q_OBJECT

@@ -29,6 +28,10 @@ public:

2928

3029public Q_SLOTS:

3130 void setCurrentScope(int index, bool animate, bool isSwipe);

31+

32+private:

33+ QDBusAbstractInterface* createInterface(const QString &service, const QString &path,

34+ const QString &interface, const QDBusConnection &connection) override;

3235};

3336

3437#endif

plugins/Unity/Indicators/CMakeLists.txt+3−2

@@ -16,18 +16,19 @@ include_directories(

1616)

1717

1818set(IndicatorsQML_SOURCES

19+ actionrootstate.cpp

1920 indicator.cpp

2021 indicators.h

2122 indicatorsmanager.cpp

2223 indicatorsmodel.cpp

2324 menucontentactivator.cpp

25+ modelactionrootstate.cpp

2426 modelprinter.cpp

2527 plugin.cpp

26− rootactionstate.cpp

28+ rootstateparser.cpp

2729 sharedunitymenumodel.cpp

2830 unitymenumodelcache.cpp

2931 unitymenumodelstack.cpp

30− visibleindicatorsmodel.cpp

3132)

3233add_definitions(-DUNITYINDICATORS_LIBRARY)

3334

plugins/Unity/Indicators/Indicators.qmltypes+28−45

@@ -7,6 +7,14 @@ import QtQuick.tooling 1.1

77// 'qmlplugindump -notrelocatable Unity.Indicators 0.1 plugins'

99Module {

10+ Component {

11+ name: "ActionRootState"

12+ prototype: "RootStateObject"

13+ exports: ["Unity.Indicators/ActionRootState 0.1"]

14+ exportMetaObjectRevisions: [0]

15+ Property { name: "actionGroup"; type: "QDBusActionGroup"; isPointer: true }

16+ Property { name: "actionName"; type: "string" }

17+ }

1018 Component {

1119 name: "ActionState"

1220 prototype: "QObject"

@@ -23,7 +31,6 @@ Module {

2331 }

2432 }

2533 }

26− Component { name: "ActionStateParser"; prototype: "QObject" }

2734 Component {

2835 name: "FlatMenuProxyModelRole"

2936 prototype: "QObject"

@@ -48,10 +55,15 @@ Module {

4855 exports: ["Unity.Indicators/IndicatorsManager 0.1"]

4956 exportMetaObjectRevisions: [0]

5057 Property { name: "loaded"; type: "bool"; isReadonly: true }

58+ Property { name: "profile"; type: "string" }

5159 Signal {

5260 name: "loadedChanged"

5361 Parameter { type: "bool" }

5462 }

63+ Signal {

64+ name: "profileChanged"

65+ Parameter { type: "string" }

66+ }

5567 Signal {

5668 name: "indicatorLoaded"

5769 Parameter { name: "indicator_name"; type: "string" }

@@ -60,10 +72,7 @@ Module {

6072 name: "indicatorAboutToBeUnloaded"

6173 Parameter { name: "indicator_name"; type: "string" }

6274 }

63− Method {

64− name: "load"

65− Parameter { name: "profile"; type: "string" }

66− }

75+ Method { name: "load" }

6776 Method { name: "unload" }

6877 }

6978 Component {

@@ -72,14 +81,12 @@ Module {

7281 exports: ["Unity.Indicators/IndicatorsModel 0.1"]

7382 exportMetaObjectRevisions: [0]

7483 Property { name: "count"; type: "int"; isReadonly: true }

84+ Property { name: "profile"; type: "string" }

7585 Signal {

7686 name: "indicatorDataChanged"

7787 Parameter { name: "data"; type: "QVariant" }

7888 }

79− Method {

80− name: "load"

81− Parameter { name: "profile"; type: "string" }

82− }

89+ Method { name: "load" }

8390 Method { name: "unload" }

8491 Method {

8592 name: "data"

@@ -99,8 +106,7 @@ Module {

99106 values: {

100107 "Identifier": 0,

101108 "Position": 1,

102− "IndicatorProperties": 2,

103− "IsVisible": 3

109+ "IndicatorProperties": 2

104110 }

105111 }

106112 }

@@ -146,6 +152,14 @@ Module {

146152 exportMetaObjectRevisions: [0]

147153 Property { name: "active"; type: "bool"; isReadonly: true }

148154 }

155+ Component {

156+ name: "ModelActionRootState"

157+ prototype: "RootStateObject"

158+ exports: ["Unity.Indicators/ModelActionRootState 0.1"]

159+ exportMetaObjectRevisions: [0]

160+ Property { name: "menu"; type: "UnityMenuModel"; isPointer: true }

161+ Signal { name: "indexChanged" }

162+ }

149163 Component {

150164 name: "ModelPrinter"

151165 prototype: "QObject"

@@ -186,26 +200,16 @@ Module {

186200 }

187201 }

188202 Component {

189− name: "QAbstractProxyModel"

190− prototype: "QAbstractItemModel"

191− Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }

192− }

193− Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }

194− Component {

195− name: "RootActionState"

196− prototype: "ActionStateParser"

197− exports: ["Unity.Indicators/RootActionState 0.1"]

198− exportMetaObjectRevisions: [0]

199− Property { name: "menu"; type: "UnityMenuModel"; isPointer: true }

203+ name: "RootStateObject"

204+ prototype: "QObject"

200205 Property { name: "valid"; type: "bool"; isReadonly: true }

201206 Property { name: "title"; type: "string"; isReadonly: true }

202207 Property { name: "leftLabel"; type: "string"; isReadonly: true }

203208 Property { name: "rightLabel"; type: "string"; isReadonly: true }

204209 Property { name: "icons"; type: "QStringList"; isReadonly: true }

205210 Property { name: "accessibleName"; type: "string"; isReadonly: true }

206− Property { name: "visible"; type: "bool"; isReadonly: true }

211+ Property { name: "indicatorVisible"; type: "bool"; isReadonly: true }

207212 Signal { name: "updated" }

208− Signal { name: "indexChanged" }

209213 }

210214 Component {

211215 name: "SharedUnityMenuModel"

@@ -257,25 +261,4 @@ Module {

257261 }

258262 Method { name: "pop"; type: "UnityMenuModel*" }

259263 }

260− Component {

261− name: "VisibleIndicatorsModel"

262− prototype: "QIdentityProxyModel"

263− exports: ["Unity.Indicators/VisibleIndicatorsModel 0.1"]

264− exportMetaObjectRevisions: [0]

265− Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }

266− Property { name: "visible"; type: "QVariantMap" }

267− Signal { name: "totalCountChanged" }

268− Method {

269− name: "onBeginRowInserted"

270− Parameter { type: "QModelIndex" }

271− Parameter { name: "start"; type: "int" }

272− Parameter { name: "end"; type: "int" }

273− }

274− Method {

275− name: "onRowInserted"

276− Parameter { type: "QModelIndex" }

277− Parameter { name: "start"; type: "int" }

278− Parameter { name: "end"; type: "int" }

279− }

280− }

281264}

plugins/Unity/Indicators/actionrootstate.cppnew file+97

@@ -0,0 +1,97 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "actionrootstate.h"

18+

19+#include <qdbusactiongroup.h>

20+#include <QDebug>

21+

22+ActionRootState::ActionRootState(QObject *parent)

23+ : RootStateObject(parent)

24+ , m_actionGroup(nullptr)

25+{

26+}

27+

28+QDBusActionGroup *ActionRootState::actionGroup() const

29+{

30+ return m_actionGroup;

31+}

32+

33+void ActionRootState::setActionGroup(QDBusActionGroup *actionGroup)

34+{

35+ if (m_actionGroup != actionGroup) {

36+ bool wasValid = valid();

37+

38+ if (m_actionGroup) {

39+ disconnect(m_actionGroup, 0, this, 0);

40+ }

41+ m_actionGroup = actionGroup;

42+

43+ if (m_actionGroup) {

44+ connect(m_actionGroup, &QDBusActionGroup::statusChanged, this, [&](bool) { updateActionState(); });

45+ connect(m_actionGroup, &QDBusActionGroup::actionAppear, this, [&](const QString&) { updateActionState(); });

46+ connect(m_actionGroup, &QDBusActionGroup::actionVanish, this, [&](const QString&) { updateActionState(); });

47+ connect(m_actionGroup, &QDBusActionGroup::actionStateChanged, this, [&](QVariant) { updateActionState(); });

48+

49+ connect(m_actionGroup, &QObject::destroyed, this, [&](QObject*) { updateActionState(); });

50+ }

51+ updateActionState();

52+ Q_EMIT actionGroupChanged();

53+

54+ if (wasValid != valid()) Q_EMIT validChanged();

55+ }

56+}

57+

58+QString ActionRootState::actionName() const

59+{

60+ return m_actionName;

61+}

62+

63+void ActionRootState::setActionName(const QString &actionName)

64+{

65+ if (m_actionName != actionName) {

66+ bool wasValid = valid();

67+

68+ m_actionName = actionName;

69+ updateActionState();

70+

71+ Q_EMIT actionNameChanged();

72+

73+ if (wasValid != valid()) Q_EMIT validChanged();

74+ }

75+}

76+

77+bool ActionRootState::valid() const

78+{

79+ return m_actionGroup && m_actionGroup->status() == DBusEnums::Connected &&

80+ !m_actionName.isEmpty() && m_actionGroup->hasAction(m_actionName);

81+}

82+

83+void ActionRootState::updateActionState()

84+{

85+ if (valid()) {

86+ ActionStateParser* oldParser = m_actionGroup->actionStateParser();

87+ m_actionGroup->setActionStateParser(&m_parser);

88+

89+ QVariantMap state = m_actionGroup->actionState(m_actionName).toMap();

90+

91+ m_actionGroup->setActionStateParser(oldParser);

92+

93+ setCurrentState(state);

94+ } else {

95+ setCurrentState(QVariantMap());

96+ }

97+}

plugins/Unity/Indicators/actionrootstate.hnew file+55

@@ -0,0 +1,55 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef ACTIONROOTSTATE_H

18+#define ACTIONROOTSTATE_H

19+

20+#include "unityindicatorsglobal.h"

21+

22+#include "rootstateparser.h"

23+

24+class QDBusActionGroup;

25+

26+class UNITYINDICATORS_EXPORT ActionRootState : public RootStateObject

27+{

28+ Q_OBJECT

29+ Q_PROPERTY(QDBusActionGroup* actionGroup READ actionGroup WRITE setActionGroup NOTIFY actionGroupChanged)

30+ Q_PROPERTY(QString actionName READ actionName WRITE setActionName NOTIFY actionNameChanged)

31+

32+public:

33+ ActionRootState(QObject *parent = 0);

34+

35+ QDBusActionGroup *actionGroup() const;

36+ void setActionGroup(QDBusActionGroup *actionGroup);

37+

38+ QString actionName() const;

39+ void setActionName(const QString& actionName);

40+

41+ bool valid() const override;

42+

43+Q_SIGNALS:

44+ void actionGroupChanged();

45+ void actionNameChanged();

46+

47+private Q_SLOTS:

48+ void updateActionState();

49+

50+private:

51+ QDBusActionGroup* m_actionGroup;

52+ QString m_actionName;

53+};

54+

55+#endif // ACTIONROOTSTATE_H

plugins/Unity/Indicators/indicator.cpp+23−8

@@ -31,24 +31,26 @@ Indicator::~Indicator()

3131{

3232}

3333

34−void Indicator::init(const QString &profile, const QString& busName, const QSettings& settings)

34+void Indicator::init(const QString& busName, const QSettings& settings)

3535{

36− setId(settings.value("Indicator Service/Name").toString());

36+ // Save all keys we care about from the QSettings object. It's annoying

37+ // that we can't just copy the object.

38+ m_settings.clear();

39+ Q_FOREACH(const QString& key, settings.allKeys()) {

40+ if (key.endsWith("/Position") || key.endsWith("/ObjectPath")) {

41+ m_settings.insert(key, settings.value(key));

42+ }

43+ }

3744

38− QVariant pos = settings.value(profile + "/Position");

39− if (!pos.isValid())

40− pos = settings.value("Indicator Service/Position", QVariant::fromValue(0));

41− setPosition(pos.toInt());

45+ setId(settings.value("Indicator Service/Name").toString());

4246

4347 QString actionObjectPath = settings.value("Indicator Service/ObjectPath").toString();

44− QString menuObjectPath = settings.value(profile + "/ObjectPath").toString();

4548

4649 QVariantMap properties;

4750 properties.clear();

4851 properties.insert("busType", 1);

4952 properties.insert("busName", busName);

5053 properties.insert("actionsObjectPath", actionObjectPath);

51− properties.insert("menuObjectPath", menuObjectPath);

5254 setIndicatorProperties(properties);

5355}

5456

@@ -78,6 +80,19 @@ void Indicator::setPosition(int position)

7880 }

7981}

8082

83+void Indicator::setProfile(const QString& profile)

84+{

85+ QVariant pos = m_settings.value(profile + "/Position");

86+ if (!pos.isValid())

87+ pos = m_settings.value("Indicator Service/Position", QVariant::fromValue(0));

88+ setPosition(pos.toInt());

89+

90+ QString menuObjectPath = m_settings.value(profile + "/ObjectPath").toString();

91+ QVariantMap map = m_properties.toMap();

92+ map.insert("menuObjectPath", menuObjectPath);

93+ setIndicatorProperties(map);

94+}

95+

8196QVariant Indicator::indicatorProperties() const

8297{

8398 return m_properties;

plugins/Unity/Indicators/indicator.h+5−1

@@ -35,12 +35,15 @@ public:

3535 Indicator(QObject *parent = 0);

3636 virtual ~Indicator();

3737

38− void init(const QString &profile, const QString& busName, const QSettings& settings);

38+ void init(const QString& busName, const QSettings& settings);

3939

4040 QString identifier() const;

4141 int position() const;

4242 QVariant indicatorProperties() const;

4343

44+public Q_SLOTS:

45+ void setProfile(const QString& profile);

46+

4447Q_SIGNALS:

4548 void identifierChanged(const QString &identifier);

4649 void positionChanged(int position);

@@ -55,6 +58,7 @@ private:

5558 QString m_identifier;

5659 int m_position;

5760 QVariant m_properties;

61+ QVariantMap m_settings;

5862};

5963

6064#endif // INDICATOR_H

plugins/Unity/Indicators/indicators.h+1−2

@@ -74,8 +74,7 @@ public:

7474 enum Roles {

7575 Identifier = 0,

7676 Position,

77− IndicatorProperties,

78− IsVisible

77+ IndicatorProperties

7978 };

8079

8180 IndicatorsModelRole(QObject*parent=0):QObject(parent) {}

plugins/Unity/Indicators/indicatorsmanager.cpp+17−3

@@ -54,10 +54,9 @@ IndicatorsManager::~IndicatorsManager()

5454

5555}

5656

57−void IndicatorsManager::load(const QString& profile)

57+void IndicatorsManager::load()

5858{

5959 unload();

60− m_profile = profile;

6160

6261 QStringList xdgLocations = shellDataDirs();//QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);

6362

@@ -216,6 +215,19 @@ void IndicatorsManager::setLoaded(bool loaded)

216215 }

217216}

218217

218+QString IndicatorsManager::profile() const

219+{

220+ return m_profile;

221+}

222+

223+void IndicatorsManager::setProfile(const QString& profile)

224+{

225+ if (m_profile != profile) {

226+ m_profile = profile;

227+ Q_EMIT profileChanged(m_profile);

228+ }

229+}

230+

219231void IndicatorsManager::startVerify(const QString& path)

220232{

221233 QHashIterator<QString, IndicatorData*> iter(m_indicatorsData);

@@ -268,7 +280,9 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)

268280 Indicator::Ptr new_indicator(new Indicator(this));

269281 data->m_indicator = new_indicator;

270282 QSettings settings(data->m_fileInfo.absoluteFilePath(), QSettings::IniFormat, this);

271− new_indicator->init(m_profile, data->m_fileInfo.fileName(), settings);

283+ new_indicator->init(data->m_fileInfo.fileName(), settings);

284+ new_indicator->setProfile(m_profile);

285+ QObject::connect(this, SIGNAL(profileChanged(const QString&)), new_indicator.data(), SLOT(setProfile(const QString&)));

272286 return new_indicator;

273287}

274288

plugins/Unity/Indicators/indicatorsmanager.h+6−1

@@ -32,13 +32,17 @@ class UNITYINDICATORS_EXPORT IndicatorsManager : public QObject

3232{

3333 Q_OBJECT

3434 Q_PROPERTY(bool loaded READ isLoaded NOTIFY loadedChanged)

35+ Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)

3536public:

3637 explicit IndicatorsManager(QObject* parent = 0);

3738 ~IndicatorsManager();

3839

39− Q_INVOKABLE void load(const QString& profile);

40+ Q_INVOKABLE void load();

4041 Q_INVOKABLE void unload();

4142

43+ QString profile() const;

44+ void setProfile(const QString& profile);

45+

4246 Indicator::Ptr indicator(const QString& indicator_name);

4347

4448 QList<Indicator::Ptr> indicators();

@@ -47,6 +51,7 @@ public:

4751

4852Q_SIGNALS:

4953 void loadedChanged(bool);

54+ void profileChanged(const QString&);

5055

5156 void indicatorLoaded(const QString& indicator_name);

5257 void indicatorAboutToBeUnloaded(const QString& indicator_name);

plugins/Unity/Indicators/indicatorsmodel.cpp+25−2

@@ -56,6 +56,7 @@ IndicatorsModel::IndicatorsModel(QObject *parent)

5656 m_manager = new IndicatorsManager(this);

5757 QObject::connect(m_manager, SIGNAL(indicatorLoaded(const QString&)), this, SLOT(onIndicatorLoaded(const QString&)));

5858 QObject::connect(m_manager, SIGNAL(indicatorAboutToBeUnloaded(const QString&)), this, SLOT(onIndicatorAboutToBeUnloaded(const QString&)));

59+ QObject::connect(m_manager, SIGNAL(profileChanged(const QString&)), this, SIGNAL(profileChanged()));

5960

6061 QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

6162 QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

@@ -80,15 +81,37 @@ int IndicatorsModel::count() const

8081 return rowCount();

8182}

8283

84+/*!

85+ \qmlproperty IndicatorsModel::profile

86+ The indicator profile to use for the model.

87+

88+ \b Note: methods should only be called after the Component has completed.

89+*/

90+QString IndicatorsModel::profile() const

91+{

92+ return m_manager->profile();

93+}

94+

95+/*!

96+ \qmlproperty IndicatorsModel::setProfile

97+ Set the indicator profile to use for the model.

98+

99+ \b Note: methods should only be called after the Component has completed.

100+*/

101+void IndicatorsModel::setProfile(const QString &profile)

102+{

103+ m_manager->setProfile(profile);

104+}

105+

83106/*!

84107 \qmlmethod IndicatorsModel::unload()

85108

86109 Load all indicators.

87110*/

88−void IndicatorsModel::load(const QString& profile)

111+void IndicatorsModel::load()

89112{

90113 m_indicators.clear();

91− m_manager->load(profile);

114+ m_manager->load();

92115}

93116

94117/*!

plugins/Unity/Indicators/indicatorsmodel.h+6−1

@@ -34,17 +34,21 @@ class UNITYINDICATORS_EXPORT IndicatorsModel : public QAbstractListModel

3434 Q_OBJECT

3535 Q_ENUMS(Roles)

3636 Q_PROPERTY(int count READ count NOTIFY countChanged)

37+ Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)

3738

3839public:

3940

4041 IndicatorsModel(QObject *parent=0);

4142 ~IndicatorsModel();

4243

43− Q_INVOKABLE void load(const QString& profile);

44+ Q_INVOKABLE void load();

4445 Q_INVOKABLE void unload();

4546

4647 Q_INVOKABLE QVariant data(int row, int role) const;

4748

49+ QString profile() const;

50+ void setProfile(const QString& profile);

51+

4852 /* QAbstractItemModel */

4953 QHash<int, QByteArray> roleNames() const;

5054 int columnCount(const QModelIndex &parent = QModelIndex()) const;

@@ -55,6 +59,7 @@ public:

5559

5660Q_SIGNALS:

5761 void countChanged();

62+ void profileChanged();

5863 void indicatorDataChanged(const QVariant& data);

5964

6065private Q_SLOTS:

plugins/Unity/Indicators/modelactionrootstate.cppnew file+129

@@ -0,0 +1,129 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+#include "modelactionrootstate.h"

21+#include "indicators.h"

22+

23+#include <unitymenumodel.h>

24+#include <QVariant>

25+#include <QIcon>

26+

27+extern "C" {

28+#include <glib.h>

29+#include <gio/gio.h>

30+}

31+

32+ModelActionRootState::ModelActionRootState(QObject *parent)

33+ : RootStateObject(parent),

34+ m_menu(nullptr)

35+{

36+}

37+

38+ModelActionRootState::~ModelActionRootState()

39+{

40+}

41+

42+UnityMenuModel* ModelActionRootState::menu() const

43+{

44+ return m_menu;

45+}

46+

47+void ModelActionRootState::setMenu(UnityMenuModel* menu)

48+{

49+ if (m_menu != menu) {

50+ bool wasValid = valid();

51+

52+ if (m_menu) {

53+ m_menu->disconnect(this);

54+ }

55+ m_menu = menu;

56+

57+ if (m_menu) {

58+ connect(m_menu, SIGNAL(rowsInserted(const QModelIndex&, int, int)), SLOT(onModelRowsAdded(const QModelIndex&, int, int)));

59+ connect(m_menu, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SLOT(onModelRowsRemoved(const QModelIndex&, int, int)));

60+ connect(m_menu, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)), SLOT(onModelDataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));

61+

62+ connect(m_menu, SIGNAL(destroyed()), SLOT(reset()));

63+ }

64+ updateActionState();

65+ Q_EMIT menuChanged();

66+

67+ if (wasValid != valid())

68+ Q_EMIT validChanged();

69+ }

70+}

71+

72+bool ModelActionRootState::valid() const

73+{

74+ return !currentState().empty();

75+}

76+

77+void ModelActionRootState::onModelRowsAdded(const QModelIndex& parent, int start, int end)

78+{

79+ Q_UNUSED(parent);

80+ if (start == 0 && end >= 0) {

81+ updateActionState();

82+ }

83+}

84+

85+void ModelActionRootState::onModelRowsRemoved(const QModelIndex& parent, int start, int end)

86+{

87+ Q_UNUSED(parent);

88+ if (start == 0 && end >= 0) {

89+ updateActionState();

90+ }

91+}

92+

93+void ModelActionRootState::onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)

94+{

95+ Q_UNUSED(roles);

96+ if (!topLeft.isValid() || !bottomRight.isValid()) {

97+ return;

98+ }

99+

100+ if (topLeft.row() <= 0 && bottomRight.row() >= 0) {

101+ updateActionState();

102+ }

103+}

104+

105+void ModelActionRootState::reset()

106+{

107+ m_menu = nullptr;

108+

109+ Q_EMIT menuChanged();

110+ setCurrentState(QVariantMap());

111+}

112+

113+void ModelActionRootState::updateActionState()

114+{

115+ if (m_menu && m_menu->rowCount() > 0) {

116+ ActionStateParser* oldParser = m_menu->actionStateParser();

117+ m_menu->setActionStateParser(&m_parser);

118+

119+ QVariantMap state = m_menu->get(0, "actionState").toMap();

120+

121+ m_menu->setActionStateParser(oldParser);

122+

123+ setCurrentState(state);

124+ } else if (!m_menu) {

125+ setCurrentState(QVariantMap());

126+ }

127+ // else if m_menu->rowCount() == 0, let's leave existing cache in place

128+ // until the new menu comes in, to avoid flashing the UI empty for a moment

129+}

plugins/Unity/Indicators/modelactionrootstate.hnew file+61

@@ -0,0 +1,61 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+#ifndef MODELACTIONROOTSTATE_H

21+#define MODELACTIONROOTSTATE_H

22+

23+#include "unityindicatorsglobal.h"

24+

25+#include "rootstateparser.h"

26+

27+class UnityMenuModel;

28+

29+class UNITYINDICATORS_EXPORT ModelActionRootState : public RootStateObject

30+{

31+ Q_OBJECT

32+ Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)

33+public:

34+ ModelActionRootState(QObject *parent = 0);

35+ virtual ~ModelActionRootState();

36+

37+ UnityMenuModel* menu() const;

38+ void setMenu(UnityMenuModel* menu);

39+

40+ int index() const;

41+ void setIndex(int index);

42+

43+ bool valid() const override;

44+

45+Q_SIGNALS:

46+ void menuChanged();

47+ void indexChanged();

48+

49+private Q_SLOTS:

50+ void onModelRowsAdded(const QModelIndex& parent, int start, int end);

51+ void onModelRowsRemoved(const QModelIndex& parent, int start, int end);

52+ void onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>&);

53+ void reset();

54+

55+private:

56+ void updateActionState();

57+

58+ UnityMenuModel* m_menu;

59+};

60+

61+#endif // MODELACTIONROOTSTATE_H

plugins/Unity/Indicators/plugin.cpp+4−4

@@ -24,16 +24,16 @@

2424#include "plugin.h"

2525

2626// local

27+#include "actionrootstate.h"

2728#include "indicators.h"

2829#include "indicatorsmanager.h"

2930#include "indicatorsmodel.h"

3031#include "menucontentactivator.h"

32+#include "modelactionrootstate.h"

3133#include "modelprinter.h"

32−#include "rootactionstate.h"

3334#include "sharedunitymenumodel.h"

3435#include "unitymenumodelcache.h"

3536#include "unitymenumodelstack.h"

36−#include "visibleindicatorsmodel.h"

3737

3838#include <unitymenumodel.h>

3939

@@ -51,9 +51,9 @@ void IndicatorsPlugin::registerTypes(const char *uri)

5151 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");

5252 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");

5353 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");

54− qmlRegisterType<RootActionState>(uri, 0, 1, "RootActionState");

54+ qmlRegisterType<ModelActionRootState>(uri, 0, 1, "ModelActionRootState");

55+ qmlRegisterType<ActionRootState>(uri, 0, 1, "ActionRootState");

5556 qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");

56− qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

5757 qmlRegisterType<SharedUnityMenuModel>(uri, 0, 1, "SharedUnityMenuModel");

5858

5959 qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);

plugins/Unity/Indicators/rootactionstate.cpp → plugins/Unity/Indicators/rootstateparser.cpprenamed+74−141

@@ -12,155 +12,18 @@

1212 *

1313 * You should have received a copy of the GNU Lesser General Public License

1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− *

16− * Authors:

17− * Nick Dedekind <nick.dedekind@canonical.com>

1815 */

1916

20−#include "rootactionstate.h"

21−#include "indicators.h"

22−

23−#include <unitymenumodel.h>

24−#include <QVariant>

25−#include <QIcon>

17+#include "rootstateparser.h"

2618

2719extern "C" {

2820#include <glib.h>

2921#include <gio/gio.h>

3022}

3123

32−RootActionState::RootActionState(QObject *parent)

33− : ActionStateParser(parent),

34− m_menu(nullptr)

35−{

36−}

37−

38−RootActionState::~RootActionState()

39−{

40−}

41−

42−UnityMenuModel* RootActionState::menu() const

43−{

44− return m_menu;

45−}

46−

47−void RootActionState::setMenu(UnityMenuModel* menu)

48−{

49− if (m_menu != menu) {

50− if (m_menu) {

51− m_menu->disconnect(this);

52− }

53− m_menu = menu;

54−

55− if (m_menu) {

56− connect(m_menu, SIGNAL(rowsInserted(const QModelIndex&, int, int)), SLOT(onModelRowsAdded(const QModelIndex&, int, int)));

57− connect(m_menu, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SLOT(onModelRowsRemoved(const QModelIndex&, int, int)));

58− connect(m_menu, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)), SLOT(onModelDataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));

59−

60− connect(m_menu, SIGNAL(destroyed()), SLOT(reset()));

61− }

62− updateActionState();

63− Q_EMIT menuChanged();

64− }

65−}

66−

67−void RootActionState::onModelRowsAdded(const QModelIndex& parent, int start, int end)

24+RootStateParser::RootStateParser(QObject* parent)

25+ : ActionStateParser(parent)

6826{

69− Q_UNUSED(parent);

70− if (start == 0 && end >= 0) {

71− updateActionState();

72− }

73−}

74−

75−void RootActionState::onModelRowsRemoved(const QModelIndex& parent, int start, int end)

76−{

77− Q_UNUSED(parent);

78− if (start == 0 && end >= 0) {

79− updateActionState();

80− }

81−}

82−

83−void RootActionState::onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)

84−{

85− Q_UNUSED(roles);

86− if (!topLeft.isValid() || !bottomRight.isValid()) {

87− return;

88− }

89−

90− if (topLeft.row() <= 0 && bottomRight.row() >= 0) {

91− updateActionState();

92− }

93−}

94−

95−void RootActionState::reset()

96−{

97− m_cachedState.clear();

98− m_menu = nullptr;

99−

100− Q_EMIT menuChanged();

101− Q_EMIT updated();

102−}

103−

104−void RootActionState::updateActionState()

105−{

106− if (m_menu && m_menu->rowCount() > 0) {

107− ActionStateParser* oldParser = m_menu->actionStateParser();

108− m_menu->setActionStateParser(this);

109−

110− m_cachedState = m_menu->get(0, "actionState").toMap();

111−

112− m_menu->setActionStateParser(oldParser);

113− } else {

114− m_cachedState.clear();

115− }

116− Q_EMIT updated();

117−}

118−

119−bool RootActionState::isValid() const

120−{

121− return m_menu && m_menu->rowCount() > 0;

122−}

123−

124−QString RootActionState::title() const

125−{

126− if (!isValid()) return QString();

127−

128− return m_cachedState.value("title", QVariant::fromValue(QString())).toString();

129−}

130−

131−QString RootActionState::leftLabel() const

132−{

133− if (!isValid()) return QString();

134−

135− return m_cachedState.value("pre-label", QVariant::fromValue(QString())).toString();

136−}

137−

138−QString RootActionState::rightLabel() const

139−{

140− if (!isValid()) return QString();

141−

142− return m_cachedState.value("label", QVariant::fromValue(QString())).toString();

143−}

144−

145−QStringList RootActionState::icons() const

146−{

147− if (!isValid()) return QStringList();

148−

149− return m_cachedState.value("icons", QVariant::fromValue(QStringList())).toStringList();

150−}

151−

152−QString RootActionState::accessibleName() const

153−{

154− if (!isValid()) return QString();

155−

156− return m_cachedState.value("accessible-desc", QVariant::fromValue(QString())).toString();

157−}

158−

159−bool RootActionState::indicatorVisible() const

160−{

161− if (!isValid()) return false;

162−

163− return m_cachedState.value("visible", QVariant::fromValue(true)).toBool();

16427}

16528

16629static QString iconUri(GIcon *icon)

@@ -209,7 +72,7 @@ static QString iconUri(GIcon *icon)

20972 return uri;

21073}

21174

212−QVariant RootActionState::toQVariant(GVariant* state) const

75+QVariant RootStateParser::toQVariant(GVariant* state) const

21376{

21477 if (!state) {

21578 return QVariant();

@@ -296,3 +159,73 @@ QVariant RootActionState::toQVariant(GVariant* state) const

296159 }

297160 return ActionStateParser::toQVariant(state);

298161}

162+

163+

164+RootStateObject::RootStateObject(QObject* parent)

165+ : QObject(parent)

166+{

167+}

168+

169+QString RootStateObject::title() const

170+{

171+ if (!valid()) return QString();

172+

173+ return m_currentState.value("title", QVariant::fromValue(QString())).toString();

174+}

175+

176+QString RootStateObject::leftLabel() const

177+{

178+ if (!valid()) return QString();

179+

180+ return m_currentState.value("pre-label", QVariant::fromValue(QString())).toString();

181+}

182+

183+QString RootStateObject::rightLabel() const

184+{

185+ if (!valid()) return QString();

186+

187+ return m_currentState.value("label", QVariant::fromValue(QString())).toString();

188+}

189+

190+QStringList RootStateObject::icons() const

191+{

192+ if (!valid()) return QStringList();

193+

194+ return m_currentState.value("icons", QVariant::fromValue(QStringList())).toStringList();

195+}

196+

197+QString RootStateObject::accessibleName() const

198+{

199+ if (!valid()) return QString();

200+

201+ return m_currentState.value("accessible-desc", QVariant::fromValue(QString())).toString();

202+}

203+

204+bool RootStateObject::indicatorVisible() const

205+{

206+ if (!valid()) return false;

207+

208+ return m_currentState.value("visible", QVariant::fromValue(true)).toBool();

209+}

210+

211+void RootStateObject::setCurrentState(const QVariantMap& newState)

212+{

213+ QString oldTitle = title();

214+ QString oldLeftLabel = leftLabel();

215+ QString oldRightLabel = rightLabel();

216+ QStringList oldIcons = icons();

217+ QString oldAccessibleName = accessibleName();

218+ bool oldIndicatorVisible = indicatorVisible();

219+

220+ if (m_currentState != newState) {

221+ m_currentState = newState;

222+ Q_EMIT updated();

223+

224+ if (oldTitle != title()) Q_EMIT titleChanged();

225+ if (oldLeftLabel != leftLabel()) Q_EMIT leftLabelChanged();

226+ if (oldRightLabel != rightLabel()) Q_EMIT rightLabelChanged();

227+ if (oldIcons != icons()) Q_EMIT iconsChanged();

228+ if (oldAccessibleName != accessibleName()) Q_EMIT accessibleNameChanged();

229+ if (oldIndicatorVisible != indicatorVisible()) Q_EMIT indicatorVisibleChanged();

230+ }

231+}

plugins/Unity/Indicators/rootactionstate.h → plugins/Unity/Indicators/rootstateparser.hrenamed+18−34

@@ -12,26 +12,27 @@

1212 *

1313 * You should have received a copy of the GNU Lesser General Public License

1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− *

16− * Authors:

17− * Nick Dedekind <nick.dedekind@canonical.com>

1815 */

1916

20−#ifndef ROOTACTIONSTATE_H

21−#define ROOTACTIONSTATE_H

17+#ifndef ROOTSTATEPARSER_H

18+#define ROOTSTATEPARSER_H

2219

2320#include "unityindicatorsglobal.h"

2421

2522#include <actionstateparser.h>

2623

27−class UnityMenuModel;

24+class UNITYINDICATORS_EXPORT RootStateParser : public ActionStateParser

25+{

26+public:

27+ RootStateParser(QObject* parent = nullptr);

28+ virtual QVariant toQVariant(GVariant* state) const override;

29+};

2830

29−class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser

31+class UNITYINDICATORS_EXPORT RootStateObject : public QObject

3032{

3133 Q_OBJECT

32− Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)

3334

34− Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)

35+ Q_PROPERTY(bool valid READ valid NOTIFY validChanged)

3536 Q_PROPERTY(QString title READ title NOTIFY titleChanged)

3637 Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)

3738 Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)

@@ -39,16 +40,10 @@ class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser

3940 Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)

4041 Q_PROPERTY(bool indicatorVisible READ indicatorVisible NOTIFY indicatorVisibleChanged)

4142public:

42− RootActionState(QObject *parent = 0);

43− virtual ~RootActionState();

43+ RootStateObject(QObject* parent = 0);

4444

45− UnityMenuModel* menu() const;

46− void setMenu(UnityMenuModel* menu);

45+ virtual bool valid() const = 0;

4746

48− int index() const;

49− void setIndex(int index);

50−

51− bool isValid() const;

5247 QString title() const;

5348 QString leftLabel() const;

5449 QString rightLabel() const;

@@ -56,15 +51,12 @@ public:

5651 QString accessibleName() const;

5752 bool indicatorVisible() const;

5853

59− // from ActionStateParser

60− virtual QVariant toQVariant(GVariant* state) const override;

54+ QVariantMap currentState() const { return m_currentState; }

55+ void setCurrentState(const QVariantMap& currentState);

6156

6257Q_SIGNALS:

6358 void updated();

6459

65− void menuChanged();

66− void indexChanged();

67−

6860 void validChanged();

6961 void titleChanged();

7062 void leftLabelChanged();

@@ -73,17 +65,9 @@ Q_SIGNALS:

7365 void accessibleNameChanged();

7466 void indicatorVisibleChanged();

7567

76−private Q_SLOTS:

77− void onModelRowsAdded(const QModelIndex& parent, int start, int end);

78− void onModelRowsRemoved(const QModelIndex& parent, int start, int end);

79− void onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>&);

80− void reset();

81−

82−private:

83− void updateActionState();

84−

85− UnityMenuModel* m_menu;

86− QVariantMap m_cachedState;

68+protected:

69+ RootStateParser m_parser;

70+ QVariantMap m_currentState;

8771};

8872

89−#endif // ROOTACTIONSTATE_H

73+#endif // ROOTSTATEPARSER_H

plugins/Unity/Indicators/unitymenumodelcache.cpp+8−11

@@ -46,17 +46,14 @@ QSharedPointer<UnityMenuModel> UnityMenuModelCache::model(const QByteArray& path

4646 QQmlEngine::setObjectOwnership(model, QQmlEngine::CppOwnership);

4747

4848 QSharedPointer<UnityMenuModel> menuModel(model);

49− connect(model, &QObject::destroyed, this, [this] {

50− QMutableHashIterator<QByteArray, QWeakPointer<UnityMenuModel>> iter(m_registry);

51− while(iter.hasNext()) {

52− auto keyVal = iter.next();

53− if (keyVal.value().isNull()) {

54− iter.remove();

55− break;

56− }

57− }

58− });

59− m_registry[path] = menuModel.toWeakRef();

49+

50+ // Keep a shared pointer (rather than weak pointer which would cause the

51+ // model to be deleted when all shared pointers we give out are deleted).

52+ // We want to keep all models cached because when we switch indicator

53+ // profiles, we will be switching paths often. And we want to keep the

54+ // old model around, ready to be used. Otherwise the UI might momentarily

55+ // wait as we populate the model from DBus yet again.

56+ m_registry[path] = menuModel;

6057

6158 menuModel->setMenuObjectPath(path);

6259 return menuModel;

plugins/Unity/Indicators/unitymenumodelcache.h+2−2

@@ -25,7 +25,7 @@

2525#include <QObject>

2626#include <QHash>

2727#include <QPointer>

28−#include <QWeakPointer>

28+#include <QSharedPointer>

2929

3030class UnityMenuModel;

3131

@@ -43,7 +43,7 @@ public:

4343 Q_INVOKABLE virtual bool contains(const QByteArray& path);

4444

4545protected:

46− QHash<QByteArray, QWeakPointer<UnityMenuModel>> m_registry;

46+ QHash<QByteArray, QSharedPointer<UnityMenuModel>> m_registry;

4747 static QPointer<UnityMenuModelCache> theCache;

4848};

4949

plugins/Unity/Indicators/visibleindicatorsmodel.cppdeleted−90

@@ -1,90 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−// self

18−#include "visibleindicatorsmodel.h"

19−#include "indicators.h"

20−

21−VisibleIndicatorsModel::VisibleIndicatorsModel(QObject *parent)

22− : QIdentityProxyModel(parent),

23− m_inserting(false)

24−{

25− QObject::connect(this, SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(onBeginRowInserted(QModelIndex, int, int)));

26− QObject::connect(this, SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(onRowInserted(QModelIndex, int, int)));

27−}

28−

29−QHash<int, QByteArray> VisibleIndicatorsModel::roleNames() const

30−{

31− static QHash<int, QByteArray> roles;

32− if (roles.isEmpty())

33− {

34− roles[IndicatorsModelRole::Identifier] = "identifier";

35− roles[IndicatorsModelRole::Position] = "position";

36− roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";

37− roles[IndicatorsModelRole::IsVisible] = "isVisible";

38− }

39− return roles;

40−}

41−

42−void VisibleIndicatorsModel::setSourceModel(QAbstractItemModel *model)

43−{

44− if (sourceModel() != model) {

45− QIdentityProxyModel::setSourceModel(model);

46− Q_EMIT modelChanged();

47− }

48−}

49−

50−QVariantMap VisibleIndicatorsModel::visible() const

51−{

52− return m_visible;

53−}

54−

55−void VisibleIndicatorsModel::onBeginRowInserted(const QModelIndex&, int, int)

56−{

57− m_inserting = true;

58−}

59−

60−void VisibleIndicatorsModel::onRowInserted(const QModelIndex&, int, int)

61−{

62− m_inserting = false;

63−}

64−

65−void VisibleIndicatorsModel::setVisible(const QVariantMap& visible)

66−{

67− if (m_visible != visible) {

68− m_visible = visible;

69− Q_EMIT visibleChanged();

70−

71− // need to tell the view that the visible data has changed.

72− if (!m_inserting && rowCount() > 0) {

73− Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), QVector<int>() << IndicatorsModelRole::IsVisible);

74− }

75− }

76−}

77−

78−QVariant VisibleIndicatorsModel::data(const QModelIndex &index, int role) const

79−{

80− if (role != IndicatorsModelRole::IsVisible) {

81− return QIdentityProxyModel::data(index, role);

82− }

83−

84− if (!index.isValid()) {

85− return false;

86− }

87−

88− QString ident = QIdentityProxyModel::data(index, IndicatorsModelRole::Identifier).toString();

89− return m_visible.value(ident, false).toBool();

90−}

plugins/Unity/Indicators/visibleindicatorsmodel.hdeleted−56

@@ -1,56 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− *

16− * Authors:

17− * Nick Dedekind <nick.dedekind@canonical.com>

18− */

19−

20−#ifndef VISIBLEINDICATORSMODEL_H

21−#define VISIBLEINDICATORSMODEL_H

22−

23−#include <QIdentityProxyModel>

24−

25−class VisibleIndicatorsModel : public QIdentityProxyModel

26−{

27− Q_OBJECT

28−

29− Q_PROPERTY(QAbstractItemModel* model READ sourceModel WRITE setSourceModel NOTIFY modelChanged)

30− Q_PROPERTY(QVariantMap visible READ visible WRITE setVisible NOTIFY visibleChanged)

31−

32−public:

33− explicit VisibleIndicatorsModel(QObject *parent = 0);

34−

35− virtual void setSourceModel(QAbstractItemModel *model);

36− virtual QHash<int, QByteArray> roleNames() const;

37− virtual QVariant data(const QModelIndex &index, int role) const;

38−

39− QVariantMap visible() const;

40− void setVisible(const QVariantMap& visible);

41−

42−public Q_SLOTS:

43− void onBeginRowInserted(const QModelIndex&, int start, int end);

44− void onRowInserted(const QModelIndex&, int start, int end);

45−

46−Q_SIGNALS:

47− void totalCountChanged();

48− void modelChanged();

49− void visibleChanged();

50−

51−private:

52− QVariantMap m_visible;

53− bool m_inserting;

54−};

55−

56−#endif // VISIBLEINDICATORSMODEL_H

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

@@ -1,5 +1,4 @@

1−include(FindPkgConfig)

2−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=5)

1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)

32pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)

43pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

@@ -21,6 +20,7 @@ set(QMLLAUNCHERPLUGIN_SRC

2120 dbusinterface.cpp

2221 gsettings.cpp

2322 desktopfilehandler.cpp

23+ asadapter.cpp

2424 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

2525 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

2626 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

plugins/Unity/Launcher/Launcher.qmltypes+3

@@ -25,6 +25,7 @@ Module {

2525 name: "requestRemove"

2626 Parameter { name: "appId"; type: "string" }

2727 }

28+ Method { name: "refresh" }

2829 Method {

2930 name: "get"

3031 type: "unity::shell::launcher::LauncherItemInterface*"

@@ -136,6 +137,8 @@ Module {

136137 type: "unity::shell::application::ApplicationManagerInterface"

137138 isPointer: true

138139 }

140+ Property { name: "onlyPinned"; type: "bool" }

141+ Signal { name: "hint" }

139142 Method {

140143 name: "move"

141144 Parameter { name: "oldIndex"; type: "int" }

plugins/Unity/Launcher/asadapter.cppnew file+60

@@ -0,0 +1,60 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "asadapter.h"

18+#include "launcheritem.h"

19+#include "AccountsServiceDBusAdaptor.h"

20+

21+#include <QDebug>

22+

23+ASAdapter::ASAdapter()

24+{

25+ m_accounts = new AccountsServiceDBusAdaptor();

26+ m_user = qgetenv("USER");

27+ if (m_user.isEmpty()) {

28+ qWarning() << "$USER not valid. Account Service integration will not work.";

29+ }

30+}

31+

32+ASAdapter::~ASAdapter()

33+{

34+ m_accounts->deleteLater();

35+}

36+

37+void ASAdapter::syncItems(QList<LauncherItem *> m_list)

38+{

39+ if (m_accounts && !m_user.isEmpty()) {

40+ QList<QVariantMap> items;

41+

42+ Q_FOREACH(LauncherItem *item, m_list) {

43+ items << itemToVariant(item);

44+ }

45+

46+ m_accounts->setUserPropertyAsync(m_user, "com.canonical.unity.AccountsService", "LauncherItems", QVariant::fromValue(items));

47+ }

48+}

49+

50+QVariantMap ASAdapter::itemToVariant(LauncherItem *item) const

51+{

52+ QVariantMap details;

53+ details.insert("id", item->appId());

54+ details.insert("name", item->name());

55+ details.insert("icon", item->icon());

56+ details.insert("count", item->count());

57+ details.insert("countVisible", item->countVisible());

58+ details.insert("pinned", item->pinned());

59+ return details;

60+}

tests/mocks/Unity/Notifications/MockNotificationTypes.h → plugins/Unity/Launcher/asadapter.hrenamed+24−14

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU Lesser General Public License as published by

@@ -12,25 +12,35 @@

1212 *

1313 * You should have received a copy of the GNU Lesser General Public License

1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− *

16− * Authors:

17− * Mirco Mueller <mirco.mueller@canonical.com>

1815 */

1916

20−#ifndef MOCK_NOTIFICATION_TYPES_H

21−#define MOCK_NOTIFICATION_TYPES_H

17+#ifndef ASADAPTER_H

18+#define ASADAPTER_H

2219

23−#include <QObject>

20+#include <QVariantMap>

2421

25−class MockNotification : public QObject {

26− Q_OBJECT

27− Q_ENUMS(Type)

22+class LauncherItem;

23+class AccountsServiceDBusAdaptor;

24+class QDBusInterface;

2825

26+class ASAdapter

27+{

2928public:

30− MockNotification(QObject *parent=nullptr);

31− virtual ~MockNotification();

29+ ASAdapter();

30+ ~ASAdapter();

31+

32+ void syncItems(QList<LauncherItem*> m_list);

33+

34+private:

35+ QVariantMap itemToVariant(LauncherItem *item) const;

36+

37+private:

38+ AccountsServiceDBusAdaptor *m_accounts;

39+ QString m_user;

40+

41+ QDBusInterface *m_userInterface;

3242

33− enum Type { PlaceHolder, Confirmation, Ephemeral, Interactive, SnapDecision };

43+ friend class LauncherModelTest;

3444};

3545

36−#endif // MOCK_NOTIFICATION_TYPES_H

46+#endif

plugins/Unity/Launcher/gsettings.cpp+8−1

@@ -59,12 +59,19 @@ void GSettings::setStoredApplications(const QStringList &storedApplications)

5959 Q_FOREACH(const QString &entry, storedApplications) {

6060 gSettingsList << QString("appid://%1").arg(entry);

6161 }

62+ // GSettings will emit a changed signal to ourselves. Let's cache the items

63+ // and only forward the changed signal when the list did actually change.

64+ m_cachedItems = gSettingsList;

6265 m_gSettings->set("items", gSettingsList);

6366}

6467

6568void GSettings::onSettingsChanged(const QString &key)

6669{

6770 if (key == "items") {

68− Q_EMIT changed();

71+ QStringList cachedItems = m_gSettings->get("items").toStringList();

72+ if (m_cachedItems != cachedItems) {

73+ m_cachedItems = cachedItems;

74+ Q_EMIT changed();

75+ }

6976 }

7077}

plugins/Unity/Launcher/gsettings.h+1

@@ -41,6 +41,7 @@ private Q_SLOTS:

4141

4242private:

4343 QGSettings *m_gSettings;

44+ QStringList m_cachedItems;

4445};

4546

4647#endif

plugins/Unity/Launcher/launchermodel.cpp+27−7

@@ -22,6 +22,7 @@

2222#include "gsettings.h"

2323#include "desktopfilehandler.h"

2424#include "dbusinterface.h"

25+#include "asadapter.h"

2526

2627#include <unity/shell/application/ApplicationInfoInterface.h>

2728

@@ -34,6 +35,7 @@ LauncherModel::LauncherModel(QObject *parent):

3435 LauncherModelInterface(parent),

3536 m_settings(new GSettings(this)),

3637 m_dbusIface(new DBusInterface(this)),

38+ m_asAdapter(new ASAdapter()),

3739 m_appManager(0)

3840{

3941 connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);

@@ -50,6 +52,8 @@ LauncherModel::~LauncherModel()

5052 while (!m_list.empty()) {

5153 m_list.takeFirst()->deleteLater();

5254 }

55+

56+ delete m_asAdapter;

5357}

5458

5559int LauncherModel::rowCount(const QModelIndex &parent) const

@@ -261,6 +265,15 @@ void LauncherModel::setApplicationManager(unity::shell::application::Application

261265 }

262266}

263267

268+bool LauncherModel::onlyPinned() const

269+{

270+ return false;

271+}

272+

273+void LauncherModel::setOnlyPinned(bool onlyPinned) {

274+ Q_UNUSED(onlyPinned);

275+ qWarning() << "This launcher implementation does not support showing only pinned apps";

276+}

264277

265278void LauncherModel::storeAppList()

266279{

@@ -271,6 +284,7 @@ void LauncherModel::storeAppList()

271284 }

272285 }

273286 m_settings->setStoredApplications(appIds);

287+ m_asAdapter->syncItems(m_list);

274288}

275289

276290void LauncherModel::unpin(const QString &appId)

@@ -321,6 +335,7 @@ void LauncherModel::countChanged(const QString &appId, int count)

321335 LauncherItem *item = m_list.at(idx);

322336 item->setCount(count);

323337 Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCount);

338+ m_asAdapter->syncItems(m_list);

324339 }

325340}

326341

@@ -352,6 +367,7 @@ void LauncherModel::countVisibleChanged(const QString &appId, int countVisible)

352367 Q_EMIT hint();

353368 }

354369 }

370+ m_asAdapter->syncItems(m_list);

355371}

356372

357373void LauncherModel::refresh()

@@ -433,6 +449,8 @@ void LauncherModel::refresh()

433449 if (changed) {

434450 Q_EMIT hint();

435451 }

452+

453+ m_asAdapter->syncItems(m_list);

436454}

437455

438456void LauncherModel::applicationAdded(const QModelIndex &parent, int row)

@@ -450,14 +468,14 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)

450468 return;

451469 }

452470

453− bool found = false;

454− Q_FOREACH(LauncherItem *item, m_list) {

455− if (app->appId() == item->appId()) {

456− found = true;

457− break;

471+ int itemIndex = findApplication(app->appId());

472+ if (itemIndex != -1) {

473+ LauncherItem *item = m_list.at(itemIndex);

474+ if (!item->recent()) {

475+ item->setRecent(true);

476+ m_asAdapter->syncItems(m_list);

477+ Q_EMIT dataChanged(index(itemIndex), index(itemIndex), QVector<int>() << RoleRecent);

458478 }

459− }

460− if (found) {

461479 // Shall we paint some running/recent app highlight? If yes, do it here.

462480 } else {

463481 LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);

@@ -467,6 +485,7 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)

467485 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());

468486 m_list.append(item);

469487 endInsertRows();

488+ m_asAdapter->syncItems(m_list);

470489 }

471490}

472491

@@ -486,6 +505,7 @@ void LauncherModel::applicationRemoved(const QModelIndex &parent, int row)

486505 beginRemoveRows(QModelIndex(), appIndex, appIndex);

487506 m_list.takeAt(appIndex)->deleteLater();

488507 endRemoveRows();

508+ m_asAdapter->syncItems(m_list);

489509 }

490510}

491511

plugins/Unity/Launcher/launchermodel.h+5

@@ -28,6 +28,7 @@

2828class LauncherItem;

2929class GSettings;

3030class DBusInterface;

31+class ASAdapter;

3132

3233using namespace unity::shell::launcher;

3334using namespace unity::shell::application;

@@ -54,6 +55,9 @@ public:

5455 unity::shell::application::ApplicationManagerInterface* applicationManager() const;

5556 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);

5657

58+ bool onlyPinned() const override;

59+ void setOnlyPinned(bool onlyPinned) override;

60+

5761 int findApplication(const QString &appId);

5862

5963public Q_SLOTS:

@@ -79,6 +83,7 @@ private:

7983

8084 GSettings *m_settings;

8185 DBusInterface *m_dbusIface;

86+ ASAdapter *m_asAdapter;

8287

8388 ApplicationManagerInterface *m_appManager;

8489

plugins/Unity/Session/CMakeLists.txt−2

@@ -1,5 +1,3 @@

1−include(FindPkgConfig)

2−

31pkg_search_module(GIO REQUIRED gio-2.0)

53include_directories(

plugins/Unity/Session/Session.qmltypes+5−1

@@ -9,7 +9,7 @@ import QtQuick.tooling 1.1

99Module {

1010 Component {

1111 name: "DBusUnitySessionService"

12− prototype: "QObject"

12+ prototype: "UnityDBusObject"

1313 exports: ["Unity.Session/DBusUnitySessionService 0.1"]

1414 isCreatable: false

1515 isSingleton: true

@@ -33,6 +33,9 @@ Module {

3333 Method { name: "RequestLogout" }

3434 Method { name: "RequestReboot" }

3535 Method { name: "RequestShutdown" }

36+ Method { name: "logout" }

37+ Method { name: "reboot" }

38+ Method { name: "shutdown" }

3639 }

3740 Component {

3841 name: "OrientationLock"

@@ -44,4 +47,5 @@ Module {

4447 Property { name: "enabled"; type: "bool"; isReadonly: true }

4548 Property { name: "savedOrientation"; type: "Qt::ScreenOrientation" }

4649 }

50+ Component { name: "UnityDBusObject"; prototype: "QObject" }

4751}

plugins/Unity/Session/dbusunitysessionservice.cpp+60

@@ -35,6 +35,17 @@ void DBusUnitySessionService::Logout()

3535 Q_EMIT logoutReady();

3636}

3737

38+void DBusUnitySessionService::EndSession()

39+{

40+ QDBusConnection connection = QDBusConnection::sessionBus();

41+ QDBusInterface iface1 ("com.ubuntu.Upstart",

42+ "/com/ubuntu/Upstart",

43+ "com.ubuntu.Upstart0_6",

44+ connection);

45+

46+ iface1.call("EndSession");

47+}

48+

3849void DBusUnitySessionService::RequestLogout()

3950{

4051 Q_EMIT logoutRequested(false);

@@ -71,3 +82,52 @@ void DBusUnitySessionService::RequestShutdown()

7182{

7283 Q_EMIT shutdownRequested(false);

7384}

85+

86+enum class Action : unsigned

87+{

88+ LOGOUT = 0,

89+ SHUTDOWN,

90+ REBOOT,

91+ NONE

92+};

93+

94+DBusGnomeSessionManagerWrapper::DBusGnomeSessionManagerWrapper()

95+ : UnityDBusObject("/org/gnome/SessionManager/EndSessionDialog", "com.canonical.Unity")

96+{

97+}

98+

99+DBusGnomeSessionManagerWrapper::~DBusGnomeSessionManagerWrapper()

100+{

101+}

102+

103+void DBusGnomeSessionManagerWrapper::Open(const unsigned type, const unsigned arg_1, const unsigned max_wait, const QList<QDBusObjectPath> &inhibitors)

104+{

105+ Q_UNUSED(arg_1);

106+ Q_UNUSED(max_wait);

107+ Q_UNUSED(inhibitors);

108+

109+ QDBusConnection connection = QDBusConnection::sessionBus();

110+ QDBusInterface iface1 ("com.canonical.Unity",

111+ "/com/canonical/Unity/Session",

112+ "com.canonical.Unity.Session",

113+ connection);

114+

115+ Action action = (Action)type;

116+

117+ switch (action)

118+ {

119+ case Action::LOGOUT:

120+ iface1.call("RequestLogout");

121+ break;

122+

123+ case Action::REBOOT:

124+ iface1.call("RequestShutdown");

125+ break;

126+

127+ case Action::SHUTDOWN:

128+ break;

129+

130+ default:

131+ break;

132+ }

133+}

plugins/Unity/Session/dbusunitysessionservice.h+28−3

@@ -17,8 +17,13 @@

1717#ifndef DBUSUNITYSESSIONSERVICE_H

1818#define DBUSUNITYSESSIONSERVICE_H

1919

20+#include <QDBusObjectPath>

21+

2022#include "unitydbusobject.h"

2123

24+typedef QList<QDBusObjectPath> QDbusList;

25+Q_DECLARE_METATYPE(QList<QDBusObjectPath>)

26+

2227/**

2328 * DBusUnitySessionService provides com.canonical.Unity.Session dbus

2429 * interface.

@@ -39,6 +44,7 @@ public:

3944 Q_INVOKABLE void logout() { Logout(); }

4045 Q_INVOKABLE void reboot() { Reboot(); }

4146 Q_INVOKABLE void shutdown() { Shutdown(); }

47+ Q_INVOKABLE void endSession() { EndSession(); }

4248

4349Q_SIGNALS:

4450 /**

@@ -49,7 +55,7 @@ Q_SIGNALS:

4955 * @param have_inhibitors if there are any special running applications

5056 * which inhibit the logout.

5157 */

52− void logoutRequested(bool have_inhibitors);

58+ Q_SCRIPTABLE void logoutRequested(bool have_inhibitors);

5359

5460 /**

5561 * rebootRequested signal

@@ -59,7 +65,7 @@ Q_SIGNALS:

5965 * @param have_inhibitors if there are any special running applications

6066 * which inhibit the reboot.

6167 */

62− void rebootRequested(bool have_inhibitors);

68+ Q_SCRIPTABLE void rebootRequested(bool have_inhibitors);

6369

6470 /**

6571 * shutdownRequested signal

@@ -69,7 +75,7 @@ Q_SIGNALS:

6975 * @param have_inhibitors if there are any special running applications

7076 * which inhibit the shutdown.

7177 */

72− void shutdownRequested(bool have_inhibitors);

78+ Q_SCRIPTABLE void shutdownRequested(bool have_inhibitors);

7379

7480

7581 /**

@@ -139,6 +145,25 @@ public Q_SLOTS:

139145 */

140146 Q_SCRIPTABLE void RequestShutdown();

141147

148+ /**

149+ * Issue an EndSession request.

150+ *

151+ * This method calls the EndSession() Upstart DBus method on the

152+ * current DBus session bus.

153+ */

154+ Q_SCRIPTABLE void EndSession();

142155};

143156

157+class DBusGnomeSessionManagerWrapper : public UnityDBusObject

158+{

159+ Q_OBJECT

160+ Q_CLASSINFO("D-Bus Interface", "org.gnome.SessionManager.EndSessionDialog")

161+

162+public:

163+ DBusGnomeSessionManagerWrapper();

164+ ~DBusGnomeSessionManagerWrapper();

165+

166+public Q_SLOTS:

167+ Q_SCRIPTABLE void Open(const unsigned int type, const unsigned int arg_1, const unsigned int max_wait, const QList<QDBusObjectPath> &inhibitors);

168+};

144169#endif // DBUSUNITYSESSIONSERVICE_H

plugins/Unity/Session/plugin.cpp+1

@@ -26,6 +26,7 @@

2626

2727static QObject *dbusunitysessionservice_provider(QQmlEngine */*engine*/, QJSEngine */*jsEngine*/)

2828{

29+ new DBusGnomeSessionManagerWrapper();

2930 return new DBusUnitySessionService();

3031}

3132

plugins/Utils/CMakeLists.txt+5−5

@@ -1,6 +1,3 @@

1−# Dependencies

2−include(FindPkgConfig)

3−

41pkg_search_module(GIO REQUIRED gio-2.0)

63include_directories(

@@ -11,13 +8,16 @@ include_directories(

118)

129

1310set(QMLPLUGIN_SRC

11+ constants.cpp

12+ inputwatcher.cpp

1413 qlimitproxymodelqml.cpp

15− qsortfilterproxymodelqml.cpp

14+ unitysortfilterproxymodelqml.cpp

1615 relativetimeformatter.cpp

1716 timeformatter.cpp

1817 unitymenumodelpaths.cpp

1918 windowkeysfilter.cpp

2019 easingcurve.cpp

20+ windowstatestorage.cpp

2121 plugin.cpp

2222 )

2323

@@ -33,6 +33,6 @@ target_link_libraries(Utils-qml ${GIO_LDFLAGS})

3333# files directly in targets.

3434set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)

3535

36−qt5_use_modules(Utils-qml Qml Quick DBus Network Gui)

36+qt5_use_modules(Utils-qml Qml Quick DBus Network Gui Sql Concurrent)

3737

3838add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)

plugins/Utils/Utils.qmltypes+60−41

@@ -60,9 +60,49 @@ Module {

6060 Method { name: "invalidate" }

6161 }

6262 Component {

63− name: "QSortFilterProxyModelQML"

63+ name: "RelativeTimeFormatter"

64+ prototype: "TimeFormatter"

65+ exports: ["Utils/RelativeTimeFormatter 0.1"]

66+ exportMetaObjectRevisions: [0]

67+ }

68+ Component {

69+ name: "TimeFormatter"

70+ prototype: "QObject"

71+ exports: ["Utils/GDateTimeFormatter 0.1", "Utils/TimeFormatter 0.1"]

72+ exportMetaObjectRevisions: [0, 0]

73+ Property { name: "format"; type: "string" }

74+ Property { name: "timeString"; type: "string"; isReadonly: true }

75+ Property { name: "time"; type: "qlonglong" }

76+ Signal {

77+ name: "formatChanged"

78+ Parameter { name: "format"; type: "string" }

79+ }

80+ Signal {

81+ name: "timeStringChanged"

82+ Parameter { name: "timeString"; type: "string" }

83+ }

84+ Signal {

85+ name: "timeChanged"

86+ Parameter { name: "time"; type: "qlonglong" }

87+ }

88+ }

89+ Component {

90+ name: "UnityMenuModelPaths"

91+ prototype: "QObject"

92+ exports: ["Utils/UnityMenuModelPaths 0.1"]

93+ exportMetaObjectRevisions: [0]

94+ Property { name: "source"; type: "QVariant" }

95+ Property { name: "busName"; type: "QByteArray"; isReadonly: true }

96+ Property { name: "actions"; type: "QVariantMap"; isReadonly: true }

97+ Property { name: "menuObjectPath"; type: "QByteArray"; isReadonly: true }

98+ Property { name: "busNameHint"; type: "QByteArray" }

99+ Property { name: "actionsHint"; type: "QByteArray" }

100+ Property { name: "menuObjectPathHint"; type: "QByteArray" }

101+ }

102+ Component {

103+ name: "UnitySortFilterProxyModelQML"

64104 prototype: "QSortFilterProxyModel"

65− exports: ["Utils/SortFilterProxyModel 0.1"]

105+ exports: ["Utils/UnitySortFilterProxyModel 0.1"]

66106 exportMetaObjectRevisions: [0]

67107 Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }

68108 Property { name: "totalCount"; type: "int"; isReadonly: true }

@@ -107,50 +147,29 @@ Module {

107147 }

108148 }

109149 Component {

110− name: "RelativeTimeFormatter"

111− prototype: "TimeFormatter"

112− exports: ["Utils/RelativeTimeFormatter 0.1"]

150+ name: "WindowKeysFilter"

151+ defaultProperty: "data"

152+ prototype: "QQuickItem"

153+ exports: ["Utils/WindowKeysFilter 0.1"]

113154 exportMetaObjectRevisions: [0]

114155 }

115156 Component {

116− name: "TimeFormatter"

157+ name: "WindowStateStorage"

117158 prototype: "QObject"

118− exports: ["Utils/GDateTimeFormatter 0.1", "Utils/TimeFormatter 0.1"]

119− exportMetaObjectRevisions: [0, 0]

120− Property { name: "format"; type: "string" }

121− Property { name: "timeString"; type: "string"; isReadonly: true }

122− Property { name: "time"; type: "qlonglong" }

123− Signal {

124− name: "formatChanged"

125− Parameter { name: "format"; type: "string" }

126− }

127− Signal {

128− name: "timeStringChanged"

129− Parameter { name: "timeString"; type: "string" }

159+ exports: ["Utils/WindowStateStorage 0.1"]

160+ isCreatable: false

161+ isSingleton: true

162+ exportMetaObjectRevisions: [0]

163+ Method {

164+ name: "saveGeometry"

165+ Parameter { name: "windowId"; type: "string" }

166+ Parameter { name: "rect"; type: "QRect" }

130167 }

131− Signal {

132− name: "timeChanged"

133− Parameter { name: "time"; type: "qlonglong" }

168+ Method {

169+ name: "getGeometry"

170+ type: "QRect"

171+ Parameter { name: "windowId"; type: "string" }

172+ Parameter { name: "defaultValue"; type: "QRect" }

134173 }

135174 }

136− Component {

137− name: "UnityMenuModelPaths"

138− prototype: "QObject"

139− exports: ["Utils/UnityMenuModelPaths 0.1"]

140− exportMetaObjectRevisions: [0]

141− Property { name: "source"; type: "QVariant" }

142− Property { name: "busName"; type: "QByteArray"; isReadonly: true }

143− Property { name: "actions"; type: "QVariantMap"; isReadonly: true }

144− Property { name: "menuObjectPath"; type: "QByteArray"; isReadonly: true }

145− Property { name: "busNameHint"; type: "QByteArray" }

146− Property { name: "actionsHint"; type: "QByteArray" }

147− Property { name: "menuObjectPathHint"; type: "QByteArray" }

148− }

149− Component {

150− name: "WindowKeysFilter"

151− defaultProperty: "data"

152− prototype: "QQuickItem"

153− exports: ["Utils/WindowKeysFilter 0.1"]

154− exportMetaObjectRevisions: [0]

155− }

156175}

plugins/Utils/constants.cppnew file+27

@@ -0,0 +1,27 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+*/

16+

17+#include "constants.h"

18+

19+Constants::Constants(QObject *parent)

20+ : QObject(parent)

21+{

22+ if (qgetenv("QT_LOAD_TESTABILITY").isEmpty()) {

23+ m_indicatorValueTimeout = 30000;

24+ } else {

25+ m_indicatorValueTimeout = 5000;

26+ }

27+}

plugins/Utils/constants.hnew file+43

@@ -0,0 +1,43 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+*/

16+

17+#ifndef CONSTANTS_H

18+#define CONSTANTS_H

19+

20+#include <QObject>

21+

22+/**

23+ * @brief The Constants class

24+ *

25+ * This singleton class exposes contants to Qml

26+ *

27+ */

28+

29+class Constants: public QObject

30+{

31+ Q_OBJECT

32+ Q_PROPERTY(int indicatorValueTimeout READ indicatorValueTimeout CONSTANT)

33+

34+public:

35+ Constants(QObject *parent = 0);

36+

37+ int indicatorValueTimeout() const { return m_indicatorValueTimeout; }

38+

39+private:

40+ int m_indicatorValueTimeout;

41+};

42+

43+#endif

plugins/Utils/inputwatcher.cppnew file+118

@@ -0,0 +1,118 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ */

17+

18+#include "inputwatcher.h"

19+

20+#include <QMouseEvent>

21+

22+InputWatcher::InputWatcher(QObject *parent)

23+ : QObject(parent)

24+ , m_mousePressed(false)

25+ , m_touchPressed(false)

26+{

27+}

28+

29+QObject *InputWatcher::target() const

30+{

31+ return m_target;

32+}

33+

34+void InputWatcher::setTarget(QObject *value)

35+{

36+ if (m_target == value) {

37+ return;

38+ }

39+

40+ if (m_target) {

41+ m_target->removeEventFilter(this);

42+ }

43+

44+ setMousePressed(false);

45+ setTouchPressed(false);

46+

47+ m_target = value;

48+ if (m_target) {

49+ m_target->installEventFilter(this);

50+ }

51+

52+ Q_EMIT targetChanged(value);

53+}

54+

55+bool InputWatcher::targetPressed() const

56+{

57+ return m_mousePressed || m_touchPressed;

58+}

59+

60+bool InputWatcher::eventFilter(QObject* /*watched*/, QEvent *event)

61+{

62+ switch (event->type()) {

63+ case QEvent::TouchBegin:

64+ setTouchPressed(true);

65+ break;

66+ case QEvent::TouchEnd:

67+ setTouchPressed(false);

68+ break;

69+ case QEvent::MouseButtonPress:

70+ {

71+ QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);

72+ if (mouseEvent->button() == Qt::LeftButton) {

73+ setMousePressed(true);

74+ }

75+ }

76+ break;

77+ case QEvent::MouseButtonRelease:

78+ {

79+ QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);

80+ if (mouseEvent->button() == Qt::LeftButton) {

81+ setMousePressed(false);

82+ }

83+ }

84+ break;

85+ default:

86+ // Not interested

87+ break;

88+ }

89+

90+ // We never filter them out. We are just watching.

91+ return false;

92+}

93+

94+void InputWatcher::setMousePressed(bool value)

95+{

96+ if (value == m_mousePressed) {

97+ return;

98+ }

99+

100+ bool oldPressed = targetPressed();

101+ m_mousePressed = value;

102+ if (targetPressed() != oldPressed) {

103+ Q_EMIT targetPressedChanged(targetPressed());

104+ }

105+}

106+

107+void InputWatcher::setTouchPressed(bool value)

108+{

109+ if (value == m_touchPressed) {

110+ return;

111+ }

112+

113+ bool oldPressed = targetPressed();

114+ m_touchPressed = value;

115+ if (targetPressed() != oldPressed) {

116+ Q_EMIT targetPressedChanged(targetPressed());

117+ }

118+}

plugins/Utils/inputwatcher.hnew file+58

@@ -0,0 +1,58 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ */

17+

18+#ifndef UNITY_INPUTWATCHER_H

19+#define UNITY_INPUTWATCHER_H

20+

21+#include <QObject>

22+#include <QPointer>

23+

24+/*

25+ Monitors the target object for input events to figure out whether it's pressed

26+ or not.

27+ */

28+class InputWatcher : public QObject

29+{

30+ Q_OBJECT

31+ Q_PROPERTY(QObject* target READ target WRITE setTarget NOTIFY targetChanged)

32+

33+ // Whether the target object is pressed (by either touch or mouse)

34+ Q_PROPERTY(bool targetPressed READ targetPressed NOTIFY targetPressedChanged)

35+public:

36+ InputWatcher(QObject *parent = nullptr);

37+

38+ QObject *target() const;

39+ void setTarget(QObject *value);

40+

41+ bool targetPressed() const;

42+

43+ bool eventFilter(QObject *watched, QEvent *event) override;

44+

45+Q_SIGNALS:

46+ void targetChanged(QObject *value);

47+ void targetPressedChanged(bool value);

48+

49+private:

50+ void setMousePressed(bool value);

51+ void setTouchPressed(bool value);

52+

53+ bool m_mousePressed;

54+ bool m_touchPressed;

55+ QPointer<QObject> m_target;

56+};

57+

58+#endif // UNITY_INPUTWATCHER_H

plugins/Utils/plugin.cpp+22−2

@@ -26,26 +26,46 @@

2626#include "plugin.h"

2727

2828// local

29+#include "inputwatcher.h"

2930#include "qlimitproxymodelqml.h"

30−#include "qsortfilterproxymodelqml.h"

31+#include "unitysortfilterproxymodelqml.h"

3132#include "relativetimeformatter.h"

3233#include "timeformatter.h"

3334#include "unitymenumodelpaths.h"

3435#include "windowkeysfilter.h"

3536#include "easingcurve.h"

37+#include "windowstatestorage.h"

38+#include "constants.h"

39+

40+static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)

41+{

42+ Q_UNUSED(engine)

43+ Q_UNUSED(scriptEngine)

44+ return new WindowStateStorage();

45+}

46+

47+static QObject *createConstants(QQmlEngine *engine, QJSEngine *scriptEngine)

48+{

49+ Q_UNUSED(engine)

50+ Q_UNUSED(scriptEngine)

51+ return new Constants();

52+}

3653

3754void UtilsPlugin::registerTypes(const char *uri)

3855{

3956 Q_ASSERT(uri == QLatin1String("Utils"));

4057 qmlRegisterType<QAbstractItemModel>();

4158 qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");

42− qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");

59+ qmlRegisterType<UnitySortFilterProxyModelQML>(uri, 0, 1, "UnitySortFilterProxyModel");

4360 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");

4461 qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");

4562 qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");

4663 qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");

4764 qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");

4865 qmlRegisterType<RelativeTimeFormatter>(uri, 0, 1, "RelativeTimeFormatter");

66+ qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "WindowStateStorage", createWindowStateStorage);

67+ qmlRegisterType<InputWatcher>(uri, 0, 1, "InputWatcher");

68+ qmlRegisterSingletonType<Constants>(uri, 0, 1, "Constants", createConstants);

4969}

5070

5171void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

plugins/Utils/qsortfilterproxymodelqml.cpp → plugins/Utils/unitysortfilterproxymodelqml.cpprenamed+15−15

@@ -15,12 +15,12 @@

1515 */

1616

1717// self

18−#include "qsortfilterproxymodelqml.h"

18+#include "unitysortfilterproxymodelqml.h"

1919

2020// Qt

2121#include <QDebug>

2222

23−QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)

23+UnitySortFilterProxyModelQML::UnitySortFilterProxyModelQML(QObject *parent)

2424 : QSortFilterProxyModel(parent)

2525 , m_invertMatch(false)

2626{

@@ -32,7 +32,7 @@ QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)

3232/*

3333 * Enter row index of filtered/sorted model, returns row index of source model

3434 */

35−int QSortFilterProxyModelQML::mapRowToSource(int row)

35+int UnitySortFilterProxyModelQML::mapRowToSource(int row)

3636{

3737 if (sourceModel() == nullptr)

3838 return -1;

@@ -40,13 +40,13 @@ int QSortFilterProxyModelQML::mapRowToSource(int row)

4040 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();

4141}

4242

43−QHash<int, QByteArray> QSortFilterProxyModelQML::roleNames() const

43+QHash<int, QByteArray> UnitySortFilterProxyModelQML::roleNames() const

4444{

4545 return sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();

4646}

4747

4848void

49−QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)

49+UnitySortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)

5050{

5151 if (itemModel == nullptr) {

5252 return;

@@ -69,7 +69,7 @@ QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)

6969}

7070

7171QVariantMap

72−QSortFilterProxyModelQML::get(int row)

72+UnitySortFilterProxyModelQML::get(int row)

7373{

7474 QVariantMap res;

7575 const QHash<int, QByteArray> roles = roleNames();

@@ -81,7 +81,7 @@ QSortFilterProxyModelQML::get(int row)

8181}

8282

8383QVariant

84−QSortFilterProxyModelQML::data(int row, int role)

84+UnitySortFilterProxyModelQML::data(int row, int role)

8585{

8686 if (sourceModel() == nullptr) {

8787 return QVariant();

@@ -91,7 +91,7 @@ QSortFilterProxyModelQML::data(int row, int role)

9191}

9292

9393int

94−QSortFilterProxyModelQML::totalCount() const

94+UnitySortFilterProxyModelQML::totalCount() const

9595{

9696 if (sourceModel() != nullptr) {

9797 return sourceModel()->rowCount();

@@ -101,19 +101,19 @@ QSortFilterProxyModelQML::totalCount() const

101101}

102102

103103int

104−QSortFilterProxyModelQML::count()

104+UnitySortFilterProxyModelQML::count()

105105{

106106 return rowCount();

107107}

108108

109109bool

110−QSortFilterProxyModelQML::invertMatch() const

110+UnitySortFilterProxyModelQML::invertMatch() const

111111{

112112 return m_invertMatch;

113113}

114114

115115void

116−QSortFilterProxyModelQML::setInvertMatch(bool invertMatch)

116+UnitySortFilterProxyModelQML::setInvertMatch(bool invertMatch)

117117{

118118 if (invertMatch != m_invertMatch) {

119119 m_invertMatch = invertMatch;

@@ -123,7 +123,7 @@ QSortFilterProxyModelQML::setInvertMatch(bool invertMatch)

123123}

124124

125125bool

126−QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,

126+UnitySortFilterProxyModelQML::filterAcceptsRow(int sourceRow,

127127 const QModelIndex &sourceParent) const

128128{

129129 // If there's no regexp set, always accept all rows indepenently of the invertMatch setting

@@ -136,7 +136,7 @@ QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,

136136}

137137

138138int

139−QSortFilterProxyModelQML::findFirst(int role, const QVariant& value) const

139+UnitySortFilterProxyModelQML::findFirst(int role, const QVariant& value) const

140140{

141141 QModelIndexList matches = match(index(0, 0), role, value, 1, Qt::MatchExactly);

142142 if (!matches.isEmpty()) {

@@ -147,7 +147,7 @@ QSortFilterProxyModelQML::findFirst(int role, const QVariant& value) const

147147}

148148

149149int

150−QSortFilterProxyModelQML::mapFromSource(int row)

150+UnitySortFilterProxyModelQML::mapFromSource(int row)

151151{

152152 if (sourceModel() != nullptr) {

153153 return QSortFilterProxyModel::mapFromSource(sourceModel()->index(row, 0)).row();

@@ -157,7 +157,7 @@ QSortFilterProxyModelQML::mapFromSource(int row)

157157}

158158

159159int

160−QSortFilterProxyModelQML::mapToSource(int row)

160+UnitySortFilterProxyModelQML::mapToSource(int row)

161161{

162162 if (sourceModel() != nullptr) {

163163 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();

plugins/Utils/qsortfilterproxymodelqml.h → plugins/Utils/unitysortfilterproxymodelqml.hrenamed+5−5

@@ -14,12 +14,12 @@

1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.

1515 */

1616

17−#ifndef QSORTFILTERPROXYMODELQML_H

18−#define QSORTFILTERPROXYMODELQML_H

17+#ifndef UNITYSORTFILTERPROXYMODELQML_H

18+#define UNITYSORTFILTERPROXYMODELQML_H

1919

2020#include <QSortFilterProxyModel>

2121

22−class QSortFilterProxyModelQML : public QSortFilterProxyModel

22+class UnitySortFilterProxyModelQML : public QSortFilterProxyModel

2323{

2424 Q_OBJECT

2525

@@ -29,7 +29,7 @@ class QSortFilterProxyModelQML : public QSortFilterProxyModel

2929 Q_PROPERTY(bool invertMatch READ invertMatch WRITE setInvertMatch NOTIFY invertMatchChanged)

3030

3131public:

32− explicit QSortFilterProxyModelQML(QObject *parent = 0);

32+ explicit UnitySortFilterProxyModelQML(QObject *parent = 0);

3333

3434 Q_INVOKABLE QVariantMap get(int row); // Use with caution, it can be slow to query all the roles

3535 Q_INVOKABLE QVariant data(int row, int role);

@@ -60,4 +60,4 @@ private:

6060 bool m_invertMatch;

6161};

6262

63−#endif // QSORTFILTERPROXYMODELQML_H

63+#endif // UNITYSORTFILTERPROXYMODELQML_H

plugins/Utils/windowstatestorage.cppnew file+117

@@ -0,0 +1,117 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "windowstatestorage.h"

18+

19+#include <QtConcurrent>

20+#include <QDebug>

21+#include <QFutureSynchronizer>

22+#include <QSqlQuery>

23+#include <QSqlError>

24+#include <QSqlResult>

25+#include <QRect>

26+

27+QMutex WindowStateStorage::s_mutex;

28+

29+WindowStateStorage::WindowStateStorage(QObject *parent):

30+ QObject(parent)

31+{

32+ QString dbPath = QDir::homePath() + "/.cache/unity8/";

33+ m_db = QSqlDatabase::addDatabase("QSQLITE");

34+ QDir dir;

35+ dir.mkpath(dbPath);

36+ m_db.setDatabaseName(dbPath + "windowstatestorage.sqlite");

37+ initdb();

38+}

39+

40+WindowStateStorage::~WindowStateStorage()

41+{

42+ QFutureSynchronizer<void> futureSync;

43+ for (int i = 0; i < m_asyncQueries.count(); ++i) {

44+ futureSync.addFuture(m_asyncQueries[i]);

45+ }

46+ futureSync.waitForFinished();

47+ m_db.close();

48+}

49+

50+void WindowStateStorage::saveGeometry(const QString &windowId, const QRect &rect)

51+{

52+ QMutexLocker mutexLocker(&s_mutex);

53+

54+ QString queryString = QString("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")

55+ .arg(windowId)

56+ .arg(rect.x())

57+ .arg(rect.y())

58+ .arg(rect.width())

59+ .arg(rect.height());

60+

61+ QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);

62+ m_asyncQueries.append(future);

63+

64+ QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();

65+ futureWatcher->setFuture(future);

66+ connect(futureWatcher, &QFutureWatcher<void>::finished,

67+ this,

68+ [=](){ m_asyncQueries.removeAll(futureWatcher->future());

69+ futureWatcher->deleteLater(); });

70+}

71+

72+void WindowStateStorage::executeAsyncQuery(const QString &queryString)

73+{

74+ QMutexLocker l(&s_mutex);

75+ QSqlQuery query;

76+

77+ bool ok = query.exec(queryString);

78+ if (!ok) {

79+ qWarning() << "Error executing query" << queryString

80+ << "Driver error:" << query.lastError().driverText()

81+ << "Database error:" << query.lastError().databaseText();

82+ }

83+}

84+

85+QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue)

86+{

87+ QMutexLocker l(&s_mutex);

88+ QString queryString = QString("SELECT * FROM geometry WHERE windowId = '%1';")

89+ .arg(windowId);

90+ QSqlQuery query;

91+

92+ bool ok = query.exec(queryString);

93+ if (!ok) {

94+ qWarning() << "Error retrieving window state for" << windowId

95+ << "Driver error:" << query.lastError().driverText()

96+ << "Database error:" << query.lastError().databaseText();

97+ return defaultValue;

98+ }

99+ if (!query.first()) {

100+ return defaultValue;

101+ }

102+ return QRect(query.value("x").toInt(), query.value("y").toInt(), query.value("width").toInt(), query.value("height").toInt());

103+}

104+

105+void WindowStateStorage::initdb()

106+{

107+ m_db.open();

108+ if (!m_db.open()) {

109+ qWarning() << "Error opening state database:" << m_db.lastError().driverText() << m_db.lastError().databaseText();

110+ return;

111+ }

112+

113+ if (!m_db.tables().contains("geometry")) {

114+ QSqlQuery query;

115+ query.exec("CREATE TABLE geometry(windowId TEXT UNIQUE, x INTEGER, y INTEGER, width INTEGER, height INTEGER);");

116+ }

117+}

plugins/Utils/windowstatestorage.hnew file+42

@@ -0,0 +1,42 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include <QObject>

18+#include <QSqlDatabase>

19+#include <QMutex>

20+#include <QFuture>

21+

22+class WindowStateStorage: public QObject

23+{

24+ Q_OBJECT

25+public:

26+ WindowStateStorage(QObject *parent = 0);

27+ virtual ~WindowStateStorage();

28+

29+ Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);

30+ Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue);

31+

32+private:

33+ void initdb();

34+

35+ static void executeAsyncQuery(const QString &queryString);

36+ static QMutex s_mutex;

37+

38+ // NB: This is accessed from threads. Make sure to mutex it.

39+ QSqlDatabase m_db;

40+

41+ QList< QFuture<void> > m_asyncQueries;

42+};

plugins/Wizard/Wizard.qmltypes−3

@@ -11,8 +11,6 @@ Module {

1111 name: "PageList"

1212 prototype: "QObject"

1313 exports: ["Wizard/PageList 0.1"]

14− isCreatable: false

15− isSingleton: true

1614 exportMetaObjectRevisions: [0]

1715 Property { name: "index"; type: "int"; isReadonly: true }

1816 Property { name: "numPages"; type: "int"; isReadonly: true }

@@ -33,4 +31,3 @@ Module {

3331 }

3432 }

3533}

36−

po/am.po+321−186

@@ -7,18 +7,18 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-06 00:53+0000\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-03-19 23:16+0000\n"

1212"Last-Translator: samson <Unknown>\n"

1313"Language-Team: Amharic <am@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr "የ መግቢያ ቃል: "

2424

@@ -31,64 +31,91 @@ msgstr "አቋራጭ ማጣበቂያ"

3131msgid "Unpin shortcut"

3232msgstr "አቋራጭ መለያያ"

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr "አካሉ ተቆልፏል"

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ሀረግ ለማስገባት በ መሞከር ምክንያት ስልኩ ተቆልፏል"

4141

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

4343msgid "You have been locked out due to too many failed passcode attempts."

4444msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ኮድ ለማስገባት በ መሞከር ምክንያት ስልኩ ተቆልፏል"

4545

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

4747#, qt-format

4848msgid "Please wait %1 minute and then try again…"

4949msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] "እባክዎን ይቆዩ %1 ደቂቃ እና ከዛ እንደ ገና ይምክሩ…"

5151msgstr[1] "እባክዎን ይቆዩ %1 ደቂቃዎች እና ከዛ እንደ ገና ይምክሩ…"

5252

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

5455msgid "Log out"

5556msgstr "መውጫ"

5657

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

5859msgid "Are you sure you want to log out?"

5960msgstr "በእርግጥ መውጣት ይፈልጋሉ?"

6061

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:122

63−msgid "No"

64−msgstr "አይ"

62+#: qml/Components/Dialogs.qml:70

63+msgctxt "Button: Lock the system"

64+msgid "Lock"

65+msgstr "መቆለፊያ"

6566

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:129

68−msgid "Yes"

69−msgstr "አዎ"

67+#: qml/Components/Dialogs.qml:77

68+msgctxt "Button: Log out from the system"

69+msgid "Log Out"

70+msgstr "መውጫ"

71+

72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

73+#: qml/Components/Dialogs.qml:171

74+msgid "Cancel"

75+msgstr "መሰረዣ"

7076

71−#: qml/Components/Dialogs.qml:94

77+#: qml/Components/Dialogs.qml:96

78+msgctxt "Title: Reboot/Shut down dialog"

7279msgid "Shut down"

7380msgstr "ማጥፊያ"

7481

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

7683msgid "Are you sure you want to shut down?"

7784msgstr "በእርግጥ ማጥፋት ይፈልጋሉ?"

7885

79−#: qml/Components/Dialogs.qml:119

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

88+msgid "Reboot"

89+msgstr "እንደገና ማስነሻ"

90+

91+#: qml/Components/Dialogs.qml:107

92+msgctxt "Button: Shut down the system"

93+msgid "Shut down"

94+msgstr "ማጥፊያ"

95+

96+#: qml/Components/Dialogs.qml:127

97+msgctxt "Title: Reboot dialog"

8098msgid "Reboot"

8199msgstr "እንደገና ማስነሻ"

82100

83−#: qml/Components/Dialogs.qml:120

101+#: qml/Components/Dialogs.qml:128

84102msgid "Are you sure you want to reboot?"

85103msgstr "በእርግጥ እንደገና ማስነሳት ይፈልጋሉ?"

86104

87−#: qml/Components/Dialogs.qml:144

105+#: qml/Components/Dialogs.qml:130

106+msgid "No"

107+msgstr "አይ"

108+

109+#: qml/Components/Dialogs.qml:136

110+msgid "Yes"

111+msgstr "አዎ"

112+

113+#: qml/Components/Dialogs.qml:150

114+msgctxt "Title: Power off/Restart dialog"

88115msgid "Power"

89116msgstr "ሐይል"

90117

91−#: qml/Components/Dialogs.qml:145

118+#: qml/Components/Dialogs.qml:151

92119msgid ""

93120"Are you sure you would like\n"

94121"to power off?"

@@ -96,65 +123,16 @@ msgstr ""

96123"በእርግጥ ሐይሉን ማጥፋት\n"

97124"ይፈልጋሉ?"

98125

99−#: qml/Components/Dialogs.qml:147

126+#: qml/Components/Dialogs.qml:153

127+msgctxt "Button: Power off the system"

100128msgid "Power off"

101−msgstr "ማጥፊያ"

129+msgstr "ሐይል ማጥፊያ"

102130

103−#: qml/Components/Dialogs.qml:157

131+#: qml/Components/Dialogs.qml:162

132+msgctxt "Button: Restart the system"

104133msgid "Restart"

105134msgstr "እንደገና ማስጀመሪያ"

106135

107−#: qml/Components/Dialogs.qml:167

108−msgid "Cancel"

109−msgstr "መሰረዣ"

110−

111−#: qml/Components/EdgeDemoOverlay.qml:151

112−msgid "Skip intro"

113−msgstr "መግቢያውን መዝለያ"

114−

115−#: qml/Components/EdgeDemo.qml:125

116−msgid "Right edge"

117−msgstr "የቀኝ ጠርዝ"

118−

119−#: qml/Components/EdgeDemo.qml:126

120−msgid "Try swiping from the right edge to unlock the phone"

121−msgstr "ስልኩን ለመክፈት ከ ቀኝ ጠርዝ በኩል ወደ ግራ ይጥረጉ"

122−

123−#: qml/Components/EdgeDemo.qml:157

124−msgid "Top edge"

125−msgstr "የላይ ጠርዝ"

126−

127−#: qml/Components/EdgeDemo.qml:158

128−msgid "Try swiping from the top edge to access the indicators"

129−msgstr "ጠቋሚዎች ጋር ለመድረስ ከ ላይ ጠርዝ በኩል ወደ ታች ይጥረጉ"

130−

131−#: qml/Components/EdgeDemo.qml:183

132−msgid "Close"

133−msgstr "መዝጊያ"

134−

135−#: qml/Components/EdgeDemo.qml:184

136−msgid "Swipe up again to close the settings screen"

137−msgstr "የማሰናጃውን መመልከቻ ለመዝጋት እንደገና ወደ ላይ ይጥረጉ"

138−

139−#: qml/Components/EdgeDemo.qml:214

140−msgid "Left edge"

141−msgstr "የግራ ጠርዝ"

142−

143−#: qml/Components/EdgeDemo.qml:215

144−msgid "Swipe from the left to reveal the launcher for quick access to apps"

145−msgstr "ከ ግራ በኩል ወደ ቀኝ ይጥረጉ በፍጥነት መተግበሪያዎች ጋር ለመድረስ እና ለማስጀመር"

146−

147−#: qml/Components/EdgeDemo.qml:242

148−msgid "Well done"

149−msgstr "ጥሩ አድረገዋል"

150−

151−#: qml/Components/EdgeDemo.qml:243

152−msgid ""

153−"You have now mastered the edge gestures and can start using the "

154−"phone Tap on the screen to start"

155−msgstr ""

156−"አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም መመልከቻውን መታ ያድርጉ ለመጀመር"

157−

158136#: qml/Components/Lockscreen.qml:238

159137msgid "Return to Call"

160138msgstr "ወደ ጥሪ መመለሻ"

@@ -167,32 +145,39 @@ msgstr "የ ድንገተኛ ጥሪ"

167145msgid "OK"

168146msgstr "እሺ"

169147

170−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

148+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

171149msgid "See less"

172150msgstr "አነስተኛ መመልከቻ"

173151

174−#: qml/Dash/GenericScopeView.qml:431

152+#: qml/Dash/GenericScopeView.qml:533

175153msgid "See all"

176154msgstr "ሁሉንም መመልከቻ"

177155

178−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

179−#: qml/Panel/SearchIndicator.qml:27

156+#: qml/Dash/GenericScopeView.qml:595

157+msgctxt "Label: Hint for dash search line edit"

180158msgid "Search"

181159msgstr "መፈለጊያ"

182160

183−#: qml/Dash/PageHeader.qml:260

161+#: qml/Dash/PageHeader.qml:269

162+msgctxt "Button: Open the Ubuntu Store"

184163msgid "Store"

185164msgstr "ማስቀመጫ"

186165

187−#: qml/Dash/PageHeader.qml:277

166+#: qml/Dash/PageHeader.qml:276

167+msgctxt "Button: Start a search in the current dash scope"

168+msgid "Search"

169+msgstr "መፈለጊያ"

170+

171+#: qml/Dash/PageHeader.qml:286

172+msgctxt "Button: Show the current dash scope settings"

188173msgid "Settings"

189−msgstr "ማሰናጃ"

174+msgstr "ማሰናጃዎች"

190175

191−#: qml/Dash/PageHeader.qml:284

176+#: qml/Dash/PageHeader.qml:293

192177msgid "Remove from Favorites"

193178msgstr "ከምወዳቸው ማስወገጃ"

194179

195−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

196181msgid "Add to Favorites"

197182msgstr "ወደምወዳቸው መጨመሪያ"

198183

@@ -224,22 +209,92 @@ msgstr "ይሳቡ ለማነቃቃት…"

224209msgid "Release to refresh…"

225210msgstr "ይልቀቁ ለማነቃቃት…"

226211

227−#: qml/Dash/ScopesList.qml:63

212+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

213+msgid "Enable location data"

214+msgstr "የአካባቢ ዳታ ማስቻያ"

215+

216+#: qml/Dash/ScopesList.qml:66

228217msgid "Manage"

229−msgstr ""

218+msgstr "አስተዳዳሪ"

230219

231−#: qml/Dash/ScopesList.qml:107

220+#: qml/Dash/ScopesList.qml:112

232221msgid "Home"

233−msgstr ""

222+msgstr "ቤት"

234223

235−#: qml/Dash/ScopesList.qml:108

224+#: qml/Dash/ScopesList.qml:113

236225msgid "Also installed"

237−msgstr ""

226+msgstr "እንዲሁም የተገጠሙ"

238227

239−#: qml/Greeter/Greeter.qml:174

228+#: qml/Greeter/CoverPage.qml:107

240229msgid "Unlock"

241230msgstr "መክፈቻ"

242231

232+#: qml/Greeter/LoginList.qml:236

233+msgid "Retry"

234+msgstr "እንደገና ይሞክሩ"

235+

236+#: qml/Greeter/LoginList.qml:237

237+msgid "Tap to unlock"

238+msgstr "ለመክፈት መታ ያድርጉ"

239+

240+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

241+msgid "Sorry, incorrect passphrase."

242+msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"

243+

244+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

245+msgid "Sorry, incorrect passcode."

246+msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"

247+

248+#: qml/Greeter/NarrowView.qml:55

249+msgid "This will be your last attempt."

250+msgstr "ይህ የመጨረሻ ሙከራዎ ነው"

251+

252+#: qml/Greeter/NarrowView.qml:57

253+msgid ""

254+"If passphrase is entered incorrectly, your phone will conduct a factory "

255+"reset and all personal data will be deleted."

256+msgstr ""

257+"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

258+"ይጠፋል"

259+

260+#: qml/Greeter/NarrowView.qml:58

261+msgid ""

262+"If passcode is entered incorrectly, your phone will conduct a factory reset "

263+"and all personal data will be deleted."

264+msgstr ""

265+"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

266+"ይጠፋል"

267+

268+#: qml/Greeter/NarrowView.qml:115

269+#, qt-format

270+msgid "Enter %1"

271+msgstr "ማስገቢያ %1"

272+

273+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

274+msgid "Enter passphrase"

275+msgstr "የ ማለፊያ ሀረግ ያስገቡ"

276+

277+#: qml/Greeter/NarrowView.qml:117

278+msgid "Enter passcode"

279+msgstr "የ ማለፊያ ኮድ ያስገቡ"

280+

281+#: qml/Greeter/NarrowView.qml:118

282+#, qt-format

283+msgid "Sorry, incorrect %1"

284+msgstr "አዝናለሁ: የተሳሳተ%1"

285+

286+#: qml/Greeter/NarrowView.qml:119

287+msgid "Sorry, incorrect passphrase"

288+msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"

289+

290+#: qml/Greeter/NarrowView.qml:120

291+msgid "Please re-enter"

292+msgstr "እባክዎን እንደገና-ያስገቡ"

293+

294+#: qml/Greeter/NarrowView.qml:121

295+msgid "Sorry, incorrect passcode"

296+msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"

297+

243298#: qml/Notifications/NotificationMenuItemFactory.qml:128

244299msgid "Show password"

245300msgstr "የመግቢያ ቃል ማሳያ"

@@ -280,6 +335,11 @@ msgstr "ጨርሷል"

280335msgid "Failed, tap to retry"

281336msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"

282337

338+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

339+msgctxt "Label: Hint in message indicator line edit"

340+msgid "Reply"

341+msgstr "መመለሻ"

342+

283343#: qml/Panel/Indicators/ModemInfoItem.qml:105

284344msgid "Unlock SIM"

285345msgstr "ሲም መክፈቻ"

@@ -288,240 +348,256 @@ msgstr "ሲም መክፈቻ"

288348msgid "Roaming"

289349msgstr "ማዘዋወሪያ"

290350

291−#: qml/Shell.qml:367

292−#, qt-format

293−msgid "Enter %1"

294−msgstr "ማስገቢያ %1"

351+#: qml/Tutorial/TutorialBottomFinish.qml:24

352+msgid "This action does different things for different apps"

353+msgstr "ይህ ተግባር ለተለያዩ መተግበሪያዎች የተለያየ ነገር ይሰራል"

295354

296−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

297−msgid "Enter passphrase"

298−msgstr "የ ማለፊያ ሀረግ ያስገቡ"

355+#: qml/Tutorial/TutorialBottomFinish.qml:25

356+msgid "Tap here to finish."

357+msgstr "እዚህ መታ ይድርጉ ለመጨረስ"

299358

300−#: qml/Shell.qml:369

301−msgid "Enter passcode"

302−msgstr "የ ማለፊያ ኮድ ያስገቡ"

359+#: qml/Tutorial/TutorialBottom.qml:28

360+msgid "Open special menus"

361+msgstr "የተለዩ ዝርዝሮች መክፈቻ"

303362

304−#: qml/Shell.qml:370

305−#, qt-format

306−msgid "Sorry, incorrect %1"

307−msgstr "አዝናለሁ: የተሳሳተ%1"

363+#: qml/Tutorial/TutorialBottom.qml:29

364+msgid "Swipe up from the bottom edge."

365+msgstr "ከ ታች ጠርዝ በኩል ወደ ላይ ይጥረጉ"

308366

309−#: qml/Shell.qml:371

310−msgid "Sorry, incorrect passphrase"

311−msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"

367+#: qml/Tutorial/TutorialLeftFinish.qml:24

368+msgid "These are the shortcuts to favorite apps"

369+msgstr "እነዚህ አቋራጮች ናቸው እርስዎ ለሚወዷቸው መተግበሪያዎች"

312370

313−#: qml/Shell.qml:372

314−msgid "Please re-enter"

315−msgstr "እባክዎን እንደገና-ያስገቡ"

371+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

372+msgid "Tap here to continue."

373+msgstr "እዚህ መታ ይድርጉ ለመቀጠል"

316374

317−#: qml/Shell.qml:373

318−msgid "Sorry, incorrect passcode"

319−msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"

375+#: qml/Tutorial/TutorialLeft.qml:26

376+msgid "Open the launcher"

377+msgstr "ማስጀመሪያውን መክፈቻ"

320378

321−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

322−msgid "Sorry, incorrect passphrase."

323−msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"

379+#: qml/Tutorial/TutorialLeft.qml:27

380+msgid "Short swipe from the left edge."

381+msgstr "ከ ግራ ጠርዝ በኩል በትንሹ ይጥረጉ"

324382

325−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

326−msgid "Sorry, incorrect passcode."

327−msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"

383+#: qml/Tutorial/TutorialPage.qml:178

384+msgid "You almost got it!"

385+msgstr "እርስዎ አሁን እያገኙት ነው!"

328386

329−#: qml/Shell.qml:469

330−msgid "This will be your last attempt."

331−msgstr "ይህ የመጨረሻ ሙከራዎ ነው"

387+#: qml/Tutorial/TutorialPage.qml:195

388+msgid "Try again."

389+msgstr "እንደገና ይሞክሩ"

332390

333−#: qml/Shell.qml:471

334−msgid ""

335−"If passphrase is entered incorrectly, your phone will conduct a factory "

336−"reset and all personal data will be deleted."

337−msgstr ""

338−"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

339−"ይጠፋል"

391+#: qml/Tutorial/TutorialRight.qml:31

392+msgid "To view open apps"

393+msgstr "ለመመልከት መተግበሪያዎች ይክፈቱ"

340394

341−#: qml/Shell.qml:472

342−msgid ""

343−"If passcode is entered incorrectly, your phone will conduct a factory reset "

344−"and all personal data will be deleted."

345−msgstr ""

346−"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

347−"ይጠፋል"

395+#: qml/Tutorial/TutorialRight.qml:32

396+msgid "Long swipe from the right edge."

397+msgstr "ከ ቀኝ ጠርዝ በኩል በረጅሙ ይጥረጉ"

398+

399+#: qml/Tutorial/TutorialRight.qml:122

400+msgid "View all your running tasks."

401+msgstr "እርስዎ የሚያስኬዱትን ተግባሮች በሙሉ መመልከቻ"

348402

349403#: qml/Wizard/Page.qml:89

404+msgctxt "Button: Go back one page in the Wizard"

350405msgid "Back"

351−msgstr ""

406+msgstr "ወደ ኋላ"

352407

353408#: qml/Wizard/Pages/10-welcome.qml:27

354409msgid "Hi!"

355−msgstr ""

410+msgstr "ሰላም"

356411

357412#: qml/Wizard/Pages/10-welcome.qml:44

358413msgid "Welcome to your Ubuntu phone."

359−msgstr ""

414+msgstr "እንኳን ደህና መጡ ወደ እርስዎ ኡቡንቱ ስልክ"

360415

361416#: qml/Wizard/Pages/10-welcome.qml:52

362417msgid "Let’s get started."

363−msgstr ""

418+msgstr "ስራ እንጀምር"

364419

365420#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

366−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

421+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

367422#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

368423#: qml/Wizard/Pages/passwd-set.qml:90

369424msgid "Continue"

370−msgstr ""

425+msgstr "ይቀጥሉ"

371426

372427#: qml/Wizard/Pages/20-sim.qml:25

373428msgid "Add a SIM card and restart your device"

374−msgstr ""

429+msgstr "የ ሲም ካርድ ይጨምሩ እና አካሉን እንደገና ያስነሱ"

375430

376−#: qml/Wizard/Pages/20-sim.qml:55

431+#: qml/Wizard/Pages/20-sim.qml:59

377432msgid "Without it, you won’t be able to make calls or use text messaging."

378−msgstr ""

433+msgstr "ያለ እሱ ጥሪ መፈጸም ወይንም የ ጽሁፍ መልእክት መላክ አይችሉም"

379434

380−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

435+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

381436msgid "Skip"

382−msgstr ""

437+msgstr "መዝለያ"

383438

384439#: qml/Wizard/Pages/30-passwd-type.qml:39

385440msgid "Lock security"

386−msgstr ""

441+msgstr "ደህንነት መቆለፊያ"

387442

388443#: qml/Wizard/Pages/30-passwd-type.qml:74

389444msgid "Please select how you’d like to unlock your phone."

390−msgstr ""

445+msgstr "እባክዎን የ እርስዎን ስልክ እንዴት እንደሚከፍቱ ይምረጡ"

391446

392447#: qml/Wizard/Pages/30-passwd-type.qml:97

448+msgctxt "Label: Type of security method"

393449msgid "Swipe"

394−msgstr ""

450+msgstr "መጥረጊያ"

395451

396452#: qml/Wizard/Pages/30-passwd-type.qml:98

453+msgctxt "Label: Description of security method"

397454msgid "No security"

398−msgstr ""

455+msgstr "ደህንነት አልተገኘም"

399456

400457#: qml/Wizard/Pages/30-passwd-type.qml:100

458+msgctxt "Label: Type of security method"

401459msgid "Passcode"

402−msgstr ""

460+msgstr "ማለፊያ ኮድ"

403461

404462#: qml/Wizard/Pages/30-passwd-type.qml:101

463+msgctxt "Label: Description of security method"

405464msgid "4 digits only"

406−msgstr ""

465+msgstr "4 ዲጂት ብቻ"

407466

408467#: qml/Wizard/Pages/30-passwd-type.qml:103

468+msgctxt "Label: Type of security method"

409469msgid "Passphrase"

410−msgstr ""

470+msgstr "የማለፊያ ሐረግ"

411471

412472#: qml/Wizard/Pages/30-passwd-type.qml:104

473+msgctxt "Label: Description of security method"

413474msgid "Numbers and letters"

414−msgstr ""

475+msgstr "ቁጥሮች እና ፊደሎች"

415476

416−#: qml/Wizard/Pages/40-wifi.qml:28

477+#: qml/Wizard/Pages/40-wifi.qml:29

417478msgid "Connect to Wi‑Fi"

418−msgstr ""

479+msgstr "ወደ ዋይ‑ፋይ መገናኛ"

419480

420−#: qml/Wizard/Pages/40-wifi.qml:147

481+#: qml/Wizard/Pages/40-wifi.qml:168

421482msgid "Available networks…"

422−msgstr ""

483+msgstr "ዝግጁ ኔትዎርኮች…"

423484

424−#: qml/Wizard/Pages/40-wifi.qml:148

485+#: qml/Wizard/Pages/40-wifi.qml:169

425486msgid "No available networks."

426−msgstr ""

487+msgstr "ዝግጁ ኔትዎርኮች አልተገኙም"

427488

428489#: qml/Wizard/Pages/50-location.qml:27

429490msgid "Location"

430−msgstr ""

491+msgstr "አካባቢ"

431492

432493#: qml/Wizard/Pages/50-location.qml:62

433494msgid "Let the phone detect your location:"

434−msgstr ""

495+msgstr "እባክዎን እርስዎ ያሉበትን አካባቢ ስልኩ እራሱ ይፈልግ:"

435496

436497#: qml/Wizard/Pages/50-location.qml:69

437498msgid "Using GPS only (less accurate)"

438−msgstr ""

499+msgstr "ጂፒኤስን ብቻ መጠቀሚያ(በጣም ቅርብ)"

439500

440501#: qml/Wizard/Pages/50-location.qml:86

441502msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

442−msgstr ""

503+msgstr "ይጠቀሙ ጂፒኤስ ግልጽ ያልሆነ ዋይ-ፋይ እና ተንቀሳቃሽ ኔትዎርክ መረጃ (ይመከራሉ)"

443504

444505#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

445506#: qml/Wizard/Pages/50-location.qml:103

446507msgid ""

447508"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

448509"conditions</a>."

449−msgstr ""

510+msgstr "ይህን ምርጫ በመምረጥ ተስማምቻለሁ ከ Nokia HERE <a href='#'>ውሎች እና ሁኔታዎች ጋር</a>."

450511

451512#: qml/Wizard/Pages/50-location.qml:112

452513msgid "Not at all"

453−msgstr ""

514+msgstr "አይደለም"

454515

455516#: qml/Wizard/Pages/50-location.qml:124

456517msgid "You can change your mind later in System Settings."

457−msgstr ""

518+msgstr "እርስዎ በኋላ መቀየር ይችላሉ ከ ስርአት ማሰናጃዎች."

458519

459520#: qml/Wizard/Pages/60-reporting.qml:24

460521msgid "Improving your experience"

461−msgstr ""

522+msgstr "የ እርስዎን ልምምድ ማሻሻያ"

462523

463524#: qml/Wizard/Pages/60-reporting.qml:36

464525msgid ""

465526"Your phone is set up to automatically report errors to Canonical and its "

466527"partners, the makers of the operating system."

467528msgstr ""

529+"የ እርስዎ ስልክ ራሱ በራሱ የ ስህተት መግለጫዎች ወደ Canonical and its partners, የ መስሪያ ስርአት "

530+"አምራቾች"

468531

469532#: qml/Wizard/Pages/60-reporting.qml:43

470533msgid ""

471534"This can be disabled in System Settings under Security & "

472535"Privacy"

473536msgstr ""

537+"ይህን ግልጋሎት ማሰናከል ይችላሉ ከ ስርአት ማሰናጃዎች under Security & Privacy"

474538

475539#: qml/Wizard/Pages/80-finished.qml:24

476540msgid "All done"

477−msgstr ""

541+msgstr "ሁሉም ተፈጽሟል"

478542

479543#: qml/Wizard/Pages/80-finished.qml:39

480544msgid "Nice work!"

481−msgstr ""

545+msgstr "ጥሩ ሰርተዋል!"

482546

483547#: qml/Wizard/Pages/80-finished.qml:46

484548msgid "Your phone is now ready to use."

485−msgstr ""

549+msgstr "ስልኩ አሁን ለመጠቀም ዝግጁ ነው"

486550

487551#: qml/Wizard/Pages/80-finished.qml:53

488552msgid "Finish"

489−msgstr ""

553+msgstr "መጨረሻ"

490554

491555#: qml/Wizard/Pages/here-terms.qml:27

492556msgid "Terms & Conditions"

493−msgstr ""

557+msgstr "ውሎች & ሁኔታዎች"

494558

495559#: qml/Wizard/Pages/passwd-confirm.qml:49

496560msgid "Confirm passphrase"

497−msgstr ""

561+msgstr "የ ማለፊያ ሐረግ ማረጋገጫ"

498562

499563#: qml/Wizard/Pages/passwd-confirm.qml:50

500564msgid "Confirm passcode"

501−msgstr ""

565+msgstr "የማለፊያ ኮድ ማረጋገጫ"

502566

503567#: qml/Wizard/Pages/passwd-confirm.qml:53

504568#: qml/Wizard/Pages/passwd-confirm.qml:54

505569msgid "Please try again."

506−msgstr ""

570+msgstr "እባክዎን እንደገና ይሞክሩ"

507571

508572#: qml/Wizard/Pages/passwd-set.qml:61

509573msgid "Choose your passcode"

510−msgstr ""

574+msgstr "የ እርስዎን የማለፊያ ኮድ ይምረጡ"

511575

512576#: qml/Wizard/Pages/passwd-set.qml:68

513577msgid "Passphrase must be 4 characters long"

514−msgstr ""

578+msgstr "የ ማለፊያ ሀረግ ቢያንስ 4 ባህሪዎች መሆን አለበት"

515579

516580#: qml/Wizard/StackButton.qml:39

517581#, qt-format

518582msgid "〈 %1"

519−msgstr ""

583+msgstr "〈 %1"

520584

521585#: qml/Wizard/StackButton.qml:42

522586#, qt-format

523587msgid "%1 〉"

524−msgstr ""

588+msgstr "%1 〉"

589+

590+#~ msgid "Top edge"

591+#~ msgstr "የላይ ጠርዝ"

592+

593+#~ msgid "Close"

594+#~ msgstr "መዝጊያ"

595+

596+#~ msgid "Left edge"

597+#~ msgstr "የግራ ጠርዝ"

598+

599+#~ msgid "Right edge"

600+#~ msgstr "የቀኝ ጠርዝ"

525601

526602#~ msgid "Type or say a command"

527603#~ msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"

@@ -538,14 +614,73 @@ msgstr ""

538614#~ msgid "Confirm"

539615#~ msgstr "ማረጋገጫ"

540616

617+#~ msgid "Search"

618+#~ msgstr "መፈለጊያ"

619+

620+#~ msgid "Skip intro"

621+#~ msgstr "መግቢያውን መዝለያ"

622+

623+#~ msgid "Try swiping from the top edge to access the indicators"

624+#~ msgstr "ጠቋሚዎች ጋር ለመድረስ ከ ላይ ጠርዝ በኩል ወደ ታች ይጥረጉ"

625+

626+#~ msgid "Swipe up again to close the settings screen"

627+#~ msgstr "የማሰናጃውን መመልከቻ ለመዝጋት እንደገና ወደ ላይ ይጥረጉ"

628+

629+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

630+#~ msgstr "ከ ግራ በኩል ወደ ቀኝ ይጥረጉ በፍጥነት መተግበሪያዎች ጋር ለመድረስ እና ለማስጀመር"

631+

632+#~ msgid "Well done"

633+#~ msgstr "ጥሩ አድረገዋል"

634+

635+#~ msgid "Try swiping from the right edge to unlock the phone"

636+#~ msgstr "ስልኩን ለመክፈት ከ ቀኝ ጠርዝ በኩል ወደ ግራ ይጥረጉ"

637+

541638#~ msgid "Favorites"

542639#~ msgstr "የምወዳቸው"

543640

544641#~ msgid "All"

545642#~ msgstr "ሁሉንም"

546643

644+#~ msgid "Store"

645+#~ msgstr "ማስቀመጫ"

646+

547647#~ msgid "Done"

548648#~ msgstr "ጨርሷል"

549649

650+#~ msgid "Power off"

651+#~ msgstr "ማጥፊያ"

652+

653+#~ msgid "Power"

654+#~ msgstr "ሐይል"

655+

656+#~ msgid "Log out"

657+#~ msgstr "መውጫ"

658+

659+#~ msgid "Shut down"

660+#~ msgstr "ማጥፊያ"

661+

662+#~ msgid "Reboot"

663+#~ msgstr "እንደገና ማስነሻ"

664+

665+#~ msgid "Settings"

666+#~ msgstr "ማሰናጃ"

667+

668+#~ msgid ""

669+#~ "You have now mastered the edge gestures and can start using the "

670+#~ "phone Tap on the screen to start"

671+#~ msgstr ""

672+#~ "አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም መመልከቻውን መታ ያድርጉ ለመጀመር"

673+

674+#~ msgid "Restart"

675+#~ msgstr "እንደገና ማስጀመሪያ"

676+

550677#~ msgid "Manage Scopes"

551678#~ msgstr "የ ክልል አስተዳዳሪ"

679+

680+#~ msgctxt "Button: Shown in Page Header Menu"

681+#~ msgid "Search"

682+#~ msgstr "መፈለጊያ"

683+

684+#~ msgctxt "Button: The Ubuntu Store"

685+#~ msgid "Store"

686+#~ msgstr "ማስቀመጫ"

po/ar.po+226−126

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

1111"PO-Revision-Date: 2014-05-22 08:22+0000\n"

1212"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"

1313"Language-Team: Arabic <ar@li.org>\n"

@@ -16,10 +16,10 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "

1818"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"

19−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

20−"X-Generator: Launchpad (build 17286)\n"

19+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

20+"X-Generator: Launchpad (build 17413)\n"

2121

22−#: plugins/LightDM/Greeter.cpp:130

22+#: plugins/LightDM/Greeter.cpp:112

2323msgid "Password: "

2424msgstr ""

2525

@@ -32,129 +32,105 @@ msgstr ""

3232msgid "Unpin shortcut"

3333msgstr ""

3434

35−#: qml/Components/DelayedLockscreen.qml:47

35+#: qml/Components/DelayedLockscreen.qml:49

3636msgid "Device Locked"

3737msgstr ""

3838

39−#: qml/Components/DelayedLockscreen.qml:62

39+#: qml/Components/DelayedLockscreen.qml:64

4040msgid "You have been locked out due to too many failed passphrase attempts."

4141msgstr ""

4242

43−#: qml/Components/DelayedLockscreen.qml:63

43+#: qml/Components/DelayedLockscreen.qml:65

4444msgid "You have been locked out due to too many failed passcode attempts."

4545msgstr ""

4646

47−#: qml/Components/DelayedLockscreen.qml:72

47+#: qml/Components/DelayedLockscreen.qml:74

4848#, qt-format

4949msgid "Please wait %1 minute and then try again…"

5050msgid_plural "Please wait %1 minutes and then try again…"

5151msgstr[0] ""

5252msgstr[1] ""

5353

54−#: qml/Components/Dialogs.qml:70

54+#: qml/Components/Dialogs.qml:67

55+msgctxt "Title: Lock/Log out dialog"

5556msgid "Log out"

5657msgstr ""

5758

58−#: qml/Components/Dialogs.qml:71

59+#: qml/Components/Dialogs.qml:68

5960msgid "Are you sure you want to log out?"

6061msgstr ""

6162

62−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63−#: qml/Components/Dialogs.qml:122

64−msgid "No"

63+#: qml/Components/Dialogs.qml:70

64+msgctxt "Button: Lock the system"

65+msgid "Lock"

6566msgstr ""

6667

67−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68−#: qml/Components/Dialogs.qml:129

69−msgid "Yes"

68+#: qml/Components/Dialogs.qml:77

69+msgctxt "Button: Log out from the system"

70+msgid "Log Out"

7071msgstr ""

7172

72−#: qml/Components/Dialogs.qml:94

73+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

74+#: qml/Components/Dialogs.qml:171

75+msgid "Cancel"

76+msgstr ""

77+

78+#: qml/Components/Dialogs.qml:96

79+msgctxt "Title: Reboot/Shut down dialog"

7380msgid "Shut down"

7481msgstr ""

7582

76−#: qml/Components/Dialogs.qml:95

83+#: qml/Components/Dialogs.qml:97

7784msgid "Are you sure you want to shut down?"

7885msgstr ""

7986

80−#: qml/Components/Dialogs.qml:119

87+#: qml/Components/Dialogs.qml:99

88+msgctxt "Button: Reboot the system"

8189msgid "Reboot"

8290msgstr ""

8391

84−#: qml/Components/Dialogs.qml:120

85−msgid "Are you sure you want to reboot?"

92+#: qml/Components/Dialogs.qml:107

93+msgctxt "Button: Shut down the system"

94+msgid "Shut down"

8695msgstr ""

8796

88−#: qml/Components/Dialogs.qml:144

89−msgid "Power"

97+#: qml/Components/Dialogs.qml:127

98+msgctxt "Title: Reboot dialog"

99+msgid "Reboot"

90100msgstr ""

91101

92−#: qml/Components/Dialogs.qml:145

93−msgid ""

94−"Are you sure you would like\n"

95−"to power off?"

102+#: qml/Components/Dialogs.qml:128

103+msgid "Are you sure you want to reboot?"

96104msgstr ""

97105

98−#: qml/Components/Dialogs.qml:147

99−msgid "Power off"

106+#: qml/Components/Dialogs.qml:130

107+msgid "No"

100108msgstr ""

101109

102−#: qml/Components/Dialogs.qml:157

103−msgid "Restart"

110+#: qml/Components/Dialogs.qml:136

111+msgid "Yes"

104112msgstr ""

105113

106−#: qml/Components/Dialogs.qml:167

107−msgid "Cancel"

114+#: qml/Components/Dialogs.qml:150

115+msgctxt "Title: Power off/Restart dialog"

116+msgid "Power"

108117msgstr ""

109118

110−#: qml/Components/EdgeDemoOverlay.qml:151

111−msgid "Skip intro"

112−msgstr "تخطي المقدمة"

113−

114−#: qml/Components/EdgeDemo.qml:125

115−msgid "Right edge"

116−msgstr "الحافة اليمنى"

117−

118−#: qml/Components/EdgeDemo.qml:126

119−msgid "Try swiping from the right edge to unlock the phone"

120−msgstr "اسحب اصبعك من الحافة اليمنى لفتح قفل الهاتف"

121−

122−#: qml/Components/EdgeDemo.qml:157

123−msgid "Top edge"

124−msgstr "الحافة العلوية"

125−

126−#: qml/Components/EdgeDemo.qml:158

127−msgid "Try swiping from the top edge to access the indicators"

128−msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"

129−

130−#: qml/Components/EdgeDemo.qml:183

131−msgid "Close"

132−msgstr "أغلق"

133−

134−#: qml/Components/EdgeDemo.qml:184

135−msgid "Swipe up again to close the settings screen"

136−msgstr "اسحب اصعبك لأعلى مرة أخرى لغلق شاشة الإعدادات"

137−

138−#: qml/Components/EdgeDemo.qml:214

139−msgid "Left edge"

140−msgstr "الحافة اليسرى"

141−

142−#: qml/Components/EdgeDemo.qml:215

143−msgid "Swipe from the left to reveal the launcher for quick access to apps"

119+#: qml/Components/Dialogs.qml:151

120+msgid ""

121+"Are you sure you would like\n"

122+"to power off?"

144123msgstr ""

145−"اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"

146124

147−#: qml/Components/EdgeDemo.qml:242

148−msgid "Well done"

149−msgstr "أحسنت!"

125+#: qml/Components/Dialogs.qml:153

126+msgctxt "Button: Power off the system"

127+msgid "Power off"

128+msgstr ""

150129

151−#: qml/Components/EdgeDemo.qml:243

152−msgid ""

153−"You have now mastered the edge gestures and can start using the "

154−"phone Tap on the screen to start"

130+#: qml/Components/Dialogs.qml:162

131+msgctxt "Button: Restart the system"

132+msgid "Restart"

155133msgstr ""

156−"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك انقر على "

157−"الشاشة للبدء"

158134

159135#: qml/Components/Lockscreen.qml:238

160136msgid "Return to Call"

@@ -168,32 +144,39 @@ msgstr "مكالمة طوارئ"

168144msgid "OK"

169145msgstr ""

170146

171−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

147+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

172148msgid "See less"

173149msgstr "شاهد أقل"

174150

175−#: qml/Dash/GenericScopeView.qml:431

151+#: qml/Dash/GenericScopeView.qml:533

176152msgid "See all"

177153msgstr ""

178154

179−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

180−#: qml/Panel/SearchIndicator.qml:27

155+#: qml/Dash/GenericScopeView.qml:595

156+msgctxt "Label: Hint for dash search line edit"

181157msgid "Search"

182−msgstr "ابحث"

158+msgstr ""

183159

184−#: qml/Dash/PageHeader.qml:260

160+#: qml/Dash/PageHeader.qml:269

161+msgctxt "Button: Open the Ubuntu Store"

185162msgid "Store"

186163msgstr ""

187164

188−#: qml/Dash/PageHeader.qml:277

165+#: qml/Dash/PageHeader.qml:276

166+msgctxt "Button: Start a search in the current dash scope"

167+msgid "Search"

168+msgstr ""

169+

170+#: qml/Dash/PageHeader.qml:286

171+msgctxt "Button: Show the current dash scope settings"

189172msgid "Settings"

190173msgstr ""

191174

192−#: qml/Dash/PageHeader.qml:284

175+#: qml/Dash/PageHeader.qml:293

193176msgid "Remove from Favorites"

194177msgstr ""

195178

196−#: qml/Dash/PageHeader.qml:284

179+#: qml/Dash/PageHeader.qml:293

197180msgid "Add to Favorites"

198181msgstr ""

199182

@@ -225,22 +208,88 @@ msgstr ""

225208msgid "Release to refresh…"

226209msgstr ""

227210

228−#: qml/Dash/ScopesList.qml:63

211+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

212+msgid "Enable location data"

213+msgstr ""

214+

215+#: qml/Dash/ScopesList.qml:66

229216msgid "Manage"

230217msgstr ""

231218

232−#: qml/Dash/ScopesList.qml:107

219+#: qml/Dash/ScopesList.qml:112

233220msgid "Home"

234221msgstr ""

235222

236−#: qml/Dash/ScopesList.qml:108

223+#: qml/Dash/ScopesList.qml:113

237224msgid "Also installed"

238225msgstr ""

239226

240−#: qml/Greeter/Greeter.qml:174

227+#: qml/Greeter/CoverPage.qml:107

241228msgid "Unlock"

242229msgstr ""

243230

231+#: qml/Greeter/LoginList.qml:236

232+msgid "Retry"

233+msgstr ""

234+

235+#: qml/Greeter/LoginList.qml:237

236+msgid "Tap to unlock"

237+msgstr ""

238+

239+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

240+msgid "Sorry, incorrect passphrase."

241+msgstr ""

242+

243+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

244+msgid "Sorry, incorrect passcode."

245+msgstr ""

246+

247+#: qml/Greeter/NarrowView.qml:55

248+msgid "This will be your last attempt."

249+msgstr ""

250+

251+#: qml/Greeter/NarrowView.qml:57

252+msgid ""

253+"If passphrase is entered incorrectly, your phone will conduct a factory "

254+"reset and all personal data will be deleted."

255+msgstr ""

256+

257+#: qml/Greeter/NarrowView.qml:58

258+msgid ""

259+"If passcode is entered incorrectly, your phone will conduct a factory reset "

260+"and all personal data will be deleted."

261+msgstr ""

262+

263+#: qml/Greeter/NarrowView.qml:115

264+#, qt-format

265+msgid "Enter %1"

266+msgstr ""

267+

268+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

269+msgid "Enter passphrase"

270+msgstr ""

271+

272+#: qml/Greeter/NarrowView.qml:117

273+msgid "Enter passcode"

274+msgstr ""

275+

276+#: qml/Greeter/NarrowView.qml:118

277+#, qt-format

278+msgid "Sorry, incorrect %1"

279+msgstr ""

280+

281+#: qml/Greeter/NarrowView.qml:119

282+msgid "Sorry, incorrect passphrase"

283+msgstr ""

284+

285+#: qml/Greeter/NarrowView.qml:120

286+msgid "Please re-enter"

287+msgstr ""

288+

289+#: qml/Greeter/NarrowView.qml:121

290+msgid "Sorry, incorrect passcode"

291+msgstr ""

292+

244293#: qml/Notifications/NotificationMenuItemFactory.qml:128

245294msgid "Show password"

246295msgstr "عرض كلمة السر"

@@ -281,6 +330,11 @@ msgstr ""

281330msgid "Failed, tap to retry"

282331msgstr ""

283332

333+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

334+msgctxt "Label: Hint in message indicator line edit"

335+msgid "Reply"

336+msgstr ""

337+

284338#: qml/Panel/Indicators/ModemInfoItem.qml:105

285339msgid "Unlock SIM"

286340msgstr ""

@@ -289,61 +343,60 @@ msgstr ""

289343msgid "Roaming"

290344msgstr ""

291345

292−#: qml/Shell.qml:367

293−#, qt-format

294−msgid "Enter %1"

346+#: qml/Tutorial/TutorialBottomFinish.qml:24

347+msgid "This action does different things for different apps"

295348msgstr ""

296349

297−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

298−msgid "Enter passphrase"

350+#: qml/Tutorial/TutorialBottomFinish.qml:25

351+msgid "Tap here to finish."

299352msgstr ""

300353

301−#: qml/Shell.qml:369

302−msgid "Enter passcode"

354+#: qml/Tutorial/TutorialBottom.qml:28

355+msgid "Open special menus"

303356msgstr ""

304357

305−#: qml/Shell.qml:370

306−#, qt-format

307−msgid "Sorry, incorrect %1"

358+#: qml/Tutorial/TutorialBottom.qml:29

359+msgid "Swipe up from the bottom edge."

308360msgstr ""

309361

310−#: qml/Shell.qml:371

311−msgid "Sorry, incorrect passphrase"

362+#: qml/Tutorial/TutorialLeftFinish.qml:24

363+msgid "These are the shortcuts to favorite apps"

312364msgstr ""

313365

314−#: qml/Shell.qml:372

315−msgid "Please re-enter"

366+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

367+msgid "Tap here to continue."

316368msgstr ""

317369

318−#: qml/Shell.qml:373

319−msgid "Sorry, incorrect passcode"

370+#: qml/Tutorial/TutorialLeft.qml:26

371+msgid "Open the launcher"

320372msgstr ""

321373

322−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

323−msgid "Sorry, incorrect passphrase."

374+#: qml/Tutorial/TutorialLeft.qml:27

375+msgid "Short swipe from the left edge."

324376msgstr ""

325377

326−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

327−msgid "Sorry, incorrect passcode."

378+#: qml/Tutorial/TutorialPage.qml:178

379+msgid "You almost got it!"

328380msgstr ""

329381

330−#: qml/Shell.qml:469

331−msgid "This will be your last attempt."

382+#: qml/Tutorial/TutorialPage.qml:195

383+msgid "Try again."

332384msgstr ""

333385

334−#: qml/Shell.qml:471

335−msgid ""

336−"If passphrase is entered incorrectly, your phone will conduct a factory "

337−"reset and all personal data will be deleted."

386+#: qml/Tutorial/TutorialRight.qml:31

387+msgid "To view open apps"

338388msgstr ""

339389

340−#: qml/Shell.qml:472

341−msgid ""

342−"If passcode is entered incorrectly, your phone will conduct a factory reset "

343−"and all personal data will be deleted."

390+#: qml/Tutorial/TutorialRight.qml:32

391+msgid "Long swipe from the right edge."

392+msgstr ""

393+

394+#: qml/Tutorial/TutorialRight.qml:122

395+msgid "View all your running tasks."

344396msgstr ""

345397

346398#: qml/Wizard/Page.qml:89

399+msgctxt "Button: Go back one page in the Wizard"

347400msgid "Back"

348401msgstr ""

349402

@@ -360,7 +413,7 @@ msgid "Let’s get started."

360413msgstr ""

361414

362415#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

363−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

416+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

364417#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

365418#: qml/Wizard/Pages/passwd-set.qml:90

366419msgid "Continue"

@@ -370,11 +423,11 @@ msgstr ""

370423msgid "Add a SIM card and restart your device"

371424msgstr ""

372425

373−#: qml/Wizard/Pages/20-sim.qml:55

426+#: qml/Wizard/Pages/20-sim.qml:59

374427msgid "Without it, you won’t be able to make calls or use text messaging."

375428msgstr ""

376429

377−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

430+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

378431msgid "Skip"

379432msgstr ""

380433

@@ -387,38 +440,44 @@ msgid "Please select how you’d like to unlock your phone."

387440msgstr ""

388441

389442#: qml/Wizard/Pages/30-passwd-type.qml:97

443+msgctxt "Label: Type of security method"

390444msgid "Swipe"

391445msgstr ""

392446

393447#: qml/Wizard/Pages/30-passwd-type.qml:98

448+msgctxt "Label: Description of security method"

394449msgid "No security"

395450msgstr ""

396451

397452#: qml/Wizard/Pages/30-passwd-type.qml:100

453+msgctxt "Label: Type of security method"

398454msgid "Passcode"

399455msgstr ""

400456

401457#: qml/Wizard/Pages/30-passwd-type.qml:101

458+msgctxt "Label: Description of security method"

402459msgid "4 digits only"

403460msgstr ""

404461

405462#: qml/Wizard/Pages/30-passwd-type.qml:103

463+msgctxt "Label: Type of security method"

406464msgid "Passphrase"

407465msgstr ""

408466

409467#: qml/Wizard/Pages/30-passwd-type.qml:104

468+msgctxt "Label: Description of security method"

410469msgid "Numbers and letters"

411470msgstr ""

412471

413−#: qml/Wizard/Pages/40-wifi.qml:28

472+#: qml/Wizard/Pages/40-wifi.qml:29

414473msgid "Connect to Wi‑Fi"

415474msgstr ""

416475

417−#: qml/Wizard/Pages/40-wifi.qml:147

476+#: qml/Wizard/Pages/40-wifi.qml:168

418477msgid "Available networks…"

419478msgstr ""

420479

421−#: qml/Wizard/Pages/40-wifi.qml:148

480+#: qml/Wizard/Pages/40-wifi.qml:169

422481msgid "No available networks."

423482msgstr ""

424483

@@ -534,3 +593,44 @@ msgstr ""

534593

535594#~ msgid "Speaking..."

536595#~ msgstr "تتكلم الآن..."

596+

597+#~ msgid "Search"

598+#~ msgstr "ابحث"

599+

600+#~ msgid "Try swiping from the top edge to access the indicators"

601+#~ msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"

602+

603+#~ msgid "Top edge"

604+#~ msgstr "الحافة العلوية"

605+

606+#~ msgid "Close"

607+#~ msgstr "أغلق"

608+

609+#~ msgid "Swipe up again to close the settings screen"

610+#~ msgstr "اسحب اصعبك لأعلى مرة أخرى لغلق شاشة الإعدادات"

611+

612+#~ msgid "Skip intro"

613+#~ msgstr "تخطي المقدمة"

614+

615+#~ msgid "Try swiping from the right edge to unlock the phone"

616+#~ msgstr "اسحب اصبعك من الحافة اليمنى لفتح قفل الهاتف"

617+

618+#~ msgid "Right edge"

619+#~ msgstr "الحافة اليمنى"

620+

621+#~ msgid "Left edge"

622+#~ msgstr "الحافة اليسرى"

623+

624+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

625+#~ msgstr ""

626+#~ "اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"

627+

628+#~ msgid "Well done"

629+#~ msgstr "أحسنت!"

630+

631+#~ msgid ""

632+#~ "You have now mastered the edge gestures and can start using the "

633+#~ "phone Tap on the screen to start"

634+#~ msgstr ""

635+#~ "أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك انقر على "

636+#~ "الشاشة للبدء"

po/ast.po+315−184

@@ -7,18 +7,18 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-08 18:24+0000\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-03-02 18:12+0000\n"

1212"Last-Translator: ivarela <ivarela@ubuntu.com>\n"

1313"Language-Team: Asturian <ast@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr "Contraseña: "

2424

@@ -31,65 +31,92 @@ msgstr "Anclar"

3131msgid "Unpin shortcut"

3232msgstr "Desanclar"

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr "Preséu bloquiáu"

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr "Quedasti bloquiáu polos escesivos intentos fallíos de frase de pasu."

4141

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

4343msgid "You have been locked out due to too many failed passcode attempts."

4444msgstr ""

4545"Quedasti bloquiáu polos escesivos intentos fallíos de códigu de pasu."

4646

47−#: qml/Components/DelayedLockscreen.qml:72

47+#: qml/Components/DelayedLockscreen.qml:74

4848#, qt-format

4949msgid "Please wait %1 minute and then try again…"

5050msgid_plural "Please wait %1 minutes and then try again…"

5151msgstr[0] "Espera %1 minutu y vuelvi a intentalo…"

5252msgstr[1] "Espera %1 minutos y vuelvi a intentalo…"

5353

54−#: qml/Components/Dialogs.qml:70

54+#: qml/Components/Dialogs.qml:67

55+msgctxt "Title: Lock/Log out dialog"

5556msgid "Log out"

56−msgstr "Zarrar sesión"

57+msgstr ""

5758

58−#: qml/Components/Dialogs.qml:71

59+#: qml/Components/Dialogs.qml:68

5960msgid "Are you sure you want to log out?"

6061msgstr "De xuru que quies zarrar la sesión?"

6162

62−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63−#: qml/Components/Dialogs.qml:122

64−msgid "No"

65−msgstr "Non"

63+#: qml/Components/Dialogs.qml:70

64+msgctxt "Button: Lock the system"

65+msgid "Lock"

66+msgstr ""

6667

67−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68−#: qml/Components/Dialogs.qml:129

69−msgid "Yes"

70−msgstr "Sí"

68+#: qml/Components/Dialogs.qml:77

69+msgctxt "Button: Log out from the system"

70+msgid "Log Out"

71+msgstr ""

72+

73+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

74+#: qml/Components/Dialogs.qml:171

75+msgid "Cancel"

76+msgstr "Encaboxar"

7177

72−#: qml/Components/Dialogs.qml:94

78+#: qml/Components/Dialogs.qml:96

79+msgctxt "Title: Reboot/Shut down dialog"

7380msgid "Shut down"

74−msgstr "Apagar"

81+msgstr ""

7582

76−#: qml/Components/Dialogs.qml:95

83+#: qml/Components/Dialogs.qml:97

7784msgid "Are you sure you want to shut down?"

7885msgstr "De xuru que quies apagar?"

7986

80−#: qml/Components/Dialogs.qml:119

87+#: qml/Components/Dialogs.qml:99

88+msgctxt "Button: Reboot the system"

8189msgid "Reboot"

82−msgstr "Reaniciar"

90+msgstr ""

91+

92+#: qml/Components/Dialogs.qml:107

93+msgctxt "Button: Shut down the system"

94+msgid "Shut down"

95+msgstr ""

96+

97+#: qml/Components/Dialogs.qml:127

98+msgctxt "Title: Reboot dialog"

99+msgid "Reboot"

100+msgstr ""

83101

84−#: qml/Components/Dialogs.qml:120

102+#: qml/Components/Dialogs.qml:128

85103msgid "Are you sure you want to reboot?"

86104msgstr "De xuru que quies reaniciar?"

87105

88−#: qml/Components/Dialogs.qml:144

106+#: qml/Components/Dialogs.qml:130

107+msgid "No"

108+msgstr "Non"

109+

110+#: qml/Components/Dialogs.qml:136

111+msgid "Yes"

112+msgstr "Sí"

113+

114+#: qml/Components/Dialogs.qml:150

115+msgctxt "Title: Power off/Restart dialog"

89116msgid "Power"

90−msgstr "Enerxía"

117+msgstr ""

91118

92−#: qml/Components/Dialogs.qml:145

119+#: qml/Components/Dialogs.qml:151

93120msgid ""

94121"Are you sure you would like\n"

95122"to power off?"

@@ -97,67 +124,15 @@ msgstr ""

97124"De xuru que quies\n"

98125"apagar?"

99126

100−#: qml/Components/Dialogs.qml:147

127+#: qml/Components/Dialogs.qml:153

128+msgctxt "Button: Power off the system"

101129msgid "Power off"

102−msgstr "Apagar"

103−

104−#: qml/Components/Dialogs.qml:157

105−msgid "Restart"

106−msgstr "Reaniciar"

107−

108−#: qml/Components/Dialogs.qml:167

109−msgid "Cancel"

110−msgstr "Encaboxar"

111−

112−#: qml/Components/EdgeDemoOverlay.qml:151

113−msgid "Skip intro"

114−msgstr "Omitir la intro"

115−

116−#: qml/Components/EdgeDemo.qml:125

117−msgid "Right edge"

118−msgstr "Berbesu drechu"

119−

120−#: qml/Components/EdgeDemo.qml:126

121−msgid "Try swiping from the right edge to unlock the phone"

122−msgstr "Esliza'l deu dende'l berbesu drechu pa desbloquiar el teléfonu"

123−

124−#: qml/Components/EdgeDemo.qml:157

125−msgid "Top edge"

126−msgstr "Berbesu superior"

127−

128−#: qml/Components/EdgeDemo.qml:158

129−msgid "Try swiping from the top edge to access the indicators"

130−msgstr "Esliza'l deu dende'l berbesu superior p'acceder a los menús"

131−

132−#: qml/Components/EdgeDemo.qml:183

133−msgid "Close"

134−msgstr "Zarrar"

135−

136−#: qml/Components/EdgeDemo.qml:184

137−msgid "Swipe up again to close the settings screen"

138−msgstr "Esliza hacia arriba pa zarrar la pantalla d'axustes"

139−

140−#: qml/Components/EdgeDemo.qml:214

141−msgid "Left edge"

142−msgstr "Berbesu esquierdu"

143−

144−#: qml/Components/EdgeDemo.qml:215

145−msgid "Swipe from the left to reveal the launcher for quick access to apps"

146130msgstr ""

147−"Esliza'l deu dende la esquierda p'amosar el llanzador y acceder rápidamente "

148−"a les aplicaciones"

149−

150−#: qml/Components/EdgeDemo.qml:242

151−msgid "Well done"

152−msgstr "Bien fecho"

153131

154−#: qml/Components/EdgeDemo.qml:243

155−msgid ""

156−"You have now mastered the edge gestures and can start using the "

157−"phone Tap on the screen to start"

132+#: qml/Components/Dialogs.qml:162

133+msgctxt "Button: Restart the system"

134+msgid "Restart"

158135msgstr ""

159−"Agora yá domines los xestos de los berbesos y pues entamar a usar el "

160−"teléfonu Toca la pantalla pa comenzar"

161136

162137#: qml/Components/Lockscreen.qml:238

163138msgid "Return to Call"

@@ -171,32 +146,39 @@ msgstr "Llamada d'emerxencia"

171146msgid "OK"

172147msgstr "Aceutar"

173148

174−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

149+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

175150msgid "See less"

176151msgstr "Ver menos"

177152

178−#: qml/Dash/GenericScopeView.qml:431

153+#: qml/Dash/GenericScopeView.qml:533

179154msgid "See all"

180155msgstr "Ver too"

181156

182−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

183−#: qml/Panel/SearchIndicator.qml:27

157+#: qml/Dash/GenericScopeView.qml:595

158+msgctxt "Label: Hint for dash search line edit"

184159msgid "Search"

185−msgstr "Guetar"

160+msgstr ""

186161

187−#: qml/Dash/PageHeader.qml:260

162+#: qml/Dash/PageHeader.qml:269

163+msgctxt "Button: Open the Ubuntu Store"

188164msgid "Store"

189−msgstr "Tienda"

165+msgstr ""

166+

167+#: qml/Dash/PageHeader.qml:276

168+msgctxt "Button: Start a search in the current dash scope"

169+msgid "Search"

170+msgstr ""

190171

191−#: qml/Dash/PageHeader.qml:277

172+#: qml/Dash/PageHeader.qml:286

173+msgctxt "Button: Show the current dash scope settings"

192174msgid "Settings"

193−msgstr "Axustes"

175+msgstr ""

194176

195−#: qml/Dash/PageHeader.qml:284

177+#: qml/Dash/PageHeader.qml:293

196178msgid "Remove from Favorites"

197179msgstr "Desaniciar de favoritos"

198180

199−#: qml/Dash/PageHeader.qml:284

181+#: qml/Dash/PageHeader.qml:293

200182msgid "Add to Favorites"

201183msgstr "Amestar a favoritos"

202184

@@ -228,22 +210,92 @@ msgstr "Tirar p'anovar..."

228210msgid "Release to refresh…"

229211msgstr "Soltar p'anovar..."

230212

231−#: qml/Dash/ScopesList.qml:63

213+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

214+msgid "Enable location data"

215+msgstr "Activar datos de llocalización"

216+

217+#: qml/Dash/ScopesList.qml:66

232218msgid "Manage"

233−msgstr ""

219+msgstr "Alministrar"

234220

235−#: qml/Dash/ScopesList.qml:107

221+#: qml/Dash/ScopesList.qml:112

236222msgid "Home"

237−msgstr ""

223+msgstr "Aniciu"

238224

239−#: qml/Dash/ScopesList.qml:108

225+#: qml/Dash/ScopesList.qml:113

240226msgid "Also installed"

241−msgstr ""

227+msgstr "Tamién instalaos"

242228

243−#: qml/Greeter/Greeter.qml:174

229+#: qml/Greeter/CoverPage.qml:107

244230msgid "Unlock"

245231msgstr "Desbloquiar"

246232

233+#: qml/Greeter/LoginList.qml:236

234+msgid "Retry"

235+msgstr ""

236+

237+#: qml/Greeter/LoginList.qml:237

238+msgid "Tap to unlock"

239+msgstr ""

240+

241+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

242+msgid "Sorry, incorrect passphrase."

243+msgstr "Fras de pasu incorreuta"

244+

245+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

246+msgid "Sorry, incorrect passcode."

247+msgstr "Códigu de pasu incorreutu"

248+

249+#: qml/Greeter/NarrowView.qml:55

250+msgid "This will be your last attempt."

251+msgstr "Esti ye'l caberu intentu."

252+

253+#: qml/Greeter/NarrowView.qml:57

254+msgid ""

255+"If passphrase is entered incorrectly, your phone will conduct a factory "

256+"reset and all personal data will be deleted."

257+msgstr ""

258+"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "

259+"configuración de fábrica y van perdese tolos datos personales."

260+

261+#: qml/Greeter/NarrowView.qml:58

262+msgid ""

263+"If passcode is entered incorrectly, your phone will conduct a factory reset "

264+"and all personal data will be deleted."

265+msgstr ""

266+"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "

267+"configuración de fábrica y van perdese tolos datos personales."

268+

269+#: qml/Greeter/NarrowView.qml:115

270+#, qt-format

271+msgid "Enter %1"

272+msgstr "Escribi %1"

273+

274+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

275+msgid "Enter passphrase"

276+msgstr "Escribi la frase contraseña"

277+

278+#: qml/Greeter/NarrowView.qml:117

279+msgid "Enter passcode"

280+msgstr "Escribi'l códigu de pasu"

281+

282+#: qml/Greeter/NarrowView.qml:118

283+#, qt-format

284+msgid "Sorry, incorrect %1"

285+msgstr "Sentímoslo, %1 incorreutu"

286+

287+#: qml/Greeter/NarrowView.qml:119

288+msgid "Sorry, incorrect passphrase"

289+msgstr "Sentímoslo, contraseña incorreuta"

290+

291+#: qml/Greeter/NarrowView.qml:120

292+msgid "Please re-enter"

293+msgstr "Vuelvi a escribila"

294+

295+#: qml/Greeter/NarrowView.qml:121

296+msgid "Sorry, incorrect passcode"

297+msgstr "Sentímoslo, códigu de pasu incorreutu"

298+

247299#: qml/Notifications/NotificationMenuItemFactory.qml:128

248300msgid "Show password"

249301msgstr "Amosar contraseña"

@@ -284,6 +336,11 @@ msgstr "Finó"

284336msgid "Failed, tap to retry"

285337msgstr "Falló, toca pa reintentar"

286338

339+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

340+msgctxt "Label: Hint in message indicator line edit"

341+msgid "Reply"

342+msgstr ""

343+

287344#: qml/Panel/Indicators/ModemInfoItem.qml:105

288345msgid "Unlock SIM"

289346msgstr "Desbloquiar SIM"

@@ -292,158 +349,160 @@ msgstr "Desbloquiar SIM"

292349msgid "Roaming"

293350msgstr "Roaming"

294351

295−#: qml/Shell.qml:367

296−#, qt-format

297−msgid "Enter %1"

298−msgstr "Escribi %1"

352+#: qml/Tutorial/TutorialBottomFinish.qml:24

353+msgid "This action does different things for different apps"

354+msgstr "Esta aición tiene efeutos distintos en cada aplicación"

299355

300−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

301−msgid "Enter passphrase"

302−msgstr "Escribi la frase contraseña"

356+#: qml/Tutorial/TutorialBottomFinish.qml:25

357+msgid "Tap here to finish."

358+msgstr "Toca equí pa finar."

303359

304−#: qml/Shell.qml:369

305−msgid "Enter passcode"

306−msgstr "Escribi'l códigu de pasu"

360+#: qml/Tutorial/TutorialBottom.qml:28

361+msgid "Open special menus"

362+msgstr "Abrir menús especiales"

307363

308−#: qml/Shell.qml:370

309−#, qt-format

310−msgid "Sorry, incorrect %1"

311−msgstr "Sentímoslo, %1 incorreutu"

364+#: qml/Tutorial/TutorialBottom.qml:29

365+msgid "Swipe up from the bottom edge."

366+msgstr ""

312367

313−#: qml/Shell.qml:371

314−msgid "Sorry, incorrect passphrase"

315−msgstr "Sentímoslo, contraseña incorreuta"

368+#: qml/Tutorial/TutorialLeftFinish.qml:24

369+msgid "These are the shortcuts to favorite apps"

370+msgstr ""

316371

317−#: qml/Shell.qml:372

318−msgid "Please re-enter"

319−msgstr "Vuelvi a escribila"

372+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

373+msgid "Tap here to continue."

374+msgstr "Toca equí pa siguir."

320375

321−#: qml/Shell.qml:373

322−msgid "Sorry, incorrect passcode"

323−msgstr "Sentímoslo, códigu de pasu incorreutu"

376+#: qml/Tutorial/TutorialLeft.qml:26

377+msgid "Open the launcher"

378+msgstr "Abrir el llanzador"

324379

325−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

326−msgid "Sorry, incorrect passphrase."

327−msgstr "Fras de pasu incorreuta"

380+#: qml/Tutorial/TutorialLeft.qml:27

381+msgid "Short swipe from the left edge."

382+msgstr ""

328383

329−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

330−msgid "Sorry, incorrect passcode."

331−msgstr "Códigu de pasu incorreutu"

384+#: qml/Tutorial/TutorialPage.qml:178

385+msgid "You almost got it!"

386+msgstr ""

332387

333−#: qml/Shell.qml:469

334−msgid "This will be your last attempt."

335−msgstr "Esti ye'l caberu intentu."

388+#: qml/Tutorial/TutorialPage.qml:195

389+msgid "Try again."

390+msgstr ""

336391

337−#: qml/Shell.qml:471

338−msgid ""

339−"If passphrase is entered incorrectly, your phone will conduct a factory "

340−"reset and all personal data will be deleted."

392+#: qml/Tutorial/TutorialRight.qml:31

393+msgid "To view open apps"

341394msgstr ""

342−"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "

343−"configuración de fábrica y van perdese tolos datos personales."

344395

345−#: qml/Shell.qml:472

346−msgid ""

347−"If passcode is entered incorrectly, your phone will conduct a factory reset "

348−"and all personal data will be deleted."

396+#: qml/Tutorial/TutorialRight.qml:32

397+msgid "Long swipe from the right edge."

398+msgstr ""

399+

400+#: qml/Tutorial/TutorialRight.qml:122

401+msgid "View all your running tasks."

349402msgstr ""

350−"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "

351−"configuración de fábrica y van perdese tolos datos personales."

352403

353404#: qml/Wizard/Page.qml:89

405+msgctxt "Button: Go back one page in the Wizard"

354406msgid "Back"

355407msgstr ""

356408

357409#: qml/Wizard/Pages/10-welcome.qml:27

358410msgid "Hi!"

359−msgstr ""

411+msgstr "Hola!"

360412

361413#: qml/Wizard/Pages/10-welcome.qml:44

362414msgid "Welcome to your Ubuntu phone."

363−msgstr ""

415+msgstr "Dámoste l'acoyida a Ubuntu Phone"

364416

365417#: qml/Wizard/Pages/10-welcome.qml:52

366418msgid "Let’s get started."

367−msgstr ""

419+msgstr "Entamamos."

368420

369421#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

370−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

422+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

371423#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

372424#: qml/Wizard/Pages/passwd-set.qml:90

373425msgid "Continue"

374−msgstr ""

426+msgstr "Siguir"

375427

376428#: qml/Wizard/Pages/20-sim.qml:25

377429msgid "Add a SIM card and restart your device"

378−msgstr ""

430+msgstr "Amiesta una tarxeta SIM y reanicia'l preséu"

379431

380−#: qml/Wizard/Pages/20-sim.qml:55

432+#: qml/Wizard/Pages/20-sim.qml:59

381433msgid "Without it, you won’t be able to make calls or use text messaging."

382−msgstr ""

434+msgstr "Ensin ella, nun vas poder facer llamaes nin unviar mensaxes."

383435

384−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

436+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

385437msgid "Skip"

386−msgstr ""

438+msgstr "Omitir"

387439

388440#: qml/Wizard/Pages/30-passwd-type.qml:39

389441msgid "Lock security"

390−msgstr ""

442+msgstr "Seguridá de bloquéu"

391443

392444#: qml/Wizard/Pages/30-passwd-type.qml:74

393445msgid "Please select how you’d like to unlock your phone."

394−msgstr ""

446+msgstr "Seleiciona cómo te prestaría desbloquiar el teléfonu."

395447

396448#: qml/Wizard/Pages/30-passwd-type.qml:97

449+msgctxt "Label: Type of security method"

397450msgid "Swipe"

398451msgstr ""

399452

400453#: qml/Wizard/Pages/30-passwd-type.qml:98

454+msgctxt "Label: Description of security method"

401455msgid "No security"

402456msgstr ""

403457

404458#: qml/Wizard/Pages/30-passwd-type.qml:100

459+msgctxt "Label: Type of security method"

405460msgid "Passcode"

406461msgstr ""

407462

408463#: qml/Wizard/Pages/30-passwd-type.qml:101

464+msgctxt "Label: Description of security method"

409465msgid "4 digits only"

410466msgstr ""

411467

412468#: qml/Wizard/Pages/30-passwd-type.qml:103

469+msgctxt "Label: Type of security method"

413470msgid "Passphrase"

414471msgstr ""

415472

416473#: qml/Wizard/Pages/30-passwd-type.qml:104

474+msgctxt "Label: Description of security method"

417475msgid "Numbers and letters"

418476msgstr ""

419477

420−#: qml/Wizard/Pages/40-wifi.qml:28

478+#: qml/Wizard/Pages/40-wifi.qml:29

421479msgid "Connect to Wi‑Fi"

422−msgstr ""

480+msgstr "Coneutar a WiFi"

423481

424−#: qml/Wizard/Pages/40-wifi.qml:147

482+#: qml/Wizard/Pages/40-wifi.qml:168

425483msgid "Available networks…"

426−msgstr ""

484+msgstr "Redes disponibles..."

427485

428−#: qml/Wizard/Pages/40-wifi.qml:148

486+#: qml/Wizard/Pages/40-wifi.qml:169

429487msgid "No available networks."

430−msgstr ""

488+msgstr "Nun hai redes disponibles"

431489

432490#: qml/Wizard/Pages/50-location.qml:27

433491msgid "Location"

434−msgstr ""

492+msgstr "Llocalización"

435493

436494#: qml/Wizard/Pages/50-location.qml:62

437495msgid "Let the phone detect your location:"

438−msgstr ""

496+msgstr "Permitir al teléfonu deteutar la llocalización:"

439497

440498#: qml/Wizard/Pages/50-location.qml:69

441499msgid "Using GPS only (less accurate)"

442−msgstr ""

500+msgstr "Namái usando GPS (menos precisión)"

443501

444502#: qml/Wizard/Pages/50-location.qml:86

445503msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

446504msgstr ""

505+"Usando GPS, Wifi anónimes ya información de redes móviles (recomiéndase)"

447506

448507#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

449508#: qml/Wizard/Pages/50-location.qml:103

@@ -451,81 +510,119 @@ msgid ""

451510"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

452511"conditions</a>."

453512msgstr ""

513+"Seleicionando esta opción, aceutes los <a href='#'>términos y "

514+"condiciones</a> de Nokia HERE."

454515

455516#: qml/Wizard/Pages/50-location.qml:112

456517msgid "Not at all"

457−msgstr ""

518+msgstr "De nengún mou"

458519

459520#: qml/Wizard/Pages/50-location.qml:124

460521msgid "You can change your mind later in System Settings."

461−msgstr ""

522+msgstr "Pues cambialo dempués n'Axustes del sistema."

462523

463524#: qml/Wizard/Pages/60-reporting.qml:24

464525msgid "Improving your experience"

465−msgstr ""

526+msgstr "Ameyorar la esperiencia"

466527

467528#: qml/Wizard/Pages/60-reporting.qml:36

468529msgid ""

469530"Your phone is set up to automatically report errors to Canonical and its "

470531"partners, the makers of the operating system."

471532msgstr ""

533+"El teléfonu ta configuráu pa informar automáticamente de los fallos a "

534+"Canonical y asociaos, los fabricantes del sistema operativu."

472535

473536#: qml/Wizard/Pages/60-reporting.qml:43

474537msgid ""

475538"This can be disabled in System Settings under Security & "

476539"Privacy"

477540msgstr ""

541+"Esto pue desactivase nos Axustes del sistema en Seguranza y "

542+"privacidá"

478543

479544#: qml/Wizard/Pages/80-finished.qml:24

480545msgid "All done"

481−msgstr ""

546+msgstr "Too fecho"

482547

483548#: qml/Wizard/Pages/80-finished.qml:39

484549msgid "Nice work!"

485−msgstr ""

550+msgstr "Bon trabayu!"

486551

487552#: qml/Wizard/Pages/80-finished.qml:46

488553msgid "Your phone is now ready to use."

489−msgstr ""

554+msgstr "El teléfonu yá ta preparáu pa usar."

490555

491556#: qml/Wizard/Pages/80-finished.qml:53

492557msgid "Finish"

493−msgstr ""

558+msgstr "Finar"

494559

495560#: qml/Wizard/Pages/here-terms.qml:27

496561msgid "Terms & Conditions"

497−msgstr ""

562+msgstr "Términos y condiciones"

498563

499564#: qml/Wizard/Pages/passwd-confirm.qml:49

500565msgid "Confirm passphrase"

501−msgstr ""

566+msgstr "Confirmar fras secreta"

502567

503568#: qml/Wizard/Pages/passwd-confirm.qml:50

504569msgid "Confirm passcode"

505−msgstr ""

570+msgstr "Confirmar el códigu de pasu"

506571

507572#: qml/Wizard/Pages/passwd-confirm.qml:53

508573#: qml/Wizard/Pages/passwd-confirm.qml:54

509574msgid "Please try again."

510−msgstr ""

575+msgstr "Vuelvi a intentalo."

511576

512577#: qml/Wizard/Pages/passwd-set.qml:61

513578msgid "Choose your passcode"

514−msgstr ""

579+msgstr "Escueyi'l códigu de pasu"

515580

516581#: qml/Wizard/Pages/passwd-set.qml:68

517582msgid "Passphrase must be 4 characters long"

518−msgstr ""

583+msgstr "La fras de contraseña tien de ser de 4 caráuteres"

519584

520585#: qml/Wizard/StackButton.qml:39

521586#, qt-format

522587msgid "〈 %1"

523−msgstr ""

588+msgstr "〈 %1"

524589

525590#: qml/Wizard/StackButton.qml:42

526591#, qt-format

527592msgid "%1 〉"

528−msgstr ""

593+msgstr "%1 〉"

594+

595+#~ msgid "Skip intro"

596+#~ msgstr "Omitir la intro"

597+

598+#~ msgid "Try swiping from the right edge to unlock the phone"

599+#~ msgstr "Esliza'l deu dende'l berbesu drechu pa desbloquiar el teléfonu"

600+

601+#~ msgid "Right edge"

602+#~ msgstr "Berbesu drechu"

603+

604+#~ msgid "Top edge"

605+#~ msgstr "Berbesu superior"

606+

607+#~ msgid "Try swiping from the top edge to access the indicators"

608+#~ msgstr "Esliza'l deu dende'l berbesu superior p'acceder a los menús"

609+

610+#~ msgid "Close"

611+#~ msgstr "Zarrar"

612+

613+#~ msgid "Swipe up again to close the settings screen"

614+#~ msgstr "Esliza hacia arriba pa zarrar la pantalla d'axustes"

615+

616+#~ msgid "Left edge"

617+#~ msgstr "Berbesu esquierdu"

618+

619+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

620+#~ msgstr ""

621+#~ "Esliza'l deu dende la esquierda p'amosar el llanzador y acceder rápidamente "

622+#~ "a les aplicaciones"

623+

624+#~ msgid "Well done"

625+#~ msgstr "Bien fecho"

529626

530627#~ msgid "Confirm"

531628#~ msgstr "Confirmar"

@@ -542,6 +639,34 @@ msgstr ""

542639#~ msgid "Speak Now..."

543640#~ msgstr "Fala agora…"

544641

642+#~ msgid "Search"

643+#~ msgstr "Guetar"

644+

645+#~ msgid ""

646+#~ "You have now mastered the edge gestures and can start using the "

647+#~ "phone Tap on the screen to start"

648+#~ msgstr ""

649+#~ "Agora yá domines los xestos de los berbesos y pues entamar a usar el "

650+#~ "teléfonu Toca la pantalla pa comenzar"

651+

652+#~ msgid "Power"

653+#~ msgstr "Enerxía"

654+

655+#~ msgid "Log out"

656+#~ msgstr "Zarrar sesión"

657+

658+#~ msgid "Reboot"

659+#~ msgstr "Reaniciar"

660+

661+#~ msgid "Shut down"

662+#~ msgstr "Apagar"

663+

664+#~ msgid "Settings"

665+#~ msgstr "Axustes"

666+

667+#~ msgid "Power off"

668+#~ msgstr "Apagar"

669+

545670#~ msgid "Done"

546671#~ msgstr "Fecho"

547672

@@ -551,5 +676,11 @@ msgstr ""

551676#~ msgid "All"

552677#~ msgstr "Too"

553678

679+#~ msgid "Store"

680+#~ msgstr "Tienda"

681+

682+#~ msgid "Restart"

683+#~ msgstr "Reaniciar"

684+

554685#~ msgid "Manage Scopes"

555686#~ msgstr "Xestionar ámbitos"

po/az.po+257−142

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

1111"PO-Revision-Date: 2014-09-03 16:39+0000\n"

1212"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"

1313"Language-Team: Azerbaijani <az@li.org>\n"

@@ -15,10 +15,10 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr "Şifrә: "

2424

@@ -31,129 +31,105 @@ msgstr "Pin qısayolu"

3131msgid "Unpin shortcut"

3232msgstr "Açma qısayolu"

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr ""

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr ""

4141

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

4343msgid "You have been locked out due to too many failed passcode attempts."

4444msgstr ""

4545

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

4747#, qt-format

4848msgid "Please wait %1 minute and then try again…"

4949msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] ""

5151msgstr[1] ""

5252

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

5455msgid "Log out"

55−msgstr "Çıxış"

56+msgstr ""

5657

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

5859msgid "Are you sure you want to log out?"

5960msgstr "Çıxmaq istәdiyinizdәn әminsiniz?"

6061

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:122

63−msgid "No"

64−msgstr "Yox"

62+#: qml/Components/Dialogs.qml:70

63+msgctxt "Button: Lock the system"

64+msgid "Lock"

65+msgstr ""

6566

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:129

68−msgid "Yes"

69−msgstr "Hə"

67+#: qml/Components/Dialogs.qml:77

68+msgctxt "Button: Log out from the system"

69+msgid "Log Out"

70+msgstr ""

71+

72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

73+#: qml/Components/Dialogs.qml:171

74+msgid "Cancel"

75+msgstr "İmtina"

7076

71−#: qml/Components/Dialogs.qml:94

77+#: qml/Components/Dialogs.qml:96

78+msgctxt "Title: Reboot/Shut down dialog"

7279msgid "Shut down"

73−msgstr "Sistemi Söndür"

80+msgstr ""

7481

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

7683msgid "Are you sure you want to shut down?"

7784msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"

7885

79−#: qml/Components/Dialogs.qml:119

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

88+msgid "Reboot"

89+msgstr ""

90+

91+#: qml/Components/Dialogs.qml:107

92+msgctxt "Button: Shut down the system"

93+msgid "Shut down"

94+msgstr ""

95+

96+#: qml/Components/Dialogs.qml:127

97+msgctxt "Title: Reboot dialog"

8098msgid "Reboot"

81−msgstr "Yenidən yüklə"

99+msgstr ""

82100

83−#: qml/Components/Dialogs.qml:120

101+#: qml/Components/Dialogs.qml:128

84102msgid "Are you sure you want to reboot?"

85103msgstr "Yenidәn başlatmaq istәdiyinizә әminsiniz?"

86104

87−#: qml/Components/Dialogs.qml:144

105+#: qml/Components/Dialogs.qml:130

106+msgid "No"

107+msgstr "Yox"

108+

109+#: qml/Components/Dialogs.qml:136

110+msgid "Yes"

111+msgstr "Hə"

112+

113+#: qml/Components/Dialogs.qml:150

114+msgctxt "Title: Power off/Restart dialog"

88115msgid "Power"

89116msgstr ""

90117

91−#: qml/Components/Dialogs.qml:145

118+#: qml/Components/Dialogs.qml:151

92119msgid ""

93120"Are you sure you would like\n"

94121"to power off?"

95122msgstr ""

96123

97−#: qml/Components/Dialogs.qml:147

124+#: qml/Components/Dialogs.qml:153

125+msgctxt "Button: Power off the system"

98126msgid "Power off"

99−msgstr "Söndür"

100−

101−#: qml/Components/Dialogs.qml:157

102−msgid "Restart"

103127msgstr ""

104128

105−#: qml/Components/Dialogs.qml:167

106−msgid "Cancel"

107−msgstr "İmtina"

108−

109−#: qml/Components/EdgeDemoOverlay.qml:151

110−msgid "Skip intro"

111−msgstr "Tәqdimatı keç"

112−

113−#: qml/Components/EdgeDemo.qml:125

114−msgid "Right edge"

115−msgstr "Sağ Künc"

116−

117−#: qml/Components/EdgeDemo.qml:126

118−msgid "Try swiping from the right edge to unlock the phone"

119−msgstr "Kilidi açmaq üçün sağ küncdən sürüşdürün"

120−

121−#: qml/Components/EdgeDemo.qml:157

122−msgid "Top edge"

123−msgstr "Yuxarı künc"

124−

125−#: qml/Components/EdgeDemo.qml:158

126−msgid "Try swiping from the top edge to access the indicators"

127−msgstr "Göstəriciləri görmәk üçün yuxarı küncdən sürüşdürün"

128−

129−#: qml/Components/EdgeDemo.qml:183

130−msgid "Close"

131−msgstr "Bağla"

132−

133−#: qml/Components/EdgeDemo.qml:184

134−msgid "Swipe up again to close the settings screen"

135−msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı sürüşdürün"

136−

137−#: qml/Components/EdgeDemo.qml:214

138−msgid "Left edge"

139−msgstr "Sol künc"

140−

141−#: qml/Components/EdgeDemo.qml:215

142−msgid "Swipe from the left to reveal the launcher for quick access to apps"

143−msgstr ""

144−"Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"

145−

146−#: qml/Components/EdgeDemo.qml:242

147−msgid "Well done"

148−msgstr "Təbriklər"

149−

150−#: qml/Components/EdgeDemo.qml:243

151−msgid ""

152−"You have now mastered the edge gestures and can start using the "

153−"phone Tap on the screen to start"

129+#: qml/Components/Dialogs.qml:162

130+msgctxt "Button: Restart the system"

131+msgid "Restart"

154132msgstr ""

155−"Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "

156−"bilərsiniz. Başlamaq üçün ekrana toxunun"

157133

158134#: qml/Components/Lockscreen.qml:238

159135msgid "Return to Call"

@@ -167,32 +143,39 @@ msgstr "Zərurət zəngi"

167143msgid "OK"

168144msgstr "Oldu"

169145

170−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

171147msgid "See less"

172148msgstr "Daha azını gör"

173149

174−#: qml/Dash/GenericScopeView.qml:431

150+#: qml/Dash/GenericScopeView.qml:533

175151msgid "See all"

176152msgstr "Hamısını gör"

177153

178−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

179−#: qml/Panel/SearchIndicator.qml:27

154+#: qml/Dash/GenericScopeView.qml:595

155+msgctxt "Label: Hint for dash search line edit"

180156msgid "Search"

181−msgstr "Axtar"

157+msgstr ""

182158

183−#: qml/Dash/PageHeader.qml:260

159+#: qml/Dash/PageHeader.qml:269

160+msgctxt "Button: Open the Ubuntu Store"

184161msgid "Store"

185162msgstr ""

186163

187−#: qml/Dash/PageHeader.qml:277

164+#: qml/Dash/PageHeader.qml:276

165+msgctxt "Button: Start a search in the current dash scope"

166+msgid "Search"

167+msgstr ""

168+

169+#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

188171msgid "Settings"

189−msgstr "Tənzimləmələr"

172+msgstr ""

190173

191−#: qml/Dash/PageHeader.qml:284

174+#: qml/Dash/PageHeader.qml:293

192175msgid "Remove from Favorites"

193176msgstr "Seçilmişlәrdәn çıxart"

194177

195−#: qml/Dash/PageHeader.qml:284

178+#: qml/Dash/PageHeader.qml:293

196179msgid "Add to Favorites"

197180msgstr "Seçilmişlәrә әlavә et"

198181

@@ -224,22 +207,92 @@ msgstr ""

224207msgid "Release to refresh…"

225208msgstr ""

226209

227−#: qml/Dash/ScopesList.qml:63

210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

211+msgid "Enable location data"

212+msgstr ""

213+

214+#: qml/Dash/ScopesList.qml:66

228215msgid "Manage"

229216msgstr ""

230217

231−#: qml/Dash/ScopesList.qml:107

218+#: qml/Dash/ScopesList.qml:112

232219msgid "Home"

233220msgstr ""

234221

235−#: qml/Dash/ScopesList.qml:108

222+#: qml/Dash/ScopesList.qml:113

236223msgid "Also installed"

237224msgstr ""

238225

239−#: qml/Greeter/Greeter.qml:174

226+#: qml/Greeter/CoverPage.qml:107

240227msgid "Unlock"

241228msgstr ""

242229

230+#: qml/Greeter/LoginList.qml:236

231+msgid "Retry"

232+msgstr ""

233+

234+#: qml/Greeter/LoginList.qml:237

235+msgid "Tap to unlock"

236+msgstr ""

237+

238+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

239+msgid "Sorry, incorrect passphrase."

240+msgstr "Bağışlayın, açar söz yanlışdır."

241+

242+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

243+msgid "Sorry, incorrect passcode."

244+msgstr "Təəssüf ki, açar kod yanlışdır."

245+

246+#: qml/Greeter/NarrowView.qml:55

247+msgid "This will be your last attempt."

248+msgstr "Bu sizin son cəhdiniz olacaq."

249+

250+#: qml/Greeter/NarrowView.qml:57

251+msgid ""

252+"If passphrase is entered incorrectly, your phone will conduct a factory "

253+"reset and all personal data will be deleted."

254+msgstr ""

255+"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "

256+"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."

257+

258+#: qml/Greeter/NarrowView.qml:58

259+msgid ""

260+"If passcode is entered incorrectly, your phone will conduct a factory reset "

261+"and all personal data will be deleted."

262+msgstr ""

263+"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "

264+"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."

265+

266+#: qml/Greeter/NarrowView.qml:115

267+#, qt-format

268+msgid "Enter %1"

269+msgstr ""

270+

271+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

272+msgid "Enter passphrase"

273+msgstr ""

274+

275+#: qml/Greeter/NarrowView.qml:117

276+msgid "Enter passcode"

277+msgstr ""

278+

279+#: qml/Greeter/NarrowView.qml:118

280+#, qt-format

281+msgid "Sorry, incorrect %1"

282+msgstr "Bağışlayın, %1 yanlışdır"

283+

284+#: qml/Greeter/NarrowView.qml:119

285+msgid "Sorry, incorrect passphrase"

286+msgstr "Bağışlayın, açar söz yanlışdır"

287+

288+#: qml/Greeter/NarrowView.qml:120

289+msgid "Please re-enter"

290+msgstr ""

291+

292+#: qml/Greeter/NarrowView.qml:121

293+msgid "Sorry, incorrect passcode"

294+msgstr ""

295+

243296#: qml/Notifications/NotificationMenuItemFactory.qml:128

244297msgid "Show password"

245298msgstr "Şifrәni göstәr"

@@ -280,6 +333,11 @@ msgstr "Bitdi"

280333msgid "Failed, tap to retry"

281334msgstr "Alınmadı. Yenidәn cәhd etmək üçün toxunun"

282335

336+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

337+msgctxt "Label: Hint in message indicator line edit"

338+msgid "Reply"

339+msgstr ""

340+

283341#: qml/Panel/Indicators/ModemInfoItem.qml:105

284342msgid "Unlock SIM"

285343msgstr "SIM kilidini aç"

@@ -288,65 +346,60 @@ msgstr "SIM kilidini aç"

288346msgid "Roaming"

289347msgstr "Rominq"

290348

291−#: qml/Shell.qml:367

292−#, qt-format

293−msgid "Enter %1"

349+#: qml/Tutorial/TutorialBottomFinish.qml:24

350+msgid "This action does different things for different apps"

294351msgstr ""

295352

296−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

297−msgid "Enter passphrase"

353+#: qml/Tutorial/TutorialBottomFinish.qml:25

354+msgid "Tap here to finish."

298355msgstr ""

299356

300−#: qml/Shell.qml:369

301−msgid "Enter passcode"

357+#: qml/Tutorial/TutorialBottom.qml:28

358+msgid "Open special menus"

302359msgstr ""

303360

304−#: qml/Shell.qml:370

305−#, qt-format

306−msgid "Sorry, incorrect %1"

307−msgstr "Bağışlayın, %1 yanlışdır"

361+#: qml/Tutorial/TutorialBottom.qml:29

362+msgid "Swipe up from the bottom edge."

363+msgstr ""

308364

309−#: qml/Shell.qml:371

310−msgid "Sorry, incorrect passphrase"

311−msgstr "Bağışlayın, açar söz yanlışdır"

365+#: qml/Tutorial/TutorialLeftFinish.qml:24

366+msgid "These are the shortcuts to favorite apps"

367+msgstr ""

312368

313−#: qml/Shell.qml:372

314−msgid "Please re-enter"

369+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

370+msgid "Tap here to continue."

315371msgstr ""

316372

317−#: qml/Shell.qml:373

318−msgid "Sorry, incorrect passcode"

373+#: qml/Tutorial/TutorialLeft.qml:26

374+msgid "Open the launcher"

319375msgstr ""

320376

321−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

322−msgid "Sorry, incorrect passphrase."

323−msgstr "Bağışlayın, açar söz yanlışdır."

377+#: qml/Tutorial/TutorialLeft.qml:27

378+msgid "Short swipe from the left edge."

379+msgstr ""

324380

325−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

326−msgid "Sorry, incorrect passcode."

327−msgstr "Təəssüf ki, açar kod yanlışdır."

381+#: qml/Tutorial/TutorialPage.qml:178

382+msgid "You almost got it!"

383+msgstr ""

328384

329−#: qml/Shell.qml:469

330−msgid "This will be your last attempt."

331−msgstr "Bu sizin son cəhdiniz olacaq."

385+#: qml/Tutorial/TutorialPage.qml:195

386+msgid "Try again."

387+msgstr ""

332388

333−#: qml/Shell.qml:471

334−msgid ""

335−"If passphrase is entered incorrectly, your phone will conduct a factory "

336−"reset and all personal data will be deleted."

389+#: qml/Tutorial/TutorialRight.qml:31

390+msgid "To view open apps"

337391msgstr ""

338−"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "

339−"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."

340392

341−#: qml/Shell.qml:472

342−msgid ""

343−"If passcode is entered incorrectly, your phone will conduct a factory reset "

344−"and all personal data will be deleted."

393+#: qml/Tutorial/TutorialRight.qml:32

394+msgid "Long swipe from the right edge."

395+msgstr ""

396+

397+#: qml/Tutorial/TutorialRight.qml:122

398+msgid "View all your running tasks."

345399msgstr ""

346−"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "

347−"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."

348400

349401#: qml/Wizard/Page.qml:89

402+msgctxt "Button: Go back one page in the Wizard"

350403msgid "Back"

351404msgstr ""

352405

@@ -363,7 +416,7 @@ msgid "Let’s get started."

363416msgstr ""

364417

365418#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

366−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

419+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

367420#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

368421#: qml/Wizard/Pages/passwd-set.qml:90

369422msgid "Continue"

@@ -373,11 +426,11 @@ msgstr ""

373426msgid "Add a SIM card and restart your device"

374427msgstr ""

375428

376−#: qml/Wizard/Pages/20-sim.qml:55

429+#: qml/Wizard/Pages/20-sim.qml:59

377430msgid "Without it, you won’t be able to make calls or use text messaging."

378431msgstr ""

379432

380−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

433+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

381434msgid "Skip"

382435msgstr ""

383436

@@ -390,38 +443,44 @@ msgid "Please select how you’d like to unlock your phone."

390443msgstr ""

391444

392445#: qml/Wizard/Pages/30-passwd-type.qml:97

446+msgctxt "Label: Type of security method"

393447msgid "Swipe"

394448msgstr ""

395449

396450#: qml/Wizard/Pages/30-passwd-type.qml:98

451+msgctxt "Label: Description of security method"

397452msgid "No security"

398453msgstr ""

399454

400455#: qml/Wizard/Pages/30-passwd-type.qml:100

456+msgctxt "Label: Type of security method"

401457msgid "Passcode"

402458msgstr ""

403459

404460#: qml/Wizard/Pages/30-passwd-type.qml:101

461+msgctxt "Label: Description of security method"

405462msgid "4 digits only"

406463msgstr ""

407464

408465#: qml/Wizard/Pages/30-passwd-type.qml:103

466+msgctxt "Label: Type of security method"

409467msgid "Passphrase"

410468msgstr ""

411469

412470#: qml/Wizard/Pages/30-passwd-type.qml:104

471+msgctxt "Label: Description of security method"

413472msgid "Numbers and letters"

414473msgstr ""

415474

416−#: qml/Wizard/Pages/40-wifi.qml:28

475+#: qml/Wizard/Pages/40-wifi.qml:29

417476msgid "Connect to Wi‑Fi"

418477msgstr ""

419478

420−#: qml/Wizard/Pages/40-wifi.qml:147

479+#: qml/Wizard/Pages/40-wifi.qml:168

421480msgid "Available networks…"

422481msgstr ""

423482

424−#: qml/Wizard/Pages/40-wifi.qml:148

483+#: qml/Wizard/Pages/40-wifi.qml:169

425484msgid "No available networks."

426485msgstr ""

427486

@@ -526,6 +585,24 @@ msgstr ""

526585#~ msgid "Confirm"

527586#~ msgstr "Təsdiqlə"

528587

588+#~ msgid "Search"

589+#~ msgstr "Axtar"

590+

591+#~ msgid "Top edge"

592+#~ msgstr "Yuxarı künc"

593+

594+#~ msgid "Close"

595+#~ msgstr "Bağla"

596+

597+#~ msgid "Left edge"

598+#~ msgstr "Sol künc"

599+

600+#~ msgid "Well done"

601+#~ msgstr "Təbriklər"

602+

603+#~ msgid "Right edge"

604+#~ msgstr "Sağ Künc"

605+

529606#~ msgid "Speaking..."

530607#~ msgstr "Danışır..."

531608

@@ -535,6 +612,13 @@ msgstr ""

535612#~ msgid "Speak Now..."

536613#~ msgstr "Danışın..."

537614

615+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

616+#~ msgstr ""

617+#~ "Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"

618+

619+#~ msgid "Power off"

620+#~ msgstr "Söndür"

621+

538622#~ msgid "All"

539623#~ msgstr "Hamısı"

540624

@@ -544,5 +628,36 @@ msgstr ""

544628#~ msgid "Done"

545629#~ msgstr "Başa çatdı"

546630

631+#~ msgid "Log out"

632+#~ msgstr "Çıxış"

633+

634+#~ msgid "Shut down"

635+#~ msgstr "Sistemi Söndür"

636+

637+#~ msgid "Reboot"

638+#~ msgstr "Yenidən yüklə"

639+

640+#~ msgid "Try swiping from the top edge to access the indicators"

641+#~ msgstr "Göstəriciləri görmәk üçün yuxarı küncdən sürüşdürün"

642+

643+#~ msgid "Skip intro"

644+#~ msgstr "Tәqdimatı keç"

645+

646+#~ msgid "Try swiping from the right edge to unlock the phone"

647+#~ msgstr "Kilidi açmaq üçün sağ küncdən sürüşdürün"

648+

649+#~ msgid "Swipe up again to close the settings screen"

650+#~ msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı sürüşdürün"

651+

652+#~ msgid ""

653+#~ "You have now mastered the edge gestures and can start using the "

654+#~ "phone Tap on the screen to start"

655+#~ msgstr ""

656+#~ "Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "

657+#~ "bilərsiniz. Başlamaq üçün ekrana toxunun"

658+

659+#~ msgid "Settings"

660+#~ msgstr "Tənzimləmələr"

661+

547662#~ msgid "Type or say a command"

548663#~ msgstr "Bir әmr söyləyin və ya yazın"

po/be.po+349−188

@@ -7,433 +7,506 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-09-24 17:12+0000\n"

12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-02-07 19:04+0000\n"

12+"Last-Translator: Mikhail_SaTuRn <mikhail_saturn@tut.by>\n"

1313"Language-Team: Belarusian <be@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

19−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

20−"X-Generator: Launchpad (build 17286)\n"

19+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

20+"X-Generator: Launchpad (build 17413)\n"

2121

22−#: plugins/LightDM/Greeter.cpp:130

22+#: plugins/LightDM/Greeter.cpp:112

2323msgid "Password: "

24−msgstr ""

24+msgstr "Пароль: "

2525

2626#: plugins/Unity/Launcher/launcheritem.cpp:45

2727#: plugins/Unity/Launcher/launcheritem.cpp:100

2828msgid "Pin shortcut"

29−msgstr ""

29+msgstr "Заблакаваць кнопку"

3030

3131#: plugins/Unity/Launcher/launcheritem.cpp:100

3232msgid "Unpin shortcut"

33−msgstr ""

33+msgstr "Разблакаваць кнопку"

3434

35−#: qml/Components/DelayedLockscreen.qml:47

35+#: qml/Components/DelayedLockscreen.qml:49

3636msgid "Device Locked"

37−msgstr ""

37+msgstr "Прылада заблакаваная"

3838

39−#: qml/Components/DelayedLockscreen.qml:62

39+#: qml/Components/DelayedLockscreen.qml:64

4040msgid "You have been locked out due to too many failed passphrase attempts."

4141msgstr ""

42+"Вы былі заблакаваныя з-за занадта вялікай колькасці няўдалых спробаў."

4243

43−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

4445msgid "You have been locked out due to too many failed passcode attempts."

4546msgstr ""

47+"Вы былі заблакаваныя з-за занадта вялікай колькасці няўдалых спробаў уводу "

48+"код доступу."

4649

47−#: qml/Components/DelayedLockscreen.qml:72

50+#: qml/Components/DelayedLockscreen.qml:74

4851#, qt-format

4952msgid "Please wait %1 minute and then try again…"

5053msgid_plural "Please wait %1 minutes and then try again…"

51−msgstr[0] ""

52−msgstr[1] ""

54+msgstr[0] "Пачакайце %1 хвіліну і паўтарыце спробу…"

55+msgstr[1] "Пачакайце %1 хвіліны і паўтарыце спробу…"

56+msgstr[2] "Пачакайце %1 хвілінаў і паўтарыце спробу…"

5357

54−#: qml/Components/Dialogs.qml:70

58+#: qml/Components/Dialogs.qml:67

59+msgctxt "Title: Lock/Log out dialog"

5560msgid "Log out"

5661msgstr ""

5762

58−#: qml/Components/Dialogs.qml:71

63+#: qml/Components/Dialogs.qml:68

5964msgid "Are you sure you want to log out?"

60−msgstr ""

65+msgstr "Вы насамрэч хочаце выйсці?"

6166

62−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63−#: qml/Components/Dialogs.qml:122

64−msgid "No"

67+#: qml/Components/Dialogs.qml:70

68+msgctxt "Button: Lock the system"

69+msgid "Lock"

6570msgstr ""

6671

67−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68−#: qml/Components/Dialogs.qml:129

69−msgid "Yes"

72+#: qml/Components/Dialogs.qml:77

73+msgctxt "Button: Log out from the system"

74+msgid "Log Out"

7075msgstr ""

7176

72−#: qml/Components/Dialogs.qml:94

77+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

78+#: qml/Components/Dialogs.qml:171

79+msgid "Cancel"

80+msgstr "Скасаваць"

81+

82+#: qml/Components/Dialogs.qml:96

83+msgctxt "Title: Reboot/Shut down dialog"

7384msgid "Shut down"

7485msgstr ""

7586

76−#: qml/Components/Dialogs.qml:95

87+#: qml/Components/Dialogs.qml:97

7788msgid "Are you sure you want to shut down?"

89+msgstr "Вы ўпэўненыя, што жадаеце выключыць прыладу?"

90+

91+#: qml/Components/Dialogs.qml:99

92+msgctxt "Button: Reboot the system"

93+msgid "Reboot"

94+msgstr ""

95+

96+#: qml/Components/Dialogs.qml:107

97+msgctxt "Button: Shut down the system"

98+msgid "Shut down"

7899msgstr ""

79100

80−#: qml/Components/Dialogs.qml:119

101+#: qml/Components/Dialogs.qml:127

102+msgctxt "Title: Reboot dialog"

81103msgid "Reboot"

82104msgstr ""

83105

84−#: qml/Components/Dialogs.qml:120

106+#: qml/Components/Dialogs.qml:128

85107msgid "Are you sure you want to reboot?"

86−msgstr ""

108+msgstr "Вы ўпэўнены, што жадаеце перазагрузіць?"

109+

110+#: qml/Components/Dialogs.qml:130

111+msgid "No"

112+msgstr "Не"

113+

114+#: qml/Components/Dialogs.qml:136

115+msgid "Yes"

116+msgstr "Так"

87117

88−#: qml/Components/Dialogs.qml:144

118+#: qml/Components/Dialogs.qml:150

119+msgctxt "Title: Power off/Restart dialog"

89120msgid "Power"

90121msgstr ""

91122

92−#: qml/Components/Dialogs.qml:145

123+#: qml/Components/Dialogs.qml:151

93124msgid ""

94125"Are you sure you would like\n"

95126"to power off?"

96127msgstr ""

128+"Вы сапраўды хочаце выключыць\n"

129+"сілкаванне?"

97130

98−#: qml/Components/Dialogs.qml:147

131+#: qml/Components/Dialogs.qml:153

132+msgctxt "Button: Power off the system"

99133msgid "Power off"

100134msgstr ""

101135

102−#: qml/Components/Dialogs.qml:157

136+#: qml/Components/Dialogs.qml:162

137+msgctxt "Button: Restart the system"

103138msgid "Restart"

104139msgstr ""

105140

106−#: qml/Components/Dialogs.qml:167

107−msgid "Cancel"

108−msgstr ""

109−

110−#: qml/Components/EdgeDemoOverlay.qml:151

111−msgid "Skip intro"

112−msgstr ""

113−

114−#: qml/Components/EdgeDemo.qml:125

115−msgid "Right edge"

116−msgstr ""

117−

118−#: qml/Components/EdgeDemo.qml:126

119−msgid "Try swiping from the right edge to unlock the phone"

120−msgstr ""

121−

122−#: qml/Components/EdgeDemo.qml:157

123−msgid "Top edge"

124−msgstr ""

125−

126−#: qml/Components/EdgeDemo.qml:158

127−msgid "Try swiping from the top edge to access the indicators"

128−msgstr ""

129−

130−#: qml/Components/EdgeDemo.qml:183

131−msgid "Close"

132−msgstr ""

133−

134−#: qml/Components/EdgeDemo.qml:184

135−msgid "Swipe up again to close the settings screen"

136−msgstr ""

137−

138−#: qml/Components/EdgeDemo.qml:214

139−msgid "Left edge"

140−msgstr ""

141−

142−#: qml/Components/EdgeDemo.qml:215

143−msgid "Swipe from the left to reveal the launcher for quick access to apps"

144−msgstr ""

145−

146−#: qml/Components/EdgeDemo.qml:242

147−msgid "Well done"

148−msgstr ""

149−

150−#: qml/Components/EdgeDemo.qml:243

151−msgid ""

152−"You have now mastered the edge gestures and can start using the "

153−"phone Tap on the screen to start"

154−msgstr ""

155−

156141#: qml/Components/Lockscreen.qml:238

157142msgid "Return to Call"

158−msgstr ""

143+msgstr "Вярнуцца да выкліку"

159144

160145#: qml/Components/Lockscreen.qml:238

161146msgid "Emergency Call"

162−msgstr ""

147+msgstr "Терміновы выклік"

163148

164149#: qml/Components/Lockscreen.qml:270

165150msgid "OK"

166−msgstr ""

151+msgstr "Добра"

167152

168−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

153+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

169154msgid "See less"

170−msgstr ""

155+msgstr "Карацей"

171156

172−#: qml/Dash/GenericScopeView.qml:431

157+#: qml/Dash/GenericScopeView.qml:533

173158msgid "See all"

174−msgstr ""

159+msgstr "Больш падрабязна"

175160

176−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

177−#: qml/Panel/SearchIndicator.qml:27

161+#: qml/Dash/GenericScopeView.qml:595

162+msgctxt "Label: Hint for dash search line edit"

178163msgid "Search"

179164msgstr ""

180165

181−#: qml/Dash/PageHeader.qml:260

166+#: qml/Dash/PageHeader.qml:269

167+msgctxt "Button: Open the Ubuntu Store"

182168msgid "Store"

183169msgstr ""

184170

185−#: qml/Dash/PageHeader.qml:277

171+#: qml/Dash/PageHeader.qml:276

172+msgctxt "Button: Start a search in the current dash scope"

173+msgid "Search"

174+msgstr ""

175+

176+#: qml/Dash/PageHeader.qml:286

177+msgctxt "Button: Show the current dash scope settings"

186178msgid "Settings"

187179msgstr ""

188180

189−#: qml/Dash/PageHeader.qml:284

181+#: qml/Dash/PageHeader.qml:293

190182msgid "Remove from Favorites"

191−msgstr ""

183+msgstr "Выдаліць з абранага"

192184

193−#: qml/Dash/PageHeader.qml:284

185+#: qml/Dash/PageHeader.qml:293

194186msgid "Add to Favorites"

195−msgstr ""

187+msgstr "Дадаць да абранага"

196188

197189#: qml/Dash/Previews/PreviewActionCombo.qml:35

198190msgid "More..."

199−msgstr ""

191+msgstr "Болей…"

200192

201193#: qml/Dash/Previews/PreviewActionCombo.qml:35

202194msgid "Less..."

203−msgstr ""

195+msgstr "Менш..."

204196

205197#: qml/Dash/Previews/PreviewRatingInput.qml:81

206198msgid "Rate this"

207−msgstr ""

199+msgstr "Ацаніць"

208200

209201#: qml/Dash/Previews/PreviewRatingInput.qml:126

210202msgid "Add a review"

211−msgstr ""

203+msgstr "Дадаць рэцэнзію"

212204

213205#: qml/Dash/Previews/PreviewRatingInput.qml:166

214206msgid "Send"

215−msgstr ""

207+msgstr "Адправіць"

216208

217209#: qml/Dash/PullToRefreshScopeStyle.qml:55

218210msgid "Pull to refresh…"

219−msgstr ""

211+msgstr "Пацягніце для абнаўлення ..."

220212

221213#: qml/Dash/PullToRefreshScopeStyle.qml:60

222214msgid "Release to refresh…"

215+msgstr "Адпусціце для абнаўлення ..."

216+

217+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

218+msgid "Enable location data"

223219msgstr ""

224220

225−#: qml/Dash/ScopesList.qml:63

221+#: qml/Dash/ScopesList.qml:66

226222msgid "Manage"

227−msgstr ""

223+msgstr "Кіраванне"

228224

229−#: qml/Dash/ScopesList.qml:107

225+#: qml/Dash/ScopesList.qml:112

230226msgid "Home"

231−msgstr ""

227+msgstr "Дом"

232228

233−#: qml/Dash/ScopesList.qml:108

229+#: qml/Dash/ScopesList.qml:113

234230msgid "Also installed"

235−msgstr ""

231+msgstr "Таксама ўсталявана"

236232

237−#: qml/Greeter/Greeter.qml:174

233+#: qml/Greeter/CoverPage.qml:107

238234msgid "Unlock"

235+msgstr "Разблакаваць"

236+

237+#: qml/Greeter/LoginList.qml:236

238+msgid "Retry"

239239msgstr ""

240240

241+#: qml/Greeter/LoginList.qml:237

242+msgid "Tap to unlock"

243+msgstr ""

244+

245+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

246+msgid "Sorry, incorrect passphrase."

247+msgstr "Даруце, няслушны пароль"

248+

249+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

250+msgid "Sorry, incorrect passcode."

251+msgstr "Даруйце, няслушны код"

252+

253+#: qml/Greeter/NarrowView.qml:55

254+msgid "This will be your last attempt."

255+msgstr "Апошняя спроба."

256+

257+#: qml/Greeter/NarrowView.qml:57

258+msgid ""

259+"If passphrase is entered incorrectly, your phone will conduct a factory "

260+"reset and all personal data will be deleted."

261+msgstr ""

262+"Калі пароль паказаны няправільна, тэлефон вернецца ў зыходны стан, усе "

263+"асабістыя дадзеныя будуць выдаленыя."

264+

265+#: qml/Greeter/NarrowView.qml:58

266+msgid ""

267+"If passcode is entered incorrectly, your phone will conduct a factory reset "

268+"and all personal data will be deleted."

269+msgstr ""

270+"Калі пароль уведзены няправільна, то ваш тэлефон будзе праводзіць скід да "

271+"завадскіх налад і ўсе асабістыя дадзеныя будуць выдаленыя."

272+

273+#: qml/Greeter/NarrowView.qml:115

274+#, qt-format

275+msgid "Enter %1"

276+msgstr "Увядзіце %1"

277+

278+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

279+msgid "Enter passphrase"

280+msgstr "Увядзіце парольную фразу"

281+

282+#: qml/Greeter/NarrowView.qml:117

283+msgid "Enter passcode"

284+msgstr "Увядзіце код"

285+

286+#: qml/Greeter/NarrowView.qml:118

287+#, qt-format

288+msgid "Sorry, incorrect %1"

289+msgstr "Даруйце, некарэктны %1"

290+

291+#: qml/Greeter/NarrowView.qml:119

292+msgid "Sorry, incorrect passphrase"

293+msgstr "Даруйце, няслушны пароль"

294+

295+#: qml/Greeter/NarrowView.qml:120

296+msgid "Please re-enter"

297+msgstr "Калі ласка паўтарыце ўвод"

298+

299+#: qml/Greeter/NarrowView.qml:121

300+msgid "Sorry, incorrect passcode"

301+msgstr "Даруйце, няслушны код"

302+

241303#: qml/Notifications/NotificationMenuItemFactory.qml:128

242304msgid "Show password"

243−msgstr ""

305+msgstr "Паказаць пароль"

244306

245307#: qml/Panel/ActiveCallHint.qml:79

246308msgid "Tap to return to call..."

247−msgstr ""

309+msgstr "Націсніце, каб вярнуцца да выкліку..."

248310

249311#: qml/Panel/ActiveCallHint.qml:92

250312msgid "Conference"

251−msgstr ""

313+msgstr "Канферэнцыя"

252314

253315#: qml/Panel/Indicators/MenuItemFactory.qml:643

254316msgid "Nothing is playing"

255−msgstr ""

317+msgstr "Анічога не прайграецца"

256318

257319#: qml/Panel/Indicators/MenuItemFactory.qml:791

258320msgid "In queue…"

259−msgstr ""

321+msgstr "У чарзе..."

260322

261323#: qml/Panel/Indicators/MenuItemFactory.qml:795

262324msgid "Downloading"

263−msgstr ""

325+msgstr "Запампоўка"

264326

265327#: qml/Panel/Indicators/MenuItemFactory.qml:797

266328msgid "Paused, tap to resume"

267−msgstr ""

329+msgstr "Прыпынена, націсніце для працягу"

268330

269331#: qml/Panel/Indicators/MenuItemFactory.qml:799

270332msgid "Canceled"

271−msgstr ""

333+msgstr "Скасавана"

272334

273335#: qml/Panel/Indicators/MenuItemFactory.qml:801

274336msgid "Finished"

275−msgstr ""

337+msgstr "Скончана"

276338

277339#: qml/Panel/Indicators/MenuItemFactory.qml:803

278340msgid "Failed, tap to retry"

341+msgstr "Памылка, націсніце для паўтору"

342+

343+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

344+msgctxt "Label: Hint in message indicator line edit"

345+msgid "Reply"

279346msgstr ""

280347

281348#: qml/Panel/Indicators/ModemInfoItem.qml:105

282349msgid "Unlock SIM"

283−msgstr ""

350+msgstr "Разблакаваць SIM"

284351

285352#: qml/Panel/Indicators/RoamingIndication.qml:27

286353msgid "Roaming"

354+msgstr "Роўмінг"

355+

356+#: qml/Tutorial/TutorialBottomFinish.qml:24

357+msgid "This action does different things for different apps"

287358msgstr ""

288359

289−#: qml/Shell.qml:367

290−#, qt-format

291−msgid "Enter %1"

360+#: qml/Tutorial/TutorialBottomFinish.qml:25

361+msgid "Tap here to finish."

292362msgstr ""

293363

294−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

295−msgid "Enter passphrase"

364+#: qml/Tutorial/TutorialBottom.qml:28

365+msgid "Open special menus"

296366msgstr ""

297367

298−#: qml/Shell.qml:369

299−msgid "Enter passcode"

368+#: qml/Tutorial/TutorialBottom.qml:29

369+msgid "Swipe up from the bottom edge."

300370msgstr ""

301371

302−#: qml/Shell.qml:370

303−#, qt-format

304−msgid "Sorry, incorrect %1"

372+#: qml/Tutorial/TutorialLeftFinish.qml:24

373+msgid "These are the shortcuts to favorite apps"

305374msgstr ""

306375

307−#: qml/Shell.qml:371

308−msgid "Sorry, incorrect passphrase"

376+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

377+msgid "Tap here to continue."

309378msgstr ""

310379

311−#: qml/Shell.qml:372

312−msgid "Please re-enter"

380+#: qml/Tutorial/TutorialLeft.qml:26

381+msgid "Open the launcher"

313382msgstr ""

314383

315−#: qml/Shell.qml:373

316−msgid "Sorry, incorrect passcode"

384+#: qml/Tutorial/TutorialLeft.qml:27

385+msgid "Short swipe from the left edge."

317386msgstr ""

318387

319−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

320−msgid "Sorry, incorrect passphrase."

388+#: qml/Tutorial/TutorialPage.qml:178

389+msgid "You almost got it!"

321390msgstr ""

322391

323−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

324−msgid "Sorry, incorrect passcode."

392+#: qml/Tutorial/TutorialPage.qml:195

393+msgid "Try again."

325394msgstr ""

326395

327−#: qml/Shell.qml:469

328−msgid "This will be your last attempt."

396+#: qml/Tutorial/TutorialRight.qml:31

397+msgid "To view open apps"

329398msgstr ""

330399

331−#: qml/Shell.qml:471

332−msgid ""

333−"If passphrase is entered incorrectly, your phone will conduct a factory "

334−"reset and all personal data will be deleted."

400+#: qml/Tutorial/TutorialRight.qml:32

401+msgid "Long swipe from the right edge."

335402msgstr ""

336403

337−#: qml/Shell.qml:472

338−msgid ""

339−"If passcode is entered incorrectly, your phone will conduct a factory reset "

340−"and all personal data will be deleted."

404+#: qml/Tutorial/TutorialRight.qml:122

405+msgid "View all your running tasks."

341406msgstr ""

342407

343408#: qml/Wizard/Page.qml:89

409+msgctxt "Button: Go back one page in the Wizard"

344410msgid "Back"

345411msgstr ""

346412

347413#: qml/Wizard/Pages/10-welcome.qml:27

348414msgid "Hi!"

349−msgstr ""

415+msgstr "Вітай!"

350416

351417#: qml/Wizard/Pages/10-welcome.qml:44

352418msgid "Welcome to your Ubuntu phone."

353−msgstr ""

419+msgstr "Вітаем Вас у сістэме тэлефона Ubuntu."

354420

355421#: qml/Wizard/Pages/10-welcome.qml:52

356422msgid "Let’s get started."

357−msgstr ""

423+msgstr "Пачнем."

358424

359425#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

360−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

426+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

361427#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

362428#: qml/Wizard/Pages/passwd-set.qml:90

363429msgid "Continue"

364−msgstr ""

430+msgstr "Працягнуць"

365431

366432#: qml/Wizard/Pages/20-sim.qml:25

367433msgid "Add a SIM card and restart your device"

368−msgstr ""

434+msgstr "Дадайце SIM-карту і перазагрузіце Вашую прыладу"

369435

370−#: qml/Wizard/Pages/20-sim.qml:55

436+#: qml/Wizard/Pages/20-sim.qml:59

371437msgid "Without it, you won’t be able to make calls or use text messaging."

372−msgstr ""

438+msgstr "Без яе вы не зможаце тэлефанаваць ці адпраўляць паведамленні."

373439

374−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

440+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

375441msgid "Skip"

376−msgstr ""

442+msgstr "Прапусціць"

377443

378444#: qml/Wizard/Pages/30-passwd-type.qml:39

379445msgid "Lock security"

380−msgstr ""

446+msgstr "Блакаванне бяспекі"

381447

382448#: qml/Wizard/Pages/30-passwd-type.qml:74

383449msgid "Please select how you’d like to unlock your phone."

384−msgstr ""

450+msgstr "Калі ласка, абярыце спосаб разблакавання тэлефона."

385451

386452#: qml/Wizard/Pages/30-passwd-type.qml:97

453+msgctxt "Label: Type of security method"

387454msgid "Swipe"

388455msgstr ""

389456

390457#: qml/Wizard/Pages/30-passwd-type.qml:98

458+msgctxt "Label: Description of security method"

391459msgid "No security"

392460msgstr ""

393461

394462#: qml/Wizard/Pages/30-passwd-type.qml:100

463+msgctxt "Label: Type of security method"

395464msgid "Passcode"

396465msgstr ""

397466

398467#: qml/Wizard/Pages/30-passwd-type.qml:101

468+msgctxt "Label: Description of security method"

399469msgid "4 digits only"

400470msgstr ""

401471

402472#: qml/Wizard/Pages/30-passwd-type.qml:103

473+msgctxt "Label: Type of security method"

403474msgid "Passphrase"

404475msgstr ""

405476

406477#: qml/Wizard/Pages/30-passwd-type.qml:104

478+msgctxt "Label: Description of security method"

407479msgid "Numbers and letters"

408480msgstr ""

409481

410−#: qml/Wizard/Pages/40-wifi.qml:28

482+#: qml/Wizard/Pages/40-wifi.qml:29

411483msgid "Connect to Wi‑Fi"

412−msgstr ""

484+msgstr "Злучыцца з Wi-Fi"

413485

414−#: qml/Wizard/Pages/40-wifi.qml:147

486+#: qml/Wizard/Pages/40-wifi.qml:168

415487msgid "Available networks…"

416−msgstr ""

488+msgstr "Даступныя сеткі..."

417489

418−#: qml/Wizard/Pages/40-wifi.qml:148

490+#: qml/Wizard/Pages/40-wifi.qml:169

419491msgid "No available networks."

420−msgstr ""

492+msgstr "Няма даступных сетак."

421493

422494#: qml/Wizard/Pages/50-location.qml:27

423495msgid "Location"

424−msgstr ""

496+msgstr "Месца"

425497

426498#: qml/Wizard/Pages/50-location.qml:62

427499msgid "Let the phone detect your location:"

428−msgstr ""

500+msgstr "Дазволіць тэлефону вызначаць месцазнаходжанне:"

429501

430502#: qml/Wizard/Pages/50-location.qml:69

431503msgid "Using GPS only (less accurate)"

432−msgstr ""

504+msgstr "З дапамогай толькі GPS (найменш дакладна)"

433505

434506#: qml/Wizard/Pages/50-location.qml:86

435507msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

436508msgstr ""

509+"На аснове GPS, ананімізаванага Wi-Fi і дадзеных сотавай сеткі (рэкамендуецца)"

437510

438511#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

439512#: qml/Wizard/Pages/50-location.qml:103

@@ -441,78 +514,166 @@ msgid ""

441514"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

442515"conditions</a>."

443516msgstr ""

517+"Выбарам гэтага варыянту дзеянняў вы згаджаецеся з <a href='#'> умовамі "

518+"прадстаўлення паслуг Nokia HERE</a>."

444519

445520#: qml/Wizard/Pages/50-location.qml:112

446521msgid "Not at all"

447−msgstr ""

522+msgstr "Не дазваляць"

448523

449524#: qml/Wizard/Pages/50-location.qml:124

450525msgid "You can change your mind later in System Settings."

451−msgstr ""

526+msgstr "Пасля змяніць налады можна з дапамогай Сістэмных параметраў."

452527

453528#: qml/Wizard/Pages/60-reporting.qml:24

454529msgid "Improving your experience"

455−msgstr ""

530+msgstr "Спрашчэнне вашай працы"

456531

457532#: qml/Wizard/Pages/60-reporting.qml:36

458533msgid ""

459534"Your phone is set up to automatically report errors to Canonical and its "

460535"partners, the makers of the operating system."

461536msgstr ""

537+"Ваш тэлефон настроены на аўтаматычную адпраўку справаздач пра памылкі ў "

538+"Canonical і партнёрскія установы, вытворцам аперацыйнай сістэмы."

462539

463540#: qml/Wizard/Pages/60-reporting.qml:43

464541msgid ""

465542"This can be disabled in System Settings under Security & "

466543"Privacy"

467544msgstr ""

545+"Гэтае можна адключыць у Сістэмных параметрах, Бяспека & "

546+"канфедэнцыйнасць"

468547

469548#: qml/Wizard/Pages/80-finished.qml:24

470549msgid "All done"

471−msgstr ""

550+msgstr "Зроблена"

472551

473552#: qml/Wizard/Pages/80-finished.qml:39

474553msgid "Nice work!"

475−msgstr ""

554+msgstr "Выдатная праца!"

476555

477556#: qml/Wizard/Pages/80-finished.qml:46

478557msgid "Your phone is now ready to use."

479−msgstr ""

558+msgstr "Цяпер Вашым тэлефонам можна карыстацца."

480559

481560#: qml/Wizard/Pages/80-finished.qml:53

482561msgid "Finish"

483−msgstr ""

562+msgstr "Скончыць"

484563

485564#: qml/Wizard/Pages/here-terms.qml:27

486565msgid "Terms & Conditions"

487−msgstr ""

566+msgstr "Умовы карыстання"

488567

489568#: qml/Wizard/Pages/passwd-confirm.qml:49

490569msgid "Confirm passphrase"

491−msgstr ""

570+msgstr "Пацвердзіце пароль"

492571

493572#: qml/Wizard/Pages/passwd-confirm.qml:50

494573msgid "Confirm passcode"

495−msgstr ""

574+msgstr "Пацвердзіце код"

496575

497576#: qml/Wizard/Pages/passwd-confirm.qml:53

498577#: qml/Wizard/Pages/passwd-confirm.qml:54

499578msgid "Please try again."

500−msgstr ""

579+msgstr "Калі ласка, паспрабуйце яшчэ раз."

501580

502581#: qml/Wizard/Pages/passwd-set.qml:61

503582msgid "Choose your passcode"

504−msgstr ""

583+msgstr "Выберыце ваш код-пароль"

505584

506585#: qml/Wizard/Pages/passwd-set.qml:68

507586msgid "Passphrase must be 4 characters long"

508−msgstr ""

587+msgstr "Пароль мусіць складацца мінімум з 4 сімвалаў"

509588

510589#: qml/Wizard/StackButton.qml:39

511590#, qt-format

512591msgid "〈 %1"

513−msgstr ""

592+msgstr "〈 %1"

514593

515594#: qml/Wizard/StackButton.qml:42

516595#, qt-format

517596msgid "%1 〉"

518−msgstr ""

597+msgstr "%1 〉"

598+

599+#~ msgid "Reboot"

600+#~ msgstr "Перазагрузіць"

601+

602+#~ msgid "Shut down"

603+#~ msgstr "Выключыць"

604+

605+#~ msgid "Top edge"

606+#~ msgstr "Верхні край"

607+

608+#~ msgid "Right edge"

609+#~ msgstr "Правы край"

610+

611+#~ msgid "Close"

612+#~ msgstr "Зачыніць"

613+

614+#~ msgid "Left edge"

615+#~ msgstr "Левы край"

616+

617+#~ msgid "Search"

618+#~ msgstr "Пошук"

619+

620+#~ msgid "Confirm"

621+#~ msgstr "Пацвердзіць"

622+

623+#~ msgid "Try swiping from the right edge to unlock the phone"

624+#~ msgstr "Правядзіце пальцам з правага краю, каб разблакаваць тэлефон"

625+

626+#~ msgid "Loading. Please Wait..."

627+#~ msgstr "Загрузка. Чакайце..."

628+

629+#~ msgid "Speaking..."

630+#~ msgstr "Кажа..."

631+

632+#~ msgid "Speak Now..."

633+#~ msgstr "Кажыце..."

634+

635+#~ msgid "Type or say a command"

636+#~ msgstr "Напішыце або вымавіце каманду"

637+

638+#~ msgid "Log out"

639+#~ msgstr "Выйсці"

640+

641+#~ msgid "Power"

642+#~ msgstr "Сілкаванне"

643+

644+#~ msgid "Restart"

645+#~ msgstr "Перазапуск"

646+

647+#~ msgid "Power off"

648+#~ msgstr "Выключыць"

649+

650+#~ msgid "Try swiping from the top edge to access the indicators"

651+#~ msgstr ""

652+#~ "Паспрабуйце правесці пальцам ад верхняга краю, для доступу да індыкатараў"

653+

654+#~ msgid "Swipe up again to close the settings screen"

655+#~ msgstr "Правядзіце пальцам яшчэ раз, каб зачыніць акно параметраў"

656+

657+#~ msgid "Well done"

658+#~ msgstr "Добра"

659+

660+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

661+#~ msgstr ""

662+#~ "Правядзіце пальцам ад левага краю, каб адкрыць панэль запуску для паскарэння "

663+#~ "доступу да праграм"

664+

665+#~ msgid "Skip intro"

666+#~ msgstr "Прапусціць уводзіны"

667+

668+#~ msgid "Settings"

669+#~ msgstr "Параметры"

670+

671+#~ msgid ""

672+#~ "You have now mastered the edge gestures and can start using the "

673+#~ "phone Tap on the screen to start"

674+#~ msgstr ""

675+#~ "Вамі наладжаныя дзеянні на дакрананні па краях экрана. Цяпер тэлефон можна "

676+#~ "выкарыстоўваць. Дакраніцеся да экрана, каб пачаць."

677+

678+#~ msgid "Store"

679+#~ msgstr "Крама"

po/bg.po+228−131

@@ -7,18 +7,18 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-04-01 14:08+0000\n"

12−"Last-Translator: Atanas Kovachki <Unknown>\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-04-12 14:43+0000\n"

12+"Last-Translator: George Karavasilev <kokoto-java@ubuntu.com>\n"

1313"Language-Team: Bulgarian <bg@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-04-14 05:33+0000\n"

19+"X-Generator: Launchpad (build 17423)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr ""

2424

@@ -31,132 +31,106 @@ msgstr ""

3131msgid "Unpin shortcut"

3232msgstr ""

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr ""

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr ""

4141

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

4343msgid "You have been locked out due to too many failed passcode attempts."

4444msgstr ""

4545

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

4747#, qt-format

4848msgid "Please wait %1 minute and then try again…"

4949msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] ""

5151msgstr[1] ""

5252

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

5455msgid "Log out"

5556msgstr ""

5657

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

5859msgid "Are you sure you want to log out?"

5960msgstr ""

6061

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:122

63−msgid "No"

62+#: qml/Components/Dialogs.qml:70

63+msgctxt "Button: Lock the system"

64+msgid "Lock"

6465msgstr ""

6566

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:129

68−msgid "Yes"

67+#: qml/Components/Dialogs.qml:77

68+msgctxt "Button: Log out from the system"

69+msgid "Log Out"

6970msgstr ""

7071

71−#: qml/Components/Dialogs.qml:94

72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

73+#: qml/Components/Dialogs.qml:171

74+msgid "Cancel"

75+msgstr ""

76+

77+#: qml/Components/Dialogs.qml:96

78+msgctxt "Title: Reboot/Shut down dialog"

7279msgid "Shut down"

7380msgstr ""

7481

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

7683msgid "Are you sure you want to shut down?"

7784msgstr ""

7885

79−#: qml/Components/Dialogs.qml:119

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

8088msgid "Reboot"

8189msgstr ""

8290

83−#: qml/Components/Dialogs.qml:120

84−msgid "Are you sure you want to reboot?"

85−msgstr ""

86−

87−#: qml/Components/Dialogs.qml:144

88−msgid "Power"

89−msgstr ""

90−

91−#: qml/Components/Dialogs.qml:145

92−msgid ""

93−"Are you sure you would like\n"

94−"to power off?"

91+#: qml/Components/Dialogs.qml:107

92+msgctxt "Button: Shut down the system"

93+msgid "Shut down"

9594msgstr ""

9695

97−#: qml/Components/Dialogs.qml:147

98−msgid "Power off"

96+#: qml/Components/Dialogs.qml:127

97+msgctxt "Title: Reboot dialog"

98+msgid "Reboot"

9999msgstr ""

100100

101−#: qml/Components/Dialogs.qml:157

102−msgid "Restart"

101+#: qml/Components/Dialogs.qml:128

102+msgid "Are you sure you want to reboot?"

103103msgstr ""

104104

105−#: qml/Components/Dialogs.qml:167

106−msgid "Cancel"

105+#: qml/Components/Dialogs.qml:130

106+msgid "No"

107107msgstr ""

108108

109−#: qml/Components/EdgeDemoOverlay.qml:151

110−msgid "Skip intro"

111−msgstr "Пропусни интрото"

112−

113−#: qml/Components/EdgeDemo.qml:125

114−msgid "Right edge"

115−msgstr "Десен край"

116−

117−#: qml/Components/EdgeDemo.qml:126

118−msgid "Try swiping from the right edge to unlock the phone"

109+#: qml/Components/Dialogs.qml:136

110+msgid "Yes"

119111msgstr ""

120−"Опитайте се да приплъзнете пръста си от десния край към левия, за да "

121−"отключите телефона"

122112

123−#: qml/Components/EdgeDemo.qml:157

124−msgid "Top edge"

125−msgstr "Горен край"

126−

127−#: qml/Components/EdgeDemo.qml:158

128−msgid "Try swiping from the top edge to access the indicators"

113+#: qml/Components/Dialogs.qml:150

114+msgctxt "Title: Power off/Restart dialog"

115+msgid "Power"

129116msgstr ""

130−"Опитайте се да приплъзнете пръста си от горния край към долния, за да "

131−"получите достъп до индикаторите"

132117

133−#: qml/Components/EdgeDemo.qml:183

134−msgid "Close"

135−msgstr "Затвори"

136−

137−#: qml/Components/EdgeDemo.qml:184

138−msgid "Swipe up again to close the settings screen"

118+#: qml/Components/Dialogs.qml:151

119+msgid ""

120+"Are you sure you would like\n"

121+"to power off?"

139122msgstr ""

140−"Отново приплъзнете пръста си нагоре за да затворите екрана с настройките"

141−

142−#: qml/Components/EdgeDemo.qml:214

143−msgid "Left edge"

144−msgstr "Ляв край"

123+"Искате ли да \n"

124+"изключите захранването на устройството?"

145125

146−#: qml/Components/EdgeDemo.qml:215

147−msgid "Swipe from the left to reveal the launcher for quick access to apps"

126+#: qml/Components/Dialogs.qml:153

127+msgctxt "Button: Power off the system"

128+msgid "Power off"

148129msgstr ""

149−"Приплъзнете пръста си от левия край към десния, за да отворите стартера за "

150−"бърз достъп до приложенията"

151−

152−#: qml/Components/EdgeDemo.qml:242

153−msgid "Well done"

154−msgstr "Великолепно"

155130

156−#: qml/Components/EdgeDemo.qml:243

157−msgid ""

158−"You have now mastered the edge gestures and can start using the "

159−"phone Tap on the screen to start"

131+#: qml/Components/Dialogs.qml:162

132+msgctxt "Button: Restart the system"

133+msgid "Restart"

160134msgstr ""

161135

162136#: qml/Components/Lockscreen.qml:238

@@ -171,32 +145,39 @@ msgstr "Спешно повикване"

171145msgid "OK"

172146msgstr ""

173147

174−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

148+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

175149msgid "See less"

176150msgstr ""

177151

178−#: qml/Dash/GenericScopeView.qml:431

152+#: qml/Dash/GenericScopeView.qml:533

179153msgid "See all"

180154msgstr ""

181155

182−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

183−#: qml/Panel/SearchIndicator.qml:27

156+#: qml/Dash/GenericScopeView.qml:595

157+msgctxt "Label: Hint for dash search line edit"

184158msgid "Search"

185−msgstr "Търсене"

159+msgstr ""

186160

187−#: qml/Dash/PageHeader.qml:260

161+#: qml/Dash/PageHeader.qml:269

162+msgctxt "Button: Open the Ubuntu Store"

188163msgid "Store"

189164msgstr ""

190165

191−#: qml/Dash/PageHeader.qml:277

166+#: qml/Dash/PageHeader.qml:276

167+msgctxt "Button: Start a search in the current dash scope"

168+msgid "Search"

169+msgstr ""

170+

171+#: qml/Dash/PageHeader.qml:286

172+msgctxt "Button: Show the current dash scope settings"

192173msgid "Settings"

193174msgstr ""

194175

195−#: qml/Dash/PageHeader.qml:284

176+#: qml/Dash/PageHeader.qml:293

196177msgid "Remove from Favorites"

197178msgstr ""

198179

199−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

200181msgid "Add to Favorites"

201182msgstr ""

202183

@@ -228,22 +209,88 @@ msgstr ""

228209msgid "Release to refresh…"

229210msgstr ""

230211

231−#: qml/Dash/ScopesList.qml:63

212+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

213+msgid "Enable location data"

214+msgstr ""

215+

216+#: qml/Dash/ScopesList.qml:66

232217msgid "Manage"

233218msgstr ""

234219

235−#: qml/Dash/ScopesList.qml:107

220+#: qml/Dash/ScopesList.qml:112

236221msgid "Home"

237222msgstr ""

238223

239−#: qml/Dash/ScopesList.qml:108

224+#: qml/Dash/ScopesList.qml:113

240225msgid "Also installed"

241226msgstr ""

242227

243−#: qml/Greeter/Greeter.qml:174

228+#: qml/Greeter/CoverPage.qml:107

244229msgid "Unlock"

245230msgstr ""

246231

232+#: qml/Greeter/LoginList.qml:236

233+msgid "Retry"

234+msgstr ""

235+

236+#: qml/Greeter/LoginList.qml:237

237+msgid "Tap to unlock"

238+msgstr ""

239+

240+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

241+msgid "Sorry, incorrect passphrase."

242+msgstr ""

243+

244+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

245+msgid "Sorry, incorrect passcode."

246+msgstr ""

247+

248+#: qml/Greeter/NarrowView.qml:55

249+msgid "This will be your last attempt."

250+msgstr ""

251+

252+#: qml/Greeter/NarrowView.qml:57

253+msgid ""

254+"If passphrase is entered incorrectly, your phone will conduct a factory "

255+"reset and all personal data will be deleted."

256+msgstr ""

257+

258+#: qml/Greeter/NarrowView.qml:58

259+msgid ""

260+"If passcode is entered incorrectly, your phone will conduct a factory reset "

261+"and all personal data will be deleted."

262+msgstr ""

263+

264+#: qml/Greeter/NarrowView.qml:115

265+#, qt-format

266+msgid "Enter %1"

267+msgstr ""

268+

269+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

270+msgid "Enter passphrase"

271+msgstr ""

272+

273+#: qml/Greeter/NarrowView.qml:117

274+msgid "Enter passcode"

275+msgstr ""

276+

277+#: qml/Greeter/NarrowView.qml:118

278+#, qt-format

279+msgid "Sorry, incorrect %1"

280+msgstr ""

281+

282+#: qml/Greeter/NarrowView.qml:119

283+msgid "Sorry, incorrect passphrase"

284+msgstr ""

285+

286+#: qml/Greeter/NarrowView.qml:120

287+msgid "Please re-enter"

288+msgstr ""

289+

290+#: qml/Greeter/NarrowView.qml:121

291+msgid "Sorry, incorrect passcode"

292+msgstr ""

293+

247294#: qml/Notifications/NotificationMenuItemFactory.qml:128

248295msgid "Show password"

249296msgstr "Покажи паролата"

@@ -284,6 +331,11 @@ msgstr ""

284331msgid "Failed, tap to retry"

285332msgstr ""

286333

334+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

335+msgctxt "Label: Hint in message indicator line edit"

336+msgid "Reply"

337+msgstr ""

338+

287339#: qml/Panel/Indicators/ModemInfoItem.qml:105

288340msgid "Unlock SIM"

289341msgstr ""

@@ -292,61 +344,60 @@ msgstr ""

292344msgid "Roaming"

293345msgstr ""

294346

295−#: qml/Shell.qml:367

296−#, qt-format

297−msgid "Enter %1"

347+#: qml/Tutorial/TutorialBottomFinish.qml:24

348+msgid "This action does different things for different apps"

298349msgstr ""

299350

300−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

301−msgid "Enter passphrase"

351+#: qml/Tutorial/TutorialBottomFinish.qml:25

352+msgid "Tap here to finish."

302353msgstr ""

303354

304−#: qml/Shell.qml:369

305−msgid "Enter passcode"

355+#: qml/Tutorial/TutorialBottom.qml:28

356+msgid "Open special menus"

306357msgstr ""

307358

308−#: qml/Shell.qml:370

309−#, qt-format

310−msgid "Sorry, incorrect %1"

359+#: qml/Tutorial/TutorialBottom.qml:29

360+msgid "Swipe up from the bottom edge."

311361msgstr ""

312362

313−#: qml/Shell.qml:371

314−msgid "Sorry, incorrect passphrase"

363+#: qml/Tutorial/TutorialLeftFinish.qml:24

364+msgid "These are the shortcuts to favorite apps"

315365msgstr ""

316366

317−#: qml/Shell.qml:372

318−msgid "Please re-enter"

367+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

368+msgid "Tap here to continue."

319369msgstr ""

320370

321−#: qml/Shell.qml:373

322−msgid "Sorry, incorrect passcode"

371+#: qml/Tutorial/TutorialLeft.qml:26

372+msgid "Open the launcher"

323373msgstr ""

324374

325−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

326−msgid "Sorry, incorrect passphrase."

375+#: qml/Tutorial/TutorialLeft.qml:27

376+msgid "Short swipe from the left edge."

327377msgstr ""

328378

329−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

330−msgid "Sorry, incorrect passcode."

379+#: qml/Tutorial/TutorialPage.qml:178

380+msgid "You almost got it!"

331381msgstr ""

332382

333−#: qml/Shell.qml:469

334−msgid "This will be your last attempt."

383+#: qml/Tutorial/TutorialPage.qml:195

384+msgid "Try again."

335385msgstr ""

336386

337−#: qml/Shell.qml:471

338−msgid ""

339−"If passphrase is entered incorrectly, your phone will conduct a factory "

340−"reset and all personal data will be deleted."

387+#: qml/Tutorial/TutorialRight.qml:31

388+msgid "To view open apps"

341389msgstr ""

342390

343−#: qml/Shell.qml:472

344−msgid ""

345−"If passcode is entered incorrectly, your phone will conduct a factory reset "

346−"and all personal data will be deleted."

391+#: qml/Tutorial/TutorialRight.qml:32

392+msgid "Long swipe from the right edge."

393+msgstr ""

394+

395+#: qml/Tutorial/TutorialRight.qml:122

396+msgid "View all your running tasks."

347397msgstr ""

348398

349399#: qml/Wizard/Page.qml:89

400+msgctxt "Button: Go back one page in the Wizard"

350401msgid "Back"

351402msgstr ""

352403

@@ -363,7 +414,7 @@ msgid "Let’s get started."

363414msgstr ""

364415

365416#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

366−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

417+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

367418#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

368419#: qml/Wizard/Pages/passwd-set.qml:90

369420msgid "Continue"

@@ -373,11 +424,11 @@ msgstr ""

373424msgid "Add a SIM card and restart your device"

374425msgstr ""

375426

376−#: qml/Wizard/Pages/20-sim.qml:55

427+#: qml/Wizard/Pages/20-sim.qml:59

377428msgid "Without it, you won’t be able to make calls or use text messaging."

378429msgstr ""

379430

380−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

431+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

381432msgid "Skip"

382433msgstr ""

383434

@@ -390,38 +441,44 @@ msgid "Please select how you’d like to unlock your phone."

390441msgstr ""

391442

392443#: qml/Wizard/Pages/30-passwd-type.qml:97

444+msgctxt "Label: Type of security method"

393445msgid "Swipe"

394446msgstr ""

395447

396448#: qml/Wizard/Pages/30-passwd-type.qml:98

449+msgctxt "Label: Description of security method"

397450msgid "No security"

398451msgstr ""

399452

400453#: qml/Wizard/Pages/30-passwd-type.qml:100

454+msgctxt "Label: Type of security method"

401455msgid "Passcode"

402456msgstr ""

403457

404458#: qml/Wizard/Pages/30-passwd-type.qml:101

459+msgctxt "Label: Description of security method"

405460msgid "4 digits only"

406461msgstr ""

407462

408463#: qml/Wizard/Pages/30-passwd-type.qml:103

464+msgctxt "Label: Type of security method"

409465msgid "Passphrase"

410466msgstr ""

411467

412468#: qml/Wizard/Pages/30-passwd-type.qml:104

469+msgctxt "Label: Description of security method"

413470msgid "Numbers and letters"

414471msgstr ""

415472

416−#: qml/Wizard/Pages/40-wifi.qml:28

473+#: qml/Wizard/Pages/40-wifi.qml:29

417474msgid "Connect to Wi‑Fi"

418475msgstr ""

419476

420−#: qml/Wizard/Pages/40-wifi.qml:147

477+#: qml/Wizard/Pages/40-wifi.qml:168

421478msgid "Available networks…"

422479msgstr ""

423480

424−#: qml/Wizard/Pages/40-wifi.qml:148

481+#: qml/Wizard/Pages/40-wifi.qml:169

425482msgid "No available networks."

426483msgstr ""

427484

@@ -526,6 +583,21 @@ msgstr ""

526583#~ msgid "Confirm"

527584#~ msgstr "Потвърди"

528585

586+#~ msgid "Search"

587+#~ msgstr "Търсене"

588+

589+#~ msgid "Top edge"

590+#~ msgstr "Горен край"

591+

592+#~ msgid "Close"

593+#~ msgstr "Затвори"

594+

595+#~ msgid "Left edge"

596+#~ msgstr "Ляв край"

597+

598+#~ msgid "Right edge"

599+#~ msgstr "Десен край"

600+

529601#~ msgid "Type or say a command"

530602#~ msgstr "Въведете или кажете команда"

531603

@@ -535,5 +607,30 @@ msgstr ""

535607#~ msgid "Speak Now..."

536608#~ msgstr "Говорете сега..."

537609

610+#~ msgid "Well done"

611+#~ msgstr "Великолепно"

612+

613+#~ msgid "Skip intro"

614+#~ msgstr "Пропусни интрото"

615+

538616#~ msgid "Loading. Please Wait..."

539617#~ msgstr "Зарежда се. Моля, почакайте..."

618+

619+#~ msgid "Try swiping from the top edge to access the indicators"

620+#~ msgstr ""

621+#~ "Опитайте се да приплъзнете пръста си от горния край към долния, за да "

622+#~ "получите достъп до индикаторите"

623+

624+#~ msgid "Swipe up again to close the settings screen"

625+#~ msgstr ""

626+#~ "Отново приплъзнете пръста си нагоре за да затворите екрана с настройките"

627+

628+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

629+#~ msgstr ""

630+#~ "Приплъзнете пръста си от левия край към десния, за да отворите стартера за "

631+#~ "бърз достъп до приложенията"

632+

633+#~ msgid "Try swiping from the right edge to unlock the phone"

634+#~ msgstr ""

635+#~ "Опитайте се да приплъзнете пръста си от десния край към левия, за да "

636+#~ "отключите телефона"

po/br.po+274−150

@@ -7,18 +7,18 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-12-16 07:27+0000\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-03-25 07:36+0000\n"

1212"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"

1313"Language-Team: Breton <br@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-17 07:06+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-03-26 05:27+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr "Ger-tremen : "

2424

@@ -31,68 +31,95 @@ msgstr "Spilhennañ ar verradenn"

3131msgid "Unpin shortcut"

3232msgstr "Dispilhennañ ar verradenn"

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr "Benveg prennet"

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr ""

4141"Prennet eo bet ho penveg abalamour da re a daolioù-esae c'hwitet evit merkañ "

4242"ho frazenn-dremen."

4343

44−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

4545msgid "You have been locked out due to too many failed passcode attempts."

4646msgstr ""

4747"Prennet eo bet ho penveg abalamour da re a daolioù-esae evit merkañ ho kod-"

4848"tremen."

4949

50−#: qml/Components/DelayedLockscreen.qml:72

50+#: qml/Components/DelayedLockscreen.qml:74

5151#, qt-format

5252msgid "Please wait %1 minute and then try again…"

5353msgid_plural "Please wait %1 minutes and then try again…"

5454msgstr[0] "Gortozit %1 vunutenn, mar plij, hag esaeit en-dro..."

5555msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."

5656

57−#: qml/Components/Dialogs.qml:70

57+#: qml/Components/Dialogs.qml:67

58+msgctxt "Title: Lock/Log out dialog"

5859msgid "Log out"

5960msgstr "Digevreañ"

6061

61−#: qml/Components/Dialogs.qml:71

62+#: qml/Components/Dialogs.qml:68

6263msgid "Are you sure you want to log out?"

6364msgstr "Ha sur oc'h e fell deoc'h digevreañ ?"

6465

65−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66−#: qml/Components/Dialogs.qml:122

67−msgid "No"

68−msgstr "N'on ket"

66+#: qml/Components/Dialogs.qml:70

67+msgctxt "Button: Lock the system"

68+msgid "Lock"

69+msgstr "Prennañ"

6970

70−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71−#: qml/Components/Dialogs.qml:129

72−msgid "Yes"

73−msgstr "Ya"

71+#: qml/Components/Dialogs.qml:77

72+msgctxt "Button: Log out from the system"

73+msgid "Log Out"

74+msgstr "Digevreañ"

75+

76+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

77+#: qml/Components/Dialogs.qml:171

78+msgid "Cancel"

79+msgstr "Nullañ"

7480

75−#: qml/Components/Dialogs.qml:94

81+#: qml/Components/Dialogs.qml:96

82+msgctxt "Title: Reboot/Shut down dialog"

7683msgid "Shut down"

7784msgstr "Lazhañ ar benveg"

7885

79−#: qml/Components/Dialogs.qml:95

86+#: qml/Components/Dialogs.qml:97

8087msgid "Are you sure you want to shut down?"

8188msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"

8289

83−#: qml/Components/Dialogs.qml:119

90+#: qml/Components/Dialogs.qml:99

91+msgctxt "Button: Reboot the system"

8492msgid "Reboot"

8593msgstr "Adloc'hañ"

8694

87−#: qml/Components/Dialogs.qml:120

95+#: qml/Components/Dialogs.qml:107

96+msgctxt "Button: Shut down the system"

97+msgid "Shut down"

98+msgstr "Lazhañ ar benveg"

99+

100+#: qml/Components/Dialogs.qml:127

101+msgctxt "Title: Reboot dialog"

102+msgid "Reboot"

103+msgstr "Adloc'hañ"

104+

105+#: qml/Components/Dialogs.qml:128

88106msgid "Are you sure you want to reboot?"

89107msgstr "Ha sur oc'h e fell deoc'h adloc'hañ ?"

90108

91−#: qml/Components/Dialogs.qml:144

109+#: qml/Components/Dialogs.qml:130

110+msgid "No"

111+msgstr "N'on ket"

112+

113+#: qml/Components/Dialogs.qml:136

114+msgid "Yes"

115+msgstr "Ya"

116+

117+#: qml/Components/Dialogs.qml:150

118+msgctxt "Title: Power off/Restart dialog"

92119msgid "Power"

93−msgstr "Tredan"

120+msgstr "Enaouiñ"

94121

95−#: qml/Components/Dialogs.qml:145

122+#: qml/Components/Dialogs.qml:151

96123msgid ""

97124"Are you sure you would like\n"

98125"to power off?"

@@ -100,71 +127,16 @@ msgstr ""

100127"Ha sur oc'h e fell deoc'h\n"

101128"troc'hañ an tredan ?"

102129

103−#: qml/Components/Dialogs.qml:147

130+#: qml/Components/Dialogs.qml:153

131+msgctxt "Button: Power off the system"

104132msgid "Power off"

105133msgstr "Lazhañ"

106134

107−#: qml/Components/Dialogs.qml:157

135+#: qml/Components/Dialogs.qml:162

136+msgctxt "Button: Restart the system"

108137msgid "Restart"

109138msgstr "Adloc'hañ"

110139

111−#: qml/Components/Dialogs.qml:167

112−msgid "Cancel"

113−msgstr "Nullañ"

114−

115−#: qml/Components/EdgeDemoOverlay.qml:151

116−msgid "Skip intro"

117−msgstr "Tremen hep sellet ouzh an digoradur"

118−

119−#: qml/Components/EdgeDemo.qml:125

120−msgid "Right edge"

121−msgstr "Bord dehoù"

122−

123−#: qml/Components/EdgeDemo.qml:126

124−msgid "Try swiping from the right edge to unlock the phone"

125−msgstr ""

126−"Lakait ho piz da riklañ adalek ar bord dehoù da zibrennañ ar pellgomzer."

127−

128−#: qml/Components/EdgeDemo.qml:157

129−msgid "Top edge"

130−msgstr "Bord uhelañ"

131−

132−#: qml/Components/EdgeDemo.qml:158

133−msgid "Try swiping from the top edge to access the indicators"

134−msgstr ""

135−"Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war wel."

136−

137−#: qml/Components/EdgeDemo.qml:183

138−msgid "Close"

139−msgstr "Serriñ"

140−

141−#: qml/Components/EdgeDemo.qml:184

142−msgid "Swipe up again to close the settings screen"

143−msgstr ""

144−"Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an arventennoù"

145−

146−#: qml/Components/EdgeDemo.qml:214

147−msgid "Left edge"

148−msgstr "Bord kleiz"

149−

150−#: qml/Components/EdgeDemo.qml:215

151−msgid "Swipe from the left to reveal the launcher for quick access to apps"

152−msgstr ""

153−"Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser arloadoù "

154−"prim."

155−

156−#: qml/Components/EdgeDemo.qml:242

157−msgid "Well done"

158−msgstr "Gourc'hemennoù !"

159−

160−#: qml/Components/EdgeDemo.qml:243

161−msgid ""

162−"You have now mastered the edge gestures and can start using the "

163−"phone Tap on the screen to start"

164−msgstr ""

165−"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "

166−"pellgomzer Touchit d'ar skramm evit kregiñ ganti"

167−

168140#: qml/Components/Lockscreen.qml:238

169141msgid "Return to Call"

170142msgstr "Distreiñ d'ar bellgomzadenn"

@@ -177,32 +149,39 @@ msgstr "Pellgomzadenn vallus"

177149msgid "OK"

178150msgstr "Mat eo"

179151

180−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

181153msgid "See less"

182154msgstr "Gwelet nebeutoc'h"

183155

184−#: qml/Dash/GenericScopeView.qml:431

156+#: qml/Dash/GenericScopeView.qml:533

185157msgid "See all"

186158msgstr "Gwelet pep tra"

187159

188−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

189−#: qml/Panel/SearchIndicator.qml:27

160+#: qml/Dash/GenericScopeView.qml:595

161+msgctxt "Label: Hint for dash search line edit"

190162msgid "Search"

191163msgstr "Klask"

192164

193−#: qml/Dash/PageHeader.qml:260

165+#: qml/Dash/PageHeader.qml:269

166+msgctxt "Button: Open the Ubuntu Store"

194167msgid "Store"

195−msgstr "Enrollañ"

168+msgstr "Stal"

169+

170+#: qml/Dash/PageHeader.qml:276

171+msgctxt "Button: Start a search in the current dash scope"

172+msgid "Search"

173+msgstr "Klask"

196174

197−#: qml/Dash/PageHeader.qml:277

175+#: qml/Dash/PageHeader.qml:286

176+msgctxt "Button: Show the current dash scope settings"

198177msgid "Settings"

199178msgstr "Arventennoù"

200179

201−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

202181msgid "Remove from Favorites"

203182msgstr "Lemel eus ar sinedoù"

204183

205−#: qml/Dash/PageHeader.qml:284

184+#: qml/Dash/PageHeader.qml:293

206185msgid "Add to Favorites"

207186msgstr "Ouzhpennañ d'ar sinedoù"

208187

@@ -234,22 +213,92 @@ msgstr "Tennañ evit freskaat..."

234213msgid "Release to refresh…"

235214msgstr "Lezel da vont evit freskaat..."

236215

237−#: qml/Dash/ScopesList.qml:63

216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

217+msgid "Enable location data"

218+msgstr "Gweredekaat ar roadennoù lec'hiañ"

219+

220+#: qml/Dash/ScopesList.qml:66

238221msgid "Manage"

239222msgstr "Merañ"

240223

241−#: qml/Dash/ScopesList.qml:107

224+#: qml/Dash/ScopesList.qml:112

242225msgid "Home"

243226msgstr "Er gêr"

244227

245−#: qml/Dash/ScopesList.qml:108

228+#: qml/Dash/ScopesList.qml:113

246229msgid "Also installed"

247230msgstr "Staliet ivez"

248231

249−#: qml/Greeter/Greeter.qml:174

232+#: qml/Greeter/CoverPage.qml:107

250233msgid "Unlock"

251234msgstr "Dibrennañ"

252235

236+#: qml/Greeter/LoginList.qml:236

237+msgid "Retry"

238+msgstr "Esaeañ en-dro"

239+

240+#: qml/Greeter/LoginList.qml:237

241+msgid "Tap to unlock"

242+msgstr "Pouezañ evit dibrennañ"

243+

244+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

245+msgid "Sorry, incorrect passphrase."

246+msgstr "Siwazh, frazenn-dremen direizh"

247+

248+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

249+msgid "Sorry, incorrect passcode."

250+msgstr "Siwazh, kod-tremen direizh"

251+

252+#: qml/Greeter/NarrowView.qml:55

253+msgid "This will be your last attempt."

254+msgstr "Ho taol-esae diwezhañ e vo."

255+

256+#: qml/Greeter/NarrowView.qml:57

257+msgid ""

258+"If passphrase is entered incorrectly, your phone will conduct a factory "

259+"reset and all personal data will be deleted."

260+msgstr ""

261+"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "

262+"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"

263+

264+#: qml/Greeter/NarrowView.qml:58

265+msgid ""

266+"If passcode is entered incorrectly, your phone will conduct a factory reset "

267+"and all personal data will be deleted."

268+msgstr ""

269+"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "

270+"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."

271+

272+#: qml/Greeter/NarrowView.qml:115

273+#, qt-format

274+msgid "Enter %1"

275+msgstr "Merkañ %1"

276+

277+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

278+msgid "Enter passphrase"

279+msgstr "Merkañ ar frazenn-dremen"

280+

281+#: qml/Greeter/NarrowView.qml:117

282+msgid "Enter passcode"

283+msgstr "Merkañ ar c'hod-tremen"

284+

285+#: qml/Greeter/NarrowView.qml:118

286+#, qt-format

287+msgid "Sorry, incorrect %1"

288+msgstr "Siwazh, %1 direizh"

289+

290+#: qml/Greeter/NarrowView.qml:119

291+msgid "Sorry, incorrect passphrase"

292+msgstr "Siwazh, frazenn-dremen direizh"

293+

294+#: qml/Greeter/NarrowView.qml:120

295+msgid "Please re-enter"

296+msgstr "Adverkañ, mar plij"

297+

298+#: qml/Greeter/NarrowView.qml:121

299+msgid "Sorry, incorrect passcode"

300+msgstr "Digarezit, kod-tremen direizh"

301+

253302#: qml/Notifications/NotificationMenuItemFactory.qml:128

254303msgid "Show password"

255304msgstr "Diskouez ar ger-tremen"

@@ -290,6 +339,11 @@ msgstr "Echu"

290339msgid "Failed, tap to retry"

291340msgstr "C'hwitet, touchit evit adkregiñ"

292341

342+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

343+msgctxt "Label: Hint in message indicator line edit"

344+msgid "Reply"

345+msgstr "Respont"

346+

293347#: qml/Panel/Indicators/ModemInfoItem.qml:105

294348msgid "Unlock SIM"

295349msgstr "Dibrennañ ar gartenn SIM"

@@ -298,65 +352,60 @@ msgstr "Dibrennañ ar gartenn SIM"

298352msgid "Roaming"

299353msgstr "O kantren"

300354

301−#: qml/Shell.qml:367

302−#, qt-format

303−msgid "Enter %1"

304−msgstr "Merkañ %1"

355+#: qml/Tutorial/TutorialBottomFinish.qml:24

356+msgid "This action does different things for different apps"

357+msgstr "An ober-mañ a ra meur a dra evit meur a arload"

305358

306−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

307−msgid "Enter passphrase"

308−msgstr "Merkañ ar frazenn-dremen"

359+#: qml/Tutorial/TutorialBottomFinish.qml:25

360+msgid "Tap here to finish."

361+msgstr "Pouezañ amañ evit echuiñ."

309362

310−#: qml/Shell.qml:369

311−msgid "Enter passcode"

312−msgstr "Merkañ ar c'hod-tremen"

363+#: qml/Tutorial/TutorialBottom.qml:28

364+msgid "Open special menus"

365+msgstr "Digeriñ al lañserioù ispisial"

313366

314−#: qml/Shell.qml:370

315−#, qt-format

316−msgid "Sorry, incorrect %1"

317−msgstr "Siwazh, %1 direizh"

367+#: qml/Tutorial/TutorialBottom.qml:29

368+msgid "Swipe up from the bottom edge."

369+msgstr "Riklit war-du an nec'h adalek an traoñ"

318370

319−#: qml/Shell.qml:371

320−msgid "Sorry, incorrect passphrase"

321−msgstr "Siwazh, frazenn-dremen direizh"

371+#: qml/Tutorial/TutorialLeftFinish.qml:24

372+msgid "These are the shortcuts to favorite apps"

373+msgstr "Berradennoù war-du hoc'h arloadoù gwellañ-deuet eo ar re-mañ"

322374

323−#: qml/Shell.qml:372

324−msgid "Please re-enter"

325−msgstr "Adverkañ, mar plij"

375+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

376+msgid "Tap here to continue."

377+msgstr "Pouzañ amañ evit kenderc'hel"

326378

327−#: qml/Shell.qml:373

328−msgid "Sorry, incorrect passcode"

329−msgstr "Digarezit, kod-tremen direizh"

379+#: qml/Tutorial/TutorialLeft.qml:26

380+msgid "Open the launcher"

381+msgstr "Digeriñ al lañser"

330382

331−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

332−msgid "Sorry, incorrect passphrase."

333−msgstr "Siwazh, frazenn-dremen direizh"

383+#: qml/Tutorial/TutorialLeft.qml:27

384+msgid "Short swipe from the left edge."

385+msgstr "Riklik dousik adalek ar bord kleiz."

334386

335−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

336−msgid "Sorry, incorrect passcode."

337−msgstr "Siwazh, kod-tremen direizh"

387+#: qml/Tutorial/TutorialPage.qml:178

388+msgid "You almost got it!"

389+msgstr "Deuet eo ganeoc'h pe dost ?"

338390

339−#: qml/Shell.qml:469

340−msgid "This will be your last attempt."

341−msgstr "Ho taol-esae diwezhañ e vo."

391+#: qml/Tutorial/TutorialPage.qml:195

392+msgid "Try again."

393+msgstr "Esaeit en-dro."

342394

343−#: qml/Shell.qml:471

344−msgid ""

345−"If passphrase is entered incorrectly, your phone will conduct a factory "

346−"reset and all personal data will be deleted."

347−msgstr ""

348−"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "

349−"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"

395+#: qml/Tutorial/TutorialRight.qml:31

396+msgid "To view open apps"

397+msgstr "Evit gwelet an arloadoù digor"

350398

351−#: qml/Shell.qml:472

352−msgid ""

353−"If passcode is entered incorrectly, your phone will conduct a factory reset "

354−"and all personal data will be deleted."

355−msgstr ""

356−"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "

357−"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."

399+#: qml/Tutorial/TutorialRight.qml:32

400+msgid "Long swipe from the right edge."

401+msgstr "Riklit pell adalek ar bord dehoù."

402+

403+#: qml/Tutorial/TutorialRight.qml:122

404+msgid "View all your running tasks."

405+msgstr "Gwelet an holl drevelloù a ya en-dro."

358406

359407#: qml/Wizard/Page.qml:89

408+msgctxt "Button: Go back one page in the Wizard"

360409msgid "Back"

361410msgstr "Distreiñ"

362411

@@ -373,7 +422,7 @@ msgid "Let’s get started."

373422msgstr "Krogomp ganti."

374423

375424#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

376−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

425+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

377426#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

378427#: qml/Wizard/Pages/passwd-set.qml:90

379428msgid "Continue"

@@ -383,11 +432,11 @@ msgstr "Kenderc'hel"

383432msgid "Add a SIM card and restart your device"

384433msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"

385434

386−#: qml/Wizard/Pages/20-sim.qml:55

435+#: qml/Wizard/Pages/20-sim.qml:59

387436msgid "Without it, you won’t be able to make calls or use text messaging."

388437msgstr "Ne vioc'h ket evit pellgomz pe kas kemennadennoù hepti."

389438

390−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

439+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

391440msgid "Skip"

392441msgstr "Tremen hebiou"

393442

@@ -401,38 +450,44 @@ msgstr ""

401450"Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."

402451

403452#: qml/Wizard/Pages/30-passwd-type.qml:97

453+msgctxt "Label: Type of security method"

404454msgid "Swipe"

405455msgstr "Riklañ"

406456

407457#: qml/Wizard/Pages/30-passwd-type.qml:98

458+msgctxt "Label: Description of security method"

408459msgid "No security"

409460msgstr "Tamm surentez ebet"

410461

411462#: qml/Wizard/Pages/30-passwd-type.qml:100

463+msgctxt "Label: Type of security method"

412464msgid "Passcode"

413465msgstr "Kod-tremen"

414466

415467#: qml/Wizard/Pages/30-passwd-type.qml:101

468+msgctxt "Label: Description of security method"

416469msgid "4 digits only"

417470msgstr "4 sifr hepken"

418471

419472#: qml/Wizard/Pages/30-passwd-type.qml:103

473+msgctxt "Label: Type of security method"

420474msgid "Passphrase"

421475msgstr "Frazenn-dremen"

422476

423477#: qml/Wizard/Pages/30-passwd-type.qml:104

478+msgctxt "Label: Description of security method"

424479msgid "Numbers and letters"

425480msgstr "Sifroù ha lizherennoù"

426481

427−#: qml/Wizard/Pages/40-wifi.qml:28

482+#: qml/Wizard/Pages/40-wifi.qml:29

428483msgid "Connect to Wi‑Fi"

429484msgstr "Kevreañ ouzh ar Wi-Fi"

430485

431−#: qml/Wizard/Pages/40-wifi.qml:147

486+#: qml/Wizard/Pages/40-wifi.qml:168

432487msgid "Available networks…"

433488msgstr "Rouedadoù a c'haller kaout..."

434489

435−#: qml/Wizard/Pages/40-wifi.qml:148

490+#: qml/Wizard/Pages/40-wifi.qml:169

436491msgid "No available networks."

437492msgstr "N'eus rouedad ebet da gaout."

438493

@@ -541,6 +596,28 @@ msgstr "〈 %1"

541596msgid "%1 〉"

542597msgstr "%1 〉"

543598

599+#~ msgid "Close"

600+#~ msgstr "Serriñ"

601+

602+#~ msgid "Top edge"

603+#~ msgstr "Bord uhelañ"

604+

605+#~ msgid "Left edge"

606+#~ msgstr "Bord kleiz"

607+

608+#~ msgid "Skip intro"

609+#~ msgstr "Tremen hep sellet ouzh an digoradur"

610+

611+#~ msgid "Right edge"

612+#~ msgstr "Bord dehoù"

613+

614+#~ msgid ""

615+#~ "You have now mastered the edge gestures and can start using the "

616+#~ "phone Tap on the screen to start"

617+#~ msgstr ""

618+#~ "Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "

619+#~ "pellgomzer Touchit d'ar skramm evit kregiñ ganti"

620+

544621#~ msgid "Loading. Please Wait..."

545622#~ msgstr "O kargañ. Gortozit, mar plij..."

546623

@@ -553,9 +630,38 @@ msgstr "%1 〉"

553630#~ msgid "Confirm"

554631#~ msgstr "Kadarnaat"

555632

633+#~ msgid "Search"

634+#~ msgstr "Klask"

635+

636+#~ msgid "Try swiping from the top edge to access the indicators"

637+#~ msgstr ""

638+#~ "Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war wel."

639+

640+#~ msgid "Swipe up again to close the settings screen"

641+#~ msgstr ""

642+#~ "Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an arventennoù"

643+

644+#~ msgid "Try swiping from the right edge to unlock the phone"

645+#~ msgstr ""

646+#~ "Lakait ho piz da riklañ adalek ar bord dehoù da zibrennañ ar pellgomzer."

647+

648+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

649+#~ msgstr ""

650+#~ "Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser arloadoù "

651+#~ "prim."

652+

653+#~ msgid "Well done"

654+#~ msgstr "Gourc'hemennoù !"

655+

556656#~ msgid "Type or say a command"

557657#~ msgstr "Skrivit pe lavarit un urzhiad"

558658

659+#~ msgid "Store"

660+#~ msgstr "Enrollañ"

661+

662+#~ msgid "Power off"

663+#~ msgstr "Lazhañ"

664+

559665#~ msgid "Done"

560666#~ msgstr "Graet eo"

561667

@@ -565,5 +671,23 @@ msgstr "%1 〉"

565671#~ msgid "Favorites"

566672#~ msgstr "Gwellañ deuet"

567673

674+#~ msgid "Power"

675+#~ msgstr "Tredan"

676+

677+#~ msgid "Log out"

678+#~ msgstr "Digevreañ"

679+

680+#~ msgid "Reboot"

681+#~ msgstr "Adloc'hañ"

682+

683+#~ msgid "Shut down"

684+#~ msgstr "Lazhañ ar benveg"

685+

686+#~ msgid "Settings"

687+#~ msgstr "Arventennoù"

688+

689+#~ msgid "Restart"

690+#~ msgstr "Adloc'hañ"

691+

568692#~ msgid "Manage Scopes"

569693#~ msgstr "Merañ ar c'hefluskerioù enklask"

po/bs.po+195−121

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

1111"PO-Revision-Date: 2014-01-16 22:33+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Bosnian <bs@li.org>\n"

@@ -16,10 +16,10 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

20−"X-Generator: Launchpad (build 17286)\n"

19+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

20+"X-Generator: Launchpad (build 17413)\n"

2121

22−#: plugins/LightDM/Greeter.cpp:130

22+#: plugins/LightDM/Greeter.cpp:112

2323msgid "Password: "

2424msgstr ""

2525

@@ -32,125 +32,104 @@ msgstr ""

3232msgid "Unpin shortcut"

3333msgstr ""

3434

35−#: qml/Components/DelayedLockscreen.qml:47

35+#: qml/Components/DelayedLockscreen.qml:49

3636msgid "Device Locked"

3737msgstr ""

3838

39−#: qml/Components/DelayedLockscreen.qml:62

39+#: qml/Components/DelayedLockscreen.qml:64

4040msgid "You have been locked out due to too many failed passphrase attempts."

4141msgstr ""

4242

43−#: qml/Components/DelayedLockscreen.qml:63

43+#: qml/Components/DelayedLockscreen.qml:65

4444msgid "You have been locked out due to too many failed passcode attempts."

4545msgstr ""

4646

47−#: qml/Components/DelayedLockscreen.qml:72

47+#: qml/Components/DelayedLockscreen.qml:74

4848#, qt-format

4949msgid "Please wait %1 minute and then try again…"

5050msgid_plural "Please wait %1 minutes and then try again…"

5151msgstr[0] ""

5252msgstr[1] ""

5353

54−#: qml/Components/Dialogs.qml:70

54+#: qml/Components/Dialogs.qml:67

55+msgctxt "Title: Lock/Log out dialog"

5556msgid "Log out"

5657msgstr ""

5758

58−#: qml/Components/Dialogs.qml:71

59+#: qml/Components/Dialogs.qml:68

5960msgid "Are you sure you want to log out?"

6061msgstr ""

6162

62−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63−#: qml/Components/Dialogs.qml:122

64−msgid "No"

63+#: qml/Components/Dialogs.qml:70

64+msgctxt "Button: Lock the system"

65+msgid "Lock"

6566msgstr ""

6667

67−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68−#: qml/Components/Dialogs.qml:129

69−msgid "Yes"

68+#: qml/Components/Dialogs.qml:77

69+msgctxt "Button: Log out from the system"

70+msgid "Log Out"

7071msgstr ""

7172

72−#: qml/Components/Dialogs.qml:94

73+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

74+#: qml/Components/Dialogs.qml:171

75+msgid "Cancel"

76+msgstr ""

77+

78+#: qml/Components/Dialogs.qml:96

79+msgctxt "Title: Reboot/Shut down dialog"

7380msgid "Shut down"

7481msgstr ""

7582

76−#: qml/Components/Dialogs.qml:95

83+#: qml/Components/Dialogs.qml:97

7784msgid "Are you sure you want to shut down?"

7885msgstr ""

7986

80−#: qml/Components/Dialogs.qml:119

87+#: qml/Components/Dialogs.qml:99

88+msgctxt "Button: Reboot the system"

8189msgid "Reboot"

8290msgstr ""

8391

84−#: qml/Components/Dialogs.qml:120

85−msgid "Are you sure you want to reboot?"

86−msgstr ""

87−

88−#: qml/Components/Dialogs.qml:144

89−msgid "Power"

90−msgstr ""

91−

92−#: qml/Components/Dialogs.qml:145

93−msgid ""

94−"Are you sure you would like\n"

95−"to power off?"

96−msgstr ""

97−

98−#: qml/Components/Dialogs.qml:147

99−msgid "Power off"

100−msgstr ""

101−

102−#: qml/Components/Dialogs.qml:157

103−msgid "Restart"

92+#: qml/Components/Dialogs.qml:107

93+msgctxt "Button: Shut down the system"

94+msgid "Shut down"

10495msgstr ""

10596

106−#: qml/Components/Dialogs.qml:167

107−msgid "Cancel"

97+#: qml/Components/Dialogs.qml:127

98+msgctxt "Title: Reboot dialog"

99+msgid "Reboot"

108100msgstr ""

109101

110−#: qml/Components/EdgeDemoOverlay.qml:151

111−msgid "Skip intro"

112−msgstr "Preskoči uvod"

113−

114−#: qml/Components/EdgeDemo.qml:125

115−msgid "Right edge"

116−msgstr "Desna ivica"

117−

118−#: qml/Components/EdgeDemo.qml:126

119−msgid "Try swiping from the right edge to unlock the phone"

102+#: qml/Components/Dialogs.qml:128

103+msgid "Are you sure you want to reboot?"

120104msgstr ""

121105

122−#: qml/Components/EdgeDemo.qml:157

123−msgid "Top edge"

124−msgstr "Gornja ivica"

125−

126−#: qml/Components/EdgeDemo.qml:158

127−msgid "Try swiping from the top edge to access the indicators"

106+#: qml/Components/Dialogs.qml:130

107+msgid "No"

128108msgstr ""

129109

130−#: qml/Components/EdgeDemo.qml:183

131−msgid "Close"

132−msgstr "Zatvori"

133−

134−#: qml/Components/EdgeDemo.qml:184

135−msgid "Swipe up again to close the settings screen"

110+#: qml/Components/Dialogs.qml:136

111+msgid "Yes"

136112msgstr ""

137113

138−#: qml/Components/EdgeDemo.qml:214

139−msgid "Left edge"

114+#: qml/Components/Dialogs.qml:150

115+msgctxt "Title: Power off/Restart dialog"

116+msgid "Power"

140117msgstr ""

141118

142−#: qml/Components/EdgeDemo.qml:215

143−msgid "Swipe from the left to reveal the launcher for quick access to apps"

119+#: qml/Components/Dialogs.qml:151

120+msgid ""

121+"Are you sure you would like\n"

122+"to power off?"

144123msgstr ""

145124

146−#: qml/Components/EdgeDemo.qml:242

147−msgid "Well done"

125+#: qml/Components/Dialogs.qml:153

126+msgctxt "Button: Power off the system"

127+msgid "Power off"

148128msgstr ""

149129

150−#: qml/Components/EdgeDemo.qml:243

151−msgid ""

152−"You have now mastered the edge gestures and can start using the "

153−"phone Tap on the screen to start"

130+#: qml/Components/Dialogs.qml:162

131+msgctxt "Button: Restart the system"

132+msgid "Restart"

154133msgstr ""

155134

156135#: qml/Components/Lockscreen.qml:238

@@ -165,32 +144,39 @@ msgstr ""

165144msgid "OK"

166145msgstr ""

167146

168−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

147+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

169148msgid "See less"

170149msgstr ""

171150

172−#: qml/Dash/GenericScopeView.qml:431

151+#: qml/Dash/GenericScopeView.qml:533

173152msgid "See all"

174153msgstr ""

175154

176−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

177−#: qml/Panel/SearchIndicator.qml:27

155+#: qml/Dash/GenericScopeView.qml:595

156+msgctxt "Label: Hint for dash search line edit"

178157msgid "Search"

179158msgstr ""

180159

181−#: qml/Dash/PageHeader.qml:260

160+#: qml/Dash/PageHeader.qml:269

161+msgctxt "Button: Open the Ubuntu Store"

182162msgid "Store"

183163msgstr ""

184164

185−#: qml/Dash/PageHeader.qml:277

165+#: qml/Dash/PageHeader.qml:276

166+msgctxt "Button: Start a search in the current dash scope"

167+msgid "Search"

168+msgstr ""

169+

170+#: qml/Dash/PageHeader.qml:286

171+msgctxt "Button: Show the current dash scope settings"

186172msgid "Settings"

187173msgstr ""

188174

189−#: qml/Dash/PageHeader.qml:284

175+#: qml/Dash/PageHeader.qml:293

190176msgid "Remove from Favorites"

191177msgstr ""

192178

193−#: qml/Dash/PageHeader.qml:284

179+#: qml/Dash/PageHeader.qml:293

194180msgid "Add to Favorites"

195181msgstr ""

196182

@@ -222,22 +208,88 @@ msgstr ""

222208msgid "Release to refresh…"

223209msgstr ""

224210

225−#: qml/Dash/ScopesList.qml:63

211+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

212+msgid "Enable location data"

213+msgstr ""

214+

215+#: qml/Dash/ScopesList.qml:66

226216msgid "Manage"

227217msgstr ""

228218

229−#: qml/Dash/ScopesList.qml:107

219+#: qml/Dash/ScopesList.qml:112

230220msgid "Home"

231221msgstr ""

232222

233−#: qml/Dash/ScopesList.qml:108

223+#: qml/Dash/ScopesList.qml:113

234224msgid "Also installed"

235225msgstr ""

236226

237−#: qml/Greeter/Greeter.qml:174

227+#: qml/Greeter/CoverPage.qml:107

238228msgid "Unlock"

239229msgstr ""

240230

231+#: qml/Greeter/LoginList.qml:236

232+msgid "Retry"

233+msgstr ""

234+

235+#: qml/Greeter/LoginList.qml:237

236+msgid "Tap to unlock"

237+msgstr ""

238+

239+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

240+msgid "Sorry, incorrect passphrase."

241+msgstr ""

242+

243+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

244+msgid "Sorry, incorrect passcode."

245+msgstr ""

246+

247+#: qml/Greeter/NarrowView.qml:55

248+msgid "This will be your last attempt."

249+msgstr ""

250+

251+#: qml/Greeter/NarrowView.qml:57

252+msgid ""

253+"If passphrase is entered incorrectly, your phone will conduct a factory "

254+"reset and all personal data will be deleted."

255+msgstr ""

256+

257+#: qml/Greeter/NarrowView.qml:58

258+msgid ""

259+"If passcode is entered incorrectly, your phone will conduct a factory reset "

260+"and all personal data will be deleted."

261+msgstr ""

262+

263+#: qml/Greeter/NarrowView.qml:115

264+#, qt-format

265+msgid "Enter %1"

266+msgstr ""

267+

268+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

269+msgid "Enter passphrase"

270+msgstr ""

271+

272+#: qml/Greeter/NarrowView.qml:117

273+msgid "Enter passcode"

274+msgstr ""

275+

276+#: qml/Greeter/NarrowView.qml:118

277+#, qt-format

278+msgid "Sorry, incorrect %1"

279+msgstr ""

280+

281+#: qml/Greeter/NarrowView.qml:119

282+msgid "Sorry, incorrect passphrase"

283+msgstr ""

284+

285+#: qml/Greeter/NarrowView.qml:120

286+msgid "Please re-enter"

287+msgstr ""

288+

289+#: qml/Greeter/NarrowView.qml:121

290+msgid "Sorry, incorrect passcode"

291+msgstr ""

292+

241293#: qml/Notifications/NotificationMenuItemFactory.qml:128

242294msgid "Show password"

243295msgstr ""

@@ -278,6 +330,11 @@ msgstr ""

278330msgid "Failed, tap to retry"

279331msgstr ""

280332

333+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

334+msgctxt "Label: Hint in message indicator line edit"

335+msgid "Reply"

336+msgstr ""

337+

281338#: qml/Panel/Indicators/ModemInfoItem.qml:105

282339msgid "Unlock SIM"

283340msgstr ""

@@ -286,61 +343,60 @@ msgstr ""

286343msgid "Roaming"

287344msgstr ""

288345

289−#: qml/Shell.qml:367

290−#, qt-format

291−msgid "Enter %1"

346+#: qml/Tutorial/TutorialBottomFinish.qml:24

347+msgid "This action does different things for different apps"

292348msgstr ""

293349

294−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

295−msgid "Enter passphrase"

350+#: qml/Tutorial/TutorialBottomFinish.qml:25

351+msgid "Tap here to finish."

296352msgstr ""

297353

298−#: qml/Shell.qml:369

299−msgid "Enter passcode"

354+#: qml/Tutorial/TutorialBottom.qml:28

355+msgid "Open special menus"

300356msgstr ""

301357

302−#: qml/Shell.qml:370

303−#, qt-format

304−msgid "Sorry, incorrect %1"

358+#: qml/Tutorial/TutorialBottom.qml:29

359+msgid "Swipe up from the bottom edge."

305360msgstr ""

306361

307−#: qml/Shell.qml:371

308−msgid "Sorry, incorrect passphrase"

362+#: qml/Tutorial/TutorialLeftFinish.qml:24

363+msgid "These are the shortcuts to favorite apps"

309364msgstr ""

310365

311−#: qml/Shell.qml:372

312−msgid "Please re-enter"

366+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

367+msgid "Tap here to continue."

313368msgstr ""

314369

315−#: qml/Shell.qml:373

316−msgid "Sorry, incorrect passcode"

370+#: qml/Tutorial/TutorialLeft.qml:26

371+msgid "Open the launcher"

317372msgstr ""

318373

319−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

320−msgid "Sorry, incorrect passphrase."

374+#: qml/Tutorial/TutorialLeft.qml:27

375+msgid "Short swipe from the left edge."

321376msgstr ""

322377

323−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

324−msgid "Sorry, incorrect passcode."

378+#: qml/Tutorial/TutorialPage.qml:178

379+msgid "You almost got it!"

325380msgstr ""

326381

327−#: qml/Shell.qml:469

328−msgid "This will be your last attempt."

382+#: qml/Tutorial/TutorialPage.qml:195

383+msgid "Try again."

329384msgstr ""

330385

331−#: qml/Shell.qml:471

332−msgid ""

333−"If passphrase is entered incorrectly, your phone will conduct a factory "

334−"reset and all personal data will be deleted."

386+#: qml/Tutorial/TutorialRight.qml:31

387+msgid "To view open apps"

335388msgstr ""

336389

337−#: qml/Shell.qml:472

338−msgid ""

339−"If passcode is entered incorrectly, your phone will conduct a factory reset "

340−"and all personal data will be deleted."

390+#: qml/Tutorial/TutorialRight.qml:32

391+msgid "Long swipe from the right edge."

392+msgstr ""

393+

394+#: qml/Tutorial/TutorialRight.qml:122

395+msgid "View all your running tasks."

341396msgstr ""

342397

343398#: qml/Wizard/Page.qml:89

399+msgctxt "Button: Go back one page in the Wizard"

344400msgid "Back"

345401msgstr ""

346402

@@ -357,7 +413,7 @@ msgid "Let’s get started."

357413msgstr ""

358414

359415#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

360−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

416+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

361417#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

362418#: qml/Wizard/Pages/passwd-set.qml:90

363419msgid "Continue"

@@ -367,11 +423,11 @@ msgstr ""

367423msgid "Add a SIM card and restart your device"

368424msgstr ""

369425

370−#: qml/Wizard/Pages/20-sim.qml:55

426+#: qml/Wizard/Pages/20-sim.qml:59

371427msgid "Without it, you won’t be able to make calls or use text messaging."

372428msgstr ""

373429

374−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

430+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

375431msgid "Skip"

376432msgstr ""

377433

@@ -384,38 +440,44 @@ msgid "Please select how you’d like to unlock your phone."

384440msgstr ""

385441

386442#: qml/Wizard/Pages/30-passwd-type.qml:97

443+msgctxt "Label: Type of security method"

387444msgid "Swipe"

388445msgstr ""

389446

390447#: qml/Wizard/Pages/30-passwd-type.qml:98

448+msgctxt "Label: Description of security method"

391449msgid "No security"

392450msgstr ""

393451

394452#: qml/Wizard/Pages/30-passwd-type.qml:100

453+msgctxt "Label: Type of security method"

395454msgid "Passcode"

396455msgstr ""

397456

398457#: qml/Wizard/Pages/30-passwd-type.qml:101

458+msgctxt "Label: Description of security method"

399459msgid "4 digits only"

400460msgstr ""

401461

402462#: qml/Wizard/Pages/30-passwd-type.qml:103

463+msgctxt "Label: Type of security method"

403464msgid "Passphrase"

404465msgstr ""

405466

406467#: qml/Wizard/Pages/30-passwd-type.qml:104

468+msgctxt "Label: Description of security method"

407469msgid "Numbers and letters"

408470msgstr ""

409471

410−#: qml/Wizard/Pages/40-wifi.qml:28

472+#: qml/Wizard/Pages/40-wifi.qml:29

411473msgid "Connect to Wi‑Fi"

412474msgstr ""

413475

414−#: qml/Wizard/Pages/40-wifi.qml:147

476+#: qml/Wizard/Pages/40-wifi.qml:168

415477msgid "Available networks…"

416478msgstr ""

417479

418−#: qml/Wizard/Pages/40-wifi.qml:148

480+#: qml/Wizard/Pages/40-wifi.qml:169

419481msgid "No available networks."

420482msgstr ""

421483

@@ -516,3 +578,15 @@ msgstr ""

516578#, qt-format

517579msgid "%1 〉"

518580msgstr ""

581+

582+#~ msgid "Top edge"

583+#~ msgstr "Gornja ivica"

584+

585+#~ msgid "Close"

586+#~ msgstr "Zatvori"

587+

588+#~ msgid "Skip intro"

589+#~ msgstr "Preskoči uvod"

590+

591+#~ msgid "Right edge"

592+#~ msgstr "Desna ivica"

po/ca.po+324−191

@@ -7,18 +7,18 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-10 09:22+0000\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-03-07 11:45+0000\n"

1212"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

1313"Language-Team: Catalan <ca@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr "Contrasenya: "

2424

@@ -31,68 +31,95 @@ msgstr "Enganxa la drecera"

3131msgid "Unpin shortcut"

3232msgstr "Desenganxa la drecera"

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr "Dispositiu bloquejat"

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr ""

4141"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "

4242"d'intents d'introducció de la contrasenya."

4343

44−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

4545msgid "You have been locked out due to too many failed passcode attempts."

4646msgstr ""

4747"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "

4848"d'intents d'introducció del codi d'accés."

4949

50−#: qml/Components/DelayedLockscreen.qml:72

50+#: qml/Components/DelayedLockscreen.qml:74

5151#, qt-format

5252msgid "Please wait %1 minute and then try again…"

5353msgid_plural "Please wait %1 minutes and then try again…"

5454msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."

5555msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."

5656

57−#: qml/Components/Dialogs.qml:70

57+#: qml/Components/Dialogs.qml:67

58+msgctxt "Title: Lock/Log out dialog"

5859msgid "Log out"

59−msgstr "Surt"

60+msgstr ""

6061

61−#: qml/Components/Dialogs.qml:71

62+#: qml/Components/Dialogs.qml:68

6263msgid "Are you sure you want to log out?"

6364msgstr "Segur que voleu sortir?"

6465

65−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66−#: qml/Components/Dialogs.qml:122

67−msgid "No"

68−msgstr "No"

66+#: qml/Components/Dialogs.qml:70

67+msgctxt "Button: Lock the system"

68+msgid "Lock"

69+msgstr ""

6970

70−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71−#: qml/Components/Dialogs.qml:129

72−msgid "Yes"

73−msgstr "Sí"

71+#: qml/Components/Dialogs.qml:77

72+msgctxt "Button: Log out from the system"

73+msgid "Log Out"

74+msgstr ""

75+

76+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

77+#: qml/Components/Dialogs.qml:171

78+msgid "Cancel"

79+msgstr "Cancel·la"

7480

75−#: qml/Components/Dialogs.qml:94

81+#: qml/Components/Dialogs.qml:96

82+msgctxt "Title: Reboot/Shut down dialog"

7683msgid "Shut down"

77−msgstr "Apaga"

84+msgstr ""

7885

79−#: qml/Components/Dialogs.qml:95

86+#: qml/Components/Dialogs.qml:97

8087msgid "Are you sure you want to shut down?"

8188msgstr "Segur que voleu apagar?"

8289

83−#: qml/Components/Dialogs.qml:119

90+#: qml/Components/Dialogs.qml:99

91+msgctxt "Button: Reboot the system"

8492msgid "Reboot"

85−msgstr "Reinicia"

93+msgstr ""

94+

95+#: qml/Components/Dialogs.qml:107

96+msgctxt "Button: Shut down the system"

97+msgid "Shut down"

98+msgstr ""

99+

100+#: qml/Components/Dialogs.qml:127

101+msgctxt "Title: Reboot dialog"

102+msgid "Reboot"

103+msgstr ""

86104

87−#: qml/Components/Dialogs.qml:120

105+#: qml/Components/Dialogs.qml:128

88106msgid "Are you sure you want to reboot?"

89107msgstr "Segur que voleu reiniciar?"

90108

91−#: qml/Components/Dialogs.qml:144

109+#: qml/Components/Dialogs.qml:130

110+msgid "No"

111+msgstr "No"

112+

113+#: qml/Components/Dialogs.qml:136

114+msgid "Yes"

115+msgstr "Sí"

116+

117+#: qml/Components/Dialogs.qml:150

118+msgctxt "Title: Power off/Restart dialog"

92119msgid "Power"

93−msgstr "Energia"

120+msgstr ""

94121

95−#: qml/Components/Dialogs.qml:145

122+#: qml/Components/Dialogs.qml:151

96123msgid ""

97124"Are you sure you would like\n"

98125"to power off?"

@@ -100,71 +127,15 @@ msgstr ""

100127"Segur que voleu\n"

101128"apagar?"

102129

103−#: qml/Components/Dialogs.qml:147

130+#: qml/Components/Dialogs.qml:153

131+msgctxt "Button: Power off the system"

104132msgid "Power off"

105−msgstr "Apaga"

106−

107−#: qml/Components/Dialogs.qml:157

108−msgid "Restart"

109−msgstr "Reinicia"

110−

111−#: qml/Components/Dialogs.qml:167

112−msgid "Cancel"

113−msgstr "Cancel·la"

114−

115−#: qml/Components/EdgeDemoOverlay.qml:151

116−msgid "Skip intro"

117−msgstr "Omet la introducció"

118−

119−#: qml/Components/EdgeDemo.qml:125

120−msgid "Right edge"

121−msgstr "Vora dreta"

122−

123−#: qml/Components/EdgeDemo.qml:126

124−msgid "Try swiping from the right edge to unlock the phone"

125−msgstr ""

126−"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"

127−

128−#: qml/Components/EdgeDemo.qml:157

129−msgid "Top edge"

130−msgstr "Vora superior"

131−

132−#: qml/Components/EdgeDemo.qml:158

133−msgid "Try swiping from the top edge to access the indicators"

134−msgstr ""

135−"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"

136−

137−#: qml/Components/EdgeDemo.qml:183

138−msgid "Close"

139−msgstr "Tanca"

140−

141−#: qml/Components/EdgeDemo.qml:184

142−msgid "Swipe up again to close the settings screen"

143−msgstr ""

144−"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "

145−"configuració"

146−

147−#: qml/Components/EdgeDemo.qml:214

148−msgid "Left edge"

149−msgstr "Vora esquerra"

150−

151−#: qml/Components/EdgeDemo.qml:215

152−msgid "Swipe from the left to reveal the launcher for quick access to apps"

153133msgstr ""

154−"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

155−"ràpidament a les aplicacions"

156−

157−#: qml/Components/EdgeDemo.qml:242

158−msgid "Well done"

159−msgstr "Enhorabona!"

160134

161−#: qml/Components/EdgeDemo.qml:243

162−msgid ""

163−"You have now mastered the edge gestures and can start using the "

164−"phone Tap on the screen to start"

135+#: qml/Components/Dialogs.qml:162

136+msgctxt "Button: Restart the system"

137+msgid "Restart"

165138msgstr ""

166−"Ja heu après com utilitzar els gestos de les vores per fer servir el "

167−"telèfon Feu un toc a la pantalla per començar"

168139

169140#: qml/Components/Lockscreen.qml:238

170141msgid "Return to Call"

@@ -178,32 +149,39 @@ msgstr "Trucada d'emergència"

178149msgid "OK"

179150msgstr "D'acord"

180151

181−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

182153msgid "See less"

183154msgstr "Mostra'n menys"

184155

185−#: qml/Dash/GenericScopeView.qml:431

156+#: qml/Dash/GenericScopeView.qml:533

186157msgid "See all"

187158msgstr "Mostra-ho tot"

188159

189−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

190−#: qml/Panel/SearchIndicator.qml:27

160+#: qml/Dash/GenericScopeView.qml:595

161+msgctxt "Label: Hint for dash search line edit"

191162msgid "Search"

192−msgstr "Cerca"

163+msgstr ""

193164

194−#: qml/Dash/PageHeader.qml:260

165+#: qml/Dash/PageHeader.qml:269

166+msgctxt "Button: Open the Ubuntu Store"

195167msgid "Store"

196−msgstr "Botiga"

168+msgstr ""

197169

198−#: qml/Dash/PageHeader.qml:277

170+#: qml/Dash/PageHeader.qml:276

171+msgctxt "Button: Start a search in the current dash scope"

172+msgid "Search"

173+msgstr ""

174+

175+#: qml/Dash/PageHeader.qml:286

176+msgctxt "Button: Show the current dash scope settings"

199177msgid "Settings"

200−msgstr "Paràmetres"

178+msgstr ""

201179

202−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

203181msgid "Remove from Favorites"

204182msgstr "Suprimeix dels preferits"

205183

206−#: qml/Dash/PageHeader.qml:284

184+#: qml/Dash/PageHeader.qml:293

207185msgid "Add to Favorites"

208186msgstr "Afegeix als preferits"

209187

@@ -235,22 +213,94 @@ msgstr "Estireu per actualitzar..."

235213msgid "Release to refresh…"

236214msgstr "Deixeu anar per actualitzar..."

237215

238−#: qml/Dash/ScopesList.qml:63

216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

217+msgid "Enable location data"

218+msgstr "Habilita les dades d'ubicació"

219+

220+#: qml/Dash/ScopesList.qml:66

239221msgid "Manage"

240−msgstr ""

222+msgstr "Gestiona"

241223

242−#: qml/Dash/ScopesList.qml:107

224+#: qml/Dash/ScopesList.qml:112

243225msgid "Home"

244−msgstr ""

226+msgstr "Inici"

245227

246−#: qml/Dash/ScopesList.qml:108

228+#: qml/Dash/ScopesList.qml:113

247229msgid "Also installed"

248−msgstr ""

230+msgstr "També instal·lat"

249231

250−#: qml/Greeter/Greeter.qml:174

232+#: qml/Greeter/CoverPage.qml:107

251233msgid "Unlock"

252234msgstr "Desbloca"

253235

236+#: qml/Greeter/LoginList.qml:236

237+msgid "Retry"

238+msgstr "Torna-ho a provar"

239+

240+#: qml/Greeter/LoginList.qml:237

241+msgid "Tap to unlock"

242+msgstr "Feu un toc per desblocar"

243+

244+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

245+msgid "Sorry, incorrect passphrase."

246+msgstr "La contrasenya és incorrecta"

247+

248+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

249+msgid "Sorry, incorrect passcode."

250+msgstr "El codi d'accés no és correcte"

251+

252+#: qml/Greeter/NarrowView.qml:55

253+msgid "This will be your last attempt."

254+msgstr "Aquest serà el darrer intent."

255+

256+#: qml/Greeter/NarrowView.qml:57

257+msgid ""

258+"If passphrase is entered incorrectly, your phone will conduct a factory "

259+"reset and all personal data will be deleted."

260+msgstr ""

261+"Si la contrasenya s'introdueix de manera incorrecta, el telèfon es "

262+"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

263+"personals."

264+

265+#: qml/Greeter/NarrowView.qml:58

266+msgid ""

267+"If passcode is entered incorrectly, your phone will conduct a factory reset "

268+"and all personal data will be deleted."

269+msgstr ""

270+"Si el codi d'accés s'introdueix de manera incorrecta, el telèfon es "

271+"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

272+"personals."

273+

274+#: qml/Greeter/NarrowView.qml:115

275+#, qt-format

276+msgid "Enter %1"

277+msgstr "Introduïu: %1"

278+

279+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

280+msgid "Enter passphrase"

281+msgstr "Introduïu la contrasenya"

282+

283+#: qml/Greeter/NarrowView.qml:117

284+msgid "Enter passcode"

285+msgstr "Introduïu el codi d'accés"

286+

287+#: qml/Greeter/NarrowView.qml:118

288+#, qt-format

289+msgid "Sorry, incorrect %1"

290+msgstr "Incorrecte (%1)"

291+

292+#: qml/Greeter/NarrowView.qml:119

293+msgid "Sorry, incorrect passphrase"

294+msgstr "La contrasenya no és correcta"

295+

296+#: qml/Greeter/NarrowView.qml:120

297+msgid "Please re-enter"

298+msgstr "Torneu-ho a introduir"

299+

300+#: qml/Greeter/NarrowView.qml:121

301+msgid "Sorry, incorrect passcode"

302+msgstr "El codi d'accés no és correcte"

303+

254304#: qml/Notifications/NotificationMenuItemFactory.qml:128

255305msgid "Show password"

256306msgstr "Mostra la contrasenya"

@@ -291,6 +341,11 @@ msgstr "S'ha finalitzat"

291341msgid "Failed, tap to retry"

292342msgstr "Ha fallat, feu un toc per tornar-ho a intentar"

293343

344+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

345+msgctxt "Label: Hint in message indicator line edit"

346+msgid "Reply"

347+msgstr ""

348+

294349#: qml/Panel/Indicators/ModemInfoItem.qml:105

295350msgid "Unlock SIM"

296351msgstr "Desbloca la SIM"

@@ -299,160 +354,161 @@ msgstr "Desbloca la SIM"

299354msgid "Roaming"

300355msgstr "Itinerància"

301356

302−#: qml/Shell.qml:367

303−#, qt-format

304−msgid "Enter %1"

305−msgstr "Introduïu: %1"

357+#: qml/Tutorial/TutorialBottomFinish.qml:24

358+msgid "This action does different things for different apps"

359+msgstr "Aquesta acció fa coses diferents depenent de l'aplicació"

306360

307−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

308−msgid "Enter passphrase"

309−msgstr "Introduïu la contrasenya"

361+#: qml/Tutorial/TutorialBottomFinish.qml:25

362+msgid "Tap here to finish."

363+msgstr "Feu un toc per finalitzar."

310364

311−#: qml/Shell.qml:369

312−msgid "Enter passcode"

313−msgstr "Introduïu el codi d'accés"

365+#: qml/Tutorial/TutorialBottom.qml:28

366+msgid "Open special menus"

367+msgstr "Obre els menús especials"

314368

315−#: qml/Shell.qml:370

316−#, qt-format

317−msgid "Sorry, incorrect %1"

318−msgstr "Incorrecte (%1)"

369+#: qml/Tutorial/TutorialBottom.qml:29

370+msgid "Swipe up from the bottom edge."

371+msgstr "Llisqueu el dit des de la vora inferior."

319372

320−#: qml/Shell.qml:371

321−msgid "Sorry, incorrect passphrase"

322−msgstr "La contrasenya no és correcta"

373+#: qml/Tutorial/TutorialLeftFinish.qml:24

374+msgid "These are the shortcuts to favorite apps"

375+msgstr "Aquestes són les dreceres a les aplicacions preferides"

323376

324−#: qml/Shell.qml:372

325−msgid "Please re-enter"

326−msgstr "Torneu-ho a introduir"

377+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

378+msgid "Tap here to continue."

379+msgstr "Feu un toc per continuar."

327380

328−#: qml/Shell.qml:373

329−msgid "Sorry, incorrect passcode"

330−msgstr "El codi d'accés no és correcte"

381+#: qml/Tutorial/TutorialLeft.qml:26

382+msgid "Open the launcher"

383+msgstr "Obre el llançador"

331384

332−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

333−msgid "Sorry, incorrect passphrase."

334−msgstr "La contrasenya és incorrecta"

385+#: qml/Tutorial/TutorialLeft.qml:27

386+msgid "Short swipe from the left edge."

387+msgstr "Lliscament curt des de la vora esquerra."

335388

336−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

337−msgid "Sorry, incorrect passcode."

338−msgstr "El codi d'accés no és correcte"

389+#: qml/Tutorial/TutorialPage.qml:178

390+msgid "You almost got it!"

391+msgstr "Ja gairebé ho teniu!"

339392

340−#: qml/Shell.qml:469

341−msgid "This will be your last attempt."

342−msgstr "Aquest serà el darrer intent."

393+#: qml/Tutorial/TutorialPage.qml:195

394+msgid "Try again."

395+msgstr "Torneu-ho a provar."

343396

344−#: qml/Shell.qml:471

345−msgid ""

346−"If passphrase is entered incorrectly, your phone will conduct a factory "

347−"reset and all personal data will be deleted."

348−msgstr ""

349−"Si la contrasenya s'introdueix de manera incorrecta, el telèfon es "

350−"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

351−"personals."

397+#: qml/Tutorial/TutorialRight.qml:31

398+msgid "To view open apps"

399+msgstr "Per veure les aplicacions obertes"

352400

353−#: qml/Shell.qml:472

354−msgid ""

355−"If passcode is entered incorrectly, your phone will conduct a factory reset "

356−"and all personal data will be deleted."

357−msgstr ""

358−"Si el codi d'accés s'introdueix de manera incorrecta, el telèfon es "

359−"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

360−"personals."

401+#: qml/Tutorial/TutorialRight.qml:32

402+msgid "Long swipe from the right edge."

403+msgstr "Lliscament llarg des de la vora dreta."

404+

405+#: qml/Tutorial/TutorialRight.qml:122

406+msgid "View all your running tasks."

407+msgstr "Mostra totes les tasques en execució."

361408

362409#: qml/Wizard/Page.qml:89

410+msgctxt "Button: Go back one page in the Wizard"

363411msgid "Back"

364412msgstr ""

365413

366414#: qml/Wizard/Pages/10-welcome.qml:27

367415msgid "Hi!"

368−msgstr ""

416+msgstr "Hola!"

369417

370418#: qml/Wizard/Pages/10-welcome.qml:44

371419msgid "Welcome to your Ubuntu phone."

372−msgstr ""

420+msgstr "Us donem la benvinguda al vostre telèfon Ubuntu."

373421

374422#: qml/Wizard/Pages/10-welcome.qml:52

375423msgid "Let’s get started."

376−msgstr ""

424+msgstr "Comencem."

377425

378426#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

379−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

427+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

380428#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

381429#: qml/Wizard/Pages/passwd-set.qml:90

382430msgid "Continue"

383−msgstr ""

431+msgstr "Continua"

384432

385433#: qml/Wizard/Pages/20-sim.qml:25

386434msgid "Add a SIM card and restart your device"

387−msgstr ""

435+msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"

388436

389−#: qml/Wizard/Pages/20-sim.qml:55

437+#: qml/Wizard/Pages/20-sim.qml:59

390438msgid "Without it, you won’t be able to make calls or use text messaging."

391−msgstr ""

439+msgstr "Sense ella, no podreu fer trucades o enviar missatges de text."

392440

393−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

441+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

394442msgid "Skip"

395−msgstr ""

443+msgstr "Omet"

396444

397445#: qml/Wizard/Pages/30-passwd-type.qml:39

398446msgid "Lock security"

399−msgstr ""

447+msgstr "Seguretat del bloqueig"

400448

401449#: qml/Wizard/Pages/30-passwd-type.qml:74

402450msgid "Please select how you’d like to unlock your phone."

403−msgstr ""

451+msgstr "Seleccioneu com voleu desblocar el telèfon."

404452

405453#: qml/Wizard/Pages/30-passwd-type.qml:97

454+msgctxt "Label: Type of security method"

406455msgid "Swipe"

407456msgstr ""

408457

409458#: qml/Wizard/Pages/30-passwd-type.qml:98

459+msgctxt "Label: Description of security method"

410460msgid "No security"

411461msgstr ""

412462

413463#: qml/Wizard/Pages/30-passwd-type.qml:100

464+msgctxt "Label: Type of security method"

414465msgid "Passcode"

415466msgstr ""

416467

417468#: qml/Wizard/Pages/30-passwd-type.qml:101

469+msgctxt "Label: Description of security method"

418470msgid "4 digits only"

419471msgstr ""

420472

421473#: qml/Wizard/Pages/30-passwd-type.qml:103

474+msgctxt "Label: Type of security method"

422475msgid "Passphrase"

423476msgstr ""

424477

425478#: qml/Wizard/Pages/30-passwd-type.qml:104

479+msgctxt "Label: Description of security method"

426480msgid "Numbers and letters"

427481msgstr ""

428482

429−#: qml/Wizard/Pages/40-wifi.qml:28

483+#: qml/Wizard/Pages/40-wifi.qml:29

430484msgid "Connect to Wi‑Fi"

431−msgstr ""

485+msgstr "Connecta't a la Wi-Fi"

432486

433−#: qml/Wizard/Pages/40-wifi.qml:147

487+#: qml/Wizard/Pages/40-wifi.qml:168

434488msgid "Available networks…"

435−msgstr ""

489+msgstr "Xarxes disponibles..."

436490

437−#: qml/Wizard/Pages/40-wifi.qml:148

491+#: qml/Wizard/Pages/40-wifi.qml:169

438492msgid "No available networks."

439−msgstr ""

493+msgstr "No hi ha xarxes disponibles"

440494

441495#: qml/Wizard/Pages/50-location.qml:27

442496msgid "Location"

443−msgstr ""

497+msgstr "Ubicació"

444498

445499#: qml/Wizard/Pages/50-location.qml:62

446500msgid "Let the phone detect your location:"

447−msgstr ""

501+msgstr "Fes que el telèfon detecti la meva ubicació:"

448502

449503#: qml/Wizard/Pages/50-location.qml:69

450504msgid "Using GPS only (less accurate)"

451−msgstr ""

505+msgstr "Utilitza només el GPS (menys precís)"

452506

453507#: qml/Wizard/Pages/50-location.qml:86

454508msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

455509msgstr ""

510+"Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "

511+"(recomanat)"

456512

457513#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

458514#: qml/Wizard/Pages/50-location.qml:103

@@ -460,81 +516,88 @@ msgid ""

460516"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

461517"conditions</a>."

462518msgstr ""

519+"Si seleccioneu aquesta opció, accepteu <a href='#'>les condicions generals "

520+"del servei Nokia HERE</a>."

463521

464522#: qml/Wizard/Pages/50-location.qml:112

465523msgid "Not at all"

466−msgstr ""

524+msgstr "No"

467525

468526#: qml/Wizard/Pages/50-location.qml:124

469527msgid "You can change your mind later in System Settings."

470528msgstr ""

529+"Podeu canviar-ho més endavant a l'aplicació Paràmetres del sistema"

471530

472531#: qml/Wizard/Pages/60-reporting.qml:24

473532msgid "Improving your experience"

474−msgstr ""

533+msgstr "Millora de l'experiència"

475534

476535#: qml/Wizard/Pages/60-reporting.qml:36

477536msgid ""

478537"Your phone is set up to automatically report errors to Canonical and its "

479538"partners, the makers of the operating system."

480539msgstr ""

540+"Aquest telèfon està configurat per enviar errors de manera automàtica a "

541+"Canonical i associats, els creadors del sistema operatiu."

481542

482543#: qml/Wizard/Pages/60-reporting.qml:43

483544msgid ""

484545"This can be disabled in System Settings under Security & "

485546"Privacy"

486547msgstr ""

548+"Podeu inhabilitar-ho a Configuració del sistema, a la secció "

549+"Seguretat i privadesa"

487550

488551#: qml/Wizard/Pages/80-finished.qml:24

489552msgid "All done"

490−msgstr ""

553+msgstr "Tot fet"

491554

492555#: qml/Wizard/Pages/80-finished.qml:39

493556msgid "Nice work!"

494−msgstr ""

557+msgstr "Bona feina!"

495558

496559#: qml/Wizard/Pages/80-finished.qml:46

497560msgid "Your phone is now ready to use."

498−msgstr ""

561+msgstr "Ja podeu utilitzar el vostre telèfon."

499562

500563#: qml/Wizard/Pages/80-finished.qml:53

501564msgid "Finish"

502−msgstr ""

565+msgstr "Finalitza"

503566

504567#: qml/Wizard/Pages/here-terms.qml:27

505568msgid "Terms & Conditions"

506−msgstr ""

569+msgstr "Condicions generals"

507570

508571#: qml/Wizard/Pages/passwd-confirm.qml:49

509572msgid "Confirm passphrase"

510−msgstr ""

573+msgstr "Confirmeu la contrasenya"

511574

512575#: qml/Wizard/Pages/passwd-confirm.qml:50

513576msgid "Confirm passcode"

514−msgstr ""

577+msgstr "Confirmeu el codi d'accés"

515578

516579#: qml/Wizard/Pages/passwd-confirm.qml:53

517580#: qml/Wizard/Pages/passwd-confirm.qml:54

518581msgid "Please try again."

519−msgstr ""

582+msgstr "Torneu-ho a intentar."

520583

521584#: qml/Wizard/Pages/passwd-set.qml:61

522585msgid "Choose your passcode"

523−msgstr ""

586+msgstr "Trieu el codi d'accés"

524587

525588#: qml/Wizard/Pages/passwd-set.qml:68

526589msgid "Passphrase must be 4 characters long"

527−msgstr ""

590+msgstr "La contrasenya ha de tenir 4 caràcters com a mínim"

528591

529592#: qml/Wizard/StackButton.qml:39

530593#, qt-format

531594msgid "〈 %1"

532−msgstr ""

595+msgstr "〈 %1"

533596

534597#: qml/Wizard/StackButton.qml:42

535598#, qt-format

536599msgid "%1 〉"

537−msgstr ""

600+msgstr "%1 〉"

538601

539602#~ msgid "Confirm"

540603#~ msgstr "Confirma"

@@ -551,6 +614,55 @@ msgstr ""

551614#~ msgid "Speaking..."

552615#~ msgstr "S'està parlant..."

553616

617+#~ msgid "Search"

618+#~ msgstr "Cerca"

619+

620+#~ msgid "Right edge"

621+#~ msgstr "Vora dreta"

622+

623+#~ msgid "Top edge"

624+#~ msgstr "Vora superior"

625+

626+#~ msgid "Well done"

627+#~ msgstr "Enhorabona!"

628+

629+#~ msgid "Left edge"

630+#~ msgstr "Vora esquerra"

631+

632+#~ msgid "Try swiping from the top edge to access the indicators"

633+#~ msgstr ""

634+#~ "Proveu de lliscar el dit des de la vora superior per accedir als indicadors"

635+

636+#~ msgid "Close"

637+#~ msgstr "Tanca"

638+

639+#~ msgid "Swipe up again to close the settings screen"

640+#~ msgstr ""

641+#~ "Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "

642+#~ "configuració"

643+

644+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

645+#~ msgstr ""

646+#~ "Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

647+#~ "ràpidament a les aplicacions"

648+

649+#~ msgid "Skip intro"

650+#~ msgstr "Omet la introducció"

651+

652+#~ msgid "Try swiping from the right edge to unlock the phone"

653+#~ msgstr ""

654+#~ "Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"

655+

656+#~ msgid ""

657+#~ "You have now mastered the edge gestures and can start using the "

658+#~ "phone Tap on the screen to start"

659+#~ msgstr ""

660+#~ "Ja heu après com utilitzar els gestos de les vores per fer servir el "

661+#~ "telèfon Feu un toc a la pantalla per començar"

662+

663+#~ msgid "Store"

664+#~ msgstr "Botiga"

665+

554666#~ msgid "Done"

555667#~ msgstr "Fet"

556668

@@ -560,5 +672,26 @@ msgstr ""

560672#~ msgid "All"

561673#~ msgstr "Totes"

562674

675+#~ msgid "Log out"

676+#~ msgstr "Surt"

677+

678+#~ msgid "Reboot"

679+#~ msgstr "Reinicia"

680+

681+#~ msgid "Settings"

682+#~ msgstr "Paràmetres"

683+

684+#~ msgid "Power"

685+#~ msgstr "Energia"

686+

687+#~ msgid "Power off"

688+#~ msgstr "Apaga"

689+

690+#~ msgid "Shut down"

691+#~ msgstr "Apaga"

692+

693+#~ msgid "Restart"

694+#~ msgstr "Reinicia"

695+

563696#~ msgid "Manage Scopes"

564697#~ msgstr "Gestioneu les lents"

po/ca@valencia.po+332−199

@@ -1,24 +1,24 @@

1−# Catalan translation for unity8

3−# This file is distributed under the same license as the unity8 package.

4−# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.

1+# Catalan translation for unity

3+# This file is distributed under the same license as the unity package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.

55#

66msgid ""

77msgstr ""

8−"Project-Id-Version: unity8\n"

8+"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-23 07:17+0000\n"

12−"Last-Translator: Pau Iranzo <Unknown>\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-02-22 15:22+0000\n"

12+"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

1313"Language-Team: Catalan <ca@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr "Contrasenya: "

2424

@@ -31,68 +31,95 @@ msgstr "Apega la drecera"

3131msgid "Unpin shortcut"

3232msgstr "Desenganxa la drecera"

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr "Dispositiu bloquejat"

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr ""

4141"Se vos ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "

4242"d'intents d'introducció de la contrasenya."

4343

44−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

4545msgid "You have been locked out due to too many failed passcode attempts."

4646msgstr ""

4747"Se vos ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "

4848"d'intents d'introducció del codi d'accés."

4949

50−#: qml/Components/DelayedLockscreen.qml:72

50+#: qml/Components/DelayedLockscreen.qml:74

5151#, qt-format

5252msgid "Please wait %1 minute and then try again…"

5353msgid_plural "Please wait %1 minutes and then try again…"

5454msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."

5555msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."

5656

57−#: qml/Components/Dialogs.qml:70

57+#: qml/Components/Dialogs.qml:67

58+msgctxt "Title: Lock/Log out dialog"

5859msgid "Log out"

59−msgstr "Ix"

60+msgstr ""

6061

61−#: qml/Components/Dialogs.qml:71

62+#: qml/Components/Dialogs.qml:68

6263msgid "Are you sure you want to log out?"

6364msgstr "Segur que voleu eixir?"

6465

65−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66−#: qml/Components/Dialogs.qml:122

67−msgid "No"

68−msgstr "No"

66+#: qml/Components/Dialogs.qml:70

67+msgctxt "Button: Lock the system"

68+msgid "Lock"

69+msgstr ""

6970

70−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71−#: qml/Components/Dialogs.qml:129

72−msgid "Yes"

73−msgstr "Sí"

71+#: qml/Components/Dialogs.qml:77

72+msgctxt "Button: Log out from the system"

73+msgid "Log Out"

74+msgstr ""

7475

75−#: qml/Components/Dialogs.qml:94

76+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

77+#: qml/Components/Dialogs.qml:171

78+msgid "Cancel"

79+msgstr "Cancel·la"

80+

81+#: qml/Components/Dialogs.qml:96

82+msgctxt "Title: Reboot/Shut down dialog"

7683msgid "Shut down"

77−msgstr "Apaga"

84+msgstr ""

7885

79−#: qml/Components/Dialogs.qml:95

86+#: qml/Components/Dialogs.qml:97

8087msgid "Are you sure you want to shut down?"

8188msgstr "Segur que voleu apagar?"

8289

83−#: qml/Components/Dialogs.qml:119

90+#: qml/Components/Dialogs.qml:99

91+msgctxt "Button: Reboot the system"

8492msgid "Reboot"

85−msgstr "Reinicia"

93+msgstr ""

8694

87−#: qml/Components/Dialogs.qml:120

95+#: qml/Components/Dialogs.qml:107

96+msgctxt "Button: Shut down the system"

97+msgid "Shut down"

98+msgstr ""

99+

100+#: qml/Components/Dialogs.qml:127

101+msgctxt "Title: Reboot dialog"

102+msgid "Reboot"

103+msgstr ""

104+

105+#: qml/Components/Dialogs.qml:128

88106msgid "Are you sure you want to reboot?"

89107msgstr "Segur que voleu reiniciar?"

90108

91−#: qml/Components/Dialogs.qml:144

109+#: qml/Components/Dialogs.qml:130

110+msgid "No"

111+msgstr "No"

112+

113+#: qml/Components/Dialogs.qml:136

114+msgid "Yes"

115+msgstr "Sí"

116+

117+#: qml/Components/Dialogs.qml:150

118+msgctxt "Title: Power off/Restart dialog"

92119msgid "Power"

93−msgstr "Energia"

120+msgstr ""

94121

95−#: qml/Components/Dialogs.qml:145

122+#: qml/Components/Dialogs.qml:151

96123msgid ""

97124"Are you sure you would like\n"

98125"to power off?"

@@ -100,75 +127,19 @@ msgstr ""

100127"Segur que voleu\n"

101128"apagar?"

102129

103−#: qml/Components/Dialogs.qml:147

130+#: qml/Components/Dialogs.qml:153

131+msgctxt "Button: Power off the system"

104132msgid "Power off"

105−msgstr "Apaga"

106−

107−#: qml/Components/Dialogs.qml:157

108−msgid "Restart"

109−msgstr "Reinicia"

110−

111−#: qml/Components/Dialogs.qml:167

112−msgid "Cancel"

113−msgstr "Cancel·la"

114−

115−#: qml/Components/EdgeDemoOverlay.qml:151

116−msgid "Skip intro"

117−msgstr "Omet la introducció"

118−

119−#: qml/Components/EdgeDemo.qml:125

120−msgid "Right edge"

121−msgstr "Vora dreta"

122−

123−#: qml/Components/EdgeDemo.qml:126

124−msgid "Try swiping from the right edge to unlock the phone"

125−msgstr ""

126−"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"

127−

128−#: qml/Components/EdgeDemo.qml:157

129−msgid "Top edge"

130−msgstr "Vora superior"

131−

132−#: qml/Components/EdgeDemo.qml:158

133−msgid "Try swiping from the top edge to access the indicators"

134−msgstr ""

135−"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"

136−

137−#: qml/Components/EdgeDemo.qml:183

138−msgid "Close"

139−msgstr "Tanca"

140−

141−#: qml/Components/EdgeDemo.qml:184

142−msgid "Swipe up again to close the settings screen"

143−msgstr ""

144−"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "

145−"configuració"

146−

147−#: qml/Components/EdgeDemo.qml:214

148−msgid "Left edge"

149−msgstr "Vora esquerra"

150−

151−#: qml/Components/EdgeDemo.qml:215

152−msgid "Swipe from the left to reveal the launcher for quick access to apps"

153133msgstr ""

154−"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

155−"ràpidament a les aplicacions"

156134

157−#: qml/Components/EdgeDemo.qml:242

158−msgid "Well done"

159−msgstr "Enhorabona!"

160−

161−#: qml/Components/EdgeDemo.qml:243

162−msgid ""

163−"You have now mastered the edge gestures and can start using the "

164−"phone Tap on the screen to start"

135+#: qml/Components/Dialogs.qml:162

136+msgctxt "Button: Restart the system"

137+msgid "Restart"

165138msgstr ""

166−"Ja heu aprés com utilitzar els gestos de les vores per fer servir el "

167−"telèfon Feu un toc a la pantalla per començar"

168139

169140#: qml/Components/Lockscreen.qml:238

170141msgid "Return to Call"

171−msgstr "Torna a la trucada"

142+msgstr "Torna a la cridada"

172143

173144#: qml/Components/Lockscreen.qml:238

174145msgid "Emergency Call"

@@ -178,32 +149,39 @@ msgstr "Cridada d'emergència"

178149msgid "OK"

179150msgstr "D'acord"

180151

181−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

182153msgid "See less"

183154msgstr "Mostra'n menys"

184155

185−#: qml/Dash/GenericScopeView.qml:431

156+#: qml/Dash/GenericScopeView.qml:533

186157msgid "See all"

187158msgstr "Mostra-ho tot"

188159

189−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

190−#: qml/Panel/SearchIndicator.qml:27

160+#: qml/Dash/GenericScopeView.qml:595

161+msgctxt "Label: Hint for dash search line edit"

191162msgid "Search"

192−msgstr "Cerca"

163+msgstr ""

193164

194−#: qml/Dash/PageHeader.qml:260

165+#: qml/Dash/PageHeader.qml:269

166+msgctxt "Button: Open the Ubuntu Store"

195167msgid "Store"

196−msgstr "Botiga"

168+msgstr ""

169+

170+#: qml/Dash/PageHeader.qml:276

171+msgctxt "Button: Start a search in the current dash scope"

172+msgid "Search"

173+msgstr ""

197174

198−#: qml/Dash/PageHeader.qml:277

175+#: qml/Dash/PageHeader.qml:286

176+msgctxt "Button: Show the current dash scope settings"

199177msgid "Settings"

200−msgstr "Paràmetres"

178+msgstr ""

201179

202−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

203181msgid "Remove from Favorites"

204182msgstr "Suprimeix dels preferits"

205183

206−#: qml/Dash/PageHeader.qml:284

184+#: qml/Dash/PageHeader.qml:293

207185msgid "Add to Favorites"

208186msgstr "Afig als preferits"

209187

@@ -235,22 +213,94 @@ msgstr "Estireu per actualitzar..."

235213msgid "Release to refresh…"

236214msgstr "Deixeu anar per actualitzar..."

237215

238−#: qml/Dash/ScopesList.qml:63

216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

217+msgid "Enable location data"

218+msgstr "Habilita les dades d'ubicació"

219+

220+#: qml/Dash/ScopesList.qml:66

239221msgid "Manage"

240−msgstr ""

222+msgstr "Gestiona"

241223

242−#: qml/Dash/ScopesList.qml:107

224+#: qml/Dash/ScopesList.qml:112

243225msgid "Home"

244−msgstr ""

226+msgstr "Inici"

245227

246−#: qml/Dash/ScopesList.qml:108

228+#: qml/Dash/ScopesList.qml:113

247229msgid "Also installed"

248−msgstr ""

230+msgstr "També instal·lat"

249231

250−#: qml/Greeter/Greeter.qml:174

232+#: qml/Greeter/CoverPage.qml:107

251233msgid "Unlock"

252234msgstr "Desbloca"

253235

236+#: qml/Greeter/LoginList.qml:236

237+msgid "Retry"

238+msgstr ""

239+

240+#: qml/Greeter/LoginList.qml:237

241+msgid "Tap to unlock"

242+msgstr ""

243+

244+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

245+msgid "Sorry, incorrect passphrase."

246+msgstr "La contrasenya és incorrecta"

247+

248+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

249+msgid "Sorry, incorrect passcode."

250+msgstr "El codi d'accés no és correcte"

251+

252+#: qml/Greeter/NarrowView.qml:55

253+msgid "This will be your last attempt."

254+msgstr "Este serà el darrer intent."

255+

256+#: qml/Greeter/NarrowView.qml:57

257+msgid ""

258+"If passphrase is entered incorrectly, your phone will conduct a factory "

259+"reset and all personal data will be deleted."

260+msgstr ""

261+"Si la contrasenya s'introdueix de manera incorrecta, el telèfon es "

262+"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

263+"personals."

264+

265+#: qml/Greeter/NarrowView.qml:58

266+msgid ""

267+"If passcode is entered incorrectly, your phone will conduct a factory reset "

268+"and all personal data will be deleted."

269+msgstr ""

270+"Si el codi d'accés s'introdueix de manera incorrecta, el telèfon es "

271+"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

272+"personals."

273+

274+#: qml/Greeter/NarrowView.qml:115

275+#, qt-format

276+msgid "Enter %1"

277+msgstr "Introduïu: %1"

278+

279+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

280+msgid "Enter passphrase"

281+msgstr "Introduïu la contrasenya"

282+

283+#: qml/Greeter/NarrowView.qml:117

284+msgid "Enter passcode"

285+msgstr "Introduïu el codi d'accés"

286+

287+#: qml/Greeter/NarrowView.qml:118

288+#, qt-format

289+msgid "Sorry, incorrect %1"

290+msgstr "Incorrecte (%1)"

291+

292+#: qml/Greeter/NarrowView.qml:119

293+msgid "Sorry, incorrect passphrase"

294+msgstr "La contrasenya no és correcta"

295+

296+#: qml/Greeter/NarrowView.qml:120

297+msgid "Please re-enter"

298+msgstr "Torneu-ho a introduir"

299+

300+#: qml/Greeter/NarrowView.qml:121

301+msgid "Sorry, incorrect passcode"

302+msgstr "El codi d'accés no és correcte"

303+

254304#: qml/Notifications/NotificationMenuItemFactory.qml:128

255305msgid "Show password"

256306msgstr "Mostra la contrasenya"

@@ -291,6 +341,11 @@ msgstr "S'ha finalitzat"

291341msgid "Failed, tap to retry"

292342msgstr "Ha fallat, feu un toc per tornar-ho a intentar"

293343

344+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

345+msgctxt "Label: Hint in message indicator line edit"

346+msgid "Reply"

347+msgstr ""

348+

294349#: qml/Panel/Indicators/ModemInfoItem.qml:105

295350msgid "Unlock SIM"

296351msgstr "Desbloca la SIM"

@@ -299,160 +354,161 @@ msgstr "Desbloca la SIM"

299354msgid "Roaming"

300355msgstr "Itinerància"

301356

302−#: qml/Shell.qml:367

303−#, qt-format

304−msgid "Enter %1"

305−msgstr "Introduïu: %1"

357+#: qml/Tutorial/TutorialBottomFinish.qml:24

358+msgid "This action does different things for different apps"

359+msgstr ""

306360

307−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

308−msgid "Enter passphrase"

309−msgstr "Introduïu la contrasenya"

361+#: qml/Tutorial/TutorialBottomFinish.qml:25

362+msgid "Tap here to finish."

363+msgstr ""

310364

311−#: qml/Shell.qml:369

312−msgid "Enter passcode"

313−msgstr "Introduïu el codi d'accés"

365+#: qml/Tutorial/TutorialBottom.qml:28

366+msgid "Open special menus"

367+msgstr ""

314368

315−#: qml/Shell.qml:370

316−#, qt-format

317−msgid "Sorry, incorrect %1"

318−msgstr "Incorrecte (%1)"

369+#: qml/Tutorial/TutorialBottom.qml:29

370+msgid "Swipe up from the bottom edge."

371+msgstr ""

319372

320−#: qml/Shell.qml:371

321−msgid "Sorry, incorrect passphrase"

322−msgstr "La contrasenya no és correcta"

373+#: qml/Tutorial/TutorialLeftFinish.qml:24

374+msgid "These are the shortcuts to favorite apps"

375+msgstr ""

323376

324−#: qml/Shell.qml:372

325−msgid "Please re-enter"

326−msgstr "Torneu-ho a introduir"

377+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

378+msgid "Tap here to continue."

379+msgstr ""

327380

328−#: qml/Shell.qml:373

329−msgid "Sorry, incorrect passcode"

330−msgstr "El codi d'accés no és correcte"

381+#: qml/Tutorial/TutorialLeft.qml:26

382+msgid "Open the launcher"

383+msgstr ""

331384

332−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

333−msgid "Sorry, incorrect passphrase."

334−msgstr "La contrasenya és incorrecta"

385+#: qml/Tutorial/TutorialLeft.qml:27

386+msgid "Short swipe from the left edge."

387+msgstr ""

335388

336−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

337−msgid "Sorry, incorrect passcode."

338−msgstr "El codi d'accés no és correcte"

389+#: qml/Tutorial/TutorialPage.qml:178

390+msgid "You almost got it!"

391+msgstr ""

339392

340−#: qml/Shell.qml:469

341−msgid "This will be your last attempt."

342−msgstr "Este serà el darrer intent."

393+#: qml/Tutorial/TutorialPage.qml:195

394+msgid "Try again."

395+msgstr ""

343396

344−#: qml/Shell.qml:471

345−msgid ""

346−"If passphrase is entered incorrectly, your phone will conduct a factory "

347−"reset and all personal data will be deleted."

397+#: qml/Tutorial/TutorialRight.qml:31

398+msgid "To view open apps"

348399msgstr ""

349−"Si la contrasenya s'introdueix de manera incorrecta, el telèfon es "

350−"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

351−"personals."

352400

353−#: qml/Shell.qml:472

354−msgid ""

355−"If passcode is entered incorrectly, your phone will conduct a factory reset "

356−"and all personal data will be deleted."

401+#: qml/Tutorial/TutorialRight.qml:32

402+msgid "Long swipe from the right edge."

403+msgstr ""

404+

405+#: qml/Tutorial/TutorialRight.qml:122

406+msgid "View all your running tasks."

357407msgstr ""

358−"Si el codi d'accés s'introdueix de manera incorrecta, el telèfon es "

359−"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

360−"personals."

361408

362409#: qml/Wizard/Page.qml:89

410+msgctxt "Button: Go back one page in the Wizard"

363411msgid "Back"

364412msgstr ""

365413

366414#: qml/Wizard/Pages/10-welcome.qml:27

367415msgid "Hi!"

368−msgstr ""

416+msgstr "Hola!"

369417

370418#: qml/Wizard/Pages/10-welcome.qml:44

371419msgid "Welcome to your Ubuntu phone."

372−msgstr ""

420+msgstr "Vos donem la benvinguda al vostre telèfon Ubuntu."

373421

374422#: qml/Wizard/Pages/10-welcome.qml:52

375423msgid "Let’s get started."

376−msgstr ""

424+msgstr "Comencem."

377425

378426#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

379−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

427+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

380428#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

381429#: qml/Wizard/Pages/passwd-set.qml:90

382430msgid "Continue"

383−msgstr ""

431+msgstr "Continua"

384432

385433#: qml/Wizard/Pages/20-sim.qml:25

386434msgid "Add a SIM card and restart your device"

387−msgstr ""

435+msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"

388436

389−#: qml/Wizard/Pages/20-sim.qml:55

437+#: qml/Wizard/Pages/20-sim.qml:59

390438msgid "Without it, you won’t be able to make calls or use text messaging."

391−msgstr ""

439+msgstr "Sense ella, no podreu fer cridades o enviar missatges de text."

392440

393−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

441+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

394442msgid "Skip"

395−msgstr ""

443+msgstr "Omet"

396444

397445#: qml/Wizard/Pages/30-passwd-type.qml:39

398446msgid "Lock security"

399−msgstr ""

447+msgstr "Seguretat del bloqueig"

400448

401449#: qml/Wizard/Pages/30-passwd-type.qml:74

402450msgid "Please select how you’d like to unlock your phone."

403−msgstr ""

451+msgstr "Seleccioneu com voleu desblocar el telèfon."

404452

405453#: qml/Wizard/Pages/30-passwd-type.qml:97

454+msgctxt "Label: Type of security method"

406455msgid "Swipe"

407456msgstr ""

408457

409458#: qml/Wizard/Pages/30-passwd-type.qml:98

459+msgctxt "Label: Description of security method"

410460msgid "No security"

411461msgstr ""

412462

413463#: qml/Wizard/Pages/30-passwd-type.qml:100

464+msgctxt "Label: Type of security method"

414465msgid "Passcode"

415466msgstr ""

416467

417468#: qml/Wizard/Pages/30-passwd-type.qml:101

469+msgctxt "Label: Description of security method"

418470msgid "4 digits only"

419471msgstr ""

420472

421473#: qml/Wizard/Pages/30-passwd-type.qml:103

474+msgctxt "Label: Type of security method"

422475msgid "Passphrase"

423476msgstr ""

424477

425478#: qml/Wizard/Pages/30-passwd-type.qml:104

479+msgctxt "Label: Description of security method"

426480msgid "Numbers and letters"

427481msgstr ""

428482

429−#: qml/Wizard/Pages/40-wifi.qml:28

483+#: qml/Wizard/Pages/40-wifi.qml:29

430484msgid "Connect to Wi‑Fi"

431−msgstr ""

485+msgstr "Connecta't a la Wi-Fi"

432486

433−#: qml/Wizard/Pages/40-wifi.qml:147

487+#: qml/Wizard/Pages/40-wifi.qml:168

434488msgid "Available networks…"

435−msgstr ""

489+msgstr "Xarxes disponibles..."

436490

437−#: qml/Wizard/Pages/40-wifi.qml:148

491+#: qml/Wizard/Pages/40-wifi.qml:169

438492msgid "No available networks."

439−msgstr ""

493+msgstr "No hi ha xarxes disponibles"

440494

441495#: qml/Wizard/Pages/50-location.qml:27

442496msgid "Location"

443−msgstr ""

497+msgstr "Ubicació"

444498

445499#: qml/Wizard/Pages/50-location.qml:62

446500msgid "Let the phone detect your location:"

447−msgstr ""

501+msgstr "Fes que el telèfon detecti la meua ubicació:"

448502

449503#: qml/Wizard/Pages/50-location.qml:69

450504msgid "Using GPS only (less accurate)"

451−msgstr ""

505+msgstr "Utilitza només el GPS (menys precís)"

452506

453507#: qml/Wizard/Pages/50-location.qml:86

454508msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

455509msgstr ""

510+"Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "

511+"(recomanat)"

456512

457513#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

458514#: qml/Wizard/Pages/50-location.qml:103

@@ -460,81 +516,148 @@ msgid ""

460516"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

461517"conditions</a>."

462518msgstr ""

519+"Si seleccioneu esta opció, accepteu <a href='#'>les condicions generals del "

520+"servei Nokia HERE</a>."

463521

464522#: qml/Wizard/Pages/50-location.qml:112

465523msgid "Not at all"

466−msgstr ""

524+msgstr "No"

467525

468526#: qml/Wizard/Pages/50-location.qml:124

469527msgid "You can change your mind later in System Settings."

470528msgstr ""

529+"Podeu canviar-ho més avant a l'aplicació Paràmetres del sistema"

471530

472531#: qml/Wizard/Pages/60-reporting.qml:24

473532msgid "Improving your experience"

474−msgstr ""

533+msgstr "Millora de l'experiència"

475534

476535#: qml/Wizard/Pages/60-reporting.qml:36

477536msgid ""

478537"Your phone is set up to automatically report errors to Canonical and its "

479538"partners, the makers of the operating system."

480539msgstr ""

540+"Este telèfon està configurat per enviar errors de manera automàtica a "

541+"Canonical i associats, els creadors del sistema operatiu."

481542

482543#: qml/Wizard/Pages/60-reporting.qml:43

483544msgid ""

484545"This can be disabled in System Settings under Security & "

485546"Privacy"

486547msgstr ""

548+"Podeu inhabilitar-ho a Configuració del sistema, a la secció "

549+"Seguretat i privadesa"

487550

488551#: qml/Wizard/Pages/80-finished.qml:24

489552msgid "All done"

490−msgstr ""

553+msgstr "Tot fet"

491554

492555#: qml/Wizard/Pages/80-finished.qml:39

493556msgid "Nice work!"

494−msgstr ""

557+msgstr "Bona faena!"

495558

496559#: qml/Wizard/Pages/80-finished.qml:46

497560msgid "Your phone is now ready to use."

498−msgstr ""

561+msgstr "Ja podeu utilitzar el vostre telèfon."

499562

500563#: qml/Wizard/Pages/80-finished.qml:53

501564msgid "Finish"

502−msgstr ""

565+msgstr "Finalitza"

503566

504567#: qml/Wizard/Pages/here-terms.qml:27

505568msgid "Terms & Conditions"

506−msgstr ""

569+msgstr "Condicions generals"

507570

508571#: qml/Wizard/Pages/passwd-confirm.qml:49

509572msgid "Confirm passphrase"

510−msgstr ""

573+msgstr "Confirmeu la contrasenya"

511574

512575#: qml/Wizard/Pages/passwd-confirm.qml:50

513576msgid "Confirm passcode"

514−msgstr ""

577+msgstr "Confirmeu el codi d'accés"

515578

516579#: qml/Wizard/Pages/passwd-confirm.qml:53

517580#: qml/Wizard/Pages/passwd-confirm.qml:54

518581msgid "Please try again."

519−msgstr ""

582+msgstr "Torneu-ho a intentar."

520583

521584#: qml/Wizard/Pages/passwd-set.qml:61

522585msgid "Choose your passcode"

523−msgstr ""

586+msgstr "Trieu el codi d'accés"

524587

525588#: qml/Wizard/Pages/passwd-set.qml:68

526589msgid "Passphrase must be 4 characters long"

527−msgstr ""

590+msgstr "La contrasenya ha de tindre 4 caràcters com a mínim"

528591

529592#: qml/Wizard/StackButton.qml:39

530593#, qt-format

531594msgid "〈 %1"

532−msgstr ""

595+msgstr "〈 %1"

533596

534597#: qml/Wizard/StackButton.qml:42

535598#, qt-format

536599msgid "%1 〉"

537−msgstr ""

600+msgstr "%1 〉"

601+

602+#~ msgid "Log out"

603+#~ msgstr "Ix"

604+

605+#~ msgid "Shut down"

606+#~ msgstr "Apaga"

607+

608+#~ msgid "Reboot"

609+#~ msgstr "Reinicia"

610+

611+#~ msgid "Power"

612+#~ msgstr "Energia"

613+

614+#~ msgid "Power off"

615+#~ msgstr "Apaga"

616+

617+#~ msgid "Restart"

618+#~ msgstr "Reinicia"

619+

620+#~ msgid "Skip intro"

621+#~ msgstr "Omet la introducció"

622+

623+#~ msgid "Right edge"

624+#~ msgstr "Vora dreta"

625+

626+#~ msgid "Try swiping from the right edge to unlock the phone"

627+#~ msgstr ""

628+#~ "Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"

629+

630+#~ msgid "Top edge"

631+#~ msgstr "Vora superior"

632+

633+#~ msgid "Try swiping from the top edge to access the indicators"

634+#~ msgstr ""

635+#~ "Proveu de lliscar el dit des de la vora superior per accedir als indicadors"

636+

637+#~ msgid "Close"

638+#~ msgstr "Tanca"

639+

640+#~ msgid "Swipe up again to close the settings screen"

641+#~ msgstr ""

642+#~ "Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "

643+#~ "configuració"

644+

645+#~ msgid "Left edge"

646+#~ msgstr "Vora esquerra"

647+

648+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

649+#~ msgstr ""

650+#~ "Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

651+#~ "ràpidament a les aplicacions"

652+

653+#~ msgid "Well done"

654+#~ msgstr "Enhorabona!"

655+

656+#~ msgid "Search"

657+#~ msgstr "Cerca"

658+

659+#~ msgid "Settings"

660+#~ msgstr "Paràmetres"

538661

539662#~ msgid "Manage Scopes"

540663#~ msgstr "Gestioneu les lents"

@@ -542,6 +665,9 @@ msgstr ""

542665#~ msgid "Done"

543666#~ msgstr "Fet"

544667

668+#~ msgid "Store"

669+#~ msgstr "Botiga"

670+

545671#~ msgid "Favorites"

546672#~ msgstr "Preferides"

547673

@@ -551,9 +677,6 @@ msgstr ""

551677#~ msgid "Confirm"

552678#~ msgstr "Confirma"

553679

554−#~ msgid "Type or say a command"

555−#~ msgstr "Escriviu o pronuncieu una orde"

556−

557680#~ msgid "Loading. Please Wait..."

558681#~ msgstr "S'està carregant. Espereu-vos un moment..."

559682

@@ -562,3 +685,13 @@ msgstr ""

562685

563686#~ msgid "Speaking..."

564687#~ msgstr "S'està parlant..."

688+

689+#~ msgid "Type or say a command"

690+#~ msgstr "Escriviu o pronuncieu una ordre"

691+

692+#~ msgid ""

693+#~ "You have now mastered the edge gestures and can start using the "

694+#~ "phone Tap on the screen to start"

695+#~ msgstr ""

696+#~ "Ja heu après com utilitzar els gestos de les vores per fer servir el "

697+#~ "telèfon Feu un toc a la pantalla per començar"

po/ce.ponew file+579

@@ -0,0 +1,579 @@

1+# Chechen translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.

5+#

6+msgid ""

7+msgstr ""

8+"Project-Id-Version: unity8\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-02-15 04:01+0000\n"

12+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13+"Language-Team: Chechen <ce@li.org>\n"

14+"MIME-Version: 1.0\n"

15+"Content-Type: text/plain; charset=UTF-8\n"

16+"Content-Transfer-Encoding: 8bit\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

20+

21+#: plugins/LightDM/Greeter.cpp:112

22+msgid "Password: "

23+msgstr ""

24+

25+#: plugins/Unity/Launcher/launcheritem.cpp:45

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27+msgid "Pin shortcut"

28+msgstr ""

29+

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31+msgid "Unpin shortcut"

32+msgstr ""

33+

34+#: qml/Components/DelayedLockscreen.qml:49

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:64

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:65

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:74

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

55+msgid "Log out"

56+msgstr ""

57+

58+#: qml/Components/Dialogs.qml:68

59+msgid "Are you sure you want to log out?"

60+msgstr ""

61+

62+#: qml/Components/Dialogs.qml:70

63+msgctxt "Button: Lock the system"

64+msgid "Lock"

65+msgstr ""

66+

67+#: qml/Components/Dialogs.qml:77

68+msgctxt "Button: Log out from the system"

69+msgid "Log Out"

70+msgstr ""

71+

72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

73+#: qml/Components/Dialogs.qml:171

74+msgid "Cancel"

75+msgstr ""

76+

77+#: qml/Components/Dialogs.qml:96

78+msgctxt "Title: Reboot/Shut down dialog"

79+msgid "Shut down"

80+msgstr ""

81+

82+#: qml/Components/Dialogs.qml:97

83+msgid "Are you sure you want to shut down?"

84+msgstr ""

85+

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

88+msgid "Reboot"

89+msgstr ""

90+

91+#: qml/Components/Dialogs.qml:107

92+msgctxt "Button: Shut down the system"

93+msgid "Shut down"

94+msgstr ""

95+

96+#: qml/Components/Dialogs.qml:127

97+msgctxt "Title: Reboot dialog"

98+msgid "Reboot"

99+msgstr ""

100+

101+#: qml/Components/Dialogs.qml:128

102+msgid "Are you sure you want to reboot?"

103+msgstr ""

104+

105+#: qml/Components/Dialogs.qml:130

106+msgid "No"

107+msgstr ""

108+

109+#: qml/Components/Dialogs.qml:136

110+msgid "Yes"

111+msgstr ""

112+

113+#: qml/Components/Dialogs.qml:150

114+msgctxt "Title: Power off/Restart dialog"

115+msgid "Power"

116+msgstr ""

117+

118+#: qml/Components/Dialogs.qml:151

119+msgid ""

120+"Are you sure you would like\n"

121+"to power off?"

122+msgstr ""

123+

124+#: qml/Components/Dialogs.qml:153

125+msgctxt "Button: Power off the system"

126+msgid "Power off"

127+msgstr ""

128+

129+#: qml/Components/Dialogs.qml:162

130+msgctxt "Button: Restart the system"

131+msgid "Restart"

132+msgstr ""

133+

134+#: qml/Components/Lockscreen.qml:238

135+msgid "Return to Call"

136+msgstr ""

137+

138+#: qml/Components/Lockscreen.qml:238

139+msgid "Emergency Call"

140+msgstr ""

141+

142+#: qml/Components/Lockscreen.qml:270

143+msgid "OK"

144+msgstr ""

145+

146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

147+msgid "See less"

148+msgstr ""

149+

150+#: qml/Dash/GenericScopeView.qml:533

151+msgid "See all"

152+msgstr ""

153+

154+#: qml/Dash/GenericScopeView.qml:595

155+msgctxt "Label: Hint for dash search line edit"

156+msgid "Search"

157+msgstr ""

158+

159+#: qml/Dash/PageHeader.qml:269

160+msgctxt "Button: Open the Ubuntu Store"

161+msgid "Store"

162+msgstr ""

163+

164+#: qml/Dash/PageHeader.qml:276

165+msgctxt "Button: Start a search in the current dash scope"

166+msgid "Search"

167+msgstr ""

168+

169+#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

171+msgid "Settings"

172+msgstr ""

173+

174+#: qml/Dash/PageHeader.qml:293

175+msgid "Remove from Favorites"

176+msgstr ""

177+

178+#: qml/Dash/PageHeader.qml:293

179+msgid "Add to Favorites"

180+msgstr ""

181+

182+#: qml/Dash/Previews/PreviewActionCombo.qml:35

183+msgid "More..."

184+msgstr ""

185+

186+#: qml/Dash/Previews/PreviewActionCombo.qml:35

187+msgid "Less..."

188+msgstr ""

189+

190+#: qml/Dash/Previews/PreviewRatingInput.qml:81

191+msgid "Rate this"

192+msgstr ""

193+

194+#: qml/Dash/Previews/PreviewRatingInput.qml:126

195+msgid "Add a review"

196+msgstr ""

197+

198+#: qml/Dash/Previews/PreviewRatingInput.qml:166

199+msgid "Send"

200+msgstr ""

201+

202+#: qml/Dash/PullToRefreshScopeStyle.qml:55

203+msgid "Pull to refresh…"

204+msgstr ""

205+

206+#: qml/Dash/PullToRefreshScopeStyle.qml:60

207+msgid "Release to refresh…"

208+msgstr ""

209+

210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

211+msgid "Enable location data"

212+msgstr ""

213+

214+#: qml/Dash/ScopesList.qml:66

215+msgid "Manage"

216+msgstr ""

217+

218+#: qml/Dash/ScopesList.qml:112

219+msgid "Home"

220+msgstr ""

221+

222+#: qml/Dash/ScopesList.qml:113

223+msgid "Also installed"

224+msgstr ""

225+

226+#: qml/Greeter/CoverPage.qml:107

227+msgid "Unlock"

228+msgstr ""

229+

230+#: qml/Greeter/LoginList.qml:236

231+msgid "Retry"

232+msgstr ""

233+

234+#: qml/Greeter/LoginList.qml:237

235+msgid "Tap to unlock"

236+msgstr ""

237+

238+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

239+msgid "Sorry, incorrect passphrase."

240+msgstr ""

241+

242+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

243+msgid "Sorry, incorrect passcode."

244+msgstr ""

245+

246+#: qml/Greeter/NarrowView.qml:55

247+msgid "This will be your last attempt."

248+msgstr ""

249+

250+#: qml/Greeter/NarrowView.qml:57

251+msgid ""

252+"If passphrase is entered incorrectly, your phone will conduct a factory "

253+"reset and all personal data will be deleted."

254+msgstr ""

255+

256+#: qml/Greeter/NarrowView.qml:58

257+msgid ""

258+"If passcode is entered incorrectly, your phone will conduct a factory reset "

259+"and all personal data will be deleted."

260+msgstr ""

261+

262+#: qml/Greeter/NarrowView.qml:115

263+#, qt-format

264+msgid "Enter %1"

265+msgstr ""

266+

267+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

268+msgid "Enter passphrase"

269+msgstr ""

270+

271+#: qml/Greeter/NarrowView.qml:117

272+msgid "Enter passcode"

273+msgstr ""

274+

275+#: qml/Greeter/NarrowView.qml:118

276+#, qt-format

277+msgid "Sorry, incorrect %1"

278+msgstr ""

279+

280+#: qml/Greeter/NarrowView.qml:119

281+msgid "Sorry, incorrect passphrase"

282+msgstr ""

283+

284+#: qml/Greeter/NarrowView.qml:120

285+msgid "Please re-enter"

286+msgstr ""

287+

288+#: qml/Greeter/NarrowView.qml:121

289+msgid "Sorry, incorrect passcode"

290+msgstr ""

291+

292+#: qml/Notifications/NotificationMenuItemFactory.qml:128

293+msgid "Show password"

294+msgstr ""

295+

296+#: qml/Panel/ActiveCallHint.qml:79

297+msgid "Tap to return to call..."

298+msgstr ""

299+

300+#: qml/Panel/ActiveCallHint.qml:92

301+msgid "Conference"

302+msgstr ""

303+

304+#: qml/Panel/Indicators/MenuItemFactory.qml:643

305+msgid "Nothing is playing"

306+msgstr ""

307+

308+#: qml/Panel/Indicators/MenuItemFactory.qml:791

309+msgid "In queue…"

310+msgstr ""

311+

312+#: qml/Panel/Indicators/MenuItemFactory.qml:795

313+msgid "Downloading"

314+msgstr ""

315+

316+#: qml/Panel/Indicators/MenuItemFactory.qml:797

317+msgid "Paused, tap to resume"

318+msgstr ""

319+

320+#: qml/Panel/Indicators/MenuItemFactory.qml:799

321+msgid "Canceled"

322+msgstr ""

323+

324+#: qml/Panel/Indicators/MenuItemFactory.qml:801

325+msgid "Finished"

326+msgstr ""

327+

328+#: qml/Panel/Indicators/MenuItemFactory.qml:803

329+msgid "Failed, tap to retry"

330+msgstr ""

331+

332+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

333+msgctxt "Label: Hint in message indicator line edit"

334+msgid "Reply"

335+msgstr ""

336+

337+#: qml/Panel/Indicators/ModemInfoItem.qml:105

338+msgid "Unlock SIM"

339+msgstr ""

340+

341+#: qml/Panel/Indicators/RoamingIndication.qml:27

342+msgid "Roaming"

343+msgstr ""

344+

345+#: qml/Tutorial/TutorialBottomFinish.qml:24

346+msgid "This action does different things for different apps"

347+msgstr ""

348+

349+#: qml/Tutorial/TutorialBottomFinish.qml:25

350+msgid "Tap here to finish."

351+msgstr ""

352+

353+#: qml/Tutorial/TutorialBottom.qml:28

354+msgid "Open special menus"

355+msgstr ""

356+

357+#: qml/Tutorial/TutorialBottom.qml:29

358+msgid "Swipe up from the bottom edge."

359+msgstr ""

360+

361+#: qml/Tutorial/TutorialLeftFinish.qml:24

362+msgid "These are the shortcuts to favorite apps"

363+msgstr ""

364+

365+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

366+msgid "Tap here to continue."

367+msgstr ""

368+

369+#: qml/Tutorial/TutorialLeft.qml:26

370+msgid "Open the launcher"

371+msgstr ""

372+

373+#: qml/Tutorial/TutorialLeft.qml:27

374+msgid "Short swipe from the left edge."

375+msgstr ""

376+

377+#: qml/Tutorial/TutorialPage.qml:178

378+msgid "You almost got it!"

379+msgstr ""

380+

381+#: qml/Tutorial/TutorialPage.qml:195

382+msgid "Try again."

383+msgstr ""

384+

385+#: qml/Tutorial/TutorialRight.qml:31

386+msgid "To view open apps"

387+msgstr ""

388+

389+#: qml/Tutorial/TutorialRight.qml:32

390+msgid "Long swipe from the right edge."

391+msgstr ""

392+

393+#: qml/Tutorial/TutorialRight.qml:122

394+msgid "View all your running tasks."

395+msgstr ""

396+

397+#: qml/Wizard/Page.qml:89

398+msgctxt "Button: Go back one page in the Wizard"

399+msgid "Back"

400+msgstr ""

401+

402+#: qml/Wizard/Pages/10-welcome.qml:27

403+msgid "Hi!"

404+msgstr ""

405+

406+#: qml/Wizard/Pages/10-welcome.qml:44

407+msgid "Welcome to your Ubuntu phone."

408+msgstr ""

409+

410+#: qml/Wizard/Pages/10-welcome.qml:52

411+msgid "Let’s get started."

412+msgstr ""

413+

414+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

415+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

416+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

417+#: qml/Wizard/Pages/passwd-set.qml:90

418+msgid "Continue"

419+msgstr ""

420+

421+#: qml/Wizard/Pages/20-sim.qml:25

422+msgid "Add a SIM card and restart your device"

423+msgstr ""

424+

425+#: qml/Wizard/Pages/20-sim.qml:59

426+msgid "Without it, you won’t be able to make calls or use text messaging."

427+msgstr ""

428+

429+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

430+msgid "Skip"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/30-passwd-type.qml:39

434+msgid "Lock security"

435+msgstr ""

436+

437+#: qml/Wizard/Pages/30-passwd-type.qml:74

438+msgid "Please select how you’d like to unlock your phone."

439+msgstr ""

440+

441+#: qml/Wizard/Pages/30-passwd-type.qml:97

442+msgctxt "Label: Type of security method"

443+msgid "Swipe"

444+msgstr ""

445+

446+#: qml/Wizard/Pages/30-passwd-type.qml:98

447+msgctxt "Label: Description of security method"

448+msgid "No security"

449+msgstr ""

450+

451+#: qml/Wizard/Pages/30-passwd-type.qml:100

452+msgctxt "Label: Type of security method"

453+msgid "Passcode"

454+msgstr ""

455+

456+#: qml/Wizard/Pages/30-passwd-type.qml:101

457+msgctxt "Label: Description of security method"

458+msgid "4 digits only"

459+msgstr ""

460+

461+#: qml/Wizard/Pages/30-passwd-type.qml:103

462+msgctxt "Label: Type of security method"

463+msgid "Passphrase"

464+msgstr ""

465+

466+#: qml/Wizard/Pages/30-passwd-type.qml:104

467+msgctxt "Label: Description of security method"

468+msgid "Numbers and letters"

469+msgstr ""

470+

471+#: qml/Wizard/Pages/40-wifi.qml:29

472+msgid "Connect to Wi‑Fi"

473+msgstr ""

474+

475+#: qml/Wizard/Pages/40-wifi.qml:168

476+msgid "Available networks…"

477+msgstr ""

478+

479+#: qml/Wizard/Pages/40-wifi.qml:169

480+msgid "No available networks."

481+msgstr ""

482+

483+#: qml/Wizard/Pages/50-location.qml:27

484+msgid "Location"

485+msgstr ""

486+

487+#: qml/Wizard/Pages/50-location.qml:62

488+msgid "Let the phone detect your location:"

489+msgstr ""

490+

491+#: qml/Wizard/Pages/50-location.qml:69

492+msgid "Using GPS only (less accurate)"

493+msgstr ""

494+

495+#: qml/Wizard/Pages/50-location.qml:86

496+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

497+msgstr ""

498+

499+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

500+#: qml/Wizard/Pages/50-location.qml:103

501+msgid ""

502+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

503+"conditions</a>."

504+msgstr ""

505+

506+#: qml/Wizard/Pages/50-location.qml:112

507+msgid "Not at all"

508+msgstr ""

509+

510+#: qml/Wizard/Pages/50-location.qml:124

511+msgid "You can change your mind later in System Settings."

512+msgstr ""

513+

514+#: qml/Wizard/Pages/60-reporting.qml:24

515+msgid "Improving your experience"

516+msgstr ""

517+

518+#: qml/Wizard/Pages/60-reporting.qml:36

519+msgid ""

520+"Your phone is set up to automatically report errors to Canonical and its "

521+"partners, the makers of the operating system."

522+msgstr ""

523+

524+#: qml/Wizard/Pages/60-reporting.qml:43

525+msgid ""

526+"This can be disabled in System Settings under Security & "

527+"Privacy"

528+msgstr ""

529+

530+#: qml/Wizard/Pages/80-finished.qml:24

531+msgid "All done"

532+msgstr ""

533+

534+#: qml/Wizard/Pages/80-finished.qml:39

535+msgid "Nice work!"

536+msgstr ""

537+

538+#: qml/Wizard/Pages/80-finished.qml:46

539+msgid "Your phone is now ready to use."

540+msgstr ""

541+

542+#: qml/Wizard/Pages/80-finished.qml:53

543+msgid "Finish"

544+msgstr ""

545+

546+#: qml/Wizard/Pages/here-terms.qml:27

547+msgid "Terms & Conditions"

548+msgstr ""

549+

550+#: qml/Wizard/Pages/passwd-confirm.qml:49

551+msgid "Confirm passphrase"

552+msgstr ""

553+

554+#: qml/Wizard/Pages/passwd-confirm.qml:50

555+msgid "Confirm passcode"

556+msgstr ""

557+

558+#: qml/Wizard/Pages/passwd-confirm.qml:53

559+#: qml/Wizard/Pages/passwd-confirm.qml:54

560+msgid "Please try again."

561+msgstr ""

562+

563+#: qml/Wizard/Pages/passwd-set.qml:61

564+msgid "Choose your passcode"

565+msgstr ""

566+

567+#: qml/Wizard/Pages/passwd-set.qml:68

568+msgid "Passphrase must be 4 characters long"

569+msgstr ""

570+

571+#: qml/Wizard/StackButton.qml:39

572+#, qt-format

573+msgid "〈 %1"

574+msgstr ""

575+

576+#: qml/Wizard/StackButton.qml:42

577+#, qt-format

578+msgid "%1 〉"

579+msgstr ""

po/ckb.po+218−123

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

1111"PO-Revision-Date: 2014-01-21 11:05+0000\n"

1212"Last-Translator: Aras <aras.noori@gmail.com>\n"

1313"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"

@@ -15,10 +15,10 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr ""

2424

@@ -31,127 +31,106 @@ msgstr ""

3131msgid "Unpin shortcut"

3232msgstr ""

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr ""

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr ""

4141

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

4343msgid "You have been locked out due to too many failed passcode attempts."

4444msgstr ""

4545

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

4747#, qt-format

4848msgid "Please wait %1 minute and then try again…"

4949msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] ""

5151msgstr[1] ""

5252

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

5455msgid "Log out"

5556msgstr ""

5657

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

5859msgid "Are you sure you want to log out?"

5960msgstr ""

6061

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:122

63−msgid "No"

62+#: qml/Components/Dialogs.qml:70

63+msgctxt "Button: Lock the system"

64+msgid "Lock"

6465msgstr ""

6566

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:129

68−msgid "Yes"

67+#: qml/Components/Dialogs.qml:77

68+msgctxt "Button: Log out from the system"

69+msgid "Log Out"

6970msgstr ""

7071

71−#: qml/Components/Dialogs.qml:94

72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

73+#: qml/Components/Dialogs.qml:171

74+msgid "Cancel"

75+msgstr ""

76+

77+#: qml/Components/Dialogs.qml:96

78+msgctxt "Title: Reboot/Shut down dialog"

7279msgid "Shut down"

7380msgstr ""

7481

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

7683msgid "Are you sure you want to shut down?"

7784msgstr ""

7885

79−#: qml/Components/Dialogs.qml:119

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

8088msgid "Reboot"

8189msgstr ""

8290

83−#: qml/Components/Dialogs.qml:120

91+#: qml/Components/Dialogs.qml:107

92+msgctxt "Button: Shut down the system"

93+msgid "Shut down"

94+msgstr ""

95+

96+#: qml/Components/Dialogs.qml:127

97+msgctxt "Title: Reboot dialog"

98+msgid "Reboot"

99+msgstr ""

100+

101+#: qml/Components/Dialogs.qml:128

84102msgid "Are you sure you want to reboot?"

85103msgstr ""

86104

87−#: qml/Components/Dialogs.qml:144

105+#: qml/Components/Dialogs.qml:130

106+msgid "No"

107+msgstr ""

108+

109+#: qml/Components/Dialogs.qml:136

110+msgid "Yes"

111+msgstr ""

112+

113+#: qml/Components/Dialogs.qml:150

114+msgctxt "Title: Power off/Restart dialog"

88115msgid "Power"

89116msgstr ""

90117

91−#: qml/Components/Dialogs.qml:145

118+#: qml/Components/Dialogs.qml:151

92119msgid ""

93120"Are you sure you would like\n"

94121"to power off?"

95122msgstr ""

96123

97−#: qml/Components/Dialogs.qml:147

124+#: qml/Components/Dialogs.qml:153

125+msgctxt "Button: Power off the system"

98126msgid "Power off"

99127msgstr ""

100128

101−#: qml/Components/Dialogs.qml:157

129+#: qml/Components/Dialogs.qml:162

130+msgctxt "Button: Restart the system"

102131msgid "Restart"

103132msgstr ""

104133

105−#: qml/Components/Dialogs.qml:167

106−msgid "Cancel"

107−msgstr ""

108−

109−#: qml/Components/EdgeDemoOverlay.qml:151

110−msgid "Skip intro"

111−msgstr "پێشەکیی بپەڕێنە"

112−

113−#: qml/Components/EdgeDemo.qml:125

114−msgid "Right edge"

115−msgstr "لێواری ڕاست"

116−

117−#: qml/Components/EdgeDemo.qml:126

118−msgid "Try swiping from the right edge to unlock the phone"

119−msgstr "لێواری ڕاست ڕابکێشە بۆ کردنەوەی مۆبایلەکە"

120−

121−#: qml/Components/EdgeDemo.qml:157

122−msgid "Top edge"

123−msgstr "لێواری سەرەوە"

124−

125−#: qml/Components/EdgeDemo.qml:158

126−msgid "Try swiping from the top edge to access the indicators"

127−msgstr "لێواری سەرەوە ڕابکێشە بۆ گەیشتن بە نیشاندەرەکان"

128−

129−#: qml/Components/EdgeDemo.qml:183

130−msgid "Close"

131−msgstr "داخستن"

132−

133−#: qml/Components/EdgeDemo.qml:184

134−msgid "Swipe up again to close the settings screen"

135−msgstr "ڕایکێشەوە سەرەوە جارێکی تر بۆ داخستنی پەردەی ڕێکخستنەکان"

136−

137−#: qml/Components/EdgeDemo.qml:214

138−msgid "Left edge"

139−msgstr "لێواری چەپ"

140−

141−#: qml/Components/EdgeDemo.qml:215

142−msgid "Swipe from the left to reveal the launcher for quick access to apps"

143−msgstr "لە چەپەوە بچۆرەوە سەر دەستپێک بۆئەوەی بتوانی هەموو ئەپەکان ببینی"

144−

145−#: qml/Components/EdgeDemo.qml:242

146−msgid "Well done"

147−msgstr "دەستخۆش"

148−

149−#: qml/Components/EdgeDemo.qml:243

150−msgid ""

151−"You have now mastered the edge gestures and can start using the "

152−"phone Tap on the screen to start"

153−msgstr ""

154−

155134#: qml/Components/Lockscreen.qml:238

156135msgid "Return to Call"

157136msgstr ""

@@ -164,32 +143,39 @@ msgstr "هێڵی فریاگوزاری"

164143msgid "OK"

165144msgstr ""

166145

167−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

168147msgid "See less"

169148msgstr ""

170149

171−#: qml/Dash/GenericScopeView.qml:431

150+#: qml/Dash/GenericScopeView.qml:533

172151msgid "See all"

173152msgstr ""

174153

175−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176−#: qml/Panel/SearchIndicator.qml:27

154+#: qml/Dash/GenericScopeView.qml:595

155+msgctxt "Label: Hint for dash search line edit"

177156msgid "Search"

178−msgstr "گەڕان"

157+msgstr ""

179158

180−#: qml/Dash/PageHeader.qml:260

159+#: qml/Dash/PageHeader.qml:269

160+msgctxt "Button: Open the Ubuntu Store"

181161msgid "Store"

182162msgstr ""

183163

184−#: qml/Dash/PageHeader.qml:277

164+#: qml/Dash/PageHeader.qml:276

165+msgctxt "Button: Start a search in the current dash scope"

166+msgid "Search"

167+msgstr ""

168+

169+#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

185171msgid "Settings"

186172msgstr ""

187173

188−#: qml/Dash/PageHeader.qml:284

174+#: qml/Dash/PageHeader.qml:293

189175msgid "Remove from Favorites"

190176msgstr ""

191177

192−#: qml/Dash/PageHeader.qml:284

178+#: qml/Dash/PageHeader.qml:293

193179msgid "Add to Favorites"

194180msgstr ""

195181

@@ -221,22 +207,88 @@ msgstr ""

221207msgid "Release to refresh…"

222208msgstr ""

223209

224−#: qml/Dash/ScopesList.qml:63

210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

211+msgid "Enable location data"

212+msgstr ""

213+

214+#: qml/Dash/ScopesList.qml:66

225215msgid "Manage"

226216msgstr ""

227217

228−#: qml/Dash/ScopesList.qml:107

218+#: qml/Dash/ScopesList.qml:112

229219msgid "Home"

230220msgstr ""

231221

232−#: qml/Dash/ScopesList.qml:108

222+#: qml/Dash/ScopesList.qml:113

233223msgid "Also installed"

234224msgstr ""

235225

236−#: qml/Greeter/Greeter.qml:174

226+#: qml/Greeter/CoverPage.qml:107

237227msgid "Unlock"

238228msgstr ""

239229

230+#: qml/Greeter/LoginList.qml:236

231+msgid "Retry"

232+msgstr ""

233+

234+#: qml/Greeter/LoginList.qml:237

235+msgid "Tap to unlock"

236+msgstr ""

237+

238+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

239+msgid "Sorry, incorrect passphrase."

240+msgstr ""

241+

242+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

243+msgid "Sorry, incorrect passcode."

244+msgstr ""

245+

246+#: qml/Greeter/NarrowView.qml:55

247+msgid "This will be your last attempt."

248+msgstr ""

249+

250+#: qml/Greeter/NarrowView.qml:57

251+msgid ""

252+"If passphrase is entered incorrectly, your phone will conduct a factory "

253+"reset and all personal data will be deleted."

254+msgstr ""

255+

256+#: qml/Greeter/NarrowView.qml:58

257+msgid ""

258+"If passcode is entered incorrectly, your phone will conduct a factory reset "

259+"and all personal data will be deleted."

260+msgstr ""

261+

262+#: qml/Greeter/NarrowView.qml:115

263+#, qt-format

264+msgid "Enter %1"

265+msgstr ""

266+

267+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

268+msgid "Enter passphrase"

269+msgstr ""

270+

271+#: qml/Greeter/NarrowView.qml:117

272+msgid "Enter passcode"

273+msgstr ""

274+

275+#: qml/Greeter/NarrowView.qml:118

276+#, qt-format

277+msgid "Sorry, incorrect %1"

278+msgstr ""

279+

280+#: qml/Greeter/NarrowView.qml:119

281+msgid "Sorry, incorrect passphrase"

282+msgstr ""

283+

284+#: qml/Greeter/NarrowView.qml:120

285+msgid "Please re-enter"

286+msgstr ""

287+

288+#: qml/Greeter/NarrowView.qml:121

289+msgid "Sorry, incorrect passcode"

290+msgstr ""

291+

240292#: qml/Notifications/NotificationMenuItemFactory.qml:128

241293msgid "Show password"

242294msgstr "تێپەڕەوشە پیشان بدە"

@@ -277,6 +329,11 @@ msgstr ""

277329msgid "Failed, tap to retry"

278330msgstr ""

279331

332+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

333+msgctxt "Label: Hint in message indicator line edit"

334+msgid "Reply"

335+msgstr ""

336+

280337#: qml/Panel/Indicators/ModemInfoItem.qml:105

281338msgid "Unlock SIM"

282339msgstr ""

@@ -285,61 +342,60 @@ msgstr ""

285342msgid "Roaming"

286343msgstr ""

287344

288−#: qml/Shell.qml:367

289−#, qt-format

290−msgid "Enter %1"

345+#: qml/Tutorial/TutorialBottomFinish.qml:24

346+msgid "This action does different things for different apps"

291347msgstr ""

292348

293−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

294−msgid "Enter passphrase"

349+#: qml/Tutorial/TutorialBottomFinish.qml:25

350+msgid "Tap here to finish."

295351msgstr ""

296352

297−#: qml/Shell.qml:369

298−msgid "Enter passcode"

353+#: qml/Tutorial/TutorialBottom.qml:28

354+msgid "Open special menus"

299355msgstr ""

300356

301−#: qml/Shell.qml:370

302−#, qt-format

303−msgid "Sorry, incorrect %1"

357+#: qml/Tutorial/TutorialBottom.qml:29

358+msgid "Swipe up from the bottom edge."

304359msgstr ""

305360

306−#: qml/Shell.qml:371

307−msgid "Sorry, incorrect passphrase"

361+#: qml/Tutorial/TutorialLeftFinish.qml:24

362+msgid "These are the shortcuts to favorite apps"

308363msgstr ""

309364

310−#: qml/Shell.qml:372

311−msgid "Please re-enter"

365+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

366+msgid "Tap here to continue."

312367msgstr ""

313368

314−#: qml/Shell.qml:373

315−msgid "Sorry, incorrect passcode"

369+#: qml/Tutorial/TutorialLeft.qml:26

370+msgid "Open the launcher"

316371msgstr ""

317372

318−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

319−msgid "Sorry, incorrect passphrase."

373+#: qml/Tutorial/TutorialLeft.qml:27

374+msgid "Short swipe from the left edge."

320375msgstr ""

321376

322−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

323−msgid "Sorry, incorrect passcode."

377+#: qml/Tutorial/TutorialPage.qml:178

378+msgid "You almost got it!"

324379msgstr ""

325380

326−#: qml/Shell.qml:469

327−msgid "This will be your last attempt."

381+#: qml/Tutorial/TutorialPage.qml:195

382+msgid "Try again."

328383msgstr ""

329384

330−#: qml/Shell.qml:471

331−msgid ""

332−"If passphrase is entered incorrectly, your phone will conduct a factory "

333−"reset and all personal data will be deleted."

385+#: qml/Tutorial/TutorialRight.qml:31

386+msgid "To view open apps"

334387msgstr ""

335388

336−#: qml/Shell.qml:472

337−msgid ""

338−"If passcode is entered incorrectly, your phone will conduct a factory reset "

339−"and all personal data will be deleted."

389+#: qml/Tutorial/TutorialRight.qml:32

390+msgid "Long swipe from the right edge."

391+msgstr ""

392+

393+#: qml/Tutorial/TutorialRight.qml:122

394+msgid "View all your running tasks."

340395msgstr ""

341396

342397#: qml/Wizard/Page.qml:89

398+msgctxt "Button: Go back one page in the Wizard"

343399msgid "Back"

344400msgstr ""

345401

@@ -356,7 +412,7 @@ msgid "Let’s get started."

356412msgstr ""

357413

358414#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

359−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

415+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

360416#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

361417#: qml/Wizard/Pages/passwd-set.qml:90

362418msgid "Continue"

@@ -366,11 +422,11 @@ msgstr ""

366422msgid "Add a SIM card and restart your device"

367423msgstr ""

368424

369−#: qml/Wizard/Pages/20-sim.qml:55

425+#: qml/Wizard/Pages/20-sim.qml:59

370426msgid "Without it, you won’t be able to make calls or use text messaging."

371427msgstr ""

372428

373−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

429+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

374430msgid "Skip"

375431msgstr ""

376432

@@ -383,38 +439,44 @@ msgid "Please select how you’d like to unlock your phone."

383439msgstr ""

384440

385441#: qml/Wizard/Pages/30-passwd-type.qml:97

442+msgctxt "Label: Type of security method"

386443msgid "Swipe"

387444msgstr ""

388445

389446#: qml/Wizard/Pages/30-passwd-type.qml:98

447+msgctxt "Label: Description of security method"

390448msgid "No security"

391449msgstr ""

392450

393451#: qml/Wizard/Pages/30-passwd-type.qml:100

452+msgctxt "Label: Type of security method"

394453msgid "Passcode"

395454msgstr ""

396455

397456#: qml/Wizard/Pages/30-passwd-type.qml:101

457+msgctxt "Label: Description of security method"

398458msgid "4 digits only"

399459msgstr ""

400460

401461#: qml/Wizard/Pages/30-passwd-type.qml:103

462+msgctxt "Label: Type of security method"

402463msgid "Passphrase"

403464msgstr ""

404465

405466#: qml/Wizard/Pages/30-passwd-type.qml:104

467+msgctxt "Label: Description of security method"

406468msgid "Numbers and letters"

407469msgstr ""

408470

409−#: qml/Wizard/Pages/40-wifi.qml:28

471+#: qml/Wizard/Pages/40-wifi.qml:29

410472msgid "Connect to Wi‑Fi"

411473msgstr ""

412474

413−#: qml/Wizard/Pages/40-wifi.qml:147

475+#: qml/Wizard/Pages/40-wifi.qml:168

414476msgid "Available networks…"

415477msgstr ""

416478

417−#: qml/Wizard/Pages/40-wifi.qml:148

479+#: qml/Wizard/Pages/40-wifi.qml:169

418480msgid "No available networks."

419481msgstr ""

420482

@@ -516,6 +578,27 @@ msgstr ""

516578msgid "%1 〉"

517579msgstr ""

518580

581+#~ msgid "Top edge"

582+#~ msgstr "لێواری سەرەوە"

583+

584+#~ msgid "Try swiping from the top edge to access the indicators"

585+#~ msgstr "لێواری سەرەوە ڕابکێشە بۆ گەیشتن بە نیشاندەرەکان"

586+

587+#~ msgid "Close"

588+#~ msgstr "داخستن"

589+

590+#~ msgid "Swipe up again to close the settings screen"

591+#~ msgstr "ڕایکێشەوە سەرەوە جارێکی تر بۆ داخستنی پەردەی ڕێکخستنەکان"

592+

593+#~ msgid "Left edge"

594+#~ msgstr "لێواری چەپ"

595+

596+#~ msgid "Try swiping from the right edge to unlock the phone"

597+#~ msgstr "لێواری ڕاست ڕابکێشە بۆ کردنەوەی مۆبایلەکە"

598+

599+#~ msgid "Right edge"

600+#~ msgstr "لێواری ڕاست"

601+

519602#~ msgid "Speaking..."

520603#~ msgstr "قسە دەکات..."

521604

@@ -525,6 +608,18 @@ msgstr ""

525608#~ msgid "Confirm"

526609#~ msgstr "پشتڕاستکردنەوە"

527610

611+#~ msgid "Search"

612+#~ msgstr "گەڕان"

613+

614+#~ msgid "Skip intro"

615+#~ msgstr "پێشەکیی بپەڕێنە"

616+

617+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

618+#~ msgstr "لە چەپەوە بچۆرەوە سەر دەستپێک بۆئەوەی بتوانی هەموو ئەپەکان ببینی"

619+

620+#~ msgid "Well done"

621+#~ msgstr "دەستخۆش"

622+

528623#~ msgid "Type or say a command"

529624#~ msgstr "فەرمانێک بێژە یان بنووسە"

530625

po/cs.po+218−123

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

1111"PO-Revision-Date: 2014-01-08 10:11+0000\n"

1212"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"

1313"Language-Team: Czech <cs@li.org>\n"

@@ -15,10 +15,10 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr ""

2424

@@ -31,127 +31,106 @@ msgstr ""

3131msgid "Unpin shortcut"

3232msgstr ""

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr ""

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr ""

4141

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

4343msgid "You have been locked out due to too many failed passcode attempts."

4444msgstr ""

4545

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

4747#, qt-format

4848msgid "Please wait %1 minute and then try again…"

4949msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] ""

5151msgstr[1] ""

5252

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

5455msgid "Log out"

5556msgstr ""

5657

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

5859msgid "Are you sure you want to log out?"

5960msgstr ""

6061

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:122

63−msgid "No"

62+#: qml/Components/Dialogs.qml:70

63+msgctxt "Button: Lock the system"

64+msgid "Lock"

6465msgstr ""

6566

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:129

68−msgid "Yes"

67+#: qml/Components/Dialogs.qml:77

68+msgctxt "Button: Log out from the system"

69+msgid "Log Out"

6970msgstr ""

7071

71−#: qml/Components/Dialogs.qml:94

72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

73+#: qml/Components/Dialogs.qml:171

74+msgid "Cancel"

75+msgstr ""

76+

77+#: qml/Components/Dialogs.qml:96

78+msgctxt "Title: Reboot/Shut down dialog"

7279msgid "Shut down"

7380msgstr ""

7481

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

7683msgid "Are you sure you want to shut down?"

7784msgstr ""

7885

79−#: qml/Components/Dialogs.qml:119

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

8088msgid "Reboot"

8189msgstr ""

8290

83−#: qml/Components/Dialogs.qml:120

91+#: qml/Components/Dialogs.qml:107

92+msgctxt "Button: Shut down the system"

93+msgid "Shut down"

94+msgstr ""

95+

96+#: qml/Components/Dialogs.qml:127

97+msgctxt "Title: Reboot dialog"

98+msgid "Reboot"

99+msgstr ""

100+

101+#: qml/Components/Dialogs.qml:128

84102msgid "Are you sure you want to reboot?"

85103msgstr ""

86104

87−#: qml/Components/Dialogs.qml:144

105+#: qml/Components/Dialogs.qml:130

106+msgid "No"

107+msgstr ""

108+

109+#: qml/Components/Dialogs.qml:136

110+msgid "Yes"

111+msgstr ""

112+

113+#: qml/Components/Dialogs.qml:150

114+msgctxt "Title: Power off/Restart dialog"

88115msgid "Power"

89116msgstr ""

90117

91−#: qml/Components/Dialogs.qml:145

118+#: qml/Components/Dialogs.qml:151

92119msgid ""

93120"Are you sure you would like\n"

94121"to power off?"

95122msgstr ""

96123

97−#: qml/Components/Dialogs.qml:147

124+#: qml/Components/Dialogs.qml:153

125+msgctxt "Button: Power off the system"

98126msgid "Power off"

99127msgstr ""

100128

101−#: qml/Components/Dialogs.qml:157

129+#: qml/Components/Dialogs.qml:162

130+msgctxt "Button: Restart the system"

102131msgid "Restart"

103132msgstr ""

104133

105−#: qml/Components/Dialogs.qml:167

106−msgid "Cancel"

107−msgstr ""

108−

109−#: qml/Components/EdgeDemoOverlay.qml:151

110−msgid "Skip intro"

111−msgstr "Přeskočit intro"

112−

113−#: qml/Components/EdgeDemo.qml:125

114−msgid "Right edge"

115−msgstr "Pravý okraj"

116−

117−#: qml/Components/EdgeDemo.qml:126

118−msgid "Try swiping from the right edge to unlock the phone"

119−msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."

120−

121−#: qml/Components/EdgeDemo.qml:157

122−msgid "Top edge"

123−msgstr "Horní okraj"

124−

125−#: qml/Components/EdgeDemo.qml:158

126−msgid "Try swiping from the top edge to access the indicators"

127−msgstr "Pokuste se zpřístupnit indikátory potažením prstu z horního okraje"

128−

129−#: qml/Components/EdgeDemo.qml:183

130−msgid "Close"

131−msgstr "Uzavřít"

132−

133−#: qml/Components/EdgeDemo.qml:184

134−msgid "Swipe up again to close the settings screen"

135−msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"

136−

137−#: qml/Components/EdgeDemo.qml:214

138−msgid "Left edge"

139−msgstr "Levý okraj"

140−

141−#: qml/Components/EdgeDemo.qml:215

142−msgid "Swipe from the left to reveal the launcher for quick access to apps"

143−msgstr "Pro rychlý přístup k aplikacím potáhněte prst z levého okraje."

144−

145−#: qml/Components/EdgeDemo.qml:242

146−msgid "Well done"

147−msgstr "Výborně"

148−

149−#: qml/Components/EdgeDemo.qml:243

150−msgid ""

151−"You have now mastered the edge gestures and can start using the "

152−"phone Tap on the screen to start"

153−msgstr ""

154−

155134#: qml/Components/Lockscreen.qml:238

156135msgid "Return to Call"

157136msgstr ""

@@ -164,32 +143,39 @@ msgstr "Tísňové volání"

164143msgid "OK"

165144msgstr ""

166145

167−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

168147msgid "See less"

169148msgstr ""

170149

171−#: qml/Dash/GenericScopeView.qml:431

150+#: qml/Dash/GenericScopeView.qml:533

172151msgid "See all"

173152msgstr ""

174153

175−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176−#: qml/Panel/SearchIndicator.qml:27

154+#: qml/Dash/GenericScopeView.qml:595

155+msgctxt "Label: Hint for dash search line edit"

177156msgid "Search"

178−msgstr "Hledat"

157+msgstr ""

179158

180−#: qml/Dash/PageHeader.qml:260

159+#: qml/Dash/PageHeader.qml:269

160+msgctxt "Button: Open the Ubuntu Store"

181161msgid "Store"

182162msgstr ""

183163

184−#: qml/Dash/PageHeader.qml:277

164+#: qml/Dash/PageHeader.qml:276

165+msgctxt "Button: Start a search in the current dash scope"

166+msgid "Search"

167+msgstr ""

168+

169+#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

185171msgid "Settings"

186172msgstr ""

187173

188−#: qml/Dash/PageHeader.qml:284

174+#: qml/Dash/PageHeader.qml:293

189175msgid "Remove from Favorites"

190176msgstr ""

191177

192−#: qml/Dash/PageHeader.qml:284

178+#: qml/Dash/PageHeader.qml:293

193179msgid "Add to Favorites"

194180msgstr ""

195181

@@ -221,22 +207,88 @@ msgstr ""

221207msgid "Release to refresh…"

222208msgstr ""

223209

224−#: qml/Dash/ScopesList.qml:63

210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

211+msgid "Enable location data"

212+msgstr ""

213+

214+#: qml/Dash/ScopesList.qml:66

225215msgid "Manage"

226216msgstr ""

227217

228−#: qml/Dash/ScopesList.qml:107

218+#: qml/Dash/ScopesList.qml:112

229219msgid "Home"

230220msgstr ""

231221

232−#: qml/Dash/ScopesList.qml:108

222+#: qml/Dash/ScopesList.qml:113

233223msgid "Also installed"

234224msgstr ""

235225

236−#: qml/Greeter/Greeter.qml:174

226+#: qml/Greeter/CoverPage.qml:107

237227msgid "Unlock"

238228msgstr ""

239229

230+#: qml/Greeter/LoginList.qml:236

231+msgid "Retry"

232+msgstr ""

233+

234+#: qml/Greeter/LoginList.qml:237

235+msgid "Tap to unlock"

236+msgstr ""

237+

238+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

239+msgid "Sorry, incorrect passphrase."

240+msgstr ""

241+

242+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

243+msgid "Sorry, incorrect passcode."

244+msgstr ""

245+

246+#: qml/Greeter/NarrowView.qml:55

247+msgid "This will be your last attempt."

248+msgstr ""

249+

250+#: qml/Greeter/NarrowView.qml:57

251+msgid ""

252+"If passphrase is entered incorrectly, your phone will conduct a factory "

253+"reset and all personal data will be deleted."

254+msgstr ""

255+

256+#: qml/Greeter/NarrowView.qml:58

257+msgid ""

258+"If passcode is entered incorrectly, your phone will conduct a factory reset "

259+"and all personal data will be deleted."

260+msgstr ""

261+

262+#: qml/Greeter/NarrowView.qml:115

263+#, qt-format

264+msgid "Enter %1"

265+msgstr ""

266+

267+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

268+msgid "Enter passphrase"

269+msgstr ""

270+

271+#: qml/Greeter/NarrowView.qml:117

272+msgid "Enter passcode"

273+msgstr ""

274+

275+#: qml/Greeter/NarrowView.qml:118

276+#, qt-format

277+msgid "Sorry, incorrect %1"

278+msgstr ""

279+

280+#: qml/Greeter/NarrowView.qml:119

281+msgid "Sorry, incorrect passphrase"

282+msgstr ""

283+

284+#: qml/Greeter/NarrowView.qml:120

285+msgid "Please re-enter"

286+msgstr ""

287+

288+#: qml/Greeter/NarrowView.qml:121

289+msgid "Sorry, incorrect passcode"

290+msgstr ""

291+

240292#: qml/Notifications/NotificationMenuItemFactory.qml:128

241293msgid "Show password"

242294msgstr "Zobrazit heslo"

@@ -277,6 +329,11 @@ msgstr ""

277329msgid "Failed, tap to retry"

278330msgstr ""

279331

332+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

333+msgctxt "Label: Hint in message indicator line edit"

334+msgid "Reply"

335+msgstr ""

336+

280337#: qml/Panel/Indicators/ModemInfoItem.qml:105

281338msgid "Unlock SIM"

282339msgstr ""

@@ -285,61 +342,60 @@ msgstr ""

285342msgid "Roaming"

286343msgstr ""

287344

288−#: qml/Shell.qml:367

289−#, qt-format

290−msgid "Enter %1"

345+#: qml/Tutorial/TutorialBottomFinish.qml:24

346+msgid "This action does different things for different apps"

291347msgstr ""

292348

293−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

294−msgid "Enter passphrase"

349+#: qml/Tutorial/TutorialBottomFinish.qml:25

350+msgid "Tap here to finish."

295351msgstr ""

296352

297−#: qml/Shell.qml:369

298−msgid "Enter passcode"

353+#: qml/Tutorial/TutorialBottom.qml:28

354+msgid "Open special menus"

299355msgstr ""

300356

301−#: qml/Shell.qml:370

302−#, qt-format

303−msgid "Sorry, incorrect %1"

357+#: qml/Tutorial/TutorialBottom.qml:29

358+msgid "Swipe up from the bottom edge."

304359msgstr ""

305360

306−#: qml/Shell.qml:371

307−msgid "Sorry, incorrect passphrase"

361+#: qml/Tutorial/TutorialLeftFinish.qml:24

362+msgid "These are the shortcuts to favorite apps"

308363msgstr ""

309364

310−#: qml/Shell.qml:372

311−msgid "Please re-enter"

365+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

366+msgid "Tap here to continue."

312367msgstr ""

313368

314−#: qml/Shell.qml:373

315−msgid "Sorry, incorrect passcode"

369+#: qml/Tutorial/TutorialLeft.qml:26

370+msgid "Open the launcher"

316371msgstr ""

317372

318−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

319−msgid "Sorry, incorrect passphrase."

373+#: qml/Tutorial/TutorialLeft.qml:27

374+msgid "Short swipe from the left edge."

320375msgstr ""

321376

322−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

323−msgid "Sorry, incorrect passcode."

377+#: qml/Tutorial/TutorialPage.qml:178

378+msgid "You almost got it!"

324379msgstr ""

325380

326−#: qml/Shell.qml:469

327−msgid "This will be your last attempt."

381+#: qml/Tutorial/TutorialPage.qml:195

382+msgid "Try again."

328383msgstr ""

329384

330−#: qml/Shell.qml:471

331−msgid ""

332−"If passphrase is entered incorrectly, your phone will conduct a factory "

333−"reset and all personal data will be deleted."

385+#: qml/Tutorial/TutorialRight.qml:31

386+msgid "To view open apps"

334387msgstr ""

335388

336−#: qml/Shell.qml:472

337−msgid ""

338−"If passcode is entered incorrectly, your phone will conduct a factory reset "

339−"and all personal data will be deleted."

389+#: qml/Tutorial/TutorialRight.qml:32

390+msgid "Long swipe from the right edge."

391+msgstr ""

392+

393+#: qml/Tutorial/TutorialRight.qml:122

394+msgid "View all your running tasks."

340395msgstr ""

341396

342397#: qml/Wizard/Page.qml:89

398+msgctxt "Button: Go back one page in the Wizard"

343399msgid "Back"

344400msgstr ""

345401

@@ -356,7 +412,7 @@ msgid "Let’s get started."

356412msgstr ""

357413

358414#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

359−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

415+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

360416#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

361417#: qml/Wizard/Pages/passwd-set.qml:90

362418msgid "Continue"

@@ -366,11 +422,11 @@ msgstr ""

366422msgid "Add a SIM card and restart your device"

367423msgstr ""

368424

369−#: qml/Wizard/Pages/20-sim.qml:55

425+#: qml/Wizard/Pages/20-sim.qml:59

370426msgid "Without it, you won’t be able to make calls or use text messaging."

371427msgstr ""

372428

373−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

429+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

374430msgid "Skip"

375431msgstr ""

376432

@@ -383,38 +439,44 @@ msgid "Please select how you’d like to unlock your phone."

383439msgstr ""

384440

385441#: qml/Wizard/Pages/30-passwd-type.qml:97

442+msgctxt "Label: Type of security method"

386443msgid "Swipe"

387444msgstr ""

388445

389446#: qml/Wizard/Pages/30-passwd-type.qml:98

447+msgctxt "Label: Description of security method"

390448msgid "No security"

391449msgstr ""

392450

393451#: qml/Wizard/Pages/30-passwd-type.qml:100

452+msgctxt "Label: Type of security method"

394453msgid "Passcode"

395454msgstr ""

396455

397456#: qml/Wizard/Pages/30-passwd-type.qml:101

457+msgctxt "Label: Description of security method"

398458msgid "4 digits only"

399459msgstr ""

400460

401461#: qml/Wizard/Pages/30-passwd-type.qml:103

462+msgctxt "Label: Type of security method"

402463msgid "Passphrase"

403464msgstr ""

404465

405466#: qml/Wizard/Pages/30-passwd-type.qml:104

467+msgctxt "Label: Description of security method"

406468msgid "Numbers and letters"

407469msgstr ""

408470

409−#: qml/Wizard/Pages/40-wifi.qml:28

471+#: qml/Wizard/Pages/40-wifi.qml:29

410472msgid "Connect to Wi‑Fi"

411473msgstr ""

412474

413−#: qml/Wizard/Pages/40-wifi.qml:147

475+#: qml/Wizard/Pages/40-wifi.qml:168

414476msgid "Available networks…"

415477msgstr ""

416478

417−#: qml/Wizard/Pages/40-wifi.qml:148

479+#: qml/Wizard/Pages/40-wifi.qml:169

418480msgid "No available networks."

419481msgstr ""

420482

@@ -516,6 +578,27 @@ msgstr ""

516578msgid "%1 〉"

517579msgstr ""

518580

581+#~ msgid "Try swiping from the right edge to unlock the phone"

582+#~ msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."

583+

584+#~ msgid "Skip intro"

585+#~ msgstr "Přeskočit intro"

586+

587+#~ msgid "Right edge"

588+#~ msgstr "Pravý okraj"

589+

590+#~ msgid "Top edge"

591+#~ msgstr "Horní okraj"

592+

593+#~ msgid "Try swiping from the top edge to access the indicators"

594+#~ msgstr "Pokuste se zpřístupnit indikátory potažením prstu z horního okraje"

595+

596+#~ msgid "Close"

597+#~ msgstr "Uzavřít"

598+

599+#~ msgid "Left edge"

600+#~ msgstr "Levý okraj"

601+

519602#~ msgid "Loading. Please Wait..."

520603#~ msgstr "Načítám. Čekejte prosím..."

521604

@@ -525,8 +608,20 @@ msgstr ""

525608#~ msgid "Confirm"

526609#~ msgstr "Potvrdit"

527610

611+#~ msgid "Search"

612+#~ msgstr "Hledat"

613+

528614#~ msgid "Speaking..."

529615#~ msgstr "Mluvte..."

530616

617+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

618+#~ msgstr "Pro rychlý přístup k aplikacím potáhněte prst z levého okraje."

619+

620+#~ msgid "Well done"

621+#~ msgstr "Výborně"

622+

531623#~ msgid "Type or say a command"

532624#~ msgstr "Napište nebo řekněte příkaz"

625+

626+#~ msgid "Swipe up again to close the settings screen"

627+#~ msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"

po/da.po+225−125

@@ -8,7 +8,7 @@ msgid ""

88msgstr ""

99"Project-Id-Version: unity8\n"

1010"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

11−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

1212"PO-Revision-Date: 2014-07-30 12:37+0000\n"

1313"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"

1414"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"

@@ -16,10 +16,10 @@ msgstr ""

1616"Content-Type: text/plain; charset=UTF-8\n"

1717"Content-Transfer-Encoding: 8bit\n"

1818"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

20−"X-Generator: Launchpad (build 17286)\n"

19+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

20+"X-Generator: Launchpad (build 17413)\n"

2121

22−#: plugins/LightDM/Greeter.cpp:130

22+#: plugins/LightDM/Greeter.cpp:112

2323msgid "Password: "

2424msgstr ""

2525

@@ -32,129 +32,106 @@ msgstr "Fastgør genvej"

3232msgid "Unpin shortcut"

3333msgstr "Gør genvej flytbar"

3434

35−#: qml/Components/DelayedLockscreen.qml:47

35+#: qml/Components/DelayedLockscreen.qml:49

3636msgid "Device Locked"

3737msgstr ""

3838

39−#: qml/Components/DelayedLockscreen.qml:62

39+#: qml/Components/DelayedLockscreen.qml:64

4040msgid "You have been locked out due to too many failed passphrase attempts."

4141msgstr ""

4242

43−#: qml/Components/DelayedLockscreen.qml:63

43+#: qml/Components/DelayedLockscreen.qml:65

4444msgid "You have been locked out due to too many failed passcode attempts."

4545msgstr ""

4646

47−#: qml/Components/DelayedLockscreen.qml:72

47+#: qml/Components/DelayedLockscreen.qml:74

4848#, qt-format

4949msgid "Please wait %1 minute and then try again…"

5050msgid_plural "Please wait %1 minutes and then try again…"

5151msgstr[0] ""

5252msgstr[1] ""

5353

54−#: qml/Components/Dialogs.qml:70

54+#: qml/Components/Dialogs.qml:67

55+msgctxt "Title: Lock/Log out dialog"

5556msgid "Log out"

5657msgstr ""

5758

58−#: qml/Components/Dialogs.qml:71

59+#: qml/Components/Dialogs.qml:68

5960msgid "Are you sure you want to log out?"

6061msgstr ""

6162

62−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63−#: qml/Components/Dialogs.qml:122

64−msgid "No"

63+#: qml/Components/Dialogs.qml:70

64+msgctxt "Button: Lock the system"

65+msgid "Lock"

6566msgstr ""

6667

67−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68−#: qml/Components/Dialogs.qml:129

69−msgid "Yes"

68+#: qml/Components/Dialogs.qml:77

69+msgctxt "Button: Log out from the system"

70+msgid "Log Out"

7071msgstr ""

7172

72−#: qml/Components/Dialogs.qml:94

73+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

74+#: qml/Components/Dialogs.qml:171

75+msgid "Cancel"

76+msgstr ""

77+

78+#: qml/Components/Dialogs.qml:96

79+msgctxt "Title: Reboot/Shut down dialog"

7380msgid "Shut down"

7481msgstr ""

7582

76−#: qml/Components/Dialogs.qml:95

83+#: qml/Components/Dialogs.qml:97

7784msgid "Are you sure you want to shut down?"

7885msgstr ""

7986

80−#: qml/Components/Dialogs.qml:119

87+#: qml/Components/Dialogs.qml:99

88+msgctxt "Button: Reboot the system"

89+msgid "Reboot"

90+msgstr ""

91+

92+#: qml/Components/Dialogs.qml:107

93+msgctxt "Button: Shut down the system"

94+msgid "Shut down"

95+msgstr ""

96+

97+#: qml/Components/Dialogs.qml:127

98+msgctxt "Title: Reboot dialog"

8199msgid "Reboot"

82100msgstr ""

83101

84−#: qml/Components/Dialogs.qml:120

102+#: qml/Components/Dialogs.qml:128

85103msgid "Are you sure you want to reboot?"

86104msgstr ""

87105

88−#: qml/Components/Dialogs.qml:144

106+#: qml/Components/Dialogs.qml:130

107+msgid "No"

108+msgstr ""

109+

110+#: qml/Components/Dialogs.qml:136

111+msgid "Yes"

112+msgstr ""

113+

114+#: qml/Components/Dialogs.qml:150

115+msgctxt "Title: Power off/Restart dialog"

89116msgid "Power"

90117msgstr ""

91118

92−#: qml/Components/Dialogs.qml:145

119+#: qml/Components/Dialogs.qml:151

93120msgid ""

94121"Are you sure you would like\n"

95122"to power off?"

96123msgstr ""

97124

98−#: qml/Components/Dialogs.qml:147

125+#: qml/Components/Dialogs.qml:153

126+msgctxt "Button: Power off the system"

99127msgid "Power off"

100128msgstr ""

101129

102−#: qml/Components/Dialogs.qml:157

130+#: qml/Components/Dialogs.qml:162

131+msgctxt "Button: Restart the system"

103132msgid "Restart"

104133msgstr ""

105134

106−#: qml/Components/Dialogs.qml:167

107−msgid "Cancel"

108−msgstr ""

109−

110−#: qml/Components/EdgeDemoOverlay.qml:151

111−msgid "Skip intro"

112−msgstr "Spring intro over"

113−

114−#: qml/Components/EdgeDemo.qml:125

115−msgid "Right edge"

116−msgstr "Højre kant"

117−

118−#: qml/Components/EdgeDemo.qml:126

119−msgid "Try swiping from the right edge to unlock the phone"

120−msgstr "Prøv at stryge fra højre kant for at låse telefonen op"

121−

122−#: qml/Components/EdgeDemo.qml:157

123−msgid "Top edge"

124−msgstr "Øvre kant"

125−

126−#: qml/Components/EdgeDemo.qml:158

127−msgid "Try swiping from the top edge to access the indicators"

128−msgstr "Prøv at stryge fra den øvre kant for at tilgå indikatorerne"

129−

130−#: qml/Components/EdgeDemo.qml:183

131−msgid "Close"

132−msgstr "Luk"

133−

134−#: qml/Components/EdgeDemo.qml:184

135−msgid "Swipe up again to close the settings screen"

136−msgstr "Stryg op igen for at låse indstillingsskærmen"

137−

138−#: qml/Components/EdgeDemo.qml:214

139−msgid "Left edge"

140−msgstr "Venstre kant"

141−

142−#: qml/Components/EdgeDemo.qml:215

143−msgid "Swipe from the left to reveal the launcher for quick access to apps"

144−msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"

145−

146−#: qml/Components/EdgeDemo.qml:242

147−msgid "Well done"

148−msgstr "Godt gjort"

149−

150−#: qml/Components/EdgeDemo.qml:243

151−msgid ""

152−"You have now mastered the edge gestures and can start using the "

153−"phone Tap on the screen to start"

154−msgstr ""

155−"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen Tryk "

156−"på skærmen for at starte"

157−

158135#: qml/Components/Lockscreen.qml:238

159136msgid "Return to Call"

160137msgstr ""

@@ -167,32 +144,39 @@ msgstr "Nødopkald"

167144msgid "OK"

168145msgstr "O.k."

169146

170−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

147+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

171148msgid "See less"

172149msgstr "Vis mindre"

173150

174−#: qml/Dash/GenericScopeView.qml:431

151+#: qml/Dash/GenericScopeView.qml:533

175152msgid "See all"

176153msgstr "Se alle"

177154

178−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

179−#: qml/Panel/SearchIndicator.qml:27

155+#: qml/Dash/GenericScopeView.qml:595

156+msgctxt "Label: Hint for dash search line edit"

180157msgid "Search"

181−msgstr "Søg"

158+msgstr ""

182159

183−#: qml/Dash/PageHeader.qml:260

160+#: qml/Dash/PageHeader.qml:269

161+msgctxt "Button: Open the Ubuntu Store"

184162msgid "Store"

185163msgstr ""

186164

187−#: qml/Dash/PageHeader.qml:277

165+#: qml/Dash/PageHeader.qml:276

166+msgctxt "Button: Start a search in the current dash scope"

167+msgid "Search"

168+msgstr ""

169+

170+#: qml/Dash/PageHeader.qml:286

171+msgctxt "Button: Show the current dash scope settings"

188172msgid "Settings"

189173msgstr ""

190174

191−#: qml/Dash/PageHeader.qml:284

175+#: qml/Dash/PageHeader.qml:293

192176msgid "Remove from Favorites"

193177msgstr ""

194178

195−#: qml/Dash/PageHeader.qml:284

179+#: qml/Dash/PageHeader.qml:293

196180msgid "Add to Favorites"

197181msgstr ""

198182

@@ -224,22 +208,88 @@ msgstr ""

224208msgid "Release to refresh…"

225209msgstr ""

226210

227−#: qml/Dash/ScopesList.qml:63

211+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

212+msgid "Enable location data"

213+msgstr ""

214+

215+#: qml/Dash/ScopesList.qml:66

228216msgid "Manage"

229217msgstr ""

230218

231−#: qml/Dash/ScopesList.qml:107

219+#: qml/Dash/ScopesList.qml:112

232220msgid "Home"

233221msgstr ""

234222

235−#: qml/Dash/ScopesList.qml:108

223+#: qml/Dash/ScopesList.qml:113

236224msgid "Also installed"

237225msgstr ""

238226

239−#: qml/Greeter/Greeter.qml:174

227+#: qml/Greeter/CoverPage.qml:107

240228msgid "Unlock"

241229msgstr ""

242230

231+#: qml/Greeter/LoginList.qml:236

232+msgid "Retry"

233+msgstr ""

234+

235+#: qml/Greeter/LoginList.qml:237

236+msgid "Tap to unlock"

237+msgstr ""

238+

239+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

240+msgid "Sorry, incorrect passphrase."

241+msgstr ""

242+

243+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

244+msgid "Sorry, incorrect passcode."

245+msgstr ""

246+

247+#: qml/Greeter/NarrowView.qml:55

248+msgid "This will be your last attempt."

249+msgstr ""

250+

251+#: qml/Greeter/NarrowView.qml:57

252+msgid ""

253+"If passphrase is entered incorrectly, your phone will conduct a factory "

254+"reset and all personal data will be deleted."

255+msgstr ""

256+

257+#: qml/Greeter/NarrowView.qml:58

258+msgid ""

259+"If passcode is entered incorrectly, your phone will conduct a factory reset "

260+"and all personal data will be deleted."

261+msgstr ""

262+

263+#: qml/Greeter/NarrowView.qml:115

264+#, qt-format

265+msgid "Enter %1"

266+msgstr ""

267+

268+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

269+msgid "Enter passphrase"

270+msgstr ""

271+

272+#: qml/Greeter/NarrowView.qml:117

273+msgid "Enter passcode"

274+msgstr ""

275+

276+#: qml/Greeter/NarrowView.qml:118

277+#, qt-format

278+msgid "Sorry, incorrect %1"

279+msgstr ""

280+

281+#: qml/Greeter/NarrowView.qml:119

282+msgid "Sorry, incorrect passphrase"

283+msgstr ""

284+

285+#: qml/Greeter/NarrowView.qml:120

286+msgid "Please re-enter"

287+msgstr ""

288+

289+#: qml/Greeter/NarrowView.qml:121

290+msgid "Sorry, incorrect passcode"

291+msgstr ""

292+

243293#: qml/Notifications/NotificationMenuItemFactory.qml:128

244294msgid "Show password"

245295msgstr "Vis adgangskode"

@@ -280,6 +330,11 @@ msgstr "Færdig"

280330msgid "Failed, tap to retry"

281331msgstr "Mislykkedes; tryk for at prøve igen"

282332

333+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

334+msgctxt "Label: Hint in message indicator line edit"

335+msgid "Reply"

336+msgstr ""

337+

283338#: qml/Panel/Indicators/ModemInfoItem.qml:105

284339msgid "Unlock SIM"

285340msgstr ""

@@ -288,61 +343,60 @@ msgstr ""

288343msgid "Roaming"

289344msgstr ""

290345

291−#: qml/Shell.qml:367

292−#, qt-format

293−msgid "Enter %1"

346+#: qml/Tutorial/TutorialBottomFinish.qml:24

347+msgid "This action does different things for different apps"

294348msgstr ""

295349

296−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

297−msgid "Enter passphrase"

350+#: qml/Tutorial/TutorialBottomFinish.qml:25

351+msgid "Tap here to finish."

298352msgstr ""

299353

300−#: qml/Shell.qml:369

301−msgid "Enter passcode"

354+#: qml/Tutorial/TutorialBottom.qml:28

355+msgid "Open special menus"

302356msgstr ""

303357

304−#: qml/Shell.qml:370

305−#, qt-format

306−msgid "Sorry, incorrect %1"

358+#: qml/Tutorial/TutorialBottom.qml:29

359+msgid "Swipe up from the bottom edge."

307360msgstr ""

308361

309−#: qml/Shell.qml:371

310−msgid "Sorry, incorrect passphrase"

362+#: qml/Tutorial/TutorialLeftFinish.qml:24

363+msgid "These are the shortcuts to favorite apps"

311364msgstr ""

312365

313−#: qml/Shell.qml:372

314−msgid "Please re-enter"

366+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

367+msgid "Tap here to continue."

315368msgstr ""

316369

317−#: qml/Shell.qml:373

318−msgid "Sorry, incorrect passcode"

370+#: qml/Tutorial/TutorialLeft.qml:26

371+msgid "Open the launcher"

319372msgstr ""

320373

321−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

322−msgid "Sorry, incorrect passphrase."

374+#: qml/Tutorial/TutorialLeft.qml:27

375+msgid "Short swipe from the left edge."

323376msgstr ""

324377

325−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

326−msgid "Sorry, incorrect passcode."

378+#: qml/Tutorial/TutorialPage.qml:178

379+msgid "You almost got it!"

327380msgstr ""

328381

329−#: qml/Shell.qml:469

330−msgid "This will be your last attempt."

382+#: qml/Tutorial/TutorialPage.qml:195

383+msgid "Try again."

331384msgstr ""

332385

333−#: qml/Shell.qml:471

334−msgid ""

335−"If passphrase is entered incorrectly, your phone will conduct a factory "

336−"reset and all personal data will be deleted."

386+#: qml/Tutorial/TutorialRight.qml:31

387+msgid "To view open apps"

337388msgstr ""

338389

339−#: qml/Shell.qml:472

340−msgid ""

341−"If passcode is entered incorrectly, your phone will conduct a factory reset "

342−"and all personal data will be deleted."

390+#: qml/Tutorial/TutorialRight.qml:32

391+msgid "Long swipe from the right edge."

392+msgstr ""

393+

394+#: qml/Tutorial/TutorialRight.qml:122

395+msgid "View all your running tasks."

343396msgstr ""

344397

345398#: qml/Wizard/Page.qml:89

399+msgctxt "Button: Go back one page in the Wizard"

346400msgid "Back"

347401msgstr ""

348402

@@ -359,7 +413,7 @@ msgid "Let’s get started."

359413msgstr ""

360414

361415#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

362−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

416+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

363417#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

364418#: qml/Wizard/Pages/passwd-set.qml:90

365419msgid "Continue"

@@ -369,11 +423,11 @@ msgstr ""

369423msgid "Add a SIM card and restart your device"

370424msgstr ""

371425

372−#: qml/Wizard/Pages/20-sim.qml:55

426+#: qml/Wizard/Pages/20-sim.qml:59

373427msgid "Without it, you won’t be able to make calls or use text messaging."

374428msgstr ""

375429

376−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

430+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

377431msgid "Skip"

378432msgstr ""

379433

@@ -386,38 +440,44 @@ msgid "Please select how you’d like to unlock your phone."

386440msgstr ""

387441

388442#: qml/Wizard/Pages/30-passwd-type.qml:97

443+msgctxt "Label: Type of security method"

389444msgid "Swipe"

390445msgstr ""

391446

392447#: qml/Wizard/Pages/30-passwd-type.qml:98

448+msgctxt "Label: Description of security method"

393449msgid "No security"

394450msgstr ""

395451

396452#: qml/Wizard/Pages/30-passwd-type.qml:100

453+msgctxt "Label: Type of security method"

397454msgid "Passcode"

398455msgstr ""

399456

400457#: qml/Wizard/Pages/30-passwd-type.qml:101

458+msgctxt "Label: Description of security method"

401459msgid "4 digits only"

402460msgstr ""

403461

404462#: qml/Wizard/Pages/30-passwd-type.qml:103

463+msgctxt "Label: Type of security method"

405464msgid "Passphrase"

406465msgstr ""

407466

408467#: qml/Wizard/Pages/30-passwd-type.qml:104

468+msgctxt "Label: Description of security method"

409469msgid "Numbers and letters"

410470msgstr ""

411471

412−#: qml/Wizard/Pages/40-wifi.qml:28

472+#: qml/Wizard/Pages/40-wifi.qml:29

413473msgid "Connect to Wi‑Fi"

414474msgstr ""

415475

416−#: qml/Wizard/Pages/40-wifi.qml:147

476+#: qml/Wizard/Pages/40-wifi.qml:168

417477msgid "Available networks…"

418478msgstr ""

419479

420−#: qml/Wizard/Pages/40-wifi.qml:148

480+#: qml/Wizard/Pages/40-wifi.qml:169

421481msgid "No available networks."

422482msgstr ""

423483

@@ -519,12 +579,45 @@ msgstr ""

519579msgid "%1 〉"

520580msgstr ""

521581

582+#~ msgid "Close"

583+#~ msgstr "Luk"

584+

585+#~ msgid "Left edge"

586+#~ msgstr "Venstre kant"

587+

588+#~ msgid "Try swiping from the right edge to unlock the phone"

589+#~ msgstr "Prøv at stryge fra højre kant for at låse telefonen op"

590+

591+#~ msgid "Right edge"

592+#~ msgstr "Højre kant"

593+

522594#~ msgid "Speaking..."

523595#~ msgstr "Taler..."

524596

525597#~ msgid "Confirm"

526598#~ msgstr "Bekræft"

527599

600+#~ msgid "Search"

601+#~ msgstr "Søg"

602+

603+#~ msgid "Skip intro"

604+#~ msgstr "Spring intro over"

605+

606+#~ msgid "Top edge"

607+#~ msgstr "Øvre kant"

608+

609+#~ msgid "Try swiping from the top edge to access the indicators"

610+#~ msgstr "Prøv at stryge fra den øvre kant for at tilgå indikatorerne"

611+

612+#~ msgid "Swipe up again to close the settings screen"

613+#~ msgstr "Stryg op igen for at låse indstillingsskærmen"

614+

615+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

616+#~ msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"

617+

618+#~ msgid "Well done"

619+#~ msgstr "Godt gjort"

620+

528621#~ msgid "Type or say a command"

529622#~ msgstr "Skriv eller indtal en kommando"

530623

@@ -533,3 +626,10 @@ msgstr ""

533626

534627#~ msgid "Speak Now..."

535628#~ msgstr "Tal nu..."

629+

630+#~ msgid ""

631+#~ "You have now mastered the edge gestures and can start using the "

632+#~ "phone Tap on the screen to start"

633+#~ msgstr ""

634+#~ "Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen Tryk "

635+#~ "på skærmen for at starte"

po/de.po+318−185

@@ -7,18 +7,18 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-12-12 01:42+0000\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-03-06 14:24+0000\n"

1212"Last-Translator: Niklas Wenzel <nikwen.developer@gmail.com>\n"

1313"Language-Team: German <de@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr "Passwort: "

2424

@@ -31,68 +31,95 @@ msgstr "Verknüpfung anheften"

3131msgid "Unpin shortcut"

3232msgstr "Verknüpfung entfernen"

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr "Gerät gesperrt"

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr ""

4141"Das Gerät wurde aufgrund zu vieler falscher Passworteingaben für längere "

4242"Zeit gesperrt."

4343

44−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

4545msgid "You have been locked out due to too many failed passcode attempts."

4646msgstr ""

4747"Das Gerät wurde aufgrund zu vieler falscher PIN-Eingaben für längere Zeit "

4848"gesperrt."

4949

50−#: qml/Components/DelayedLockscreen.qml:72

50+#: qml/Components/DelayedLockscreen.qml:74

5151#, qt-format

5252msgid "Please wait %1 minute and then try again…"

5353msgid_plural "Please wait %1 minutes and then try again…"

5454msgstr[0] "Bitte warten Sie %1 Minute und versuchen Sie es dann erneut..."

5555msgstr[1] "Bitte warten Sie %1 Minuten und versuchen Sie es dann erneut..."

5656

57−#: qml/Components/Dialogs.qml:70

57+#: qml/Components/Dialogs.qml:67

58+msgctxt "Title: Lock/Log out dialog"

5859msgid "Log out"

59−msgstr "Abmelden"

60+msgstr ""

6061

61−#: qml/Components/Dialogs.qml:71

62+#: qml/Components/Dialogs.qml:68

6263msgid "Are you sure you want to log out?"

6364msgstr "Sind Sie sicher, dass Sie sich abmelden wollen?"

6465

65−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66−#: qml/Components/Dialogs.qml:122

67−msgid "No"

68−msgstr "Nein"

66+#: qml/Components/Dialogs.qml:70

67+msgctxt "Button: Lock the system"

68+msgid "Lock"

69+msgstr ""

6970

70−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71−#: qml/Components/Dialogs.qml:129

72−msgid "Yes"

73−msgstr "Ja"

71+#: qml/Components/Dialogs.qml:77

72+msgctxt "Button: Log out from the system"

73+msgid "Log Out"

74+msgstr ""

75+

76+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

77+#: qml/Components/Dialogs.qml:171

78+msgid "Cancel"

79+msgstr "Abbrechen"

7480

75−#: qml/Components/Dialogs.qml:94

81+#: qml/Components/Dialogs.qml:96

82+msgctxt "Title: Reboot/Shut down dialog"

7683msgid "Shut down"

77−msgstr "Herunterfahren"

84+msgstr ""

7885

79−#: qml/Components/Dialogs.qml:95

86+#: qml/Components/Dialogs.qml:97

8087msgid "Are you sure you want to shut down?"

8188msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"

8289

83−#: qml/Components/Dialogs.qml:119

90+#: qml/Components/Dialogs.qml:99

91+msgctxt "Button: Reboot the system"

92+msgid "Reboot"

93+msgstr ""

94+

95+#: qml/Components/Dialogs.qml:107

96+msgctxt "Button: Shut down the system"

97+msgid "Shut down"

98+msgstr ""

99+

100+#: qml/Components/Dialogs.qml:127

101+msgctxt "Title: Reboot dialog"

84102msgid "Reboot"

85−msgstr "Neustart"

103+msgstr ""

86104

87−#: qml/Components/Dialogs.qml:120

105+#: qml/Components/Dialogs.qml:128

88106msgid "Are you sure you want to reboot?"

89107msgstr "Sind Sie sicher, dass Sie neu starten wollen?"

90108

91−#: qml/Components/Dialogs.qml:144

109+#: qml/Components/Dialogs.qml:130

110+msgid "No"

111+msgstr "Nein"

112+

113+#: qml/Components/Dialogs.qml:136

114+msgid "Yes"

115+msgstr "Ja"

116+

117+#: qml/Components/Dialogs.qml:150

118+msgctxt "Title: Power off/Restart dialog"

92119msgid "Power"

93−msgstr "Energie"

120+msgstr ""

94121

95−#: qml/Components/Dialogs.qml:145

122+#: qml/Components/Dialogs.qml:151

96123msgid ""

97124"Are you sure you would like\n"

98125"to power off?"

@@ -100,68 +127,15 @@ msgstr ""

100127"Sind Sie sicher, dass Sie das\n"

101128"Gerät ausschalten wollen?"

102129

103−#: qml/Components/Dialogs.qml:147

130+#: qml/Components/Dialogs.qml:153

131+msgctxt "Button: Power off the system"

104132msgid "Power off"

105−msgstr "Ausschalten"

106−

107−#: qml/Components/Dialogs.qml:157

108−msgid "Restart"

109−msgstr "Neustarten"

110−

111−#: qml/Components/Dialogs.qml:167

112−msgid "Cancel"

113−msgstr "Abbrechen"

114−

115−#: qml/Components/EdgeDemoOverlay.qml:151

116−msgid "Skip intro"

117−msgstr "Einführung überspringen"

118−

119−#: qml/Components/EdgeDemo.qml:125

120−msgid "Right edge"

121−msgstr "Rechter Bildschirmrand"

122−

123−#: qml/Components/EdgeDemo.qml:126

124−msgid "Try swiping from the right edge to unlock the phone"

125−msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"

126−

127−#: qml/Components/EdgeDemo.qml:157

128−msgid "Top edge"

129−msgstr "Oberer Bildschirmrand"

130−

131−#: qml/Components/EdgeDemo.qml:158

132−msgid "Try swiping from the top edge to access the indicators"

133−msgstr ""

134−"Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"

135−

136−#: qml/Components/EdgeDemo.qml:183

137−msgid "Close"

138−msgstr "Schließen"

139−

140−#: qml/Components/EdgeDemo.qml:184

141−msgid "Swipe up again to close the settings screen"

142−msgstr "Wischen Sie erneut nach oben, um das Einstellungsmenü zu schließen"

143−

144−#: qml/Components/EdgeDemo.qml:214

145−msgid "Left edge"

146−msgstr "Linker Rand"

147−

148−#: qml/Components/EdgeDemo.qml:215

149−msgid "Swipe from the left to reveal the launcher for quick access to apps"

150133msgstr ""

151−"Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"

152−"Schnellzugriff aufzurufen"

153134

154−#: qml/Components/EdgeDemo.qml:242

155−msgid "Well done"

156−msgstr "Gut gemacht"

157−

158−#: qml/Components/EdgeDemo.qml:243

159−msgid ""

160−"You have now mastered the edge gestures and can start using the "

161−"phone Tap on the screen to start"

135+#: qml/Components/Dialogs.qml:162

136+msgctxt "Button: Restart the system"

137+msgid "Restart"

162138msgstr ""

163−"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "

164−"nun nutzen Zum Starten auf den Bildschirm tippen"

165139

166140#: qml/Components/Lockscreen.qml:238

167141msgid "Return to Call"

@@ -175,32 +149,39 @@ msgstr "Notruf"

175149msgid "OK"

176150msgstr "OK"

177151

178−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

179153msgid "See less"

180154msgstr "Weniger ansehen"

181155

182−#: qml/Dash/GenericScopeView.qml:431

156+#: qml/Dash/GenericScopeView.qml:533

183157msgid "See all"

184158msgstr "Alle anzeigen"

185159

186−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

187−#: qml/Panel/SearchIndicator.qml:27

160+#: qml/Dash/GenericScopeView.qml:595

161+msgctxt "Label: Hint for dash search line edit"

188162msgid "Search"

189−msgstr "Suchen"

163+msgstr ""

190164

191−#: qml/Dash/PageHeader.qml:260

165+#: qml/Dash/PageHeader.qml:269

166+msgctxt "Button: Open the Ubuntu Store"

192167msgid "Store"

193−msgstr "Store"

168+msgstr ""

194169

195−#: qml/Dash/PageHeader.qml:277

170+#: qml/Dash/PageHeader.qml:276

171+msgctxt "Button: Start a search in the current dash scope"

172+msgid "Search"

173+msgstr ""

174+

175+#: qml/Dash/PageHeader.qml:286

176+msgctxt "Button: Show the current dash scope settings"

196177msgid "Settings"

197−msgstr "Einstellungen"

178+msgstr ""

198179

199−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

200181msgid "Remove from Favorites"

201182msgstr "Aus den Favoriten entfernen"

202183

203−#: qml/Dash/PageHeader.qml:284

184+#: qml/Dash/PageHeader.qml:293

204185msgid "Add to Favorites"

205186msgstr "Zu Favoriten hinzufügen"

206187

@@ -232,22 +213,92 @@ msgstr "Zum Aktualisieren ziehen …"

232213msgid "Release to refresh…"

233214msgstr "Zum Aktualisieren loslassen …"

234215

235−#: qml/Dash/ScopesList.qml:63

216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

217+msgid "Enable location data"

218+msgstr "Standortdaten aktivieren"

219+

220+#: qml/Dash/ScopesList.qml:66

236221msgid "Manage"

237222msgstr "Verwalten"

238223

239−#: qml/Dash/ScopesList.qml:107

224+#: qml/Dash/ScopesList.qml:112

240225msgid "Home"

241−msgstr ""

226+msgstr "Startseite"

242227

243−#: qml/Dash/ScopesList.qml:108

228+#: qml/Dash/ScopesList.qml:113

244229msgid "Also installed"

245−msgstr ""

230+msgstr "Ebenfalls installiert"

246231

247−#: qml/Greeter/Greeter.qml:174

232+#: qml/Greeter/CoverPage.qml:107

248233msgid "Unlock"

249234msgstr "Entsperren"

250235

236+#: qml/Greeter/LoginList.qml:236

237+msgid "Retry"

238+msgstr "Erneut versuchen"

239+

240+#: qml/Greeter/LoginList.qml:237

241+msgid "Tap to unlock"

242+msgstr "Zum Entsperren tippen"

243+

244+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

245+msgid "Sorry, incorrect passphrase."

246+msgstr "Entschuldigung, falsches Passwort."

247+

248+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

249+msgid "Sorry, incorrect passcode."

250+msgstr "Falsche PIN"

251+

252+#: qml/Greeter/NarrowView.qml:55

253+msgid "This will be your last attempt."

254+msgstr "Dies ist Ihr letzter Versuch."

255+

256+#: qml/Greeter/NarrowView.qml:57

257+msgid ""

258+"If passphrase is entered incorrectly, your phone will conduct a factory "

259+"reset and all personal data will be deleted."

260+msgstr ""

261+"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "

262+"zurückgesetzt und alle Daten werden gelöscht."

263+

264+#: qml/Greeter/NarrowView.qml:58

265+msgid ""

266+"If passcode is entered incorrectly, your phone will conduct a factory reset "

267+"and all personal data will be deleted."

268+msgstr ""

269+"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "

270+"zurückgesetzt und alle Daten werden gelöscht."

271+

272+#: qml/Greeter/NarrowView.qml:115

273+#, qt-format

274+msgid "Enter %1"

275+msgstr "%1 eingeben"

276+

277+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

278+msgid "Enter passphrase"

279+msgstr "Passwort eingeben"

280+

281+#: qml/Greeter/NarrowView.qml:117

282+msgid "Enter passcode"

283+msgstr "PIN eingeben"

284+

285+#: qml/Greeter/NarrowView.qml:118

286+#, qt-format

287+msgid "Sorry, incorrect %1"

288+msgstr "%1 falsch"

289+

290+#: qml/Greeter/NarrowView.qml:119

291+msgid "Sorry, incorrect passphrase"

292+msgstr "Das Passwort ist nicht korrekt"

293+

294+#: qml/Greeter/NarrowView.qml:120

295+msgid "Please re-enter"

296+msgstr "Bitte erneut eingeben"

297+

298+#: qml/Greeter/NarrowView.qml:121

299+msgid "Sorry, incorrect passcode"

300+msgstr "Falsches Passwort"

301+

251302#: qml/Notifications/NotificationMenuItemFactory.qml:128

252303msgid "Show password"

253304msgstr "Passwort anzeigen"

@@ -288,6 +339,11 @@ msgstr "Erledigt"

288339msgid "Failed, tap to retry"

289340msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"

290341

342+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

343+msgctxt "Label: Hint in message indicator line edit"

344+msgid "Reply"

345+msgstr ""

346+

291347#: qml/Panel/Indicators/ModemInfoItem.qml:105

292348msgid "Unlock SIM"

293349msgstr "SIM-Karte entsperren"

@@ -296,158 +352,161 @@ msgstr "SIM-Karte entsperren"

296352msgid "Roaming"

297353msgstr "Roaming"

298354

299−#: qml/Shell.qml:367

300−#, qt-format

301−msgid "Enter %1"

302−msgstr "%1 eingeben"

355+#: qml/Tutorial/TutorialBottomFinish.qml:24

356+msgid "This action does different things for different apps"

357+msgstr ""

358+"Diese Aktion bewirkt verschiedene Dinge in verschiedenen Anwendungen."

303359

304−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

305−msgid "Enter passphrase"

306−msgstr "Passwort eingeben"

360+#: qml/Tutorial/TutorialBottomFinish.qml:25

361+msgid "Tap here to finish."

362+msgstr "Zum Beenden hier tippen."

307363

308−#: qml/Shell.qml:369

309−msgid "Enter passcode"

310−msgstr "PIN eingeben"

364+#: qml/Tutorial/TutorialBottom.qml:28

365+msgid "Open special menus"

366+msgstr "Spezielle Menüs öffnen"

311367

312−#: qml/Shell.qml:370

313−#, qt-format

314−msgid "Sorry, incorrect %1"

315−msgstr "%1 falsch"

368+#: qml/Tutorial/TutorialBottom.qml:29

369+msgid "Swipe up from the bottom edge."

370+msgstr "Wischen Sie von der unteren Bildschirmkante nach oben."

316371

317−#: qml/Shell.qml:371

318−msgid "Sorry, incorrect passphrase"

319−msgstr "Das Passwort ist nicht korrekt"

372+#: qml/Tutorial/TutorialLeftFinish.qml:24

373+msgid "These are the shortcuts to favorite apps"

374+msgstr "Dies sind die Verknüpfungen zu Ihren favorisierten Anwendungen."

320375

321−#: qml/Shell.qml:372

322−msgid "Please re-enter"

323−msgstr "Bitte erneut eingeben"

376+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

377+msgid "Tap here to continue."

378+msgstr "Zum Fortfahren hier tippen."

324379

325−#: qml/Shell.qml:373

326−msgid "Sorry, incorrect passcode"

327−msgstr "Falsches Passwort"

380+#: qml/Tutorial/TutorialLeft.qml:26

381+msgid "Open the launcher"

382+msgstr "Öffnen Sie den Starter."

328383

329−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

330−msgid "Sorry, incorrect passphrase."

331−msgstr "Entschuldigung, falsches Passwort."

384+#: qml/Tutorial/TutorialLeft.qml:27

385+msgid "Short swipe from the left edge."

386+msgstr "Kurzer Wisch von der linken Bildschirmkante."

332387

333−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

334−msgid "Sorry, incorrect passcode."

335−msgstr "Falsche PIN"

388+#: qml/Tutorial/TutorialPage.qml:178

389+msgid "You almost got it!"

390+msgstr "Fast geschafft!"

336391

337−#: qml/Shell.qml:469

338−msgid "This will be your last attempt."

339−msgstr "Dies ist Ihr letzter Versuch."

392+#: qml/Tutorial/TutorialPage.qml:195

393+msgid "Try again."

394+msgstr "Versuchen Sie es noch einmal."

340395

341−#: qml/Shell.qml:471

342−msgid ""

343−"If passphrase is entered incorrectly, your phone will conduct a factory "

344−"reset and all personal data will be deleted."

345−msgstr ""

346−"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "

347−"zurückgesetzt und alle Daten werden gelöscht."

396+#: qml/Tutorial/TutorialRight.qml:31

397+msgid "To view open apps"

398+msgstr "Zum Ansehen offener Anwendungen"

348399

349−#: qml/Shell.qml:472

350−msgid ""

351−"If passcode is entered incorrectly, your phone will conduct a factory reset "

352−"and all personal data will be deleted."

353−msgstr ""

354−"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "

355−"zurückgesetzt und alle Daten werden gelöscht."

400+#: qml/Tutorial/TutorialRight.qml:32

401+msgid "Long swipe from the right edge."

402+msgstr "Langer Wisch von der rechten Bildschirmkante."

403+

404+#: qml/Tutorial/TutorialRight.qml:122

405+msgid "View all your running tasks."

406+msgstr "Sehen Sie alle Ihre laufenden Anwendungen."

356407

357408#: qml/Wizard/Page.qml:89

409+msgctxt "Button: Go back one page in the Wizard"

358410msgid "Back"

359411msgstr ""

360412

361413#: qml/Wizard/Pages/10-welcome.qml:27

362414msgid "Hi!"

363−msgstr ""

415+msgstr "Hallo!"

364416

365417#: qml/Wizard/Pages/10-welcome.qml:44

366418msgid "Welcome to your Ubuntu phone."

367−msgstr ""

419+msgstr "Willkommen zu Ihrem Ubuntu-Telefon."

368420

369421#: qml/Wizard/Pages/10-welcome.qml:52

370422msgid "Let’s get started."

371−msgstr ""

423+msgstr "Fangen wir an!"

372424

373425#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

374−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

426+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

375427#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

376428#: qml/Wizard/Pages/passwd-set.qml:90

377429msgid "Continue"

378−msgstr ""

430+msgstr "Weiter"

379431

380432#: qml/Wizard/Pages/20-sim.qml:25

381433msgid "Add a SIM card and restart your device"

382−msgstr ""

434+msgstr "SIM-Karte einlegen und Gerät neustarten"

383435

384−#: qml/Wizard/Pages/20-sim.qml:55

436+#: qml/Wizard/Pages/20-sim.qml:59

385437msgid "Without it, you won’t be able to make calls or use text messaging."

386−msgstr ""

438+msgstr "Ohne SIM funktionieren Anrufe und Nachrichten nicht."

387439

388−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

440+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

389441msgid "Skip"

390−msgstr ""

442+msgstr "Überspringen"

391443

392444#: qml/Wizard/Pages/30-passwd-type.qml:39

393445msgid "Lock security"

394−msgstr ""

446+msgstr "Sicherheit nach dem Sperren"

395447

396448#: qml/Wizard/Pages/30-passwd-type.qml:74

397449msgid "Please select how you’d like to unlock your phone."

398−msgstr ""

450+msgstr "Bitte wählen Sie aus, wie Sie Ihr Telefon entsperren wollen."

399451

400452#: qml/Wizard/Pages/30-passwd-type.qml:97

453+msgctxt "Label: Type of security method"

401454msgid "Swipe"

402455msgstr ""

403456

404457#: qml/Wizard/Pages/30-passwd-type.qml:98

458+msgctxt "Label: Description of security method"

405459msgid "No security"

406460msgstr ""

407461

408462#: qml/Wizard/Pages/30-passwd-type.qml:100

463+msgctxt "Label: Type of security method"

409464msgid "Passcode"

410465msgstr ""

411466

412467#: qml/Wizard/Pages/30-passwd-type.qml:101

468+msgctxt "Label: Description of security method"

413469msgid "4 digits only"

414470msgstr ""

415471

416472#: qml/Wizard/Pages/30-passwd-type.qml:103

473+msgctxt "Label: Type of security method"

417474msgid "Passphrase"

418475msgstr ""

419476

420477#: qml/Wizard/Pages/30-passwd-type.qml:104

478+msgctxt "Label: Description of security method"

421479msgid "Numbers and letters"

422480msgstr ""

423481

424−#: qml/Wizard/Pages/40-wifi.qml:28

482+#: qml/Wizard/Pages/40-wifi.qml:29

425483msgid "Connect to Wi‑Fi"

426−msgstr ""

484+msgstr "Mit WLAN verbinden"

427485

428−#: qml/Wizard/Pages/40-wifi.qml:147

486+#: qml/Wizard/Pages/40-wifi.qml:168

429487msgid "Available networks…"

430−msgstr ""

488+msgstr "Verfügbare Netzwerke …"

431489

432−#: qml/Wizard/Pages/40-wifi.qml:148

490+#: qml/Wizard/Pages/40-wifi.qml:169

433491msgid "No available networks."

434−msgstr ""

492+msgstr "Keine verfügbaren Netzwerke."

435493

436494#: qml/Wizard/Pages/50-location.qml:27

437495msgid "Location"

438−msgstr ""

496+msgstr "Position"

439497

440498#: qml/Wizard/Pages/50-location.qml:62

441499msgid "Let the phone detect your location:"

442−msgstr ""

500+msgstr "Dem Telefon erlauben, Ihre Position zu bestimmen:"

443501

444502#: qml/Wizard/Pages/50-location.qml:69

445503msgid "Using GPS only (less accurate)"

446−msgstr ""

504+msgstr "Nur durch GPS (ungenauer)"

447505

448506#: qml/Wizard/Pages/50-location.qml:86

449507msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

450508msgstr ""

509+"Durch GPS sowie anonymisierte WLAN- und Mobilfunknetz-Daten (empfohlen)"

451510

452511#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

453512#: qml/Wizard/Pages/50-location.qml:103

@@ -455,81 +514,88 @@ msgid ""

455514"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

456515"conditions</a>."

457516msgstr ""

517+"Mit dem Auswählen dieser Option stimmen Sie den Nokia HERE <a "

518+"href='#'>allgemeinen Geschäftsbedingungen</a> zu."

458519

459520#: qml/Wizard/Pages/50-location.qml:112

460521msgid "Not at all"

461−msgstr ""

522+msgstr "Gar nicht"

462523

463524#: qml/Wizard/Pages/50-location.qml:124

464525msgid "You can change your mind later in System Settings."

465526msgstr ""

527+"Sie können Ihre Meinung später in den Systemeinstellungen ändern."

466528

467529#: qml/Wizard/Pages/60-reporting.qml:24

468530msgid "Improving your experience"

469−msgstr ""

531+msgstr "Verbessert Ihre Erfahrung mit diesem Produkt"

470532

471533#: qml/Wizard/Pages/60-reporting.qml:36

472534msgid ""

473535"Your phone is set up to automatically report errors to Canonical and its "

474536"partners, the makers of the operating system."

475537msgstr ""

538+"Ihr Telefon ist so eingestellt, dass es automatisch Fehlerberichte an "

539+"Canonical und seine Partner, die Hersteller des Betriebssystems, sendet."

476540

477541#: qml/Wizard/Pages/60-reporting.qml:43

478542msgid ""

479543"This can be disabled in System Settings under Security & "

480544"Privacy"

481545msgstr ""

546+"Dies kann in den Systemeinstellungen unter Sicherheit & "

547+"Datenschutz deaktiviert werden"

482548

483549#: qml/Wizard/Pages/80-finished.qml:24

484550msgid "All done"

485−msgstr ""

551+msgstr "Alles erledigt"

486552

487553#: qml/Wizard/Pages/80-finished.qml:39

488554msgid "Nice work!"

489−msgstr ""

555+msgstr "Gute Arbeit!"

490556

491557#: qml/Wizard/Pages/80-finished.qml:46

492558msgid "Your phone is now ready to use."

493−msgstr ""

559+msgstr "Ihr Telefon ist nun einsatzbereit."

494560

495561#: qml/Wizard/Pages/80-finished.qml:53

496562msgid "Finish"

497−msgstr ""

563+msgstr "Beenden"

498564

499565#: qml/Wizard/Pages/here-terms.qml:27

500566msgid "Terms & Conditions"

501−msgstr ""

567+msgstr "Nutzungsbedingungen"

502568

503569#: qml/Wizard/Pages/passwd-confirm.qml:49

504570msgid "Confirm passphrase"

505−msgstr ""

571+msgstr "Passwort bestätigen"

506572

507573#: qml/Wizard/Pages/passwd-confirm.qml:50

508574msgid "Confirm passcode"

509−msgstr ""

575+msgstr "PIN bestätigen"

510576

511577#: qml/Wizard/Pages/passwd-confirm.qml:53

512578#: qml/Wizard/Pages/passwd-confirm.qml:54

513579msgid "Please try again."

514−msgstr ""

580+msgstr "Bitte versuchen Sie es erneut."

515581

516582#: qml/Wizard/Pages/passwd-set.qml:61

517583msgid "Choose your passcode"

518−msgstr ""

584+msgstr "Wählen Sie Ihre PIN"

519585

520586#: qml/Wizard/Pages/passwd-set.qml:68

521587msgid "Passphrase must be 4 characters long"

522−msgstr ""

588+msgstr "Passwörter müssen 4 Buchstaben lang sein"

523589

524590#: qml/Wizard/StackButton.qml:39

525591#, qt-format

526592msgid "〈 %1"

527−msgstr ""

593+msgstr "〈 %1"

528594

529595#: qml/Wizard/StackButton.qml:42

530596#, qt-format

531597msgid "%1 〉"

532−msgstr ""

598+msgstr "%1 〉"

533599

534600#~ msgid "Confirm"

535601#~ msgstr "Bestätigen"

@@ -540,12 +606,58 @@ msgstr ""

540606#~ msgid "Speak Now..."

541607#~ msgstr "Sprechen Sie jetzt …"

542608

609+#~ msgid "Search"

610+#~ msgstr "Suchen"

611+

612+#~ msgid "Close"

613+#~ msgstr "Schließen"

614+

615+#~ msgid "Left edge"

616+#~ msgstr "Linker Rand"

617+

618+#~ msgid "Well done"

619+#~ msgstr "Gut gemacht"

620+

621+#~ msgid "Swipe up again to close the settings screen"

622+#~ msgstr "Wischen Sie erneut nach oben, um das Einstellungsmenü zu schließen"

623+

624+#~ msgid "Skip intro"

625+#~ msgstr "Einführung überspringen"

626+

543627#~ msgid "Type or say a command"

544628#~ msgstr "Befehl eingeben oder sprechen"

545629

546630#~ msgid "Speaking..."

547631#~ msgstr "Sprechen Sie …"

548632

633+#~ msgid ""

634+#~ "You have now mastered the edge gestures and can start using the "

635+#~ "phone Tap on the screen to start"

636+#~ msgstr ""

637+#~ "Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "

638+#~ "nun nutzen Zum Starten auf den Bildschirm tippen"

639+

640+#~ msgid "Top edge"

641+#~ msgstr "Oberer Bildschirmrand"

642+

643+#~ msgid "Try swiping from the top edge to access the indicators"

644+#~ msgstr ""

645+#~ "Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"

646+

647+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

648+#~ msgstr ""

649+#~ "Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"

650+#~ "Schnellzugriff aufzurufen"

651+

652+#~ msgid "Try swiping from the right edge to unlock the phone"

653+#~ msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"

654+

655+#~ msgid "Right edge"

656+#~ msgstr "Rechter Bildschirmrand"

657+

658+#~ msgid "Power off"

659+#~ msgstr "Ausschalten"

660+

549661#~ msgid "All"

550662#~ msgstr "Alle"

551663

@@ -555,5 +667,26 @@ msgstr ""

555667#~ msgid "Favorites"

556668#~ msgstr "Favoriten"

557669

670+#~ msgid "Store"

671+#~ msgstr "Store"

672+

673+#~ msgid "Log out"

674+#~ msgstr "Abmelden"

675+

676+#~ msgid "Reboot"

677+#~ msgstr "Neustart"

678+

679+#~ msgid "Shut down"

680+#~ msgstr "Herunterfahren"

681+

682+#~ msgid "Power"

683+#~ msgstr "Energie"

684+

685+#~ msgid "Settings"

686+#~ msgstr "Einstellungen"

687+

688+#~ msgid "Restart"

689+#~ msgstr "Neustarten"

690+

558691#~ msgid "Manage Scopes"

559692#~ msgstr "Filter verwalten"

po/el.po+327−184

@@ -7,18 +7,18 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-08 18:38+0000\n"

12−"Last-Translator: Efstathios Iosifidis <Unknown>\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-03-30 19:52+0000\n"

12+"Last-Translator: Simos Xenitellis <Unknown>\n"

1313"Language-Team: Greek <el@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-03-31 05:58+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr "Κωδικός πρόσβασης: "

2424

@@ -31,68 +31,95 @@ msgstr "Καρφίτσωμα συντόμευσης"

3131msgid "Unpin shortcut"

3232msgstr "Ξεκαρφίτσωμα συντόμευσης"

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr "Κλειδωμένη συσκευή"

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr ""

4141"Δεν σας επιτρέπεται η πρόσβαση καθώς προσπαθήσατε επανηλλημένως να "

4242"συνδεθείτε με λάθος κωδικό."

4343

44−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

4545msgid "You have been locked out due to too many failed passcode attempts."

4646msgstr ""

4747"Δεν σας επιτρέπεται η πρόσβαση καθώς προσπαθήσατε επανηλλημένως να "

4848"συνδεθείτε με λάθος κωδικό."

4949

50−#: qml/Components/DelayedLockscreen.qml:72

50+#: qml/Components/DelayedLockscreen.qml:74

5151#, qt-format

5252msgid "Please wait %1 minute and then try again…"

5353msgid_plural "Please wait %1 minutes and then try again…"

5454msgstr[0] "Παρακαλώ περιμένετε %1 λεπτό και δοκιμάστε ξανά..."

5555msgstr[1] "Παρακαλώ περιμένετε %1 λεπτά και δοκιμάστε ξανά..."

5656

57−#: qml/Components/Dialogs.qml:70

57+#: qml/Components/Dialogs.qml:67

58+msgctxt "Title: Lock/Log out dialog"

5859msgid "Log out"

5960msgstr "Αποσύνδεση"

6061

61−#: qml/Components/Dialogs.qml:71

62+#: qml/Components/Dialogs.qml:68

6263msgid "Are you sure you want to log out?"

6364msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε;"

6465

65−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66−#: qml/Components/Dialogs.qml:122

67−msgid "No"

68−msgstr "Όχι"

66+#: qml/Components/Dialogs.qml:70

67+msgctxt "Button: Lock the system"

68+msgid "Lock"

69+msgstr "Κλείδωμα"

6970

70−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71−#: qml/Components/Dialogs.qml:129

72−msgid "Yes"

73−msgstr "Ναι"

71+#: qml/Components/Dialogs.qml:77

72+msgctxt "Button: Log out from the system"

73+msgid "Log Out"

74+msgstr "Αποσύνδεση"

75+

76+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

77+#: qml/Components/Dialogs.qml:171

78+msgid "Cancel"

79+msgstr "Ακύρωση"

7480

75−#: qml/Components/Dialogs.qml:94

81+#: qml/Components/Dialogs.qml:96

82+msgctxt "Title: Reboot/Shut down dialog"

7683msgid "Shut down"

7784msgstr "Τερματισμός λειτουργίας"

7885

79−#: qml/Components/Dialogs.qml:95

86+#: qml/Components/Dialogs.qml:97

8087msgid "Are you sure you want to shut down?"

8188msgstr "Επιθυμείτε σίγουρα τερματισμό;"

8289

83−#: qml/Components/Dialogs.qml:119

90+#: qml/Components/Dialogs.qml:99

91+msgctxt "Button: Reboot the system"

8492msgid "Reboot"

8593msgstr "Επανεκκίνηση"

8694

87−#: qml/Components/Dialogs.qml:120

95+#: qml/Components/Dialogs.qml:107

96+msgctxt "Button: Shut down the system"

97+msgid "Shut down"

98+msgstr "Τερματισμός"

99+

100+#: qml/Components/Dialogs.qml:127

101+msgctxt "Title: Reboot dialog"

102+msgid "Reboot"

103+msgstr "Επανεκκίνηση"

104+

105+#: qml/Components/Dialogs.qml:128

88106msgid "Are you sure you want to reboot?"

89107msgstr "Επιθυμείτε σίγουρα επανεκκίνηση;"

90108

91−#: qml/Components/Dialogs.qml:144

109+#: qml/Components/Dialogs.qml:130

110+msgid "No"

111+msgstr "Όχι"

112+

113+#: qml/Components/Dialogs.qml:136

114+msgid "Yes"

115+msgstr "Ναι"

116+

117+#: qml/Components/Dialogs.qml:150

118+msgctxt "Title: Power off/Restart dialog"

92119msgid "Power"

93120msgstr ""

94121

95−#: qml/Components/Dialogs.qml:145

122+#: qml/Components/Dialogs.qml:151

96123msgid ""

97124"Are you sure you would like\n"

98125"to power off?"

@@ -100,68 +127,16 @@ msgstr ""

100127"Επιθυμείτε σίγουρα τον\n"

101128"τερματισμό λειτουργίας;"

102129

103−#: qml/Components/Dialogs.qml:147

130+#: qml/Components/Dialogs.qml:153

131+msgctxt "Button: Power off the system"

104132msgid "Power off"

105−msgstr "Τερματισμός"

133+msgstr "Κλείσιμο τροφοδοσίας"

106134

107−#: qml/Components/Dialogs.qml:157

135+#: qml/Components/Dialogs.qml:162

136+msgctxt "Button: Restart the system"

108137msgid "Restart"

109138msgstr "Επανεκκίνηση"

110139

111−#: qml/Components/Dialogs.qml:167

112−msgid "Cancel"

113−msgstr "Ακύρωση"

114−

115−#: qml/Components/EdgeDemoOverlay.qml:151

116−msgid "Skip intro"

117−msgstr "Παράλειψη εισαγωγής"

118−

119−#: qml/Components/EdgeDemo.qml:125

120−msgid "Right edge"

121−msgstr "Δεξί άκρο"

122−

123−#: qml/Components/EdgeDemo.qml:126

124−msgid "Try swiping from the right edge to unlock the phone"

125−msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"

126−

127−#: qml/Components/EdgeDemo.qml:157

128−msgid "Top edge"

129−msgstr "Πάνω άκρο"

130−

131−#: qml/Components/EdgeDemo.qml:158

132−msgid "Try swiping from the top edge to access the indicators"

133−msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"

134−

135−#: qml/Components/EdgeDemo.qml:183

136−msgid "Close"

137−msgstr "Κλείσιμο"

138−

139−#: qml/Components/EdgeDemo.qml:184

140−msgid "Swipe up again to close the settings screen"

141−msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"

142−

143−#: qml/Components/EdgeDemo.qml:214

144−msgid "Left edge"

145−msgstr "Αριστερό άκρο"

146−

147−#: qml/Components/EdgeDemo.qml:215

148−msgid "Swipe from the left to reveal the launcher for quick access to apps"

149−msgstr ""

150−"Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "

151−"στις εφαρμογές"

152−

153−#: qml/Components/EdgeDemo.qml:242

154−msgid "Well done"

155−msgstr "Συγχαρητήρια"

156−

157−#: qml/Components/EdgeDemo.qml:243

158−msgid ""

159−"You have now mastered the edge gestures and can start using the "

160−"phone Tap on the screen to start"

161−msgstr ""

162−"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "

163−"χρησιμοποιείτε το τηλέφωνο Αγγίξτε την οθόνη για να ξεκινήσετε"

164−

165140#: qml/Components/Lockscreen.qml:238

166141msgid "Return to Call"

167142msgstr "Επιστροφή στην κλήση"

@@ -174,32 +149,39 @@ msgstr "Κλήση έκτακτης ανάγκης"

174149msgid "OK"

175150msgstr "OK"

176151

177−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

178153msgid "See less"

179154msgstr "Λιγότερα"

180155

181−#: qml/Dash/GenericScopeView.qml:431

156+#: qml/Dash/GenericScopeView.qml:533

182157msgid "See all"

183158msgstr "Εμφάνιση όλων"

184159

185−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

186−#: qml/Panel/SearchIndicator.qml:27

160+#: qml/Dash/GenericScopeView.qml:595

161+msgctxt "Label: Hint for dash search line edit"

187162msgid "Search"

188163msgstr "Αναζήτηση"

189164

190−#: qml/Dash/PageHeader.qml:260

165+#: qml/Dash/PageHeader.qml:269

166+msgctxt "Button: Open the Ubuntu Store"

191167msgid "Store"

192−msgstr "Κατάστημα"

168+msgstr ""

193169

194−#: qml/Dash/PageHeader.qml:277

170+#: qml/Dash/PageHeader.qml:276

171+msgctxt "Button: Start a search in the current dash scope"

172+msgid "Search"

173+msgstr ""

174+

175+#: qml/Dash/PageHeader.qml:286

176+msgctxt "Button: Show the current dash scope settings"

195177msgid "Settings"

196−msgstr "Ρυθμίσεις"

178+msgstr ""

197179

198−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

199181msgid "Remove from Favorites"

200182msgstr "Αφαίρεση από τα αγαπημένα"

201183

202−#: qml/Dash/PageHeader.qml:284

184+#: qml/Dash/PageHeader.qml:293

203185msgid "Add to Favorites"

204186msgstr "Προσθήκη στα αγαπημένα"

205187

@@ -225,28 +207,100 @@ msgstr "Αποστολή"

225207

226208#: qml/Dash/PullToRefreshScopeStyle.qml:55

227209msgid "Pull to refresh…"

228−msgstr ""

210+msgstr "Σύρτε για ανανέωση…"

229211

230212#: qml/Dash/PullToRefreshScopeStyle.qml:60

231213msgid "Release to refresh…"

232−msgstr ""

214+msgstr "Αφήστε για ανανέωση…"

215+

216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

217+msgid "Enable location data"

218+msgstr "Ενεργοποίηση δεδομένων τοποθεσίας"

233219

234−#: qml/Dash/ScopesList.qml:63

220+#: qml/Dash/ScopesList.qml:66

235221msgid "Manage"

236−msgstr ""

222+msgstr "Διαχείριση"

237223

238−#: qml/Dash/ScopesList.qml:107

224+#: qml/Dash/ScopesList.qml:112

239225msgid "Home"

240−msgstr ""

226+msgstr "Αρχή"

241227

242−#: qml/Dash/ScopesList.qml:108

228+#: qml/Dash/ScopesList.qml:113

243229msgid "Also installed"

244−msgstr ""

230+msgstr "Επίσης εγκατεστημένα"

245231

246−#: qml/Greeter/Greeter.qml:174

232+#: qml/Greeter/CoverPage.qml:107

247233msgid "Unlock"

248234msgstr "Ξεκλείδωμα"

249235

236+#: qml/Greeter/LoginList.qml:236

237+msgid "Retry"

238+msgstr "Επανάληψη"

239+

240+#: qml/Greeter/LoginList.qml:237

241+msgid "Tap to unlock"

242+msgstr "Ακουμπήστε για να ξεκλειδώσετε"

243+

244+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

245+msgid "Sorry, incorrect passphrase."

246+msgstr "Συγνώμη, μη έγκυρη συνθηματική φράση."

247+

248+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

249+msgid "Sorry, incorrect passcode."

250+msgstr "Συγνώμη, μη έγκυρος κωδικός πρόσβασης."

251+

252+#: qml/Greeter/NarrowView.qml:55

253+msgid "This will be your last attempt."

254+msgstr "Αυτή θα είναι η τελευταία σας προσπάθεια."

255+

256+#: qml/Greeter/NarrowView.qml:57

257+msgid ""

258+"If passphrase is entered incorrectly, your phone will conduct a factory "

259+"reset and all personal data will be deleted."

260+msgstr ""

261+"Εάν η συνθηματική φράση που θα εισάγετε είναι μη έγκυρη, το τηλέφωνο σας θα "

262+"κάνει επαναφορά των εργοστασιακών ρυθμίσεων και όλα τα δεδομένα σας θα "

263+"διαγραφούν."

264+

265+#: qml/Greeter/NarrowView.qml:58

266+msgid ""

267+"If passcode is entered incorrectly, your phone will conduct a factory reset "

268+"and all personal data will be deleted."

269+msgstr ""

270+"Εάν ο κωδικός πρόσβασης που θα εισάγετε είναι μη έγκυρος, το τηλέφωνο σας θα "

271+"κάνει επαναφορά των εργοστασιακών ρυθμίσεων και όλα τα δεδομένα σας θα "

272+"διαγραφούν."

273+

274+#: qml/Greeter/NarrowView.qml:115

275+#, qt-format

276+msgid "Enter %1"

277+msgstr "Εισάγετε %1"

278+

279+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

280+msgid "Enter passphrase"

281+msgstr "Εισαγωγή συνθηματικού"

282+

283+#: qml/Greeter/NarrowView.qml:117

284+msgid "Enter passcode"

285+msgstr "Εισαγωγή κωδικού"

286+

287+#: qml/Greeter/NarrowView.qml:118

288+#, qt-format

289+msgid "Sorry, incorrect %1"

290+msgstr "Συγνώμη, μη έγκυρο %1"

291+

292+#: qml/Greeter/NarrowView.qml:119

293+msgid "Sorry, incorrect passphrase"

294+msgstr "Συγνώμη, μη έγκυρο συνθηματικό"

295+

296+#: qml/Greeter/NarrowView.qml:120

297+msgid "Please re-enter"

298+msgstr "Παρακαλώ πληκτρολογήστε ξανά"

299+

300+#: qml/Greeter/NarrowView.qml:121

301+msgid "Sorry, incorrect passcode"

302+msgstr "Συγνώμη, μη έγκυρος κωδικός πρόσβασης"

303+

250304#: qml/Notifications/NotificationMenuItemFactory.qml:128

251305msgid "Show password"

252306msgstr "Εμφάνιση κωδικού"

@@ -287,6 +341,11 @@ msgstr "Ολοκληρώθηκε"

287341msgid "Failed, tap to retry"

288342msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσετε"

289343

344+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

345+msgctxt "Label: Hint in message indicator line edit"

346+msgid "Reply"

347+msgstr "Απάντηση"

348+

290349#: qml/Panel/Indicators/ModemInfoItem.qml:105

291350msgid "Unlock SIM"

292351msgstr "Ξεκλείδωμα SIM"

@@ -295,154 +354,164 @@ msgstr "Ξεκλείδωμα SIM"

295354msgid "Roaming"

296355msgstr "Περιαγωγή"

297356

298−#: qml/Shell.qml:367

299−#, qt-format

300−msgid "Enter %1"

301−msgstr "Εισάγετε %1"

357+#: qml/Tutorial/TutorialBottomFinish.qml:24

358+msgid "This action does different things for different apps"

359+msgstr ""

360+"Αυτή η ενέργεια κάνει διαφορετικά πράγματα για διαφορετικές εφαρμογές"

302361

303−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

304−msgid "Enter passphrase"

305−msgstr "Εισαγωγή συνθηματικού"

362+#: qml/Tutorial/TutorialBottomFinish.qml:25

363+msgid "Tap here to finish."

364+msgstr "Πατήστε εδώ για τέλος."

306365

307−#: qml/Shell.qml:369

308−msgid "Enter passcode"

309−msgstr "Εισαγωγή κωδικού"

366+#: qml/Tutorial/TutorialBottom.qml:28

367+msgid "Open special menus"

368+msgstr "Άνοιγμα ειδικών μενού"

310369

311−#: qml/Shell.qml:370

312−#, qt-format

313−msgid "Sorry, incorrect %1"

314−msgstr "Συγνώμη, μη έγκυρο %1"

370+#: qml/Tutorial/TutorialBottom.qml:29

371+msgid "Swipe up from the bottom edge."

372+msgstr "Σύρετε από την κάτω άκρη προς τα πάνω."

315373

316−#: qml/Shell.qml:371

317−msgid "Sorry, incorrect passphrase"

318−msgstr "Συγνώμη, μη έγκυρο συνθηματικό"

374+#: qml/Tutorial/TutorialLeftFinish.qml:24

375+msgid "These are the shortcuts to favorite apps"

376+msgstr "Είναι συντομεύσεις για αγαπημένες εφαρμογές"

319377

320−#: qml/Shell.qml:372

321−msgid "Please re-enter"

322−msgstr "Παρακαλώ πληκτρολογήστε ξανά"

378+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

379+msgid "Tap here to continue."

380+msgstr "Πατήστε εδώ για συνέχεια."

323381

324−#: qml/Shell.qml:373

325−msgid "Sorry, incorrect passcode"

326−msgstr ""

382+#: qml/Tutorial/TutorialLeft.qml:26

383+msgid "Open the launcher"

384+msgstr "Άνοιγμα του εκκινητή"

327385

328−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

329−msgid "Sorry, incorrect passphrase."

330−msgstr ""

386+#: qml/Tutorial/TutorialLeft.qml:27

387+msgid "Short swipe from the left edge."

388+msgstr "Σύρετε ελάχιστα από την αριστερή άκρη."

331389

332−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

333−msgid "Sorry, incorrect passcode."

334−msgstr ""

390+#: qml/Tutorial/TutorialPage.qml:178

391+msgid "You almost got it!"

392+msgstr "Σχεδόν το είχατε!"

335393

336−#: qml/Shell.qml:469

337−msgid "This will be your last attempt."

338−msgstr ""

394+#: qml/Tutorial/TutorialPage.qml:195

395+msgid "Try again."

396+msgstr "Δοκιμάστε πάλι."

339397

340−#: qml/Shell.qml:471

341−msgid ""

342−"If passphrase is entered incorrectly, your phone will conduct a factory "

343−"reset and all personal data will be deleted."

344−msgstr ""

398+#: qml/Tutorial/TutorialRight.qml:31

399+msgid "To view open apps"

400+msgstr "Για να δείτε τις ανοιχτές εφαρμογές"

345401

346−#: qml/Shell.qml:472

347−msgid ""

348−"If passcode is entered incorrectly, your phone will conduct a factory reset "

349−"and all personal data will be deleted."

350−msgstr ""

402+#: qml/Tutorial/TutorialRight.qml:32

403+msgid "Long swipe from the right edge."

404+msgstr "Σύρετε παρατεταμένα από την δεξιά άκρη."

405+

406+#: qml/Tutorial/TutorialRight.qml:122

407+msgid "View all your running tasks."

408+msgstr "Δείτε όλες τις εργασίες που εκτελούνται."

351409

352410#: qml/Wizard/Page.qml:89

411+msgctxt "Button: Go back one page in the Wizard"

353412msgid "Back"

354−msgstr ""

413+msgstr "Πίσω"

355414

356415#: qml/Wizard/Pages/10-welcome.qml:27

357416msgid "Hi!"

358−msgstr ""

417+msgstr "Γεια!"

359418

360419#: qml/Wizard/Pages/10-welcome.qml:44

361420msgid "Welcome to your Ubuntu phone."

362−msgstr ""

421+msgstr "Καλώς ήρθατε στο Ubuntu phone σας."

363422

364423#: qml/Wizard/Pages/10-welcome.qml:52

365424msgid "Let’s get started."

366−msgstr ""

425+msgstr "Ας ξεκινήσουμε."

367426

368427#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

369−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

428+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

370429#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

371430#: qml/Wizard/Pages/passwd-set.qml:90

372431msgid "Continue"

373−msgstr ""

432+msgstr "Συνέχιση"

374433

375434#: qml/Wizard/Pages/20-sim.qml:25

376435msgid "Add a SIM card and restart your device"

377−msgstr ""

436+msgstr "Εισάγετε μια κάρτα SIM και επανεκκινήστε τη συσκευή σας"

378437

379−#: qml/Wizard/Pages/20-sim.qml:55

438+#: qml/Wizard/Pages/20-sim.qml:59

380439msgid "Without it, you won’t be able to make calls or use text messaging."

381440msgstr ""

441+"Χωρίς αυτήν, δεν θα μπορείτε να κάνετε κλήσεις ή να χρησιμοποιήσετε μηνύματα "

442+"κειμένου."

382443

383−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

444+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

384445msgid "Skip"

385−msgstr ""

446+msgstr "Παράβλεψη"

386447

387448#: qml/Wizard/Pages/30-passwd-type.qml:39

388449msgid "Lock security"

389−msgstr ""

450+msgstr "Κλείδωμα ασφαλείας"

390451

391452#: qml/Wizard/Pages/30-passwd-type.qml:74

392453msgid "Please select how you’d like to unlock your phone."

393−msgstr ""

454+msgstr "Παρακαλούμε επιλέξτε πως θα θέλατε να ξεκλειδώνετε το τηλέφωνό σας."

394455

395456#: qml/Wizard/Pages/30-passwd-type.qml:97

457+msgctxt "Label: Type of security method"

396458msgid "Swipe"

397459msgstr ""

398460

399461#: qml/Wizard/Pages/30-passwd-type.qml:98

462+msgctxt "Label: Description of security method"

400463msgid "No security"

401−msgstr ""

464+msgstr "Χωρίς ασφάλεια"

402465

403466#: qml/Wizard/Pages/30-passwd-type.qml:100

467+msgctxt "Label: Type of security method"

404468msgid "Passcode"

405−msgstr ""

469+msgstr "Κωδικός αριθμός"

406470

407471#: qml/Wizard/Pages/30-passwd-type.qml:101

472+msgctxt "Label: Description of security method"

408473msgid "4 digits only"

409−msgstr ""

474+msgstr "Μόνο με 4 ψηφία"

410475

411476#: qml/Wizard/Pages/30-passwd-type.qml:103

477+msgctxt "Label: Type of security method"

412478msgid "Passphrase"

413−msgstr ""

479+msgstr "Κωδική φράση"

414480

415481#: qml/Wizard/Pages/30-passwd-type.qml:104

482+msgctxt "Label: Description of security method"

416483msgid "Numbers and letters"

417−msgstr ""

484+msgstr "Αριθμοί και γράμματα"

418485

419−#: qml/Wizard/Pages/40-wifi.qml:28

486+#: qml/Wizard/Pages/40-wifi.qml:29

420487msgid "Connect to Wi‑Fi"

421−msgstr ""

488+msgstr "Σύνδεση σε δίκτυο Wi-Fi"

422489

423−#: qml/Wizard/Pages/40-wifi.qml:147

490+#: qml/Wizard/Pages/40-wifi.qml:168

424491msgid "Available networks…"

425−msgstr ""

492+msgstr "Διαθέσιμα δίκτυα..."

426493

427−#: qml/Wizard/Pages/40-wifi.qml:148

494+#: qml/Wizard/Pages/40-wifi.qml:169

428495msgid "No available networks."

429−msgstr ""

496+msgstr "Δεν υπάρχουν διαθέσιμα δίκτυα."

430497

431498#: qml/Wizard/Pages/50-location.qml:27

432499msgid "Location"

433−msgstr ""

500+msgstr "Τοποθεσία"

434501

435502#: qml/Wizard/Pages/50-location.qml:62

436503msgid "Let the phone detect your location:"

437−msgstr ""

504+msgstr "Επιτρέψετε το τηλέφωνο να εντοπίσει την τοποθεσία σας:"

438505

439506#: qml/Wizard/Pages/50-location.qml:69

440507msgid "Using GPS only (less accurate)"

441−msgstr ""

508+msgstr "Χρήση μόνο GPS (λιγότερο ακριβή)"

442509

443510#: qml/Wizard/Pages/50-location.qml:86

444511msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

445512msgstr ""

513+"Χρήση GPS, ανωνυνοποιημένα δίκτυα Wi-Fi και πληροφορίες δικτύων κινητής "

514+"τηλεφωνίας (συνιστάται)"

446515

447516#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

448517#: qml/Wizard/Pages/50-location.qml:103

@@ -450,81 +519,89 @@ msgid ""

450519"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

451520"conditions</a>."

452521msgstr ""

522+"Ενεργοποιώντας αυτή την επιλογή, αποδέχεστε τους <a href='#'>όρους και "

523+"προϋποθέσεις</a> της Nokia HERE."

453524

454525#: qml/Wizard/Pages/50-location.qml:112

455526msgid "Not at all"

456−msgstr ""

527+msgstr "Καθόλου"

457528

458529#: qml/Wizard/Pages/50-location.qml:124

459530msgid "You can change your mind later in System Settings."

460531msgstr ""

532+"Μπορείτε να αλλάξετε τη γνώμη σας αργότερα στις Ρυθμίσεις Συστήματος."

461533

462534#: qml/Wizard/Pages/60-reporting.qml:24

463535msgid "Improving your experience"

464−msgstr ""

536+msgstr "Βελτιώστε την εμπειρία σας"

465537

466538#: qml/Wizard/Pages/60-reporting.qml:36

467539msgid ""

468540"Your phone is set up to automatically report errors to Canonical and its "

469541"partners, the makers of the operating system."

470542msgstr ""

543+"Το τηλέφωνό σας είναι ρυθμισμένο να στέλνει αυτόματα αναφορές σφαλμάτων στην "

544+"Canonical και τους συνεργάτες της, τους δημιουργούς τους λειτουργικού "

545+"συστήματος."

471546

472547#: qml/Wizard/Pages/60-reporting.qml:43

473548msgid ""

474549"This can be disabled in System Settings under Security & "

475550"Privacy"

476551msgstr ""

552+"Αυτό μπορεί να απενεργοποιηθεί στις Ρυθμίσεις Συστήματος στο πεδίο "

553+"Ασφάλεια & Ιδιωτικότητα"

477554

478555#: qml/Wizard/Pages/80-finished.qml:24

479556msgid "All done"

480−msgstr ""

557+msgstr "Όλα έτοιμα"

481558

482559#: qml/Wizard/Pages/80-finished.qml:39

483560msgid "Nice work!"

484−msgstr ""

561+msgstr "Ωραία δουλειά!"

485562

486563#: qml/Wizard/Pages/80-finished.qml:46

487564msgid "Your phone is now ready to use."

488−msgstr ""

565+msgstr "Το τηλέφωνό σας είναι πλέον έτοιμο για χρήση."

489566

490567#: qml/Wizard/Pages/80-finished.qml:53

491568msgid "Finish"

492−msgstr ""

569+msgstr "Ολοκλήρωση"

493570

494571#: qml/Wizard/Pages/here-terms.qml:27

495572msgid "Terms & Conditions"

496−msgstr ""

573+msgstr "Όροι και προϋποθέσεις"

497574

498575#: qml/Wizard/Pages/passwd-confirm.qml:49

499576msgid "Confirm passphrase"

500−msgstr ""

577+msgstr "Επιβεβαίωση φράσης πρόσβασης"

501578

502579#: qml/Wizard/Pages/passwd-confirm.qml:50

503580msgid "Confirm passcode"

504−msgstr ""

581+msgstr "Επιβεβαιώστε τον κωδικό πρόσβασης"

505582

506583#: qml/Wizard/Pages/passwd-confirm.qml:53

507584#: qml/Wizard/Pages/passwd-confirm.qml:54

508585msgid "Please try again."

509−msgstr ""

586+msgstr "Παρακαλώ προσπαθήστε ξανά."

510587

511588#: qml/Wizard/Pages/passwd-set.qml:61

512589msgid "Choose your passcode"

513−msgstr ""

590+msgstr "Επιλογή κωδικού πρόσβασης"

514591

515592#: qml/Wizard/Pages/passwd-set.qml:68

516593msgid "Passphrase must be 4 characters long"

517−msgstr ""

594+msgstr "Η φράση πρόσβασης πρέπει να έχει 4 χαρακτήρες"

518595

519596#: qml/Wizard/StackButton.qml:39

520597#, qt-format

521598msgid "〈 %1"

522−msgstr ""

599+msgstr "〈 %1"

523600

524601#: qml/Wizard/StackButton.qml:42

525602#, qt-format

526603msgid "%1 〉"

527−msgstr ""

604+msgstr "%1 〉"

528605

529606#~ msgid "Confirm"

530607#~ msgstr "Επιβεβαίωση"

@@ -538,9 +615,57 @@ msgstr ""

538615#~ msgid "Speaking..."

539616#~ msgstr "Ομιλία..."

540617

618+#~ msgid "Search"

619+#~ msgstr "Αναζήτηση"

620+

621+#~ msgid "Try swiping from the top edge to access the indicators"

622+#~ msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"

623+

624+#~ msgid "Swipe up again to close the settings screen"

625+#~ msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"

626+

627+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

628+#~ msgstr ""

629+#~ "Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "

630+#~ "στις εφαρμογές"

631+

632+#~ msgid "Well done"

633+#~ msgstr "Συγχαρητήρια"

634+

635+#~ msgid "Close"

636+#~ msgstr "Κλείσιμο"

637+

638+#~ msgid "Left edge"

639+#~ msgstr "Αριστερό άκρο"

640+

641+#~ msgid "Top edge"

642+#~ msgstr "Πάνω άκρο"

643+

644+#~ msgid "Right edge"

645+#~ msgstr "Δεξί άκρο"

646+

541647#~ msgid "Loading. Please Wait..."

542648#~ msgstr "Γίνεται φόρτωση. Παρακαλώ περιμένετε..."

543649

650+#~ msgid "Try swiping from the right edge to unlock the phone"

651+#~ msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"

652+

653+#~ msgid "Skip intro"

654+#~ msgstr "Παράλειψη εισαγωγής"

655+

656+#~ msgid ""

657+#~ "You have now mastered the edge gestures and can start using the "

658+#~ "phone Tap on the screen to start"

659+#~ msgstr ""

660+#~ "Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "

661+#~ "χρησιμοποιείτε το τηλέφωνο Αγγίξτε την οθόνη για να ξεκινήσετε"

662+

663+#~ msgid "Store"

664+#~ msgstr "Κατάστημα"

665+

666+#~ msgid "Power off"

667+#~ msgstr "Τερματισμός"

668+

544669#~ msgid "All"

545670#~ msgstr "Όλα"

546671

@@ -549,3 +674,21 @@ msgstr ""

549674

550675#~ msgid "Done"

551676#~ msgstr "Ολοκληρώθηκε"

677+

678+#~ msgid "Log out"

679+#~ msgstr "Αποσύνδεση"

680+

681+#~ msgid "Reboot"

682+#~ msgstr "Επανεκκίνηση"

683+

684+#~ msgid "Restart"

685+#~ msgstr "Επανεκκίνηση"

686+

687+#~ msgid "Shut down"

688+#~ msgstr "Τερματισμός λειτουργίας"

689+

690+#~ msgid "Settings"

691+#~ msgstr "Ρυθμίσεις"

692+

693+#~ msgid "Power"

694+#~ msgstr "Ενέργεια"

po/en_AU.po+315−185

@@ -7,18 +7,18 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-10-12 09:41+0000\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-04-11 02:20+0000\n"

1212"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"

1313"Language-Team: English (Australia) <en_AU@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-04-14 05:33+0000\n"

19+"X-Generator: Launchpad (build 17423)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr "Password: "

2424

@@ -31,64 +31,91 @@ msgstr "Pin shortcut"

3131msgid "Unpin shortcut"

3232msgstr "Unpin shortcut"

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr "Device Locked"

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr "You have been locked out due to too many failed passphrase attempts."

4141

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

4343msgid "You have been locked out due to too many failed passcode attempts."

4444msgstr "You have been locked out due to too many failed passcode attempts."

4545

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

4747#, qt-format

4848msgid "Please wait %1 minute and then try again…"

4949msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] "Please wait %1 minute and then try again…"

5151msgstr[1] "Please wait %1 minutes and then try again…"

5252

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

5455msgid "Log out"

5556msgstr "Log out"

5657

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

5859msgid "Are you sure you want to log out?"

5960msgstr "Are you sure you want to log out?"

6061

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:122

63−msgid "No"

64−msgstr "No"

62+#: qml/Components/Dialogs.qml:70

63+msgctxt "Button: Lock the system"

64+msgid "Lock"

65+msgstr "Lock"

6566

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:129

68−msgid "Yes"

69−msgstr "Yes"

67+#: qml/Components/Dialogs.qml:77

68+msgctxt "Button: Log out from the system"

69+msgid "Log Out"

70+msgstr "Log Out"

7071

71−#: qml/Components/Dialogs.qml:94

72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

73+#: qml/Components/Dialogs.qml:171

74+msgid "Cancel"

75+msgstr "Cancel"

76+

77+#: qml/Components/Dialogs.qml:96

78+msgctxt "Title: Reboot/Shut down dialog"

7279msgid "Shut down"

7380msgstr "Shut down"

7481

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

7683msgid "Are you sure you want to shut down?"

7784msgstr "Are you sure you want to shut down?"

7885

79−#: qml/Components/Dialogs.qml:119

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

8088msgid "Reboot"

8189msgstr "Reboot"

8290

83−#: qml/Components/Dialogs.qml:120

91+#: qml/Components/Dialogs.qml:107

92+msgctxt "Button: Shut down the system"

93+msgid "Shut down"

94+msgstr "Shut down"

95+

96+#: qml/Components/Dialogs.qml:127

97+msgctxt "Title: Reboot dialog"

98+msgid "Reboot"

99+msgstr "Reboot"

100+

101+#: qml/Components/Dialogs.qml:128

84102msgid "Are you sure you want to reboot?"

85103msgstr "Are you sure you want to reboot?"

86104

87−#: qml/Components/Dialogs.qml:144

105+#: qml/Components/Dialogs.qml:130

106+msgid "No"

107+msgstr "No"

108+

109+#: qml/Components/Dialogs.qml:136

110+msgid "Yes"

111+msgstr "Yes"

112+

113+#: qml/Components/Dialogs.qml:150

114+msgctxt "Title: Power off/Restart dialog"

88115msgid "Power"

89116msgstr "Power"

90117

91−#: qml/Components/Dialogs.qml:145

118+#: qml/Components/Dialogs.qml:151

92119msgid ""

93120"Are you sure you would like\n"

94121"to power off?"

@@ -96,69 +123,19 @@ msgstr ""

96123"Are you sure you would like\n"

97124"to power off?"

98125

99−#: qml/Components/Dialogs.qml:147

126+#: qml/Components/Dialogs.qml:153

127+msgctxt "Button: Power off the system"

100128msgid "Power off"

101129msgstr "Power off"

102130

103−#: qml/Components/Dialogs.qml:157

131+#: qml/Components/Dialogs.qml:162

132+msgctxt "Button: Restart the system"

104133msgid "Restart"

105134msgstr "Restart"

106135

107−#: qml/Components/Dialogs.qml:167

108−msgid "Cancel"

109−msgstr "Cancel"

110−

111−#: qml/Components/EdgeDemoOverlay.qml:151

112−msgid "Skip intro"

113−msgstr "Skip intro"

114−

115−#: qml/Components/EdgeDemo.qml:125

116−msgid "Right edge"

117−msgstr "Right edge"

118−

119−#: qml/Components/EdgeDemo.qml:126

120−msgid "Try swiping from the right edge to unlock the phone"

121−msgstr "Try swiping from the right edge to unlock the phone"

122−

123−#: qml/Components/EdgeDemo.qml:157

124−msgid "Top edge"

125−msgstr "Top edge"

126−

127−#: qml/Components/EdgeDemo.qml:158

128−msgid "Try swiping from the top edge to access the indicators"

129−msgstr "Try swiping from the top edge to access the indicators"

130−

131−#: qml/Components/EdgeDemo.qml:183

132−msgid "Close"

133−msgstr "Close"

134−

135−#: qml/Components/EdgeDemo.qml:184

136−msgid "Swipe up again to close the settings screen"

137−msgstr "Swipe up again to close the settings screen"

138−

139−#: qml/Components/EdgeDemo.qml:214

140−msgid "Left edge"

141−msgstr "Left edge"

142−

143−#: qml/Components/EdgeDemo.qml:215

144−msgid "Swipe from the left to reveal the launcher for quick access to apps"

145−msgstr "Swipe from the left to reveal the launcher for quick access to apps"

146−

147−#: qml/Components/EdgeDemo.qml:242

148−msgid "Well done"

149−msgstr "Well done"

150−

151−#: qml/Components/EdgeDemo.qml:243

152−msgid ""

153−"You have now mastered the edge gestures and can start using the "

154−"phone Tap on the screen to start"

155−msgstr ""

156−"You have now mastered the edge gestures and can start using the "

157−"phone Tap on the screen to start"

158−

159136#: qml/Components/Lockscreen.qml:238

160137msgid "Return to Call"

161−msgstr ""

138+msgstr "Return to Call"

162139

163140#: qml/Components/Lockscreen.qml:238

164141msgid "Emergency Call"

@@ -168,32 +145,39 @@ msgstr "Emergency Call"

168145msgid "OK"

169146msgstr "OK"

170147

171−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

148+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

172149msgid "See less"

173150msgstr "See less"

174151

175−#: qml/Dash/GenericScopeView.qml:431

152+#: qml/Dash/GenericScopeView.qml:533

176153msgid "See all"

177154msgstr "See all"

178155

179−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

180−#: qml/Panel/SearchIndicator.qml:27

156+#: qml/Dash/GenericScopeView.qml:595

157+msgctxt "Label: Hint for dash search line edit"

181158msgid "Search"

182159msgstr "Search"

183160

184−#: qml/Dash/PageHeader.qml:260

161+#: qml/Dash/PageHeader.qml:269

162+msgctxt "Button: Open the Ubuntu Store"

185163msgid "Store"

186164msgstr "Store"

187165

188−#: qml/Dash/PageHeader.qml:277

166+#: qml/Dash/PageHeader.qml:276

167+msgctxt "Button: Start a search in the current dash scope"

168+msgid "Search"

169+msgstr "Search"

170+

171+#: qml/Dash/PageHeader.qml:286

172+msgctxt "Button: Show the current dash scope settings"

189173msgid "Settings"

190174msgstr "Settings"

191175

192−#: qml/Dash/PageHeader.qml:284

176+#: qml/Dash/PageHeader.qml:293

193177msgid "Remove from Favorites"

194178msgstr "Remove from Favourites"

195179

196−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

197181msgid "Add to Favorites"

198182msgstr "Add to Favourites"

199183

@@ -225,22 +209,92 @@ msgstr "Pull to refresh…"

225209msgid "Release to refresh…"

226210msgstr "Release to refresh…"

227211

228−#: qml/Dash/ScopesList.qml:63

212+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

213+msgid "Enable location data"

214+msgstr "Enable location data"

215+

216+#: qml/Dash/ScopesList.qml:66

229217msgid "Manage"

230−msgstr ""

218+msgstr "Manage"

231219

232−#: qml/Dash/ScopesList.qml:107

220+#: qml/Dash/ScopesList.qml:112

233221msgid "Home"

234−msgstr ""

222+msgstr "Home"

235223

236−#: qml/Dash/ScopesList.qml:108

224+#: qml/Dash/ScopesList.qml:113

237225msgid "Also installed"

238−msgstr ""

226+msgstr "Also installed"

239227

240−#: qml/Greeter/Greeter.qml:174

228+#: qml/Greeter/CoverPage.qml:107

241229msgid "Unlock"

242230msgstr "Unlock"

243231

232+#: qml/Greeter/LoginList.qml:236

233+msgid "Retry"

234+msgstr "Retry"

235+

236+#: qml/Greeter/LoginList.qml:237

237+msgid "Tap to unlock"

238+msgstr "Tap to unlock"

239+

240+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

241+msgid "Sorry, incorrect passphrase."

242+msgstr "Sorry, incorrect passphrase."

243+

244+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

245+msgid "Sorry, incorrect passcode."

246+msgstr "Sorry, incorrect passcode."

247+

248+#: qml/Greeter/NarrowView.qml:55

249+msgid "This will be your last attempt."

250+msgstr "This will be your last attempt."

251+

252+#: qml/Greeter/NarrowView.qml:57

253+msgid ""

254+"If passphrase is entered incorrectly, your phone will conduct a factory "

255+"reset and all personal data will be deleted."

256+msgstr ""

257+"If passphrase is entered incorrectly, your phone will conduct a factory "

258+"reset and all personal data will be deleted."

259+

260+#: qml/Greeter/NarrowView.qml:58

261+msgid ""

262+"If passcode is entered incorrectly, your phone will conduct a factory reset "

263+"and all personal data will be deleted."

264+msgstr ""

265+"If passcode is entered incorrectly, your phone will conduct a factory reset "

266+"and all personal data will be deleted."

267+

268+#: qml/Greeter/NarrowView.qml:115

269+#, qt-format

270+msgid "Enter %1"

271+msgstr "Enter %1"

272+

273+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

274+msgid "Enter passphrase"

275+msgstr "Enter passphrase"

276+

277+#: qml/Greeter/NarrowView.qml:117

278+msgid "Enter passcode"

279+msgstr "Enter passcode"

280+

281+#: qml/Greeter/NarrowView.qml:118

282+#, qt-format

283+msgid "Sorry, incorrect %1"

284+msgstr "Sorry, incorrect %1"

285+

286+#: qml/Greeter/NarrowView.qml:119

287+msgid "Sorry, incorrect passphrase"

288+msgstr "Sorry, incorrect passphrase"

289+

290+#: qml/Greeter/NarrowView.qml:120

291+msgid "Please re-enter"

292+msgstr "Please re-enter"

293+

294+#: qml/Greeter/NarrowView.qml:121

295+msgid "Sorry, incorrect passcode"

296+msgstr "Sorry, incorrect passcode"

297+

244298#: qml/Notifications/NotificationMenuItemFactory.qml:128

245299msgid "Show password"

246300msgstr "Show password"

@@ -281,6 +335,11 @@ msgstr "Finished"

281335msgid "Failed, tap to retry"

282336msgstr "Failed, tap to retry"

283337

338+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

339+msgctxt "Label: Hint in message indicator line edit"

340+msgid "Reply"

341+msgstr "Reply"

342+

284343#: qml/Panel/Indicators/ModemInfoItem.qml:105

285344msgid "Unlock SIM"

286345msgstr "Unlock SIM"

@@ -289,158 +348,159 @@ msgstr "Unlock SIM"

289348msgid "Roaming"

290349msgstr "Roaming"

291350

292−#: qml/Shell.qml:367

293−#, qt-format

294−msgid "Enter %1"

295−msgstr "Enter %1"

351+#: qml/Tutorial/TutorialBottomFinish.qml:24

352+msgid "This action does different things for different apps"

353+msgstr "This action does different things for different apps"

296354

297−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

298−msgid "Enter passphrase"

299−msgstr "Enter passphrase"

355+#: qml/Tutorial/TutorialBottomFinish.qml:25

356+msgid "Tap here to finish."

357+msgstr "Tap here to finish."

300358

301−#: qml/Shell.qml:369

302−msgid "Enter passcode"

303−msgstr "Enter passcode"

359+#: qml/Tutorial/TutorialBottom.qml:28

360+msgid "Open special menus"

361+msgstr "Open special menus"

304362

305−#: qml/Shell.qml:370

306−#, qt-format

307−msgid "Sorry, incorrect %1"

308−msgstr "Sorry, incorrect %1"

363+#: qml/Tutorial/TutorialBottom.qml:29

364+msgid "Swipe up from the bottom edge."

365+msgstr "Swipe up from the bottom edge."

309366

310−#: qml/Shell.qml:371

311−msgid "Sorry, incorrect passphrase"

312−msgstr "Sorry, incorrect passphrase"

367+#: qml/Tutorial/TutorialLeftFinish.qml:24

368+msgid "These are the shortcuts to favorite apps"

369+msgstr "These are the shortcuts to favourite apps"

313370

314−#: qml/Shell.qml:372

315−msgid "Please re-enter"

316−msgstr "Please re-enter"

371+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

372+msgid "Tap here to continue."

373+msgstr "Tap here to continue."

317374

318−#: qml/Shell.qml:373

319−msgid "Sorry, incorrect passcode"

320−msgstr "Sorry, incorrect passcode"

375+#: qml/Tutorial/TutorialLeft.qml:26

376+msgid "Open the launcher"

377+msgstr "Open the launcher"

321378

322−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

323−msgid "Sorry, incorrect passphrase."

324−msgstr "Sorry, incorrect passphrase."

379+#: qml/Tutorial/TutorialLeft.qml:27

380+msgid "Short swipe from the left edge."

381+msgstr "Short swipe from the left edge."

325382

326−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

327−msgid "Sorry, incorrect passcode."

328−msgstr "Sorry, incorrect passcode."

383+#: qml/Tutorial/TutorialPage.qml:178

384+msgid "You almost got it!"

385+msgstr "You almost got it!"

329386

330−#: qml/Shell.qml:469

331−msgid "This will be your last attempt."

332−msgstr "This will be your last attempt."

387+#: qml/Tutorial/TutorialPage.qml:195

388+msgid "Try again."

389+msgstr "Try again."

333390

334−#: qml/Shell.qml:471

335−msgid ""

336−"If passphrase is entered incorrectly, your phone will conduct a factory "

337−"reset and all personal data will be deleted."

338−msgstr ""

339−"If passphrase is entered incorrectly, your phone will conduct a factory "

340−"reset and all personal data will be deleted."

391+#: qml/Tutorial/TutorialRight.qml:31

392+msgid "To view open apps"

393+msgstr "To view open apps"

341394

342−#: qml/Shell.qml:472

343−msgid ""

344−"If passcode is entered incorrectly, your phone will conduct a factory reset "

345−"and all personal data will be deleted."

346−msgstr ""

347−"If passcode is entered incorrectly, your phone will conduct a factory reset "

348−"and all personal data will be deleted."

395+#: qml/Tutorial/TutorialRight.qml:32

396+msgid "Long swipe from the right edge."

397+msgstr "Long swipe from the right edge."

398+

399+#: qml/Tutorial/TutorialRight.qml:122

400+msgid "View all your running tasks."

401+msgstr "View all your running tasks."

349402

350403#: qml/Wizard/Page.qml:89

404+msgctxt "Button: Go back one page in the Wizard"

351405msgid "Back"

352−msgstr ""

406+msgstr "Back"

353407

354408#: qml/Wizard/Pages/10-welcome.qml:27

355409msgid "Hi!"

356−msgstr ""

410+msgstr "Hi!"

357411

358412#: qml/Wizard/Pages/10-welcome.qml:44

359413msgid "Welcome to your Ubuntu phone."

360−msgstr ""

414+msgstr "Welcome to your Ubuntu phone."

361415

362416#: qml/Wizard/Pages/10-welcome.qml:52

363417msgid "Let’s get started."

364−msgstr ""

418+msgstr "Let’s get started."

365419

366420#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

367−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

421+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

368422#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

369423#: qml/Wizard/Pages/passwd-set.qml:90

370424msgid "Continue"

371−msgstr ""

425+msgstr "Continue"

372426

373427#: qml/Wizard/Pages/20-sim.qml:25

374428msgid "Add a SIM card and restart your device"

375−msgstr ""

429+msgstr "Add a SIM card and restart your device"

376430

377−#: qml/Wizard/Pages/20-sim.qml:55

431+#: qml/Wizard/Pages/20-sim.qml:59

378432msgid "Without it, you won’t be able to make calls or use text messaging."

379−msgstr ""

433+msgstr "Without it, you won’t be able to make calls or use text messaging."

380434

381−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

435+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

382436msgid "Skip"

383−msgstr ""

437+msgstr "Skip"

384438

385439#: qml/Wizard/Pages/30-passwd-type.qml:39

386440msgid "Lock security"

387−msgstr ""

441+msgstr "Lock security"

388442

389443#: qml/Wizard/Pages/30-passwd-type.qml:74

390444msgid "Please select how you’d like to unlock your phone."

391−msgstr ""

445+msgstr "Please select how you’d like to unlock your phone."

392446

393447#: qml/Wizard/Pages/30-passwd-type.qml:97

448+msgctxt "Label: Type of security method"

394449msgid "Swipe"

395−msgstr ""

450+msgstr "Swipe"

396451

397452#: qml/Wizard/Pages/30-passwd-type.qml:98

453+msgctxt "Label: Description of security method"

398454msgid "No security"

399−msgstr ""

455+msgstr "No security"

400456

401457#: qml/Wizard/Pages/30-passwd-type.qml:100

458+msgctxt "Label: Type of security method"

402459msgid "Passcode"

403−msgstr ""

460+msgstr "Passcode"

404461

405462#: qml/Wizard/Pages/30-passwd-type.qml:101

463+msgctxt "Label: Description of security method"

406464msgid "4 digits only"

407−msgstr ""

465+msgstr "4 digits only"

408466

409467#: qml/Wizard/Pages/30-passwd-type.qml:103

468+msgctxt "Label: Type of security method"

410469msgid "Passphrase"

411−msgstr ""

470+msgstr "Passphrase"

412471

413472#: qml/Wizard/Pages/30-passwd-type.qml:104

473+msgctxt "Label: Description of security method"

414474msgid "Numbers and letters"

415−msgstr ""

475+msgstr "Numbers and letters"

416476

417−#: qml/Wizard/Pages/40-wifi.qml:28

477+#: qml/Wizard/Pages/40-wifi.qml:29

418478msgid "Connect to Wi‑Fi"

419−msgstr ""

479+msgstr "Connect to Wi‑Fi"

420480

421−#: qml/Wizard/Pages/40-wifi.qml:147

481+#: qml/Wizard/Pages/40-wifi.qml:168

422482msgid "Available networks…"

423−msgstr ""

483+msgstr "Available networks…"

424484

425−#: qml/Wizard/Pages/40-wifi.qml:148

485+#: qml/Wizard/Pages/40-wifi.qml:169

426486msgid "No available networks."

427−msgstr ""

487+msgstr "No available networks."

428488

429489#: qml/Wizard/Pages/50-location.qml:27

430490msgid "Location"

431−msgstr ""

491+msgstr "Location"

432492

433493#: qml/Wizard/Pages/50-location.qml:62

434494msgid "Let the phone detect your location:"

435−msgstr ""

495+msgstr "Let the phone detect your location:"

436496

437497#: qml/Wizard/Pages/50-location.qml:69

438498msgid "Using GPS only (less accurate)"

439−msgstr ""

499+msgstr "Using GPS only (less accurate)"

440500

441501#: qml/Wizard/Pages/50-location.qml:86

442502msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

443−msgstr ""

503+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"

444504

445505#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

446506#: qml/Wizard/Pages/50-location.qml:103

@@ -448,81 +508,87 @@ msgid ""

448508"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

449509"conditions</a>."

450510msgstr ""

511+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

512+"conditions</a>."

451513

452514#: qml/Wizard/Pages/50-location.qml:112

453515msgid "Not at all"

454−msgstr ""

516+msgstr "Not at all"

455517

456518#: qml/Wizard/Pages/50-location.qml:124

457519msgid "You can change your mind later in System Settings."

458−msgstr ""

520+msgstr "You can change your mind later in System Settings."

459521

460522#: qml/Wizard/Pages/60-reporting.qml:24

461523msgid "Improving your experience"

462−msgstr ""

524+msgstr "Improving your experience"

463525

464526#: qml/Wizard/Pages/60-reporting.qml:36

465527msgid ""

466528"Your phone is set up to automatically report errors to Canonical and its "

467529"partners, the makers of the operating system."

468530msgstr ""

531+"Your phone is set up to automatically report errors to Canonical and its "

532+"partners, the makers of the operating system."

469533

470534#: qml/Wizard/Pages/60-reporting.qml:43

471535msgid ""

472536"This can be disabled in System Settings under Security & "

473537"Privacy"

474538msgstr ""

539+"This can be disabled in System Settings under Security & "

540+"Privacy"

475541

476542#: qml/Wizard/Pages/80-finished.qml:24

477543msgid "All done"

478−msgstr ""

544+msgstr "All done"

479545

480546#: qml/Wizard/Pages/80-finished.qml:39

481547msgid "Nice work!"

482−msgstr ""

548+msgstr "Nice work!"

483549

484550#: qml/Wizard/Pages/80-finished.qml:46

485551msgid "Your phone is now ready to use."

486−msgstr ""

552+msgstr "Your phone is now ready to use."

487553

488554#: qml/Wizard/Pages/80-finished.qml:53

489555msgid "Finish"

490−msgstr ""

556+msgstr "Finish"

491557

492558#: qml/Wizard/Pages/here-terms.qml:27

493559msgid "Terms & Conditions"

494−msgstr ""

560+msgstr "Terms & Conditions"

495561

496562#: qml/Wizard/Pages/passwd-confirm.qml:49

497563msgid "Confirm passphrase"

498−msgstr ""

564+msgstr "Confirm passphrase"

499565

500566#: qml/Wizard/Pages/passwd-confirm.qml:50

501567msgid "Confirm passcode"

502−msgstr ""

568+msgstr "Confirm passcode"

503569

504570#: qml/Wizard/Pages/passwd-confirm.qml:53

505571#: qml/Wizard/Pages/passwd-confirm.qml:54

506572msgid "Please try again."

507−msgstr ""

573+msgstr "Please try again."

508574

509575#: qml/Wizard/Pages/passwd-set.qml:61

510576msgid "Choose your passcode"

511−msgstr ""

577+msgstr "Choose your passcode"

512578

513579#: qml/Wizard/Pages/passwd-set.qml:68

514580msgid "Passphrase must be 4 characters long"

515−msgstr ""

581+msgstr "Passphrase must be 4 characters long"

516582

517583#: qml/Wizard/StackButton.qml:39

518584#, qt-format

519585msgid "〈 %1"

520−msgstr ""

586+msgstr "〈 %1"

521587

522588#: qml/Wizard/StackButton.qml:42

523589#, qt-format

524590msgid "%1 〉"

525−msgstr ""

591+msgstr "%1 〉"

526592

527593#~ msgid "Confirm"

528594#~ msgstr "Confirm"

@@ -539,14 +605,78 @@ msgstr ""

539605#~ msgid "Speaking..."

540606#~ msgstr "Speaking..."

541607

608+#~ msgid "Search"

609+#~ msgstr "Search"

610+

611+#~ msgid "Top edge"

612+#~ msgstr "Top edge"

613+

614+#~ msgid "Try swiping from the top edge to access the indicators"

615+#~ msgstr "Try swiping from the top edge to access the indicators"

616+

617+#~ msgid "Close"

618+#~ msgstr "Close"

619+

620+#~ msgid "Swipe up again to close the settings screen"

621+#~ msgstr "Swipe up again to close the settings screen"

622+

623+#~ msgid "Left edge"

624+#~ msgstr "Left edge"

625+

626+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

627+#~ msgstr "Swipe from the left to reveal the launcher for quick access to apps"

628+

629+#~ msgid "Well done"

630+#~ msgstr "Well done"

631+

632+#~ msgid "Skip intro"

633+#~ msgstr "Skip intro"

634+

635+#~ msgid "Try swiping from the right edge to unlock the phone"

636+#~ msgstr "Try swiping from the right edge to unlock the phone"

637+

638+#~ msgid "Right edge"

639+#~ msgstr "Right edge"

640+

641+#~ msgid ""

642+#~ "You have now mastered the edge gestures and can start using the "

643+#~ "phone Tap on the screen to start"

644+#~ msgstr ""

645+#~ "You have now mastered the edge gestures and can start using the "

646+#~ "phone Tap on the screen to start"

647+

542648#~ msgid "All"

543649#~ msgstr "All"

544650

545651#~ msgid "Favorites"

546652#~ msgstr "Favourites"

547653

654+#~ msgid "Store"

655+#~ msgstr "Store"

656+

657+#~ msgid "Power off"

658+#~ msgstr "Power off"

659+

548660#~ msgid "Done"

549661#~ msgstr "Done"

550662

663+#~ msgid "Log out"

664+#~ msgstr "Log out"

665+

666+#~ msgid "Reboot"

667+#~ msgstr "Reboot"

668+

669+#~ msgid "Power"

670+#~ msgstr "Power"

671+

672+#~ msgid "Shut down"

673+#~ msgstr "Shut down"

674+

675+#~ msgid "Settings"

676+#~ msgstr "Settings"

677+

678+#~ msgid "Restart"

679+#~ msgstr "Restart"

680+

551681#~ msgid "Manage Scopes"

552682#~ msgstr "Manage Scopes"

po/en_GB.po+321−183

@@ -7,18 +7,18 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-05 18:59+0000\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-01-22 12:14+0000\n"

1212"Last-Translator: Andi Chandler <Unknown>\n"

1313"Language-Team: English (United Kingdom) <en_GB@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr "Password: "

2424

@@ -31,64 +31,91 @@ msgstr "Pin shortcut"

3131msgid "Unpin shortcut"

3232msgstr "Unpin shortcut"

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr "Device Locked"

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr "You have been locked out due to too many failed passphrase attempts."

4141

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

4343msgid "You have been locked out due to too many failed passcode attempts."

4444msgstr "You have been locked out due to too many failed passcode attempts."

4545

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

4747#, qt-format

4848msgid "Please wait %1 minute and then try again…"

4949msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] "Please wait %1 minute and then try again…"

5151msgstr[1] "Please wait %1 minutes and then try again…"

5252

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

5455msgid "Log out"

5556msgstr "Log out"

5657

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

5859msgid "Are you sure you want to log out?"

5960msgstr "Are you sure you want to log out?"

6061

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:122

63−msgid "No"

64−msgstr "No"

62+#: qml/Components/Dialogs.qml:70

63+msgctxt "Button: Lock the system"

64+msgid "Lock"

65+msgstr "Lock"

6566

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:129

68−msgid "Yes"

69−msgstr "Yes"

67+#: qml/Components/Dialogs.qml:77

68+msgctxt "Button: Log out from the system"

69+msgid "Log Out"

70+msgstr "Log Out"

7071

71−#: qml/Components/Dialogs.qml:94

72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

73+#: qml/Components/Dialogs.qml:171

74+msgid "Cancel"

75+msgstr "Cancel"

76+

77+#: qml/Components/Dialogs.qml:96

78+msgctxt "Title: Reboot/Shut down dialog"

7279msgid "Shut down"

7380msgstr "Shut down"

7481

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

7683msgid "Are you sure you want to shut down?"

7784msgstr "Are you sure you want to shut down?"

7885

79−#: qml/Components/Dialogs.qml:119

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

8088msgid "Reboot"

8189msgstr "Reboot"

8290

83−#: qml/Components/Dialogs.qml:120

91+#: qml/Components/Dialogs.qml:107

92+msgctxt "Button: Shut down the system"

93+msgid "Shut down"

94+msgstr "Shut down"

95+

96+#: qml/Components/Dialogs.qml:127

97+msgctxt "Title: Reboot dialog"

98+msgid "Reboot"

99+msgstr "Reboot"

100+

101+#: qml/Components/Dialogs.qml:128

84102msgid "Are you sure you want to reboot?"

85103msgstr "Are you sure you want to reboot?"

86104

87−#: qml/Components/Dialogs.qml:144

105+#: qml/Components/Dialogs.qml:130

106+msgid "No"

107+msgstr "No"

108+

109+#: qml/Components/Dialogs.qml:136

110+msgid "Yes"

111+msgstr "Yes"

112+

113+#: qml/Components/Dialogs.qml:150

114+msgctxt "Title: Power off/Restart dialog"

88115msgid "Power"

89116msgstr "Power"

90117

91−#: qml/Components/Dialogs.qml:145

118+#: qml/Components/Dialogs.qml:151

92119msgid ""

93120"Are you sure you would like\n"

94121"to power off?"

@@ -96,66 +123,16 @@ msgstr ""

96123"Are you sure you would like\n"

97124"to power off?"

98125

99−#: qml/Components/Dialogs.qml:147

126+#: qml/Components/Dialogs.qml:153

127+msgctxt "Button: Power off the system"

100128msgid "Power off"

101129msgstr "Power off"

102130

103−#: qml/Components/Dialogs.qml:157

131+#: qml/Components/Dialogs.qml:162

132+msgctxt "Button: Restart the system"

104133msgid "Restart"

105134msgstr "Restart"

106135

107−#: qml/Components/Dialogs.qml:167

108−msgid "Cancel"

109−msgstr "Cancel"

110−

111−#: qml/Components/EdgeDemoOverlay.qml:151

112−msgid "Skip intro"

113−msgstr "Skip intro"

114−

115−#: qml/Components/EdgeDemo.qml:125

116−msgid "Right edge"

117−msgstr "Right edge"

118−

119−#: qml/Components/EdgeDemo.qml:126

120−msgid "Try swiping from the right edge to unlock the phone"

121−msgstr "Try swiping from the right edge to unlock the phone"

122−

123−#: qml/Components/EdgeDemo.qml:157

124−msgid "Top edge"

125−msgstr "Top edge"

126−

127−#: qml/Components/EdgeDemo.qml:158

128−msgid "Try swiping from the top edge to access the indicators"

129−msgstr "Try swiping from the top edge to access the indicators"

130−

131−#: qml/Components/EdgeDemo.qml:183

132−msgid "Close"

133−msgstr "Close"

134−

135−#: qml/Components/EdgeDemo.qml:184

136−msgid "Swipe up again to close the settings screen"

137−msgstr "Swipe up again to close the settings screen"

138−

139−#: qml/Components/EdgeDemo.qml:214

140−msgid "Left edge"

141−msgstr "Left edge"

142−

143−#: qml/Components/EdgeDemo.qml:215

144−msgid "Swipe from the left to reveal the launcher for quick access to apps"

145−msgstr "Swipe from the left to reveal the launcher for quick access to apps"

146−

147−#: qml/Components/EdgeDemo.qml:242

148−msgid "Well done"

149−msgstr "Well done"

150−

151−#: qml/Components/EdgeDemo.qml:243

152−msgid ""

153−"You have now mastered the edge gestures and can start using the "

154−"phone Tap on the screen to start"

155−msgstr ""

156−"You have now mastered the edge gestures and can start using the "

157−"phone Tap on the screen to start"

158−

159136#: qml/Components/Lockscreen.qml:238

160137msgid "Return to Call"

161138msgstr "Return to Call"

@@ -168,32 +145,39 @@ msgstr "Emergency Call"

168145msgid "OK"

169146msgstr "OK"

170147

171−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

148+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

172149msgid "See less"

173150msgstr "See less"

174151

175−#: qml/Dash/GenericScopeView.qml:431

152+#: qml/Dash/GenericScopeView.qml:533

176153msgid "See all"

177154msgstr "See all"

178155

179−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

180−#: qml/Panel/SearchIndicator.qml:27

156+#: qml/Dash/GenericScopeView.qml:595

157+msgctxt "Label: Hint for dash search line edit"

181158msgid "Search"

182159msgstr "Search"

183160

184−#: qml/Dash/PageHeader.qml:260

161+#: qml/Dash/PageHeader.qml:269

162+msgctxt "Button: Open the Ubuntu Store"

185163msgid "Store"

186−msgstr "Store"

164+msgstr ""

165+

166+#: qml/Dash/PageHeader.qml:276

167+msgctxt "Button: Start a search in the current dash scope"

168+msgid "Search"

169+msgstr ""

187170

188−#: qml/Dash/PageHeader.qml:277

171+#: qml/Dash/PageHeader.qml:286

172+msgctxt "Button: Show the current dash scope settings"

189173msgid "Settings"

190−msgstr "Settings"

174+msgstr ""

191175

192−#: qml/Dash/PageHeader.qml:284

176+#: qml/Dash/PageHeader.qml:293

193177msgid "Remove from Favorites"

194178msgstr "Remove from Favourites"

195179

196−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

197181msgid "Add to Favorites"

198182msgstr "Add to Favourites"

199183

@@ -225,22 +209,92 @@ msgstr "Pull to refresh…"

225209msgid "Release to refresh…"

226210msgstr "Release to refresh…"

227211

228−#: qml/Dash/ScopesList.qml:63

212+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

213+msgid "Enable location data"

214+msgstr "Enable location data"

215+

216+#: qml/Dash/ScopesList.qml:66

229217msgid "Manage"

230218msgstr "Manage"

231219

232−#: qml/Dash/ScopesList.qml:107

220+#: qml/Dash/ScopesList.qml:112

233221msgid "Home"

234222msgstr "Home"

235223

236−#: qml/Dash/ScopesList.qml:108

224+#: qml/Dash/ScopesList.qml:113

237225msgid "Also installed"

238226msgstr "Also installed"

239227

240−#: qml/Greeter/Greeter.qml:174

228+#: qml/Greeter/CoverPage.qml:107

241229msgid "Unlock"

242230msgstr "Unlock"

243231

232+#: qml/Greeter/LoginList.qml:236

233+msgid "Retry"

234+msgstr "Retry"

235+

236+#: qml/Greeter/LoginList.qml:237

237+msgid "Tap to unlock"

238+msgstr "Tap to unlock"

239+

240+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

241+msgid "Sorry, incorrect passphrase."

242+msgstr "Sorry, incorrect passphrase."

243+

244+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

245+msgid "Sorry, incorrect passcode."

246+msgstr "Sorry, incorrect passcode."

247+

248+#: qml/Greeter/NarrowView.qml:55

249+msgid "This will be your last attempt."

250+msgstr "This will be your last attempt."

251+

252+#: qml/Greeter/NarrowView.qml:57

253+msgid ""

254+"If passphrase is entered incorrectly, your phone will conduct a factory "

255+"reset and all personal data will be deleted."

256+msgstr ""

257+"If passphrase is entered incorrectly, your phone will conduct a factory "

258+"reset and all personal data will be deleted."

259+

260+#: qml/Greeter/NarrowView.qml:58

261+msgid ""

262+"If passcode is entered incorrectly, your phone will conduct a factory reset "

263+"and all personal data will be deleted."

264+msgstr ""

265+"If passcode is entered incorrectly, your phone will conduct a factory reset "

266+"and all personal data will be deleted."

267+

268+#: qml/Greeter/NarrowView.qml:115

269+#, qt-format

270+msgid "Enter %1"

271+msgstr "Enter %1"

272+

273+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

274+msgid "Enter passphrase"

275+msgstr "Enter passphrase"

276+

277+#: qml/Greeter/NarrowView.qml:117

278+msgid "Enter passcode"

279+msgstr "Enter passcode"

280+

281+#: qml/Greeter/NarrowView.qml:118

282+#, qt-format

283+msgid "Sorry, incorrect %1"

284+msgstr "Sorry, incorrect %1"

285+

286+#: qml/Greeter/NarrowView.qml:119

287+msgid "Sorry, incorrect passphrase"

288+msgstr "Sorry, incorrect passphrase"

289+

290+#: qml/Greeter/NarrowView.qml:120

291+msgid "Please re-enter"

292+msgstr "Please re-enter"

293+

294+#: qml/Greeter/NarrowView.qml:121

295+msgid "Sorry, incorrect passcode"

296+msgstr "Sorry, incorrect passcode"

297+

244298#: qml/Notifications/NotificationMenuItemFactory.qml:128

245299msgid "Show password"

246300msgstr "Show password"

@@ -281,6 +335,11 @@ msgstr "Finished"

281335msgid "Failed, tap to retry"

282336msgstr "Failed, tap to retry"

283337

338+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

339+msgctxt "Label: Hint in message indicator line edit"

340+msgid "Reply"

341+msgstr "Reply"

342+

284343#: qml/Panel/Indicators/ModemInfoItem.qml:105

285344msgid "Unlock SIM"

286345msgstr "Unlock SIM"

@@ -289,158 +348,159 @@ msgstr "Unlock SIM"

289348msgid "Roaming"

290349msgstr "Roaming"

291350

292−#: qml/Shell.qml:367

293−#, qt-format

294−msgid "Enter %1"

295−msgstr "Enter %1"

351+#: qml/Tutorial/TutorialBottomFinish.qml:24

352+msgid "This action does different things for different apps"

353+msgstr "This action does different things for different apps"

296354

297−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

298−msgid "Enter passphrase"

299−msgstr "Enter passphrase"

355+#: qml/Tutorial/TutorialBottomFinish.qml:25

356+msgid "Tap here to finish."

357+msgstr "Tap here to finish."

300358

301−#: qml/Shell.qml:369

302−msgid "Enter passcode"

303−msgstr "Enter passcode"

359+#: qml/Tutorial/TutorialBottom.qml:28

360+msgid "Open special menus"

361+msgstr "Open special menus"

304362

305−#: qml/Shell.qml:370

306−#, qt-format

307−msgid "Sorry, incorrect %1"

308−msgstr "Sorry, incorrect %1"

363+#: qml/Tutorial/TutorialBottom.qml:29

364+msgid "Swipe up from the bottom edge."

365+msgstr "Swipe up from the bottom edge."

309366

310−#: qml/Shell.qml:371

311−msgid "Sorry, incorrect passphrase"

312−msgstr "Sorry, incorrect passphrase"

367+#: qml/Tutorial/TutorialLeftFinish.qml:24

368+msgid "These are the shortcuts to favorite apps"

369+msgstr "These are the shortcuts to favourite apps"

313370

314−#: qml/Shell.qml:372

315−msgid "Please re-enter"

316−msgstr "Please re-enter"

371+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

372+msgid "Tap here to continue."

373+msgstr "Tap here to continue."

317374

318−#: qml/Shell.qml:373

319−msgid "Sorry, incorrect passcode"

320−msgstr "Sorry, incorrect passcode"

375+#: qml/Tutorial/TutorialLeft.qml:26

376+msgid "Open the launcher"

377+msgstr "Open the launcher"

321378

322−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

323−msgid "Sorry, incorrect passphrase."

324−msgstr "Sorry, incorrect passphrase."

379+#: qml/Tutorial/TutorialLeft.qml:27

380+msgid "Short swipe from the left edge."

381+msgstr "Short swipe from the left edge."

325382

326−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

327−msgid "Sorry, incorrect passcode."

328−msgstr "Sorry, incorrect passcode."

383+#: qml/Tutorial/TutorialPage.qml:178

384+msgid "You almost got it!"

385+msgstr "You almost got it!"

329386

330−#: qml/Shell.qml:469

331−msgid "This will be your last attempt."

332−msgstr "This will be your last attempt."

387+#: qml/Tutorial/TutorialPage.qml:195

388+msgid "Try again."

389+msgstr "Try again."

333390

334−#: qml/Shell.qml:471

335−msgid ""

336−"If passphrase is entered incorrectly, your phone will conduct a factory "

337−"reset and all personal data will be deleted."

338−msgstr ""

339−"If passphrase is entered incorrectly, your phone will conduct a factory "

340−"reset and all personal data will be deleted."

391+#: qml/Tutorial/TutorialRight.qml:31

392+msgid "To view open apps"

393+msgstr "To view open apps"

341394

342−#: qml/Shell.qml:472

343−msgid ""

344−"If passcode is entered incorrectly, your phone will conduct a factory reset "

345−"and all personal data will be deleted."

346−msgstr ""

347−"If passcode is entered incorrectly, your phone will conduct a factory reset "

348−"and all personal data will be deleted."

395+#: qml/Tutorial/TutorialRight.qml:32

396+msgid "Long swipe from the right edge."

397+msgstr "Long swipe from the right edge."

398+

399+#: qml/Tutorial/TutorialRight.qml:122

400+msgid "View all your running tasks."

401+msgstr "View all your running tasks."

349402

350403#: qml/Wizard/Page.qml:89

404+msgctxt "Button: Go back one page in the Wizard"

351405msgid "Back"

352−msgstr ""

406+msgstr "Back"

353407

354408#: qml/Wizard/Pages/10-welcome.qml:27

355409msgid "Hi!"

356−msgstr ""

410+msgstr "Hi!"

357411

358412#: qml/Wizard/Pages/10-welcome.qml:44

359413msgid "Welcome to your Ubuntu phone."

360−msgstr ""

414+msgstr "Welcome to your Ubuntu phone."

361415

362416#: qml/Wizard/Pages/10-welcome.qml:52

363417msgid "Let’s get started."

364−msgstr ""

418+msgstr "Let’s get started."

365419

366420#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

367−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

421+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

368422#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

369423#: qml/Wizard/Pages/passwd-set.qml:90

370424msgid "Continue"

371−msgstr ""

425+msgstr "Continue"

372426

373427#: qml/Wizard/Pages/20-sim.qml:25

374428msgid "Add a SIM card and restart your device"

375−msgstr ""

429+msgstr "Add a SIM card and restart your device"

376430

377−#: qml/Wizard/Pages/20-sim.qml:55

431+#: qml/Wizard/Pages/20-sim.qml:59

378432msgid "Without it, you won’t be able to make calls or use text messaging."

379−msgstr ""

433+msgstr "Without it, you won’t be able to make calls or use text messaging."

380434

381−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

435+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

382436msgid "Skip"

383−msgstr ""

437+msgstr "Skip"

384438

385439#: qml/Wizard/Pages/30-passwd-type.qml:39

386440msgid "Lock security"

387−msgstr ""

441+msgstr "Lock security"

388442

389443#: qml/Wizard/Pages/30-passwd-type.qml:74

390444msgid "Please select how you’d like to unlock your phone."

391−msgstr ""

445+msgstr "Please select how you’d like to unlock your phone."

392446

393447#: qml/Wizard/Pages/30-passwd-type.qml:97

448+msgctxt "Label: Type of security method"

394449msgid "Swipe"

395−msgstr ""

450+msgstr "Swipe"

396451

397452#: qml/Wizard/Pages/30-passwd-type.qml:98

453+msgctxt "Label: Description of security method"

398454msgid "No security"

399−msgstr ""

455+msgstr "No security"

400456

401457#: qml/Wizard/Pages/30-passwd-type.qml:100

458+msgctxt "Label: Type of security method"

402459msgid "Passcode"

403−msgstr ""

460+msgstr "Passcode"

404461

405462#: qml/Wizard/Pages/30-passwd-type.qml:101

463+msgctxt "Label: Description of security method"

406464msgid "4 digits only"

407−msgstr ""

465+msgstr "4 digits only"

408466

409467#: qml/Wizard/Pages/30-passwd-type.qml:103

468+msgctxt "Label: Type of security method"

410469msgid "Passphrase"

411−msgstr ""

470+msgstr "Passphrase"

412471

413472#: qml/Wizard/Pages/30-passwd-type.qml:104

473+msgctxt "Label: Description of security method"

414474msgid "Numbers and letters"

415−msgstr ""

475+msgstr "Numbers and letters"

416476

417−#: qml/Wizard/Pages/40-wifi.qml:28

477+#: qml/Wizard/Pages/40-wifi.qml:29

418478msgid "Connect to Wi‑Fi"

419−msgstr ""

479+msgstr "Connect to Wi‑Fi"

420480

421−#: qml/Wizard/Pages/40-wifi.qml:147

481+#: qml/Wizard/Pages/40-wifi.qml:168

422482msgid "Available networks…"

423−msgstr ""

483+msgstr "Available networks…"

424484

425−#: qml/Wizard/Pages/40-wifi.qml:148

485+#: qml/Wizard/Pages/40-wifi.qml:169

426486msgid "No available networks."

427−msgstr ""

487+msgstr "No available networks."

428488

429489#: qml/Wizard/Pages/50-location.qml:27

430490msgid "Location"

431−msgstr ""

491+msgstr "Location"

432492

433493#: qml/Wizard/Pages/50-location.qml:62

434494msgid "Let the phone detect your location:"

435−msgstr ""

495+msgstr "Let the phone detect your location:"

436496

437497#: qml/Wizard/Pages/50-location.qml:69

438498msgid "Using GPS only (less accurate)"

439−msgstr ""

499+msgstr "Using GPS only (less accurate)"

440500

441501#: qml/Wizard/Pages/50-location.qml:86

442502msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

443−msgstr ""

503+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"

444504

445505#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

446506#: qml/Wizard/Pages/50-location.qml:103

@@ -448,81 +508,87 @@ msgid ""

448508"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

449509"conditions</a>."

450510msgstr ""

511+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

512+"conditions</a>."

451513

452514#: qml/Wizard/Pages/50-location.qml:112

453515msgid "Not at all"

454−msgstr ""

516+msgstr "Not at all"

455517

456518#: qml/Wizard/Pages/50-location.qml:124

457519msgid "You can change your mind later in System Settings."

458−msgstr ""

520+msgstr "You can change your mind later in System Settings."

459521

460522#: qml/Wizard/Pages/60-reporting.qml:24

461523msgid "Improving your experience"

462−msgstr ""

524+msgstr "Improving your experience"

463525

464526#: qml/Wizard/Pages/60-reporting.qml:36

465527msgid ""

466528"Your phone is set up to automatically report errors to Canonical and its "

467529"partners, the makers of the operating system."

468530msgstr ""

531+"Your phone is set up to automatically report errors to Canonical and its "

532+"partners, the makers of the operating system."

469533

470534#: qml/Wizard/Pages/60-reporting.qml:43

471535msgid ""

472536"This can be disabled in System Settings under Security & "

473537"Privacy"

474538msgstr ""

539+"This can be disabled in System Settings under Security & "

540+"Privacy"

475541

476542#: qml/Wizard/Pages/80-finished.qml:24

477543msgid "All done"

478−msgstr ""

544+msgstr "All done"

479545

480546#: qml/Wizard/Pages/80-finished.qml:39

481547msgid "Nice work!"

482−msgstr ""

548+msgstr "Nice work!"

483549

484550#: qml/Wizard/Pages/80-finished.qml:46

485551msgid "Your phone is now ready to use."

486−msgstr ""

552+msgstr "Your phone is now ready to use."

487553

488554#: qml/Wizard/Pages/80-finished.qml:53

489555msgid "Finish"

490−msgstr ""

556+msgstr "Finish"

491557

492558#: qml/Wizard/Pages/here-terms.qml:27

493559msgid "Terms & Conditions"

494−msgstr ""

560+msgstr "Terms & Conditions"

495561

496562#: qml/Wizard/Pages/passwd-confirm.qml:49

497563msgid "Confirm passphrase"

498−msgstr ""

564+msgstr "Confirm passphrase"

499565

500566#: qml/Wizard/Pages/passwd-confirm.qml:50

501567msgid "Confirm passcode"

502−msgstr ""

568+msgstr "Confirm passcode"

503569

504570#: qml/Wizard/Pages/passwd-confirm.qml:53

505571#: qml/Wizard/Pages/passwd-confirm.qml:54

506572msgid "Please try again."

507−msgstr ""

573+msgstr "Please try again."

508574

509575#: qml/Wizard/Pages/passwd-set.qml:61

510576msgid "Choose your passcode"

511−msgstr ""

577+msgstr "Choose your passcode"

512578

513579#: qml/Wizard/Pages/passwd-set.qml:68

514580msgid "Passphrase must be 4 characters long"

515−msgstr ""

581+msgstr "Passphrase must be 4 characters long"

516582

517583#: qml/Wizard/StackButton.qml:39

518584#, qt-format

519585msgid "〈 %1"

520−msgstr ""

586+msgstr "〈 %1"

521587

522588#: qml/Wizard/StackButton.qml:42

523589#, qt-format

524590msgid "%1 〉"

525−msgstr ""

591+msgstr "%1 〉"

526592

527593#~ msgid "Confirm"

528594#~ msgstr "Confirm"

@@ -539,14 +605,86 @@ msgstr ""

539605#~ msgid "Speaking..."

540606#~ msgstr "Speaking..."

541607

608+#~ msgid "Search"

609+#~ msgstr "Search"

610+

611+#~ msgid "Try swiping from the right edge to unlock the phone"

612+#~ msgstr "Try swiping from the right edge to unlock the phone"

613+

614+#~ msgid "Top edge"

615+#~ msgstr "Top edge"

616+

617+#~ msgid "Try swiping from the top edge to access the indicators"

618+#~ msgstr "Try swiping from the top edge to access the indicators"

619+

620+#~ msgid "Close"

621+#~ msgstr "Close"

622+

623+#~ msgid "Swipe up again to close the settings screen"

624+#~ msgstr "Swipe up again to close the settings screen"

625+

626+#~ msgid "Left edge"

627+#~ msgstr "Left edge"

628+

629+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

630+#~ msgstr "Swipe from the left to reveal the launcher for quick access to apps"

631+

632+#~ msgid "Well done"

633+#~ msgstr "Well done"

634+

635+#~ msgid "Skip intro"

636+#~ msgstr "Skip intro"

637+

638+#~ msgid "Right edge"

639+#~ msgstr "Right edge"

640+

641+#~ msgid ""

642+#~ "You have now mastered the edge gestures and can start using the "

643+#~ "phone Tap on the screen to start"

644+#~ msgstr ""

645+#~ "You have now mastered the edge gestures and can start using the "

646+#~ "phone Tap on the screen to start"

647+

648+#~ msgid "Store"

649+#~ msgstr "Store"

650+

542651#~ msgid "All"

543652#~ msgstr "All"

544653

545654#~ msgid "Favorites"

546655#~ msgstr "Favourites"

547656

657+#~ msgid "Power off"

658+#~ msgstr "Power off"

659+

548660#~ msgid "Done"

549661#~ msgstr "Done"

550662

663+#~ msgid "Log out"

664+#~ msgstr "Log out"

665+

666+#~ msgid "Reboot"

667+#~ msgstr "Reboot"

668+

669+#~ msgid "Power"

670+#~ msgstr "Power"

671+

672+#~ msgid "Shut down"

673+#~ msgstr "Shut down"

674+

675+#~ msgid "Settings"

676+#~ msgstr "Settings"

677+

678+#~ msgid "Restart"

679+#~ msgstr "Restart"

680+

551681#~ msgid "Manage Scopes"

552682#~ msgstr "Manage Scopes"

683+

684+#~ msgctxt "Button: Shown in Page Header Menu"

685+#~ msgid "Search"

686+#~ msgstr "Search"

687+

688+#~ msgctxt "Button: The Ubuntu Store"

689+#~ msgid "Store"

690+#~ msgstr "Store"

po/eo.po+183−121

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

1111"PO-Revision-Date: 2013-06-26 22:35+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Esperanto <eo@li.org>\n"

@@ -15,10 +15,10 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr ""

2424

@@ -31,125 +31,104 @@ msgstr ""

3131msgid "Unpin shortcut"

3232msgstr ""

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr ""

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr ""

4141

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

4343msgid "You have been locked out due to too many failed passcode attempts."

4444msgstr ""

4545

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

4747#, qt-format

4848msgid "Please wait %1 minute and then try again…"

4949msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] ""

5151msgstr[1] ""

5252

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

5455msgid "Log out"

5556msgstr ""

5657

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

5859msgid "Are you sure you want to log out?"

5960msgstr ""

6061

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:122

63−msgid "No"

62+#: qml/Components/Dialogs.qml:70

63+msgctxt "Button: Lock the system"

64+msgid "Lock"

6465msgstr ""

6566

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:129

68−msgid "Yes"

67+#: qml/Components/Dialogs.qml:77

68+msgctxt "Button: Log out from the system"

69+msgid "Log Out"

6970msgstr ""

7071

71−#: qml/Components/Dialogs.qml:94

72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

73+#: qml/Components/Dialogs.qml:171

74+msgid "Cancel"

75+msgstr ""

76+

77+#: qml/Components/Dialogs.qml:96

78+msgctxt "Title: Reboot/Shut down dialog"

7279msgid "Shut down"

7380msgstr ""

7481

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

7683msgid "Are you sure you want to shut down?"

7784msgstr ""

7885

79−#: qml/Components/Dialogs.qml:119

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

8088msgid "Reboot"

8189msgstr ""

8290

83−#: qml/Components/Dialogs.qml:120

84−msgid "Are you sure you want to reboot?"

85−msgstr ""

86−

87−#: qml/Components/Dialogs.qml:144

88−msgid "Power"

89−msgstr ""

90−

91−#: qml/Components/Dialogs.qml:145

92−msgid ""

93−"Are you sure you would like\n"

94−"to power off?"

95−msgstr ""

96−

97−#: qml/Components/Dialogs.qml:147

98−msgid "Power off"

99−msgstr ""

100−

101−#: qml/Components/Dialogs.qml:157

102−msgid "Restart"

103−msgstr ""

104−

105−#: qml/Components/Dialogs.qml:167

106−msgid "Cancel"

107−msgstr ""

108−

109−#: qml/Components/EdgeDemoOverlay.qml:151

110−msgid "Skip intro"

111−msgstr ""

112−

113−#: qml/Components/EdgeDemo.qml:125

114−msgid "Right edge"

115−msgstr ""

116−

117−#: qml/Components/EdgeDemo.qml:126

118−msgid "Try swiping from the right edge to unlock the phone"

91+#: qml/Components/Dialogs.qml:107

92+msgctxt "Button: Shut down the system"

93+msgid "Shut down"

11994msgstr ""

12095

121−#: qml/Components/EdgeDemo.qml:157

122−msgid "Top edge"

96+#: qml/Components/Dialogs.qml:127

97+msgctxt "Title: Reboot dialog"

98+msgid "Reboot"

12399msgstr ""

124100

125−#: qml/Components/EdgeDemo.qml:158

126−msgid "Try swiping from the top edge to access the indicators"

101+#: qml/Components/Dialogs.qml:128

102+msgid "Are you sure you want to reboot?"

127103msgstr ""

128104

129−#: qml/Components/EdgeDemo.qml:183

130−msgid "Close"

105+#: qml/Components/Dialogs.qml:130

106+msgid "No"

131107msgstr ""

132108

133−#: qml/Components/EdgeDemo.qml:184

134−msgid "Swipe up again to close the settings screen"

109+#: qml/Components/Dialogs.qml:136

110+msgid "Yes"

135111msgstr ""

136112

137−#: qml/Components/EdgeDemo.qml:214

138−msgid "Left edge"

113+#: qml/Components/Dialogs.qml:150

114+msgctxt "Title: Power off/Restart dialog"

115+msgid "Power"

139116msgstr ""

140117

141−#: qml/Components/EdgeDemo.qml:215

142−msgid "Swipe from the left to reveal the launcher for quick access to apps"

118+#: qml/Components/Dialogs.qml:151

119+msgid ""

120+"Are you sure you would like\n"

121+"to power off?"

143122msgstr ""

144123

145−#: qml/Components/EdgeDemo.qml:242

146−msgid "Well done"

124+#: qml/Components/Dialogs.qml:153

125+msgctxt "Button: Power off the system"

126+msgid "Power off"

147127msgstr ""

148128

149−#: qml/Components/EdgeDemo.qml:243

150−msgid ""

151−"You have now mastered the edge gestures and can start using the "

152−"phone Tap on the screen to start"

129+#: qml/Components/Dialogs.qml:162

130+msgctxt "Button: Restart the system"

131+msgid "Restart"

153132msgstr ""

154133

155134#: qml/Components/Lockscreen.qml:238

@@ -164,32 +143,39 @@ msgstr ""

164143msgid "OK"

165144msgstr ""

166145

167−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

168147msgid "See less"

169148msgstr ""

170149

171−#: qml/Dash/GenericScopeView.qml:431

150+#: qml/Dash/GenericScopeView.qml:533

172151msgid "See all"

173152msgstr ""

174153

175−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176−#: qml/Panel/SearchIndicator.qml:27

154+#: qml/Dash/GenericScopeView.qml:595

155+msgctxt "Label: Hint for dash search line edit"

177156msgid "Search"

178157msgstr ""

179158

180−#: qml/Dash/PageHeader.qml:260

159+#: qml/Dash/PageHeader.qml:269

160+msgctxt "Button: Open the Ubuntu Store"

181161msgid "Store"

182162msgstr ""

183163

184−#: qml/Dash/PageHeader.qml:277

164+#: qml/Dash/PageHeader.qml:276

165+msgctxt "Button: Start a search in the current dash scope"

166+msgid "Search"

167+msgstr ""

168+

169+#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

185171msgid "Settings"

186172msgstr ""

187173

188−#: qml/Dash/PageHeader.qml:284

174+#: qml/Dash/PageHeader.qml:293

189175msgid "Remove from Favorites"

190176msgstr ""

191177

192−#: qml/Dash/PageHeader.qml:284

178+#: qml/Dash/PageHeader.qml:293

193179msgid "Add to Favorites"

194180msgstr ""

195181

@@ -221,22 +207,88 @@ msgstr ""

221207msgid "Release to refresh…"

222208msgstr ""

223209

224−#: qml/Dash/ScopesList.qml:63

210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

211+msgid "Enable location data"

212+msgstr ""

213+

214+#: qml/Dash/ScopesList.qml:66

225215msgid "Manage"

226216msgstr ""

227217

228−#: qml/Dash/ScopesList.qml:107

218+#: qml/Dash/ScopesList.qml:112

229219msgid "Home"

230220msgstr ""

231221

232−#: qml/Dash/ScopesList.qml:108

222+#: qml/Dash/ScopesList.qml:113

233223msgid "Also installed"

234224msgstr ""

235225

236−#: qml/Greeter/Greeter.qml:174

226+#: qml/Greeter/CoverPage.qml:107

237227msgid "Unlock"

238228msgstr ""

239229

230+#: qml/Greeter/LoginList.qml:236

231+msgid "Retry"

232+msgstr ""

233+

234+#: qml/Greeter/LoginList.qml:237

235+msgid "Tap to unlock"

236+msgstr ""

237+

238+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

239+msgid "Sorry, incorrect passphrase."

240+msgstr ""

241+

242+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

243+msgid "Sorry, incorrect passcode."

244+msgstr ""

245+

246+#: qml/Greeter/NarrowView.qml:55

247+msgid "This will be your last attempt."

248+msgstr ""

249+

250+#: qml/Greeter/NarrowView.qml:57

251+msgid ""

252+"If passphrase is entered incorrectly, your phone will conduct a factory "

253+"reset and all personal data will be deleted."

254+msgstr ""

255+

256+#: qml/Greeter/NarrowView.qml:58

257+msgid ""

258+"If passcode is entered incorrectly, your phone will conduct a factory reset "

259+"and all personal data will be deleted."

260+msgstr ""

261+

262+#: qml/Greeter/NarrowView.qml:115

263+#, qt-format

264+msgid "Enter %1"

265+msgstr ""

266+

267+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

268+msgid "Enter passphrase"

269+msgstr ""

270+

271+#: qml/Greeter/NarrowView.qml:117

272+msgid "Enter passcode"

273+msgstr ""

274+

275+#: qml/Greeter/NarrowView.qml:118

276+#, qt-format

277+msgid "Sorry, incorrect %1"

278+msgstr ""

279+

280+#: qml/Greeter/NarrowView.qml:119

281+msgid "Sorry, incorrect passphrase"

282+msgstr ""

283+

284+#: qml/Greeter/NarrowView.qml:120

285+msgid "Please re-enter"

286+msgstr ""

287+

288+#: qml/Greeter/NarrowView.qml:121

289+msgid "Sorry, incorrect passcode"

290+msgstr ""

291+

240292#: qml/Notifications/NotificationMenuItemFactory.qml:128

241293msgid "Show password"

242294msgstr ""

@@ -277,6 +329,11 @@ msgstr ""

277329msgid "Failed, tap to retry"

278330msgstr ""

279331

332+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

333+msgctxt "Label: Hint in message indicator line edit"

334+msgid "Reply"

335+msgstr ""

336+

280337#: qml/Panel/Indicators/ModemInfoItem.qml:105

281338msgid "Unlock SIM"

282339msgstr ""

@@ -285,61 +342,60 @@ msgstr ""

285342msgid "Roaming"

286343msgstr ""

287344

288−#: qml/Shell.qml:367

289−#, qt-format

290−msgid "Enter %1"

345+#: qml/Tutorial/TutorialBottomFinish.qml:24

346+msgid "This action does different things for different apps"

291347msgstr ""

292348

293−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

294−msgid "Enter passphrase"

349+#: qml/Tutorial/TutorialBottomFinish.qml:25

350+msgid "Tap here to finish."

295351msgstr ""

296352

297−#: qml/Shell.qml:369

298−msgid "Enter passcode"

353+#: qml/Tutorial/TutorialBottom.qml:28

354+msgid "Open special menus"

299355msgstr ""

300356

301−#: qml/Shell.qml:370

302−#, qt-format

303−msgid "Sorry, incorrect %1"

357+#: qml/Tutorial/TutorialBottom.qml:29

358+msgid "Swipe up from the bottom edge."

304359msgstr ""

305360

306−#: qml/Shell.qml:371

307−msgid "Sorry, incorrect passphrase"

361+#: qml/Tutorial/TutorialLeftFinish.qml:24

362+msgid "These are the shortcuts to favorite apps"

308363msgstr ""

309364

310−#: qml/Shell.qml:372

311−msgid "Please re-enter"

365+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

366+msgid "Tap here to continue."

312367msgstr ""

313368

314−#: qml/Shell.qml:373

315−msgid "Sorry, incorrect passcode"

369+#: qml/Tutorial/TutorialLeft.qml:26

370+msgid "Open the launcher"

316371msgstr ""

317372

318−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

319−msgid "Sorry, incorrect passphrase."

373+#: qml/Tutorial/TutorialLeft.qml:27

374+msgid "Short swipe from the left edge."

320375msgstr ""

321376

322−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

323−msgid "Sorry, incorrect passcode."

377+#: qml/Tutorial/TutorialPage.qml:178

378+msgid "You almost got it!"

324379msgstr ""

325380

326−#: qml/Shell.qml:469

327−msgid "This will be your last attempt."

381+#: qml/Tutorial/TutorialPage.qml:195

382+msgid "Try again."

328383msgstr ""

329384

330−#: qml/Shell.qml:471

331−msgid ""

332−"If passphrase is entered incorrectly, your phone will conduct a factory "

333−"reset and all personal data will be deleted."

385+#: qml/Tutorial/TutorialRight.qml:31

386+msgid "To view open apps"

334387msgstr ""

335388

336−#: qml/Shell.qml:472

337−msgid ""

338−"If passcode is entered incorrectly, your phone will conduct a factory reset "

339−"and all personal data will be deleted."

389+#: qml/Tutorial/TutorialRight.qml:32

390+msgid "Long swipe from the right edge."

391+msgstr ""

392+

393+#: qml/Tutorial/TutorialRight.qml:122

394+msgid "View all your running tasks."

340395msgstr ""

341396

342397#: qml/Wizard/Page.qml:89

398+msgctxt "Button: Go back one page in the Wizard"

343399msgid "Back"

344400msgstr ""

345401

@@ -356,7 +412,7 @@ msgid "Let’s get started."

356412msgstr ""

357413

358414#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

359−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

415+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

360416#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

361417#: qml/Wizard/Pages/passwd-set.qml:90

362418msgid "Continue"

@@ -366,11 +422,11 @@ msgstr ""

366422msgid "Add a SIM card and restart your device"

367423msgstr ""

368424

369−#: qml/Wizard/Pages/20-sim.qml:55

425+#: qml/Wizard/Pages/20-sim.qml:59

370426msgid "Without it, you won’t be able to make calls or use text messaging."

371427msgstr ""

372428

373−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

429+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

374430msgid "Skip"

375431msgstr ""

376432

@@ -383,38 +439,44 @@ msgid "Please select how you’d like to unlock your phone."

383439msgstr ""

384440

385441#: qml/Wizard/Pages/30-passwd-type.qml:97

442+msgctxt "Label: Type of security method"

386443msgid "Swipe"

387444msgstr ""

388445

389446#: qml/Wizard/Pages/30-passwd-type.qml:98

447+msgctxt "Label: Description of security method"

390448msgid "No security"

391449msgstr ""

392450

393451#: qml/Wizard/Pages/30-passwd-type.qml:100

452+msgctxt "Label: Type of security method"

394453msgid "Passcode"

395454msgstr ""

396455

397456#: qml/Wizard/Pages/30-passwd-type.qml:101

457+msgctxt "Label: Description of security method"

398458msgid "4 digits only"

399459msgstr ""

400460

401461#: qml/Wizard/Pages/30-passwd-type.qml:103

462+msgctxt "Label: Type of security method"

402463msgid "Passphrase"

403464msgstr ""

404465

405466#: qml/Wizard/Pages/30-passwd-type.qml:104

467+msgctxt "Label: Description of security method"

406468msgid "Numbers and letters"

407469msgstr ""

408470

409−#: qml/Wizard/Pages/40-wifi.qml:28

471+#: qml/Wizard/Pages/40-wifi.qml:29

410472msgid "Connect to Wi‑Fi"

411473msgstr ""

412474

413−#: qml/Wizard/Pages/40-wifi.qml:147

475+#: qml/Wizard/Pages/40-wifi.qml:168

414476msgid "Available networks…"

415477msgstr ""

416478

417−#: qml/Wizard/Pages/40-wifi.qml:148

479+#: qml/Wizard/Pages/40-wifi.qml:169

418480msgid "No available networks."

419481msgstr ""

420482

po/es.po+324−194

@@ -7,18 +7,18 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-08 08:01+0000\n"

12−"Last-Translator: Paco Molinero <paco@byasl.com>\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-03-27 21:24+0000\n"

12+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"

1313"Language-Team: Spanish <es@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-03-28 05:32+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr "Contraseña: "

2424

@@ -31,138 +31,112 @@ msgstr "Anclar"

3131msgid "Unpin shortcut"

3232msgstr "Desanclar"

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr "Dispositivo bloqueado"

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr ""

4141"Se ha proporcionado una contraseña errónea demasiadas veces. Se ha bloqueado "

4242"el dispositivo."

4343

44−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

4545msgid "You have been locked out due to too many failed passcode attempts."

4646msgstr ""

4747"Se ha bloqueado el dispositivo debido al gran número de intentos fallidos de "

4848"desbloqueo."

4949

50−#: qml/Components/DelayedLockscreen.qml:72

50+#: qml/Components/DelayedLockscreen.qml:74

5151#, qt-format

5252msgid "Please wait %1 minute and then try again…"

5353msgid_plural "Please wait %1 minutes and then try again…"

5454msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."

5555msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."

5656

57−#: qml/Components/Dialogs.qml:70

57+#: qml/Components/Dialogs.qml:67

58+msgctxt "Title: Lock/Log out dialog"

5859msgid "Log out"

5960msgstr "Cerrar la sesión"

6061

61−#: qml/Components/Dialogs.qml:71

62+#: qml/Components/Dialogs.qml:68

6263msgid "Are you sure you want to log out?"

63−msgstr "̉¿Está seguro de que quiere cerrar la sesión?"

64+msgstr "¿Seguro que quiere cerrar la sesión?"

6465

65−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66−#: qml/Components/Dialogs.qml:122

67−msgid "No"

68−msgstr "No"

66+#: qml/Components/Dialogs.qml:70

67+msgctxt "Button: Lock the system"

68+msgid "Lock"

69+msgstr "Bloquear"

6970

70−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71−#: qml/Components/Dialogs.qml:129

72−msgid "Yes"

73−msgstr "Sí"

71+#: qml/Components/Dialogs.qml:77

72+msgctxt "Button: Log out from the system"

73+msgid "Log Out"

74+msgstr "Cerrar la sesión"

75+

76+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

77+#: qml/Components/Dialogs.qml:171

78+msgid "Cancel"

79+msgstr "Cancelar"

7480

75−#: qml/Components/Dialogs.qml:94

81+#: qml/Components/Dialogs.qml:96

82+msgctxt "Title: Reboot/Shut down dialog"

7683msgid "Shut down"

7784msgstr "Apagar"

7885

79−#: qml/Components/Dialogs.qml:95

86+#: qml/Components/Dialogs.qml:97

8087msgid "Are you sure you want to shut down?"

8188msgstr "¿Está seguro de que quiere apagar?"

8289

83−#: qml/Components/Dialogs.qml:119

90+#: qml/Components/Dialogs.qml:99

91+msgctxt "Button: Reboot the system"

92+msgid "Reboot"

93+msgstr "Reiniciar"

94+

95+#: qml/Components/Dialogs.qml:107

96+msgctxt "Button: Shut down the system"

97+msgid "Shut down"

98+msgstr "Apagar"

99+

100+#: qml/Components/Dialogs.qml:127

101+msgctxt "Title: Reboot dialog"

84102msgid "Reboot"

85103msgstr "Reiniciar"

86104

87−#: qml/Components/Dialogs.qml:120

105+#: qml/Components/Dialogs.qml:128

88106msgid "Are you sure you want to reboot?"

89−msgstr "¿Esta seguro de que quiere reiniciar?"

107+msgstr "¿Seguro que quiere reiniciar?"

108+

109+#: qml/Components/Dialogs.qml:130

110+msgid "No"

111+msgstr "No"

112+

113+#: qml/Components/Dialogs.qml:136

114+msgid "Yes"

115+msgstr "Sí"

90116

91−#: qml/Components/Dialogs.qml:144

117+#: qml/Components/Dialogs.qml:150

118+msgctxt "Title: Power off/Restart dialog"

92119msgid "Power"

93120msgstr "Apagar"

94121

95−#: qml/Components/Dialogs.qml:145

122+#: qml/Components/Dialogs.qml:151

96123msgid ""

97124"Are you sure you would like\n"

98125"to power off?"

99126msgstr ""

100−"¿Está seguro de que quiere\n"

127+"¿Seguro que quiere\n"

101128"apagar?"

102129

103−#: qml/Components/Dialogs.qml:147

130+#: qml/Components/Dialogs.qml:153

131+msgctxt "Button: Power off the system"

104132msgid "Power off"

105133msgstr "Apagar"

106134

107−#: qml/Components/Dialogs.qml:157

135+#: qml/Components/Dialogs.qml:162

136+msgctxt "Button: Restart the system"

108137msgid "Restart"

109138msgstr "Reiniciar"

110139

111−#: qml/Components/Dialogs.qml:167

112−msgid "Cancel"

113−msgstr "Cancelar"

114−

115−#: qml/Components/EdgeDemoOverlay.qml:151

116−msgid "Skip intro"

117−msgstr "Omitir la introducción"

118−

119−#: qml/Components/EdgeDemo.qml:125

120−msgid "Right edge"

121−msgstr "Borde derecho"

122−

123−#: qml/Components/EdgeDemo.qml:126

124−msgid "Try swiping from the right edge to unlock the phone"

125−msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"

126−

127−#: qml/Components/EdgeDemo.qml:157

128−msgid "Top edge"

129−msgstr "Borde superior"

130−

131−#: qml/Components/EdgeDemo.qml:158

132−msgid "Try swiping from the top edge to access the indicators"

133−msgstr ""

134−"Deslice el dedo desde el borde superior para acceder a los indicadores"

135−

136−#: qml/Components/EdgeDemo.qml:183

137−msgid "Close"

138−msgstr "Cerrar"

139−

140−#: qml/Components/EdgeDemo.qml:184

141−msgid "Swipe up again to close the settings screen"

142−msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"

143−

144−#: qml/Components/EdgeDemo.qml:214

145−msgid "Left edge"

146−msgstr "Borde izquierdo"

147−

148−#: qml/Components/EdgeDemo.qml:215

149−msgid "Swipe from the left to reveal the launcher for quick access to apps"

150−msgstr ""

151−"Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "

152−"rápidamente a las aplicaciones"

153−

154−#: qml/Components/EdgeDemo.qml:242

155−msgid "Well done"

156−msgstr "Bien hecho"

157−

158−#: qml/Components/EdgeDemo.qml:243

159−msgid ""

160−"You have now mastered the edge gestures and can start using the "

161−"phone Tap on the screen to start"

162−msgstr ""

163−"Ahora domina los gestos de los bordes y puede usar el teléfono Toque "

164−"la pantalla para comenzar"

165−

166140#: qml/Components/Lockscreen.qml:238

167141msgid "Return to Call"

168142msgstr "Volver a la llamada"

@@ -175,32 +149,39 @@ msgstr "Llamada de emergencia"

175149msgid "OK"

176150msgstr "Aceptar"

177151

178−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

179153msgid "See less"

180154msgstr "Ver menos"

181155

182−#: qml/Dash/GenericScopeView.qml:431

156+#: qml/Dash/GenericScopeView.qml:533

183157msgid "See all"

184158msgstr "Ver todo"

185159

186−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

187−#: qml/Panel/SearchIndicator.qml:27

160+#: qml/Dash/GenericScopeView.qml:595

161+msgctxt "Label: Hint for dash search line edit"

188162msgid "Search"

189−msgstr "Buscar"

163+msgstr "Búsqueda"

190164

191−#: qml/Dash/PageHeader.qml:260

165+#: qml/Dash/PageHeader.qml:269

166+msgctxt "Button: Open the Ubuntu Store"

192167msgid "Store"

193168msgstr "Tienda"

194169

195−#: qml/Dash/PageHeader.qml:277

170+#: qml/Dash/PageHeader.qml:276

171+msgctxt "Button: Start a search in the current dash scope"

172+msgid "Search"

173+msgstr "Buscar"

174+

175+#: qml/Dash/PageHeader.qml:286

176+msgctxt "Button: Show the current dash scope settings"

196177msgid "Settings"

197−msgstr "Configuración"

178+msgstr "Ajustes"

198179

199−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

200181msgid "Remove from Favorites"

201182msgstr "Quitar de favoritos"

202183

203−#: qml/Dash/PageHeader.qml:284

184+#: qml/Dash/PageHeader.qml:293

204185msgid "Add to Favorites"

205186msgstr "Añadir a favoritos"

206187

@@ -232,29 +213,99 @@ msgstr "Deslice para actualizar…"

232213msgid "Release to refresh…"

233214msgstr "Suelte para actualizar…"

234215

235−#: qml/Dash/ScopesList.qml:63

216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

217+msgid "Enable location data"

218+msgstr "Activar datos de ubicación"

219+

220+#: qml/Dash/ScopesList.qml:66

236221msgid "Manage"

237−msgstr ""

222+msgstr "Administrar"

238223

239−#: qml/Dash/ScopesList.qml:107

224+#: qml/Dash/ScopesList.qml:112

240225msgid "Home"

241−msgstr ""

226+msgstr "Inicio"

242227

243−#: qml/Dash/ScopesList.qml:108

228+#: qml/Dash/ScopesList.qml:113

244229msgid "Also installed"

245−msgstr ""

230+msgstr "También instalados"

246231

247−#: qml/Greeter/Greeter.qml:174

232+#: qml/Greeter/CoverPage.qml:107

248233msgid "Unlock"

249234msgstr "Desbloquear"

250235

236+#: qml/Greeter/LoginList.qml:236

237+msgid "Retry"

238+msgstr "Reintentar"

239+

240+#: qml/Greeter/LoginList.qml:237

241+msgid "Tap to unlock"

242+msgstr "Toque para desbloquear"

243+

244+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

245+msgid "Sorry, incorrect passphrase."

246+msgstr "La contraseña es incorrecta."

247+

248+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

249+msgid "Sorry, incorrect passcode."

250+msgstr "Código de acceso incorrecto."

251+

252+#: qml/Greeter/NarrowView.qml:55

253+msgid "This will be your last attempt."

254+msgstr "Este será su último intento."

255+

256+#: qml/Greeter/NarrowView.qml:57

257+msgid ""

258+"If passphrase is entered incorrectly, your phone will conduct a factory "

259+"reset and all personal data will be deleted."

260+msgstr ""

261+"Si se introduce la frase incorrectamente, el teléfono volverá a la "

262+"configuración de fábrica y se perderán todos los datos personales."

263+

264+#: qml/Greeter/NarrowView.qml:58

265+msgid ""

266+"If passcode is entered incorrectly, your phone will conduct a factory reset "

267+"and all personal data will be deleted."

268+msgstr ""

269+"Si se introduce el código incorrectamente, el teléfono volverá a la "

270+"configuración de fábrica y se perderán todos los datos personales."

271+

272+#: qml/Greeter/NarrowView.qml:115

273+#, qt-format

274+msgid "Enter %1"

275+msgstr "Introduzca %1"

276+

277+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

278+msgid "Enter passphrase"

279+msgstr "Introduzca la contraseña"

280+

281+#: qml/Greeter/NarrowView.qml:117

282+msgid "Enter passcode"

283+msgstr "Introduzca el código"

284+

285+#: qml/Greeter/NarrowView.qml:118

286+#, qt-format

287+msgid "Sorry, incorrect %1"

288+msgstr "Incorrecto (%1)"

289+

290+#: qml/Greeter/NarrowView.qml:119

291+msgid "Sorry, incorrect passphrase"

292+msgstr "La contraseña es incorrecta"

293+

294+#: qml/Greeter/NarrowView.qml:120

295+msgid "Please re-enter"

296+msgstr "Reintroduzca"

297+

298+#: qml/Greeter/NarrowView.qml:121

299+msgid "Sorry, incorrect passcode"

300+msgstr "El código es incorrecto"

301+

251302#: qml/Notifications/NotificationMenuItemFactory.qml:128

252303msgid "Show password"

253304msgstr "Mostrar contraseña"

254305

255306#: qml/Panel/ActiveCallHint.qml:79

256307msgid "Tap to return to call..."

257−msgstr "Toque para volver a llamar..."

308+msgstr "Toque para volver a la llamada…"

258309

259310#: qml/Panel/ActiveCallHint.qml:92

260311msgid "Conference"

@@ -288,6 +339,11 @@ msgstr "Finalizado"

288339msgid "Failed, tap to retry"

289340msgstr "Falló, toque para reintentar"

290341

342+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

343+msgctxt "Label: Hint in message indicator line edit"

344+msgid "Reply"

345+msgstr "Responder"

346+

291347#: qml/Panel/Indicators/ModemInfoItem.qml:105

292348msgid "Unlock SIM"

293349msgstr "Desbloquear SIM"

@@ -296,158 +352,159 @@ msgstr "Desbloquear SIM"

296352msgid "Roaming"

297353msgstr "Itinerancia"

298354

299−#: qml/Shell.qml:367

300−#, qt-format

301−msgid "Enter %1"

302−msgstr "Introduzca %1"

355+#: qml/Tutorial/TutorialBottomFinish.qml:24

356+msgid "This action does different things for different apps"

357+msgstr "Esta acción tiene efectos diferentes en cada aplicación"

303358

304−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

305−msgid "Enter passphrase"

306−msgstr "Introduzca la contraseña"

359+#: qml/Tutorial/TutorialBottomFinish.qml:25

360+msgid "Tap here to finish."

361+msgstr "Toque aquí para finalizar."

307362

308−#: qml/Shell.qml:369

309−msgid "Enter passcode"

310−msgstr "Introduzca el código"

363+#: qml/Tutorial/TutorialBottom.qml:28

364+msgid "Open special menus"

365+msgstr "Abrir menús especiales"

311366

312−#: qml/Shell.qml:370

313−#, qt-format

314−msgid "Sorry, incorrect %1"

315−msgstr "Incorrecto (%1)"

367+#: qml/Tutorial/TutorialBottom.qml:29

368+msgid "Swipe up from the bottom edge."

369+msgstr "Deslizar hacia arriba desde el borde inferior."

316370

317−#: qml/Shell.qml:371

318−msgid "Sorry, incorrect passphrase"

319−msgstr "La contraseña es incorrecta"

371+#: qml/Tutorial/TutorialLeftFinish.qml:24

372+msgid "These are the shortcuts to favorite apps"

373+msgstr "Esto son atajos a las aplicaciones favoritas"

320374

321−#: qml/Shell.qml:372

322−msgid "Please re-enter"

323−msgstr "Reintroduzca"

375+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

376+msgid "Tap here to continue."

377+msgstr "Toque aquí para continuar."

324378

325−#: qml/Shell.qml:373

326−msgid "Sorry, incorrect passcode"

327−msgstr "El código es incorrecto"

379+#: qml/Tutorial/TutorialLeft.qml:26

380+msgid "Open the launcher"

381+msgstr "Abrir el lanzador"

328382

329−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

330−msgid "Sorry, incorrect passphrase."

331−msgstr "La contraseña es incorrecta."

383+#: qml/Tutorial/TutorialLeft.qml:27

384+msgid "Short swipe from the left edge."

385+msgstr "Deslizamiento corto desde el borde izquierdo."

332386

333−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

334−msgid "Sorry, incorrect passcode."

335−msgstr "Código de acceso incorrecto."

387+#: qml/Tutorial/TutorialPage.qml:178

388+msgid "You almost got it!"

389+msgstr "¡Casi lo tiene!"

336390

337−#: qml/Shell.qml:469

338−msgid "This will be your last attempt."

339−msgstr "Este será su último intento."

391+#: qml/Tutorial/TutorialPage.qml:195

392+msgid "Try again."

393+msgstr "Inténtelo de nuevo."

340394

341−#: qml/Shell.qml:471

342−msgid ""

343−"If passphrase is entered incorrectly, your phone will conduct a factory "

344−"reset and all personal data will be deleted."

345−msgstr ""

346−"Si se introduce la frase incorrectamente, el teléfono volverá a la "

347−"configuración de fábrica y se perderán todos los datos personales."

395+#: qml/Tutorial/TutorialRight.qml:31

396+msgid "To view open apps"

397+msgstr "Para ver las aplicaciones abiertas"

348398

349−#: qml/Shell.qml:472

350−msgid ""

351−"If passcode is entered incorrectly, your phone will conduct a factory reset "

352−"and all personal data will be deleted."

353−msgstr ""

354−"Si se introduce el código incorrectamente, el teléfono volverá a la "

355−"configuración de fábrica y se perderán todos los datos personales."

399+#: qml/Tutorial/TutorialRight.qml:32

400+msgid "Long swipe from the right edge."

401+msgstr "Deslizamiento largo desde el borde derecho."

402+

403+#: qml/Tutorial/TutorialRight.qml:122

404+msgid "View all your running tasks."

405+msgstr "Ver todas las tareas en ejecución."

356406

357407#: qml/Wizard/Page.qml:89

408+msgctxt "Button: Go back one page in the Wizard"

358409msgid "Back"

359−msgstr ""

410+msgstr "Atrás"

360411

361412#: qml/Wizard/Pages/10-welcome.qml:27

362413msgid "Hi!"

363−msgstr ""

414+msgstr "¡Hola!"

364415

365416#: qml/Wizard/Pages/10-welcome.qml:44

366417msgid "Welcome to your Ubuntu phone."

367−msgstr ""

418+msgstr "Bienvenido a su teléfono Ubuntu."

368419

369420#: qml/Wizard/Pages/10-welcome.qml:52

370421msgid "Let’s get started."

371−msgstr ""

422+msgstr "Comencemos."

372423

373424#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

374−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

425+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

375426#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

376427#: qml/Wizard/Pages/passwd-set.qml:90

377428msgid "Continue"

378−msgstr ""

429+msgstr "Continuar"

379430

380431#: qml/Wizard/Pages/20-sim.qml:25

381432msgid "Add a SIM card and restart your device"

382−msgstr ""

433+msgstr "Inserte una tarjeta SIM y reinicie el dispositivo"

383434

384−#: qml/Wizard/Pages/20-sim.qml:55

435+#: qml/Wizard/Pages/20-sim.qml:59

385436msgid "Without it, you won’t be able to make calls or use text messaging."

386−msgstr ""

437+msgstr "Sin ella, no podrá hacer llamadas ni enviar mensajes."

387438

388−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

439+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

389440msgid "Skip"

390−msgstr ""

441+msgstr "Omitir"

391442

392443#: qml/Wizard/Pages/30-passwd-type.qml:39

393444msgid "Lock security"

394−msgstr ""

445+msgstr "Seguridad de bloqueo"

395446

396447#: qml/Wizard/Pages/30-passwd-type.qml:74

397448msgid "Please select how you’d like to unlock your phone."

398−msgstr ""

449+msgstr "Seleccione el método de desbloqueo del teléfono."

399450

400451#: qml/Wizard/Pages/30-passwd-type.qml:97

452+msgctxt "Label: Type of security method"

401453msgid "Swipe"

402−msgstr ""

454+msgstr "Deslizar"

403455

404456#: qml/Wizard/Pages/30-passwd-type.qml:98

457+msgctxt "Label: Description of security method"

405458msgid "No security"

406−msgstr ""

459+msgstr "Sin seguridad"

407460

408461#: qml/Wizard/Pages/30-passwd-type.qml:100

462+msgctxt "Label: Type of security method"

409463msgid "Passcode"

410−msgstr ""

464+msgstr "Código"

411465

412466#: qml/Wizard/Pages/30-passwd-type.qml:101

467+msgctxt "Label: Description of security method"

413468msgid "4 digits only"

414−msgstr ""

469+msgstr "Solo 4 dígitos"

415470

416471#: qml/Wizard/Pages/30-passwd-type.qml:103

472+msgctxt "Label: Type of security method"

417473msgid "Passphrase"

418−msgstr ""

474+msgstr "Contraseña"

419475

420476#: qml/Wizard/Pages/30-passwd-type.qml:104

477+msgctxt "Label: Description of security method"

421478msgid "Numbers and letters"

422−msgstr ""

479+msgstr "Números y letras"

423480

424−#: qml/Wizard/Pages/40-wifi.qml:28

481+#: qml/Wizard/Pages/40-wifi.qml:29

425482msgid "Connect to Wi‑Fi"

426−msgstr ""

483+msgstr "Conectar con wifi"

427484

428−#: qml/Wizard/Pages/40-wifi.qml:147

485+#: qml/Wizard/Pages/40-wifi.qml:168

429486msgid "Available networks…"

430−msgstr ""

487+msgstr "Redes disponibles…"

431488

432−#: qml/Wizard/Pages/40-wifi.qml:148

489+#: qml/Wizard/Pages/40-wifi.qml:169

433490msgid "No available networks."

434−msgstr ""

491+msgstr "No hay redes disponibles."

435492

436493#: qml/Wizard/Pages/50-location.qml:27

437494msgid "Location"

438−msgstr ""

495+msgstr "Ubicación"

439496

440497#: qml/Wizard/Pages/50-location.qml:62

441498msgid "Let the phone detect your location:"

442−msgstr ""

499+msgstr "Permitir que el teléfono detecte su ubicación:"

443500

444501#: qml/Wizard/Pages/50-location.qml:69

445502msgid "Using GPS only (less accurate)"

446−msgstr ""

503+msgstr "Usando solo GPS (poco preciso)"

447504

448505#: qml/Wizard/Pages/50-location.qml:86

449506msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

450−msgstr ""

507+msgstr "Usando GPS, wifi anonimizado y red de datos móviles (recomendado)"

451508

452509#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

453510#: qml/Wizard/Pages/50-location.qml:103

@@ -455,81 +512,87 @@ msgid ""

455512"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

456513"conditions</a>."

457514msgstr ""

515+"Al seleccionar esta opción acepta los <a href='#'>términos y condiciones</a> "

516+"de Nokia HERE."

458517

459518#: qml/Wizard/Pages/50-location.qml:112

460519msgid "Not at all"

461−msgstr ""

520+msgstr "De ningún modo"

462521

463522#: qml/Wizard/Pages/50-location.qml:124

464523msgid "You can change your mind later in System Settings."

465−msgstr ""

524+msgstr "Si cambia de opinión, vaya a Configuración del sistema."

466525

467526#: qml/Wizard/Pages/60-reporting.qml:24

468527msgid "Improving your experience"

469−msgstr ""

528+msgstr "Mejorar la experiencia"

470529

471530#: qml/Wizard/Pages/60-reporting.qml:36

472531msgid ""

473532"Your phone is set up to automatically report errors to Canonical and its "

474533"partners, the makers of the operating system."

475534msgstr ""

535+"El teléfono está configurado para enviar automáticamente informes de error a "

536+"Canonical y sus socios, los creadores del sistema operativo."

476537

477538#: qml/Wizard/Pages/60-reporting.qml:43

478539msgid ""

479540"This can be disabled in System Settings under Security & "

480541"Privacy"

481542msgstr ""

543+"Esto se puede desactivar en Configuración del sistema > "

544+"Seguridad y privacidad."

482545

483546#: qml/Wizard/Pages/80-finished.qml:24

484547msgid "All done"

485−msgstr ""

548+msgstr "Hecho"

486549

487550#: qml/Wizard/Pages/80-finished.qml:39

488551msgid "Nice work!"

489−msgstr ""

552+msgstr "¡Buen trabajo!"

490553

491554#: qml/Wizard/Pages/80-finished.qml:46

492555msgid "Your phone is now ready to use."

493−msgstr ""

556+msgstr "El teléfono ya está listo para usarse."

494557

495558#: qml/Wizard/Pages/80-finished.qml:53

496559msgid "Finish"

497−msgstr ""

560+msgstr "Finalizar"

498561

499562#: qml/Wizard/Pages/here-terms.qml:27

500563msgid "Terms & Conditions"

501−msgstr ""

564+msgstr "Términos y condiciones"

502565

503566#: qml/Wizard/Pages/passwd-confirm.qml:49

504567msgid "Confirm passphrase"

505−msgstr ""

568+msgstr "Confirme la contraseña"

506569

507570#: qml/Wizard/Pages/passwd-confirm.qml:50

508571msgid "Confirm passcode"

509−msgstr ""

572+msgstr "Confirme el código"

510573

511574#: qml/Wizard/Pages/passwd-confirm.qml:53

512575#: qml/Wizard/Pages/passwd-confirm.qml:54

513576msgid "Please try again."

514−msgstr ""

577+msgstr "Inténtelo de nuevo."

515578

516579#: qml/Wizard/Pages/passwd-set.qml:61

517580msgid "Choose your passcode"

518−msgstr ""

581+msgstr "Elija su código"

519582

520583#: qml/Wizard/Pages/passwd-set.qml:68

521584msgid "Passphrase must be 4 characters long"

522−msgstr ""

585+msgstr "El código debe tener 4 caracteres"

523586

524587#: qml/Wizard/StackButton.qml:39

525588#, qt-format

526589msgid "〈 %1"

527−msgstr ""

590+msgstr "〈 %1"

528591

529592#: qml/Wizard/StackButton.qml:42

530593#, qt-format

531594msgid "%1 〉"

532−msgstr ""

595+msgstr "%1 〉"

533596

534597#~ msgid "Confirm"

535598#~ msgstr "Confirmar"

@@ -546,14 +609,81 @@ msgstr ""

546609#~ msgid "Speaking..."

547610#~ msgstr "Hablando…"

548611

612+#~ msgid "Search"

613+#~ msgstr "Buscar"

614+

615+#~ msgid "Top edge"

616+#~ msgstr "Borde superior"

617+

618+#~ msgid "Close"

619+#~ msgstr "Cerrar"

620+

621+#~ msgid "Left edge"

622+#~ msgstr "Borde izquierdo"

623+

624+#~ msgid "Skip intro"

625+#~ msgstr "Omitir la introducción"

626+

627+#~ msgid "Right edge"

628+#~ msgstr "Borde derecho"

629+

630+#~ msgid "Well done"

631+#~ msgstr "Bien hecho"

632+

633+#~ msgid "Swipe up again to close the settings screen"

634+#~ msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"

635+

636+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

637+#~ msgstr ""

638+#~ "Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "

639+#~ "rápidamente a las aplicaciones"

640+

641+#~ msgid "Try swiping from the right edge to unlock the phone"

642+#~ msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"

643+

644+#~ msgid "Try swiping from the top edge to access the indicators"

645+#~ msgstr ""

646+#~ "Deslice el dedo desde el borde superior para acceder a los indicadores"

647+

648+#~ msgid ""

649+#~ "You have now mastered the edge gestures and can start using the "

650+#~ "phone Tap on the screen to start"

651+#~ msgstr ""

652+#~ "Ahora domina los gestos de los bordes y puede usar el teléfono Toque "

653+#~ "la pantalla para comenzar"

654+

655+#~ msgid "Power off"

656+#~ msgstr "Apagar"

657+

549658#~ msgid "All"

550659#~ msgstr "Todo"

551660

552661#~ msgid "Favorites"

553662#~ msgstr "Favoritos"

554663

664+#~ msgid "Store"

665+#~ msgstr "Tienda"

666+

555667#~ msgid "Done"

556668#~ msgstr "Hecho"

557669

670+#~ msgid "Reboot"

671+#~ msgstr "Reiniciar"

672+

673+#~ msgid "Shut down"

674+#~ msgstr "Apagar"

675+

676+#~ msgid "Settings"

677+#~ msgstr "Configuración"

678+

679+#~ msgid "Log out"

680+#~ msgstr "Cerrar la sesión"

681+

682+#~ msgid "Restart"

683+#~ msgstr "Reiniciar"

684+

685+#~ msgid "Power"

686+#~ msgstr "Apagar"

687+

558688#~ msgid "Manage Scopes"

559689#~ msgstr "Administrar Scopes"

po/eu.po+317−185

@@ -7,18 +7,18 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-08 14:44+0000\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-01-22 21:40+0000\n"

1212"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

1313"Language-Team: Basque <eu@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

2020

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

2323msgstr "Pasahitza: "

2424

@@ -31,134 +31,108 @@ msgstr "Ainguratu lasterbidea"

3131msgid "Unpin shortcut"

3232msgstr "Askatu lasterbidea"

3333

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

3535msgid "Device Locked"

3636msgstr "Gailua blokeatuta"

3737

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr ""

4141"Gailua blokeatu da, pasaesaldia sartzeko saiakera gehiegi hutsegin "

4242"dituzulako."

4343

44−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

4545msgid "You have been locked out due to too many failed passcode attempts."

4646msgstr ""

4747"Gailua blokeatu da, pasakodea sartzeko saiakera gehiegi hutsegin dituzulako."

4848

49−#: qml/Components/DelayedLockscreen.qml:72

49+#: qml/Components/DelayedLockscreen.qml:74

5050#, qt-format

5151msgid "Please wait %1 minute and then try again…"

5252msgid_plural "Please wait %1 minutes and then try again…"

5353msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"

5454msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"

5555

56−#: qml/Components/Dialogs.qml:70

56+#: qml/Components/Dialogs.qml:67

57+msgctxt "Title: Lock/Log out dialog"

5758msgid "Log out"

58−msgstr "Amaitu saioa"

59+msgstr ""

5960

60−#: qml/Components/Dialogs.qml:71

61+#: qml/Components/Dialogs.qml:68

6162msgid "Are you sure you want to log out?"

6263msgstr "Ziur saioa amaitu nahi duzula?"

6364

64−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

65−#: qml/Components/Dialogs.qml:122

66−msgid "No"

67−msgstr "Ez"

65+#: qml/Components/Dialogs.qml:70

66+msgctxt "Button: Lock the system"

67+msgid "Lock"

68+msgstr ""

6869

69−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

70−#: qml/Components/Dialogs.qml:129

71−msgid "Yes"

72−msgstr "Bai"

70+#: qml/Components/Dialogs.qml:77

71+msgctxt "Button: Log out from the system"

72+msgid "Log Out"

73+msgstr ""

74+

75+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

76+#: qml/Components/Dialogs.qml:171

77+msgid "Cancel"

78+msgstr "Utzi"

7379

74−#: qml/Components/Dialogs.qml:94

80+#: qml/Components/Dialogs.qml:96

81+msgctxt "Title: Reboot/Shut down dialog"

7582msgid "Shut down"

76−msgstr "Itzali"

83+msgstr ""

7784

78−#: qml/Components/Dialogs.qml:95

85+#: qml/Components/Dialogs.qml:97

7986msgid "Are you sure you want to shut down?"

8087msgstr "Ziur itzali nahi duzula?"

8188

82−#: qml/Components/Dialogs.qml:119

89+#: qml/Components/Dialogs.qml:99

90+msgctxt "Button: Reboot the system"

8391msgid "Reboot"

84−msgstr "Berrabiarazi"

92+msgstr ""

93+

94+#: qml/Components/Dialogs.qml:107

95+msgctxt "Button: Shut down the system"

96+msgid "Shut down"

97+msgstr ""

98+

99+#: qml/Components/Dialogs.qml:127

100+msgctxt "Title: Reboot dialog"

101+msgid "Reboot"

102+msgstr ""

85103

86−#: qml/Components/Dialogs.qml:120

104+#: qml/Components/Dialogs.qml:128

87105msgid "Are you sure you want to reboot?"

88106msgstr "Ziur berrabiarazi nahi duzula?"

89107

90−#: qml/Components/Dialogs.qml:144

108+#: qml/Components/Dialogs.qml:130

109+msgid "No"

110+msgstr "Ez"

111+

112+#: qml/Components/Dialogs.qml:136

113+msgid "Yes"

114+msgstr "Bai"

115+

116+#: qml/Components/Dialogs.qml:150

117+msgctxt "Title: Power off/Restart dialog"

91118msgid "Power"

92−msgstr "Piztu/itzali"

119+msgstr ""

93120

94−#: qml/Components/Dialogs.qml:145

121+#: qml/Components/Dialogs.qml:151

95122msgid ""

96123"Are you sure you would like\n"

97124"to power off?"

98125msgstr "Ziur itzali nahi duzula?"

99126

100−#: qml/Components/Dialogs.qml:147

127+#: qml/Components/Dialogs.qml:153

128+msgctxt "Button: Power off the system"

101129msgid "Power off"

102−msgstr "Itzali"

103−

104−#: qml/Components/Dialogs.qml:157

105−msgid "Restart"

106−msgstr "Berrabiarazi"

107−

108−#: qml/Components/Dialogs.qml:167

109−msgid "Cancel"

110−msgstr "Utzi"

111−

112−#: qml/Components/EdgeDemoOverlay.qml:151

113−msgid "Skip intro"

114−msgstr "Saltatu aurkezpena"

115−

116−#: qml/Components/EdgeDemo.qml:125

117−msgid "Right edge"

118−msgstr "Eskuineko ertza"

119−

120−#: qml/Components/EdgeDemo.qml:126

121−msgid "Try swiping from the right edge to unlock the phone"

122130msgstr ""

123−"Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"

124−

125−#: qml/Components/EdgeDemo.qml:157

126−msgid "Top edge"

127−msgstr "Goiko ertza"

128−

129−#: qml/Components/EdgeDemo.qml:158

130−msgid "Try swiping from the top edge to access the indicators"

131−msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"

132−

133−#: qml/Components/EdgeDemo.qml:183

134−msgid "Close"

135−msgstr "Itxi"

136−

137−#: qml/Components/EdgeDemo.qml:184

138−msgid "Swipe up again to close the settings screen"

139−msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"

140131

141−#: qml/Components/EdgeDemo.qml:214

142−msgid "Left edge"

143−msgstr "Ezkerreko ertza"

144−

145−#: qml/Components/EdgeDemo.qml:215

146−msgid "Swipe from the left to reveal the launcher for quick access to apps"

147−msgstr ""

148−"Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak berehala eskura "

149−"izateko"

150−

151−#: qml/Components/EdgeDemo.qml:242

152−msgid "Well done"

153−msgstr "Bikain"

154−

155−#: qml/Components/EdgeDemo.qml:243

156−msgid ""

157−"You have now mastered the edge gestures and can start using the "

158−"phone Tap on the screen to start"

132+#: qml/Components/Dialogs.qml:162

133+msgctxt "Button: Restart the system"

134+msgid "Restart"

159135msgstr ""

160−"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "

161−"zaitezke Sakatu pantailan hasteko"

162136

163137#: qml/Components/Lockscreen.qml:238

164138msgid "Return to Call"

@@ -172,32 +146,39 @@ msgstr "Larrialdi-deia"

172146msgid "OK"

173147msgstr "Ados"

174148

175−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

149+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

176150msgid "See less"

177151msgstr "Ikusi gutxiago"

178152

179−#: qml/Dash/GenericScopeView.qml:431

153+#: qml/Dash/GenericScopeView.qml:533

180154msgid "See all"

181155msgstr "Ikusi guztiak"

182156

183−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

184−#: qml/Panel/SearchIndicator.qml:27

157+#: qml/Dash/GenericScopeView.qml:595

158+msgctxt "Label: Hint for dash search line edit"

185159msgid "Search"

186−msgstr "Bilatu"

160+msgstr ""

187161

188−#: qml/Dash/PageHeader.qml:260

162+#: qml/Dash/PageHeader.qml:269

163+msgctxt "Button: Open the Ubuntu Store"

189164msgid "Store"

190−msgstr "Denda"

165+msgstr ""

166+

167+#: qml/Dash/PageHeader.qml:276

168+msgctxt "Button: Start a search in the current dash scope"

169+msgid "Search"

170+msgstr ""

191171

192−#: qml/Dash/PageHeader.qml:277

172+#: qml/Dash/PageHeader.qml:286

173+msgctxt "Button: Show the current dash scope settings"

193174msgid "Settings"

194−msgstr "Ezarpenak"

175+msgstr ""

195176

196−#: qml/Dash/PageHeader.qml:284

177+#: qml/Dash/PageHeader.qml:293

197178msgid "Remove from Favorites"

198179msgstr "Kendu gogokoetatik"

199180

200−#: qml/Dash/PageHeader.qml:284

181+#: qml/Dash/PageHeader.qml:293

201182msgid "Add to Favorites"

202183msgstr "Gehitu gogokoetara"

203184

@@ -229,22 +210,92 @@ msgstr "Tiratu freskatzeko…"

229210msgid "Release to refresh…"

230211msgstr "Askatu freskatzeko…"

231212

232−#: qml/Dash/ScopesList.qml:63

233−msgid "Manage"

213+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

214+msgid "Enable location data"

234215msgstr ""

235216

236−#: qml/Dash/ScopesList.qml:107

217+#: qml/Dash/ScopesList.qml:66

218+msgid "Manage"

219+msgstr "Kudeatu"

220+

221+#: qml/Dash/ScopesList.qml:112

237222msgid "Home"

238−msgstr ""

223+msgstr "Hasiera"

239224

240−#: qml/Dash/ScopesList.qml:108

225+#: qml/Dash/ScopesList.qml:113

241226msgid "Also installed"

242−msgstr ""

227+msgstr "Hau ere instalatuta"

243228

244−#: qml/Greeter/Greeter.qml:174

229+#: qml/Greeter/CoverPage.qml:107

245230msgid "Unlock"

246231msgstr "Desblokeatu"

247232

233+#: qml/Greeter/LoginList.qml:236

234+msgid "Retry"

235+msgstr ""

236+

237+#: qml/Greeter/LoginList.qml:237

238+msgid "Tap to unlock"

239+msgstr ""

240+

241+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

242+msgid "Sorry, incorrect passphrase."

243+msgstr "Sentitzen dugu, pasaesaldia okerra da."

244+

245+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

246+msgid "Sorry, incorrect passcode."

247+msgstr "Sentitzen dugu, pasakodea okerra da."

248+

249+#: qml/Greeter/NarrowView.qml:55

250+msgid "This will be your last attempt."

251+msgstr "Hau duzu azken saiakera."

252+

253+#: qml/Greeter/NarrowView.qml:57

254+msgid ""

255+"If passphrase is entered incorrectly, your phone will conduct a factory "

256+"reset and all personal data will be deleted."

257+msgstr ""

258+"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "

259+"berrezarri eta datu pertsonal guztiak ezabatuko dira."

260+

261+#: qml/Greeter/NarrowView.qml:58

262+msgid ""

263+"If passcode is entered incorrectly, your phone will conduct a factory reset "

264+"and all personal data will be deleted."

265+msgstr ""

266+"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "

267+"berrezarri eta datu pertsonal guztiak ezabatuko dira."

268+

269+#: qml/Greeter/NarrowView.qml:115

270+#, qt-format

271+msgid "Enter %1"

272+msgstr "Sartu %1"

273+

274+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

275+msgid "Enter passphrase"

276+msgstr "Sartu pasaesaldia"

277+

278+#: qml/Greeter/NarrowView.qml:117

279+msgid "Enter passcode"

280+msgstr "Sartu pasakodea"

281+

282+#: qml/Greeter/NarrowView.qml:118

283+#, qt-format

284+msgid "Sorry, incorrect %1"

285+msgstr "Sentitzen dugu, %1 okerra da"

286+

287+#: qml/Greeter/NarrowView.qml:119

288+msgid "Sorry, incorrect passphrase"

289+msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"

290+

291+#: qml/Greeter/NarrowView.qml:120

292+msgid "Please re-enter"

293+msgstr "Errepikatu"

294+

295+#: qml/Greeter/NarrowView.qml:121

296+msgid "Sorry, incorrect passcode"

297+msgstr "Sentitzen dugu, pasakodea okerra da"

298+

248299#: qml/Notifications/NotificationMenuItemFactory.qml:128

249300msgid "Show password"

250301msgstr "Erakutsi pasahitza"

@@ -285,6 +336,11 @@ msgstr "Amaituta"

285336msgid "Failed, tap to retry"

286337msgstr "Huts egin du, sakatu berriro saiatzeko"

287338

339+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

340+msgctxt "Label: Hint in message indicator line edit"

341+msgid "Reply"

342+msgstr ""

343+

288344#: qml/Panel/Indicators/ModemInfoItem.qml:105

289345msgid "Unlock SIM"

290346msgstr "Desblokeatu SIMa"

@@ -293,158 +349,161 @@ msgstr "Desblokeatu SIMa"

293349msgid "Roaming"

294350msgstr "Ibiltaritza"

295351

296−#: qml/Shell.qml:367

297−#, qt-format

298−msgid "Enter %1"

299−msgstr "Sartu %1"

352+#: qml/Tutorial/TutorialBottomFinish.qml:24

353+msgid "This action does different things for different apps"

354+msgstr ""

300355

301−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

302−msgid "Enter passphrase"

303−msgstr "Sartu pasaesaldia"

356+#: qml/Tutorial/TutorialBottomFinish.qml:25

357+msgid "Tap here to finish."

358+msgstr ""

304359

305−#: qml/Shell.qml:369

306−msgid "Enter passcode"

307−msgstr "Sartu pasakodea"

360+#: qml/Tutorial/TutorialBottom.qml:28

361+msgid "Open special menus"

362+msgstr ""

308363

309−#: qml/Shell.qml:370

310−#, qt-format

311−msgid "Sorry, incorrect %1"

312−msgstr "Sentitzen dugu, %1 okerra da"

364+#: qml/Tutorial/TutorialBottom.qml:29

365+msgid "Swipe up from the bottom edge."

366+msgstr ""

313367

314−#: qml/Shell.qml:371

315−msgid "Sorry, incorrect passphrase"

316−msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"

368+#: qml/Tutorial/TutorialLeftFinish.qml:24

369+msgid "These are the shortcuts to favorite apps"

370+msgstr ""

317371

318−#: qml/Shell.qml:372

319−msgid "Please re-enter"

320−msgstr "Errepikatu"

372+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

373+msgid "Tap here to continue."

374+msgstr ""

321375

322−#: qml/Shell.qml:373

323−msgid "Sorry, incorrect passcode"

324−msgstr "Sentitzen dugu, pasakodea okerra da"

376+#: qml/Tutorial/TutorialLeft.qml:26

377+msgid "Open the launcher"

378+msgstr ""

325379

326−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

327−msgid "Sorry, incorrect passphrase."

328−msgstr "Sentitzen dugu, pasaesaldia okerra da."

380+#: qml/Tutorial/TutorialLeft.qml:27

381+msgid "Short swipe from the left edge."

382+msgstr ""

329383

330−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

331−msgid "Sorry, incorrect passcode."

332−msgstr "Sentitzen dugu, pasakodea okerra da."

384+#: qml/Tutorial/TutorialPage.qml:178

385+msgid "You almost got it!"

386+msgstr ""

333387

334−#: qml/Shell.qml:469

335−msgid "This will be your last attempt."

336−msgstr "Hau duzu azken saiakera."

388+#: qml/Tutorial/TutorialPage.qml:195

389+msgid "Try again."

390+msgstr ""

337391

338−#: qml/Shell.qml:471

339−msgid ""

340−"If passphrase is entered incorrectly, your phone will conduct a factory "

341−"reset and all personal data will be deleted."

392+#: qml/Tutorial/TutorialRight.qml:31

393+msgid "To view open apps"

342394msgstr ""

343−"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "

344−"berrezarri eta datu pertsonal guztiak ezabatuko dira."

345395

346−#: qml/Shell.qml:472

347−msgid ""

348−"If passcode is entered incorrectly, your phone will conduct a factory reset "

349−"and all personal data will be deleted."

396+#: qml/Tutorial/TutorialRight.qml:32

397+msgid "Long swipe from the right edge."

398+msgstr ""

399+

400+#: qml/Tutorial/TutorialRight.qml:122

401+msgid "View all your running tasks."

350402msgstr ""

351−"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "

352−"berrezarri eta datu pertsonal guztiak ezabatuko dira."

353403

354404#: qml/Wizard/Page.qml:89

405+msgctxt "Button: Go back one page in the Wizard"

355406msgid "Back"

356407msgstr ""

357408

358409#: qml/Wizard/Pages/10-welcome.qml:27

359410msgid "Hi!"

360−msgstr ""

411+msgstr "Epa!"

361412

362413#: qml/Wizard/Pages/10-welcome.qml:44

363414msgid "Welcome to your Ubuntu phone."

364−msgstr ""

415+msgstr "Ongi etorri zure Ubuntu telefonora."

365416

366417#: qml/Wizard/Pages/10-welcome.qml:52

367418msgid "Let’s get started."

368−msgstr ""

419+msgstr "Has gaitezen."

369420

370421#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

371−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

422+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

372423#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

373424#: qml/Wizard/Pages/passwd-set.qml:90

374425msgid "Continue"

375−msgstr ""

426+msgstr "Jarraitu"

376427

377428#: qml/Wizard/Pages/20-sim.qml:25

378429msgid "Add a SIM card and restart your device"

379−msgstr ""

430+msgstr "Gehitu SIM txartel bat eta berrabiarazi zure gailua"

380431

381−#: qml/Wizard/Pages/20-sim.qml:55

432+#: qml/Wizard/Pages/20-sim.qml:59

382433msgid "Without it, you won’t be able to make calls or use text messaging."

383−msgstr ""

434+msgstr "Hura gabe, ezingo duzu deirik egin edo testu-mezularitza erabili."

384435

385−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

436+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

386437msgid "Skip"

387−msgstr ""

438+msgstr "Saltatu"

388439

389440#: qml/Wizard/Pages/30-passwd-type.qml:39

390441msgid "Lock security"

391−msgstr ""

442+msgstr "Blokeo-segurtasuna"

392443

393444#: qml/Wizard/Pages/30-passwd-type.qml:74

394445msgid "Please select how you’d like to unlock your phone."

395−msgstr ""

446+msgstr "Aukeratu telefonoa nola desblokeatu nahi duzun."

396447

397448#: qml/Wizard/Pages/30-passwd-type.qml:97

449+msgctxt "Label: Type of security method"

398450msgid "Swipe"

399451msgstr ""

400452

401453#: qml/Wizard/Pages/30-passwd-type.qml:98

454+msgctxt "Label: Description of security method"

402455msgid "No security"

403456msgstr ""

404457

405458#: qml/Wizard/Pages/30-passwd-type.qml:100

459+msgctxt "Label: Type of security method"

406460msgid "Passcode"

407461msgstr ""

408462

409463#: qml/Wizard/Pages/30-passwd-type.qml:101

464+msgctxt "Label: Description of security method"

410465msgid "4 digits only"

411466msgstr ""

412467

413468#: qml/Wizard/Pages/30-passwd-type.qml:103

469+msgctxt "Label: Type of security method"

414470msgid "Passphrase"

415471msgstr ""

416472

417473#: qml/Wizard/Pages/30-passwd-type.qml:104

474+msgctxt "Label: Description of security method"

418475msgid "Numbers and letters"

419476msgstr ""

420477

421−#: qml/Wizard/Pages/40-wifi.qml:28

478+#: qml/Wizard/Pages/40-wifi.qml:29

422479msgid "Connect to Wi‑Fi"

423−msgstr ""

480+msgstr "Konektatu wifira"

424481

425−#: qml/Wizard/Pages/40-wifi.qml:147

482+#: qml/Wizard/Pages/40-wifi.qml:168

426483msgid "Available networks…"

427−msgstr ""

484+msgstr "Sare erabilgarriak…"

428485

429−#: qml/Wizard/Pages/40-wifi.qml:148

486+#: qml/Wizard/Pages/40-wifi.qml:169

430487msgid "No available networks."

431−msgstr ""

488+msgstr "Ez dago sare erabilgarririk."

432489

433490#: qml/Wizard/Pages/50-location.qml:27

434491msgid "Location"

435−msgstr ""

492+msgstr "Kokalekua"

436493

437494#: qml/Wizard/Pages/50-location.qml:62

438495msgid "Let the phone detect your location:"

439−msgstr ""

496+msgstr "Utzi telefonoari zure kokalekua detektatzen:"

440497

441498#: qml/Wizard/Pages/50-location.qml:69

442499msgid "Using GPS only (less accurate)"

443−msgstr ""

500+msgstr "GPSa soilik erabiltzen (zehaztasun gutxiago)"

444501

445502#: qml/Wizard/Pages/50-location.qml:86

446503msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

447504msgstr ""

505+"GPSa, wifi anonimotua eta sare mugikorraren informazioa erabiltzen "

506+"(gomendatua)"

448507

449508#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

450509#: qml/Wizard/Pages/50-location.qml:103

@@ -452,81 +511,105 @@ msgid ""

452511"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

453512"conditions</a>."

454513msgstr ""

514+"Aukera hau hautatuz, Nokia HERE(r)en <a href='#'>baldintzak</a> onartzeko "

515+"dituzu."

455516

456517#: qml/Wizard/Pages/50-location.qml:112

457518msgid "Not at all"

458−msgstr ""

519+msgstr "Bat ere ez"

459520

460521#: qml/Wizard/Pages/50-location.qml:124

461522msgid "You can change your mind later in System Settings."

462−msgstr ""

523+msgstr "Geroago ere alda dezakezu Sistemaren ezarpenetan."

463524

464525#: qml/Wizard/Pages/60-reporting.qml:24

465526msgid "Improving your experience"

466−msgstr ""

527+msgstr "Zure esperientzia hobetuz"

467528

468529#: qml/Wizard/Pages/60-reporting.qml:36

469530msgid ""

470531"Your phone is set up to automatically report errors to Canonical and its "

471532"partners, the makers of the operating system."

472533msgstr ""

534+"Telefonoa erroreen berria automatikoki Canonical-i eta honen bazkideei "

535+"emateko konfiguratuta dago, sistema eragilearen egileei."

473536

474537#: qml/Wizard/Pages/60-reporting.qml:43

475538msgid ""

476539"This can be disabled in System Settings under Security & "

477540"Privacy"

478541msgstr ""

542+"Hau Sistemaren ezarpenetatik desgaitu daiteke, Segurtasuna eta "

543+"pribatutasuna atalean"

479544

480545#: qml/Wizard/Pages/80-finished.qml:24

481546msgid "All done"

482−msgstr ""

547+msgstr "Eginda"

483548

484549#: qml/Wizard/Pages/80-finished.qml:39

485550msgid "Nice work!"

486−msgstr ""

551+msgstr "Bikain!"

487552

488553#: qml/Wizard/Pages/80-finished.qml:46

489554msgid "Your phone is now ready to use."

490−msgstr ""

555+msgstr "Zure telefonoa erabiltzeko prest dago."

491556

492557#: qml/Wizard/Pages/80-finished.qml:53

493558msgid "Finish"

494−msgstr ""

559+msgstr "Amaitu"

495560

496561#: qml/Wizard/Pages/here-terms.qml:27

497562msgid "Terms & Conditions"

498−msgstr ""

563+msgstr "Baldintzak"

499564

500565#: qml/Wizard/Pages/passwd-confirm.qml:49

501566msgid "Confirm passphrase"

502−msgstr ""

567+msgstr "Berretsi pasaesaldia"

503568

504569#: qml/Wizard/Pages/passwd-confirm.qml:50

505570msgid "Confirm passcode"

506−msgstr ""

571+msgstr "Berretsi pasakodea"

507572

508573#: qml/Wizard/Pages/passwd-confirm.qml:53

509574#: qml/Wizard/Pages/passwd-confirm.qml:54

510575msgid "Please try again."

511−msgstr ""

576+msgstr "Saiatu berriro."

512577

513578#: qml/Wizard/Pages/passwd-set.qml:61

514579msgid "Choose your passcode"

515−msgstr ""

580+msgstr "Aukeratu zure pasakodea"

516581

517582#: qml/Wizard/Pages/passwd-set.qml:68

518583msgid "Passphrase must be 4 characters long"

519−msgstr ""

584+msgstr "Pasaesaldiak 4 karaktereko luzera izan behar du"

520585

521586#: qml/Wizard/StackButton.qml:39

522587#, qt-format

523588msgid "〈 %1"

524−msgstr ""

589+msgstr "〈 %1"

525590

526591#: qml/Wizard/StackButton.qml:42

527592#, qt-format

528593msgid "%1 〉"

529−msgstr ""

594+msgstr "%1 〉"

595+

596+#~ msgid "Top edge"

597+#~ msgstr "Goiko ertza"

598+

599+#~ msgid "Close"

600+#~ msgstr "Itxi"

601+

602+#~ msgid "Left edge"

603+#~ msgstr "Ezkerreko ertza"

604+

605+#~ msgid "Well done"

606+#~ msgstr "Bikain"

607+

608+#~ msgid "Skip intro"

609+#~ msgstr "Saltatu aurkezpena"

610+

611+#~ msgid "Right edge"

612+#~ msgstr "Eskuineko ertza"

530613

531614#~ msgid "Type or say a command"

532615#~ msgstr "Idatzi edo esan agindu bat"

@@ -540,6 +623,41 @@ msgstr ""

540623#~ msgid "Speaking..."

541624#~ msgstr "Hitz egiten..."

542625

626+#~ msgid "Search"

627+#~ msgstr "Bilatu"

628+

629+#~ msgid ""

630+#~ "You have now mastered the edge gestures and can start using the "

631+#~ "phone Tap on the screen to start"

632+#~ msgstr ""

633+#~ "Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "

634+#~ "zaitezke Sakatu pantailan hasteko"

635+

636+#~ msgid "Try swiping from the top edge to access the indicators"

637+#~ msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"

638+

639+#~ msgid "Swipe up again to close the settings screen"

640+#~ msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"

641+

642+#~ msgid "Try swiping from the right edge to unlock the phone"

643+#~ msgstr ""

644+#~ "Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"

645+

646+#~ msgid "Log out"

647+#~ msgstr "Amaitu saioa"

648+

649+#~ msgid "Reboot"

650+#~ msgstr "Berrabiarazi"

651+

652+#~ msgid "Shut down"

653+#~ msgstr "Itzali"

654+

655+#~ msgid "Settings"

656+#~ msgstr "Ezarpenak"

657+

658+#~ msgid "Power off"

659+#~ msgstr "Itzali"

660+

543661#~ msgid "Done"

544662#~ msgstr "Eginda"

545663

@@ -549,6 +667,20 @@ msgstr ""

549667#~ msgid "Favorites"

550668#~ msgstr "Gogokoak"

551669

670+#~ msgid "Store"

671+#~ msgstr "Denda"

672+

673+#~ msgid "Restart"

674+#~ msgstr "Berrabiarazi"

675+

676+#~ msgid "Power"

677+#~ msgstr "Piztu/itzali"

678+

679+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

680+#~ msgstr ""

681+#~ "Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak berehala eskura "

682+#~ "izateko"

683+

552684#~ msgid "Confirm"

553685#~ msgstr "Berretsi"

554686

po/fa.po+315−183

This diff is too big to show here.

po/fi.po+269−145

This diff is too big to show here.

po/fo.po+193−122

This diff is too big to show here.

po/fr.po+336−192

This diff is too big to show here.

po/gd.po+325−190

This diff is too big to show here.

po/gl.po+277−153

This diff is too big to show here.

po/gv.ponew file+649

This diff is too big to show here.

po/he.po+237−131

This diff is too big to show here.

po/hi.po+205−122

This diff is too big to show here.

po/hr.po+187−122

This diff is too big to show here.

po/hu.po+276−152

This diff is too big to show here.

po/hy.po+249−142

This diff is too big to show here.

po/id.po+275−151

This diff is too big to show here.

po/is.po+273−149

This diff is too big to show here.

po/it.po+332−190

This diff is too big to show here.

po/ja.po+269−145

This diff is too big to show here.

po/km.po+272−148

This diff is too big to show here.

po/kn.po+187−122

This diff is too big to show here.

po/ko.po+321−189

This diff is too big to show here.

po/ku.po+264−143

This diff is too big to show here.

po/ky.po+187−122

This diff is too big to show here.

po/lo.po+193−122

This diff is too big to show here.

po/lt.po+220−125

This diff is too big to show here.

po/lv.po+324−198

This diff is too big to show here.

po/ml.po+220−125

This diff is too big to show here.

po/mr.po+214−122

This diff is too big to show here.

po/ms.po+272−148

This diff is too big to show here.

po/my.po+205−122

This diff is too big to show here.

po/nb.po+326−188

This diff is too big to show here.

po/nl.po+317−184

This diff is too big to show here.

po/oc.ponew file+579

This diff is too big to show here.

po/or.ponew file+579

This diff is too big to show here.

po/pa.po+321−212

This diff is too big to show here.

po/pl.po+340−201

This diff is too big to show here.

po/pt.po+319−189

This diff is too big to show here.

po/pt_BR.po+333−198

This diff is too big to show here.

po/ro.po+323−188

This diff is too big to show here.

po/ru.po+319−186

This diff is too big to show here.

po/shn.po+183−121

This diff is too big to show here.

po/si.po+183−121

This diff is too big to show here.

po/sk.ponew file+579

This diff is too big to show here.

po/sl.po+330−190

This diff is too big to show here.

po/sq.po+202−122

This diff is too big to show here.

po/sr.po+329−195

This diff is too big to show here.

po/sv.po+325−193

This diff is too big to show here.

po/sw.po+190−122

This diff is too big to show here.

po/ta.po+220−125

This diff is too big to show here.

po/te.po+211−122

This diff is too big to show here.

po/th.po+183−121

This diff is too big to show here.

po/tr.po+326−192

This diff is too big to show here.

po/ug.po+272−148

This diff is too big to show here.

po/uk.po+287−150

This diff is too big to show here.

po/unity8.pot+181−119

This diff is too big to show here.

po/update-unity-pot+1

This diff is too big to show here.

po/vi.po+183−121

This diff is too big to show here.

po/xh.po+183−121

This diff is too big to show here.

po/zh_CN.po+231−125

This diff is too big to show here.

po/zh_HK.po+223−123

This diff is too big to show here.

po/zh_TW.po+314−189

This diff is too big to show here.

qml/CMakeLists.txt+3−2

This diff is too big to show here.

qml/Components/Carousel.qml+6−2

This diff is too big to show here.

qml/Components/DelayedLockscreen.qml+3−1

This diff is too big to show here.

qml/Components/Dialogs.qml+32−33

This diff is too big to show here.

qml/Components/EdgeDemo.qmldeleted−254

This diff is too big to show here.

qml/Components/EdgeDemoOverlay.qmldeleted−273

This diff is too big to show here.

qml/Components/Lockscreen.qml+14−7

This diff is too big to show here.

qml/Components/PassphraseLockscreen.qml+7−7

This diff is too big to show here.

qml/Components/PhysicalKeysMapper.qmlnew file+113

This diff is too big to show here.

qml/Components/PinLockscreen.qml+156−145

This diff is too big to show here.

qml/Components/PinPadButton.qml+3−2

This diff is too big to show here.

qml/Components/VolumeKeyFilter.qmldeleted−63

This diff is too big to show here.

qml/Dash/CardCarousel.qml+6−2

This diff is too big to show here.

qml/Dash/CardHorizontalList.qml+7−2

This diff is too big to show here.

qml/Dash/Dash.qml+38−32

This diff is too big to show here.

qml/Dash/DashContent.qml+3−9

This diff is too big to show here.

qml/Dash/DashNavigation.qml+4

This diff is too big to show here.

qml/Dash/DashNavigationButton.qml+2

This diff is too big to show here.

qml/Dash/DashRenderer.qml+6−1

This diff is too big to show here.

qml/Dash/GenericScopeView.qml+121−45

This diff is too big to show here.

qml/Dash/PageHeader.qml+5−3

This diff is too big to show here.

qml/Dash/Previews/Preview.qml+1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

qml/Dash/Previews/PreviewTable.qml+6

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

qml/Dash/ScopesList.qml+1

This diff is too big to show here.

qml/Dash/ScopesListCategoryItem.qml+1

This diff is too big to show here.

qml/Greeter/Clock.qml+1−1

This diff is too big to show here.

qml/Greeter/CoverPage.qmlnew file+216

This diff is too big to show here.

qml/Greeter/Greeter.qml+333−142

This diff is too big to show here.

qml/Greeter/GreeterContent.qmldeleted−158

This diff is too big to show here.

qml/Greeter/Infographics.qml+10−7

This diff is too big to show here.

qml/Greeter/LoginList.qml+67−85

This diff is too big to show here.

qml/Greeter/NarrowView.qmlnew file+170

This diff is too big to show here.

qml/Greeter/WideView.qmlnew file+134

This diff is too big to show here.

qml/Launcher/Launcher.qml+52−9

This diff is too big to show here.

qml/Launcher/LauncherPanel.qml+7−5

This diff is too big to show here.

qml/Notifications/Notification.qml+36−6

This diff is too big to show here.

qml/Notifications/Notifications.qml+3−7

This diff is too big to show here.

qml/Notifications/SwipeToAct.qml+178−247

This diff is too big to show here.

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

This diff is too big to show here.

qml/Panel/IndicatorItem.qml+2−8

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

qml/Panel/Indicators/MessageMenuItemFactory.qml+1

This diff is too big to show here.

qml/Panel/Indicators/VisibleIndicators.qmldeleted−84

This diff is too big to show here.

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

This diff is too big to show here.

qml/Panel/IndicatorsMenu.qml+25

This diff is too big to show here.

qml/Panel/Panel.qml+7−4

This diff is too big to show here.

qml/Panel/SearchIndicator.qmldeleted−82

This diff is too big to show here.

qml/Shell.qml+150−391

This diff is too big to show here.

qml/Stages/ApplicationWindow.qml+19−3

This diff is too big to show here.

qml/Stages/DecoratedWindow.qml+5−4

This diff is too big to show here.

qml/Stages/DesktopStage.qml+24−48

This diff is too big to show here.

qml/Stages/PhoneStage.qml+69−35

This diff is too big to show here.

qml/Stages/SessionContainer.qml+22−7

This diff is too big to show here.

qml/Stages/SpreadDelegate.qml+2−1

This diff is too big to show here.

qml/Stages/SurfaceContainer.qml+17−28

This diff is too big to show here.

qml/Stages/TabletStage.qml+16−2

This diff is too big to show here.

qml/Stages/TransformedSpreadDelegate.qml+27−21

This diff is too big to show here.

qml/Stages/TransformedTabletSpreadDelegate.qml+1−1

This diff is too big to show here.

qml/Stages/WindowDecoration.qml+1

This diff is too big to show here.

qml/Stages/WindowMoveResizeArea.qmlnew file+109

This diff is too big to show here.

qml/Tutorial/Arrow.qmlnew file+56

This diff is too big to show here.

qml/Tutorial/Slider.qmlnew file+123

This diff is too big to show here.

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

This diff is too big to show here.

qml/Tutorial/Tutorial.qmlnew file+85

This diff is too big to show here.

qml/Tutorial/TutorialBottom.qmlnew file+104

This diff is too big to show here.

qml/Tutorial/TutorialBottomFinish.qmlnew file+41

This diff is too big to show here.

qml/Tutorial/TutorialContent.qmlnew file+125

This diff is too big to show here.

qml/Tutorial/TutorialLeft.qmlnew file+91

This diff is too big to show here.

qml/Tutorial/TutorialLeftFinish.qmlnew file+41

This diff is too big to show here.

qml/Tutorial/TutorialPage.qmlnew file+245

This diff is too big to show here.

qml/Tutorial/TutorialRight.qmlnew file+223

This diff is too big to show here.

qml/Tutorial/graphics/camera.pngnew file

Binary file not shown.

qml/Tutorial/graphics/chevron.pngnew file

Binary file not shown.

qml/Tutorial/graphics/dialer.pngnew file

Binary file not shown.

qml/Tutorial/graphics/facebook.pngnew file

Binary file not shown.

qml/Tutorial/graphics/gallery.pngnew file

Binary file not shown.

qml/Tutorial/graphics/tick.pngnew file

Binary file not shown.

qml/Wizard/Page.qml+1−1

This diff is too big to show here.

qml/Wizard/Pages.qml+16−1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

qml/Wizard/Pages/40-wifi.qml+27−9

This diff is too big to show here.

qml/Wizard/Wizard.qml+6−1

This diff is too big to show here.

run.sh+4−27

This diff is too big to show here.

src/Dash/main.cpp+2−2

This diff is too big to show here.

src/MouseTouchAdaptor.cpp+40−4

This diff is too big to show here.

src/MouseTouchAdaptor.h+18−5

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

src/main.cpp+28−12

This diff is too big to show here.

tests/autopilot/setup.py+2−2

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/autopilot/unity8/fixture_setup.py+83−4

This diff is too big to show here.

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

No changes to the content.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/test_indicators.py+8−23

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/dash.py+4−5

This diff is too big to show here.

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

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/main_window.py+28−7

This diff is too big to show here.

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

This diff is too big to show here.

tests/autopilot/unity8/shell/fixture_setup.py+40−2

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/__init__.py+26−21

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_emulators.py+4−4

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_lock_screen.py+16−27

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_notifications.py+23−12

This diff is too big to show here.

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

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_upstart.py+1−7

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.qmltypes+3

This diff is too big to show here.

tests/mocks/CMakeLists.txt+2

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/LightDM/MockGreeter.cppnew file+35

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/LightDM/QLightDM/InfographicModeldeleted−1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/LightDM/single/UsersModelPrivate.cpp → tests/mocks/LightDM/plugin.hrenamed+13−14

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp → tests/mocks/Lights/plugin.hrenamed+13−14

This diff is too big to show here.

tests/mocks/Lights/qmldirnew file+3

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/qmldir−1

This diff is too big to show here.

tests/mocks/QMenuModel/CMakeLists.txt+1

This diff is too big to show here.

tests/mocks/QMenuModel/QDBusActionGroup.qml+20−67

This diff is too big to show here.

tests/mocks/QMenuModel/QMenuModel.qmltypes+33

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/QMenuModel/plugin.cpp+10

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

The content is the same.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Unity/Unity.qmltypes+21

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Unity/fake_previewwidgetmodel.cpp+11

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.cpp+12

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.h+5

This diff is too big to show here.

tests/mocks/Unity/fake_scopesoverview.cpp+1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/libusermetrics/UserMetrics.cpp+8

This diff is too big to show here.

tests/plugins/CMakeLists.txt+1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertest.cpp+11

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/plugins/LightDM/CMakeLists.txt+18−10

This diff is too big to show here.

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

This diff is too big to show here.

tests/plugins/LightDM/greeter.qml+5

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/CMakeLists.txt+25−21

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Components/tst_EdgeDemoOverlay.qmldeleted−123

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Components/tst_ZoomableImage.qml+7

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Dash/tst_Dash.qml+180−26

This diff is too big to show here.

tests/qmltests/Dash/tst_DashContent.qml+105−27

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Greeter/tst_Infographics.qml+10

This diff is too big to show here.

tests/qmltests/Greeter/tst_MultiGreeter.qmldeleted−386

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Greeter/tst_SingleGreeter.qmldeleted−244

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Launcher/tst_Launcher.qml+102−30

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Notifications/tst_Notifications.qml+285−219

This diff is too big to show here.

tests/qmltests/Notifications/tst_OptionToggle.qml+18−13

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+57−2

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Panel/tst_SearchIndicator.qmldeleted−61

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Stages/RecursingChildSessionControl.qml+3

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Wizard/tst_Wizard.qml+102−18

This diff is too big to show here.

tests/qmltests/tst_Shell.qml+507−96

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml+195−43

This diff is too big to show here.

tests/qmltests/tst_TabletShell.qmldeleted−306

This diff is too big to show here.

tests/uqmlscene/ActiveFocusLogger.cppnew file+48

This diff is too big to show here.

tests/uqmlscene/ActiveFocusLogger.hnew file+37

This diff is too big to show here.

tests/uqmlscene/CMakeLists.txt+1−1

This diff is too big to show here.

tests/uqmlscene/main.cpp+13−4

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/LightDM/single/GreeterPrivate.cpp → tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qmlrenamed+24−27

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/utils/modules/Unity/Test/UnityTestCase.qml+130−86

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tools/registry-tracker.cpp+2

This diff is too big to show here.