git.iko.soy/unity8

on xenial help sign in

CMakeLists.txt+13−5

compare with xenial

unifiedsplit

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

54find_package(Qt5Gui 5.2 REQUIRED)

54find_package(Qt5Gui 5.2 REQUIRED)

55find_package(Qt5DBus 5.2 REQUIRED)

55find_package(Qt5DBus 5.2 REQUIRED)

56find_package(Qt5Concurrent 5.2 REQUIRED)

56find_package(Qt5Concurrent 5.2 REQUIRED)

57+find_package(Qt5Sql 5.2 REQUIRED)

57

58

58# Standard install paths

59# Standard install paths

59include(GNUInstallDirs)

60include(GNUInstallDirs)

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

97# Save a few container detach and conversions

98# Save a few container detach and conversions

98add_definitions(-DQT_STRICT_ITERATORS)

99add_definitions(-DQT_STRICT_ITERATORS)

99

100

100−# Tests

101−include(CTest)

102−enable_testing()

103−

104# Autopilot tests

101# Autopilot tests

105include(autopilot)

102include(autopilot)

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

103declare_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/)

108set(SHELL_APP unity8)

105set(SHELL_APP unity8)

109set(DASH_APP unity8-dash)

106set(DASH_APP unity8-dash)

110set(SCOPE_TOOL unity-scope-tool)

107set(SCOPE_TOOL unity-scope-tool)

108+set(INDICATORS_CLIENT_APP indicators-client)

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

111

110

112include_directories(

111include_directories(

113 ${CMAKE_SOURCE_DIR}/include

112 ${CMAKE_SOURCE_DIR}/include

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

120add_subdirectory(src)

119add_subdirectory(src)

121add_subdirectory(tools)

120add_subdirectory(tools)

122add_subdirectory(qml)

121add_subdirectory(qml)

122+

123+# Tests

124+if (NOT NO_TESTS)

125+ include(CTest)

126+ enable_testing()

123−add_subdirectory(tests)

127+ add_subdirectory(tests)

128+else()

129+ message(STATUS "Tests disabled")

130+endif()

131+

124add_subdirectory(plugins)

132add_subdirectory(plugins)

125

133

126#

134#

CODING+6−6

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

24

24

25 this will:

25 this will:

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

26 - 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

28 are technically "recommends", not strict dependencies

28 are technically "recommends", not strict dependencies

29

29

30build Unity 8

30build Unity 8

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

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

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

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

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

106 the screen

106 the screen

107−- exporting ANDROID_SERIAL=$your_device_serial or

107+- exporting ANDROID_SERIAL=$your_device_serial or

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

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

109 multiple devices

109 multiple devices

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

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

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

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

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

186

186

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

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

188

188

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

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

190

190

191And then run a single test with

191And then run a single test with

192

192

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

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

194

194

195or run them all with

195or run them all with

196

196

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

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

build.sh+4−1

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

61}

61}

62

62

63mk_build_deps() {

63mk_build_deps() {

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

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

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

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

67+ fi

65}

68}

66

69

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

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

cmake/modules/QmlTest.cmake+4−1

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

28

28

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

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

30

30

31−set(test_env UNITY_TESTING=1)

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

32

32

33macro(add_manual_qml_test SUBPATH COMPONENT_NAME)

33macro(add_manual_qml_test SUBPATH COMPONENT_NAME)

34 set(options NO_ADD_TEST NO_TARGETS)

34 set(options NO_ADD_TEST NO_TARGETS)

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

153

153

154macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)

154macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)

155 set(testCommand

155 set(testCommand

156+ ${ENVVAR}

156 LD_LIBRARY_PATH=${LD_PATH}

157 LD_LIBRARY_PATH=${LD_PATH}

158+ dbus-launch

157 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

159 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

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

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

159 -o -,txt)

161 -o -,txt)

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

171 ${ENVVAR}

173 ${ENVVAR}

172 LD_LIBRARY_PATH=${LD_PATH}

174 LD_LIBRARY_PATH=${LD_PATH}

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

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

176+ dbus-launch

174 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

177 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

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

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

176 -o -,txt)

179 -o -,txt)

cmake/modules/autopilot.cmake−8

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

13

13

14 add_dependencies(autopilot autopilot-${TEST_NAME})

14 add_dependencies(autopilot autopilot-${TEST_NAME})

15

15

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−

24endfunction()

16endfunction()

data/CMakeLists.txt+3−1

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

1# generate desktop files

1# generate desktop files

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

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

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

3configure_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)

4

5

5# install desktop files

6# install desktop files

6install(FILES

7install(FILES

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

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

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

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

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

9 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

11 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

10 )

12 )

11

13

12−# install url dispatcher files

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

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

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

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

The content is the same.

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

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

1+[Desktop Entry]

2+Type=Application

3+Name=Indicators Client

4+Comment=Application for testing the Indicators system

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

6+Terminal=false

7+Icon=

8+NoDisplay=false

9+X-Ubuntu-Touch=true

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

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

1+description "Unity Shell v8 Mock Indicator"

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

3+

4+respawn

5+respawn limit 2 10

6+

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

debian/changelog+421

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

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

2+

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

8+

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+

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

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

2

423

3 [ Ubuntu daily release ]

424 [ Ubuntu daily release ]

debian/control+19−19

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

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

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

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

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

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

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

13−# version.

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.

14− g++-4.9,

16+ g++-4.9:native,

15 libconnectivity-qt1-dev,

17 libconnectivity-qt1-dev,

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

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

17 libgl1-mesa-dri,

19 libgl1-mesa-dri,

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

22 libpam0g-dev,

24 libpam0g-dev,

23 libpay2-dev,

25 libpay2-dev,

24 libpulse-dev,

26 libpulse-dev,

25− libqmenumodel-dev (>= 0.2.8),

27+ libqmenumodel-dev (>= 0.2.9),

26 libqt5xmlpatterns5-dev,

28 libqt5xmlpatterns5-dev,

27 libsystemsettings-dev,

29 libsystemsettings-dev,

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

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

29 libusermetricsoutput1-dev,

31 libusermetricsoutput1-dev,

30 libxcb1-dev,

32 libxcb1-dev,

31 pkg-config,

33 pkg-config,

32− python-setuptools,

33 python3-all:any,

34 python3-all:any,

34 python3-setuptools,

35 python3-setuptools,

35− python:any (>= 2.7),

36 qml-module-qt-labs-folderlistmodel,

36 qml-module-qt-labs-folderlistmodel,

37 qml-module-qtquick-layouts,

37 qml-module-qtquick-layouts,

38 qml-module-qtquick-xmllistmodel,

38 qml-module-qtquick-xmllistmodel,

39 qml-module-qtquick2,

39 qml-module-qtquick2,

40+ qml-module-qtsysteminfo,

40 qml-module-qttest,

41 qml-module-qttest,

41 qt5-default,

42 qt5-default,

42 qtbase5-dev (>= 5.2.1),

43 qtbase5-dev (>= 5.2.1),

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

46 qtdeclarative5-dev-tools,

47 qtdeclarative5-dev-tools,

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

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

48 qtdeclarative5-qtmultimedia-plugin,

49 qtdeclarative5-qtmultimedia-plugin,

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

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

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

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

51 qtdeclarative5-ubuntu-web-plugin,

52 qtdeclarative5-ubuntu-web-plugin,

52 ttf-ubuntu-font-family,

53 ttf-ubuntu-font-family,

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

61

62

62Package: indicators-client

63Package: indicators-client

63Architecture: amd64 armhf i386

64Architecture: amd64 armhf i386

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

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

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

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

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

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

67 ${misc:Depends},

68 ${misc:Depends},

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

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

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

76 ${misc:Depends},

77 ${misc:Depends},

77 ${shlibs:Depends},

78 ${shlibs:Depends},

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

80+ pkg-config,

81+ libunity-scopes-dev,

78Description: Development tool for Unity scopes

82Description: Development tool for Unity scopes

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

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

80 on Unity8.

84 on Unity8.

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

85Depends: gsettings-desktop-schemas,

89Depends: gsettings-desktop-schemas,

86 libcap2-bin,

90 libcap2-bin,

87 libglib2.0-bin,

91 libglib2.0-bin,

88− qmenumodel-qml (>= 0.2.8),

92+ qmenumodel-qml (>= 0.2.9),

89 qml-module-qt-labs-folderlistmodel,

93 qml-module-qt-labs-folderlistmodel,

90 qml-module-qtquick-xmllistmodel,

94 qml-module-qtquick-xmllistmodel,

95+ qml-module-qtsysteminfo,

91 qtdeclarative5-gsettings1.0,

96 qtdeclarative5-gsettings1.0,

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

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

93 qtdeclarative5-ubuntu-telephony0.1,

98 qtdeclarative5-ubuntu-telephony0.1,

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

114Package: unity8-common

119Package: unity8-common

115Architecture: all

120Architecture: all

116Depends: qml-module-qtquick-layouts,

121Depends: qml-module-qtquick-layouts,

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

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

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

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

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

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

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

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

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

122 unity-application-impl-4,

127 unity-application-impl-4,

123 unity-notifications-impl-3,

128 unity-notifications-impl-3,

124 unity-plugin-scopes | unity-scopes-impl,

129 unity-plugin-scopes | unity-scopes-impl,

125− unity-scopes-impl-4,

130+ unity-scopes-impl-6,

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

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

127 ${misc:Depends},

132 ${misc:Depends},

128Breaks: unity8 (<< 7.86),

133Breaks: unity8 (<< 7.86),

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

135

140

136Package: unity8-autopilot

141Package: unity8-autopilot

137Architecture: all

142Architecture: all

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

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

144+ gir1.2-glib-2.0,

139 gir1.2-notify-0.7,

145 gir1.2-notify-0.7,

140− libautopilot-qt (>= 1.4),

141 libqt5test5,

146 libqt5test5,

142 libqt5widgets5,

147 libqt5widgets5,

143− python-autopilot,

144− python-evdev,

145− python-fixtures,

146− python-gi,

147− python-mock,

148 python3-autopilot,

148 python3-autopilot,

149 python3-evdev,

149 python3-evdev,

150 python3-fixtures,

150 python3-fixtures,

151 python3-gi,

151 python3-gi,

152+ qttestability-autopilot (>= 1.4),

152 ubuntu-ui-toolkit-autopilot,

153 ubuntu-ui-toolkit-autopilot,

153 unity-scope-click,

154 unity-scope-click,

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

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

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

156 url-dispatcher-tools,

157 url-dispatcher-tools,

157 ${misc:Depends},

158 ${misc:Depends},

158 ${python3:Depends},

159 ${python3:Depends},

159− ${python:Depends},

160 ${shlibs:Depends},

160 ${shlibs:Depends},

161Description: Test package for Unity 8 shell

161Description: Test package for Unity 8 shell

162 Autopilot tests for the unity8 package

162 Autopilot tests for the unity8 package

debian/indicators-client.install+1

@@ -1 +1,2 @@

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

1/usr/bin/indicators-client

2/usr/bin/indicators-client

debian/rules+2−2

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

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

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

15

15

16%:

16%:

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

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

18

18

19override_dh_auto_clean:

19override_dh_auto_clean:

20 dh_auto_clean

20 dh_auto_clean

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

32override_dh_install:

32override_dh_install:

33 # install autopilot tests

33 # install autopilot tests

34 cd tests/autopilot; \

34 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 \

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

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

37 done; \

37 done; \

38 cd $(CURDIR)

38 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

1usr/lib/python*/*/unity*

3usr/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

1usr/share/locale

2usr/share/locale

2usr/share/unity8/Components

3usr/share/unity8/Components

3usr/share/unity8/Dash

4usr/share/unity8/Dash

4usr/share/unity8/Notifications

5usr/share/unity8/Notifications

5usr/share/unity8/graphics

6usr/share/unity8/graphics

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

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

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

debian/unity8-private.install+1

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

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

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

2usr/lib/*/unity8/qml/AccountsService

2usr/lib/*/unity8/qml/AccountsService

3usr/lib/*/unity8/qml/Dash

3usr/lib/*/unity8/qml/Dash

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

4usr/lib/*/unity8/qml/LightDM

5usr/lib/*/unity8/qml/LightDM

5usr/lib/*/unity8/qml/Lights

6usr/lib/*/unity8/qml/Lights

6usr/lib/*/unity8/qml/Powerd

7usr/lib/*/unity8/qml/Powerd

debian/unity8.install+1

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

10usr/share/unity8/Panel

10usr/share/unity8/Panel

11usr/share/unity8/Shell.qml

11usr/share/unity8/Shell.qml

12usr/share/unity8/Stages

12usr/share/unity8/Stages

13+usr/share/unity8/Tutorial

13usr/share/unity8/Wizard

14usr/share/unity8/Wizard

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

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

include/paths.h.in+1−6

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

92

92

93inline QStringList shellDataDirs() {

93inline QStringList shellDataDirs() {

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

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

95− if (!isRunningInstalled()) {

95+ if (isRunningInstalled()) {

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

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

98− }

99− }

100− else {

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

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

102 dirs.append(qmlDirectory());

97 dirs.append(qmlDirectory());

103 }

98 }

plugins/AccountsService/AccountsService.cpp+1−1

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

152

152

153void AccountsService::updateBackgroundFile()

153void AccountsService::updateBackgroundFile()

154{

154{

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();

156 if (m_backgroundFile != backgroundFile) {

156 if (m_backgroundFile != backgroundFile) {

157 m_backgroundFile = backgroundFile;

157 m_backgroundFile = backgroundFile;

158 Q_EMIT backgroundFileChanged();

158 Q_EMIT backgroundFileChanged();

plugins/AccountsService/AccountsService.qmltypes+3

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

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

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

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

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

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

31 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 }

32 }

35 }

33}

36}

plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+20−2

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

25AccountsServiceDBusAdaptor::AccountsServiceDBusAdaptor(QObject* parent)

25AccountsServiceDBusAdaptor::AccountsServiceDBusAdaptor(QObject* parent)

26 : QObject(parent),

26 : QObject(parent),

27 m_accountsManager(nullptr),

27 m_accountsManager(nullptr),

28− m_users()

28+ m_users(),

29+ m_ignoreNextChanged(false)

29{

30{

30 QDBusConnection connection = QDBusConnection::SM_BUSNAME();

31 QDBusConnection connection = QDBusConnection::SM_BUSNAME();

31 QDBusConnectionInterface *interface = connection.interface();

32 QDBusConnectionInterface *interface = connection.interface();

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

57 }

58 }

58}

59}

59

60

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+

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

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

61{

71{

62 // Merge changed and invalidated together

72 // Merge changed and invalidated together

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

66 combined.removeDuplicates();

76 combined.removeDuplicates();

67

77

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

78 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;

69}

84}

70

85

71void AccountsServiceDBusAdaptor::maybeChangedSlot()

86void AccountsServiceDBusAdaptor::maybeChangedSlot()

72{

87{

88+ if (!m_ignoreNextChanged) {

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

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

90+ }

91+ m_ignoreNextChanged = false;

74}

92}

75

93

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

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

plugins/AccountsService/AccountsServiceDBusAdaptor.h+14

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

19#ifndef UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H

19#ifndef UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H

20#define UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H

20#define UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H

21

21

22+#include <QDBusArgument>

22#include <QDBusContext>

23#include <QDBusContext>

23#include <QDBusInterface>

24#include <QDBusInterface>

24#include <QMap>

25#include <QMap>

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

33 explicit AccountsServiceDBusAdaptor(QObject *parent = 0);

34 explicit AccountsServiceDBusAdaptor(QObject *parent = 0);

34

35

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

36 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+

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

47 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);

37

49

38Q_SIGNALS:

50Q_SIGNALS:

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

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

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

49

61

50 QDBusInterface *m_accountsManager;

62 QDBusInterface *m_accountsManager;

51 QMap<QString, QDBusInterface *> m_users;

63 QMap<QString, QDBusInterface *> m_users;

64+

65+ bool m_ignoreNextChanged;

52};

66};

53

67

54#endif

68#endif

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

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

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

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

15 </property>

15 </property>

16

16

17− <!-- Should have been named LauncherItems, sorry folks. -mterry -->

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

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

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

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

20 </property>

19 </property>

21

20

plugins/CMakeLists.txt+1

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

12endmacro()

12endmacro()

13

13

14add_subdirectory(AccountsService)

14add_subdirectory(AccountsService)

15+add_subdirectory(Greeter)

15add_subdirectory(LightDM)

16add_subdirectory(LightDM)

16add_subdirectory(Lights)

17add_subdirectory(Lights)

17add_subdirectory(Dash)

18add_subdirectory(Dash)

plugins/Dash/CardAttributes.qml+2

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

49 Icon {

49 Icon {

50 id: icon

50 id: icon

51 height: units.gu(2)

51 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

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

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

53 color: grid.color

55 color: grid.color

54 }

56 }

plugins/Dash/CardCreator.js+6−1

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

224

224

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

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

226// %2 is used as color of emblemIcon

226// %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

227var kEmblemIconCode = 'Icon { \n\

229var kEmblemIconCode = 'Icon { \n\

228 id: emblemIcon; \n\

230 id: emblemIcon; \n\

229 objectName: "emblemIcon"; \n\

231 objectName: "emblemIcon"; \n\

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

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

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

236 color: %2; \n\

238 color: %2; \n\

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

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

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

238 }\n';

241 }\n';

239

242

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

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

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

255 anchors { %1 } \n\

258 anchors { %1 } \n\

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

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

257 elide: Text.ElideRight; \n\

260 elide: Text.ElideRight; \n\

261+ maximumLineCount: 1; \n\

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

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

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

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

260 color: %2; \n\

264 color: %2; \n\

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

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

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

321 var artAndSummary = hasArt && hasSummary;

325 var artAndSummary = hasArt && hasSummary;

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

326 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"]));

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

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

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

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

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

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

plugins/Dash/Dash.qmltypes+17−1

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

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

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

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

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

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

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

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

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

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

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

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

20 }

21 }

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+ }

21 Component {

37 Component {

22 name: "HorizontalJournal"

38 name: "HorizontalJournal"

23 defaultProperty: "data"

39 defaultProperty: "data"

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

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

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

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

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

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

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

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

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

44 Signal { name: "headerChanged" }

60 Signal { name: "headerChanged" }

45 Method { name: "positionAtBeginning" }

61 Method { name: "positionAtBeginning" }

46 Method { name: "showHeader" }

62 Method { name: "showHeader" }

plugins/Dash/listviewwithpageheader.cpp+7−8

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

973 }

973 }

974 if (growDown) {

974 if (growDown) {

975 adjustMinYExtent();

975 adjustMinYExtent();

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

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

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);

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

981− } else {

978+ }

979+ if (m_visibleItems.isEmpty()) {

982− m_firstVisibleIndex = -1;

980+ m_firstVisibleIndex = -1;

983− }

981+ } else {

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

984 }

983 }

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

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

986 m_firstVisibleIndex -= remove.count;

985 m_firstVisibleIndex -= remove.count;

plugins/Greeter/CMakeLists.txtnew file+6

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

1+macro(add_unity8_greeter_plugin PLUGIN VERSION PATH)

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

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

4+endmacro()

5+

6+add_subdirectory(Unity)

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

@@ -0,0 +1 @@

1+add_subdirectory(Launcher)

plugins/Greeter/Unity/Launcher/CMakeLists.txtnew file+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)

4+

5+add_definitions(-DSM_BUSNAME=systemBus)

6+

7+include_directories(

8+ ${CMAKE_CURRENT_SOURCE_DIR}

9+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService

10+ ${GSETTINGS_QT_INCLUDE_DIRS}

11+ ${libunity8-private_SOURCE_DIR}

12+)

13+

14+set(QMLLAUNCHERPLUGINAS_SRC

15+ plugin.cpp

16+ launchermodelas.cpp

17+ launcheritem.cpp

18+ quicklistmodel.cpp

19+ quicklistentry.cpp

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

21+ ${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

2+

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

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

5+//

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

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

8+

9+Module {

10+ Component {

11+ name: "LauncherItem"

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

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

14+ isCreatable: false

15+ exportMetaObjectRevisions: [0]

16+ }

17+ Component {

18+ name: "LauncherModel"

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

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

21+ isCreatable: false

22+ isSingleton: true

23+ exportMetaObjectRevisions: [0]

24+ Method {

25+ name: "requestRemove"

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

27+ }

28+ Method { name: "refresh" }

29+ Method {

30+ name: "get"

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

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

33+ }

34+ Method {

35+ name: "move"

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

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

38+ }

39+ Method {

40+ name: "pin"

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

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

43+ }

44+ Method {

45+ name: "pin"

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

47+ }

48+ Method {

49+ name: "quickListActionInvoked"

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

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

52+ }

53+ Method {

54+ name: "setUser"

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

56+ }

57+ Method {

58+ name: "getUrlForAppId"

59+ type: "string"

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

61+ }

62+ }

63+ Component {

64+ name: "QuickListModel"

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

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

67+ isCreatable: false

68+ exportMetaObjectRevisions: [0]

69+ }

70+ Component {

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

72+ prototype: "QObject"

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

74+ isCreatable: false

75+ exportMetaObjectRevisions: [0]

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

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

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

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

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

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

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

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

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

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

86+ Property {

87+ name: "quickList"

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

89+ isReadonly: true

90+ isPointer: true

91+ }

92+ Signal {

93+ name: "nameChanged"

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

95+ }

96+ Signal {

97+ name: "iconChanged"

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

99+ }

100+ Signal {

101+ name: "pinnedChanged"

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

103+ }

104+ Signal {

105+ name: "runningChanged"

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

107+ }

108+ Signal {

109+ name: "recentChanged"

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

111+ }

112+ Signal {

113+ name: "progressChanged"

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

115+ }

116+ Signal {

117+ name: "countChanged"

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

119+ }

120+ Signal {

121+ name: "countVisibleChanged"

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

123+ }

124+ Signal {

125+ name: "focusedChanged"

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

127+ }

128+ }

129+ Component {

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

131+ prototype: "QAbstractListModel"

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

133+ isCreatable: false

134+ exportMetaObjectRevisions: [0]

135+ Property {

136+ name: "applicationManager"

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

138+ isPointer: true

139+ }

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

141+ Signal { name: "hint" }

142+ Method {

143+ name: "move"

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

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

146+ }

147+ Method {

148+ name: "get"

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

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

151+ }

152+ Method {

153+ name: "pin"

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

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

156+ }

157+ Method {

158+ name: "pin"

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

160+ }

161+ Method {

162+ name: "requestRemove"

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

164+ }

165+ Method {

166+ name: "quickListActionInvoked"

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

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

169+ }

170+ Method {

171+ name: "setUser"

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

173+ }

174+ }

175+ Component {

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

177+ prototype: "QAbstractListModel"

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

179+ isCreatable: false

180+ exportMetaObjectRevisions: [0]

181+ }

182+}

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

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

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#include "launcheritem.h"

18+#include "quicklistmodel.h"

19+

20+#include <libintl.h>

21+

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

23+ LauncherItemInterface(parent),

24+ m_appId(appId),

25+ m_name(name),

26+ m_icon(icon),

27+ m_pinned(false),

28+ m_running(false),

29+ m_recent(false),

30+ m_progress(-1),

31+ m_count(0),

32+ m_countVisible(false),

33+ m_focused(false),

34+ m_quickList(new QuickListModel(this))

35+{

36+ QuickListEntry nameAction;

37+ nameAction.setActionId("launch_item");

38+ nameAction.setText(m_name);

39+ m_quickList->appendAction(nameAction);

40+}

41+

42+QString LauncherItem::appId() const

43+{

44+ return m_appId;

45+}

46+

47+QString LauncherItem::name() const

48+{

49+ return m_name;

50+}

51+

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

53+{

54+ if (m_name != name) {

55+ m_name = name;

56+ QuickListEntry entry;

57+ entry.setActionId("launch_item");

58+ entry.setText(m_name);

59+ m_quickList->updateAction(entry);

60+ Q_EMIT nameChanged(name);

61+ }

62+}

63+

64+QString LauncherItem::icon() const

65+{

66+ return m_icon;

67+}

68+

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

70+{

71+ if (m_icon != icon) {

72+ m_icon = icon;

73+ Q_EMIT iconChanged(icon);

74+ }

75+}

76+

77+bool LauncherItem::pinned() const

78+{

79+ return m_pinned;

80+}

81+

82+void LauncherItem::setPinned(bool pinned)

83+{

84+ if (m_pinned != pinned) {

85+ m_pinned = pinned;

86+ Q_EMIT pinnedChanged(pinned);

87+ }

88+}

89+

90+bool LauncherItem::running() const

91+{

92+ return m_running;

93+}

94+

95+void LauncherItem::setRunning(bool running)

96+{

97+ if (m_running != running) {

98+ m_running = running;

99+ Q_EMIT runningChanged(running);

100+ }

101+}

102+

103+bool LauncherItem::recent() const

104+{

105+ return m_recent;

106+}

107+

108+void LauncherItem::setRecent(bool recent)

109+{

110+ if (m_recent != recent) {

111+ m_recent = recent;

112+ Q_EMIT recentChanged(recent);

113+ }

114+}

115+

116+int LauncherItem::progress() const

117+{

118+ return m_progress;

119+}

120+

121+void LauncherItem::setProgress(int progress)

122+{

123+ if (m_progress != progress) {

124+ m_progress = progress;

125+ Q_EMIT progressChanged(progress);

126+ }

127+}

128+

129+int LauncherItem::count() const

130+{

131+ return m_count;

132+}

133+

134+void LauncherItem::setCount(int count)

135+{

136+ if (m_count != count) {

137+ m_count = count;

138+ Q_EMIT countChanged(count);

139+ }

140+}

141+

142+bool LauncherItem::countVisible() const

143+{

144+ return m_countVisible;

145+}

146+

147+void LauncherItem::setCountVisible(bool countVisible)

148+{

149+ if (m_countVisible != countVisible) {

150+ m_countVisible = countVisible;

151+ Q_EMIT countVisibleChanged(countVisible);

152+ }

153+}

154+

155+bool LauncherItem::focused() const

156+{

157+ return m_focused;

158+}

159+

160+void LauncherItem::setFocused(bool focused)

161+{

162+ if (m_focused != focused) {

163+ m_focused = focused;

164+ Q_EMIT focusedChanged(focused);

165+ }

166+}

167+

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

169+{

170+ return m_quickList;

171+}

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

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

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#ifndef LAUNCHERITEM_H

18+#define LAUNCHERITEM_H

19+

20+#include "quicklistmodel.h"

21+

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

23+

24+class QuickListModel;

25+

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

27+

28+class LauncherItem: public LauncherItemInterface

29+{

30+ Q_OBJECT

31+public:

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

33+

34+ QString appId() const override;

35+ QString name() const override;

36+ QString icon() const override;

37+ bool pinned() const override;

38+ bool running() const override;

39+ bool recent() const override;

40+ int progress() const override;

41+ int count() const override;

42+ bool countVisible() const override;

43+ bool focused() const override;

44+

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

46+

47+private:

48+ void setName(const QString &name);

49+ void setIcon(const QString &icon);

50+ void setPinned(bool pinned);

51+ void setRunning(bool running);

52+ void setRecent(bool recent);

53+ void setProgress(int progress);

54+ void setCount(int count);

55+ void setCountVisible(bool countVisible);

56+ void setFocused(bool focused);

57+

58+private:

59+ QString m_appId;

60+ QString m_name;

61+ QString m_icon;

62+ bool m_pinned;

63+ bool m_running;

64+ bool m_recent;

65+ int m_progress;

66+ int m_count;

67+ bool m_countVisible;

68+ bool m_focused;

69+ QuickListModel *m_quickList;

70+

71+ friend class LauncherModel;

72+};

73+

74+#endif // LAUNCHERITEM_H

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

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

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#include "launchermodelas.h"

18+#include "launcheritem.h"

19+#include "AccountsServiceDBusAdaptor.h"

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

21+

22+#include <QDesktopServices>

23+#include <QDebug>

24+#include <QDBusArgument>

25+

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

27+

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

29+ LauncherModelInterface(parent),

30+ m_accounts(new AccountsServiceDBusAdaptor(this)),

31+ m_onlyPinned(true)

32+{

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

34+ refresh();

35+}

36+

37+LauncherModel::~LauncherModel()

38+{

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

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

41+ }

42+}

43+

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

45+{

46+ Q_UNUSED(parent)

47+ return m_list.count();

48+}

49+

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

51+{

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

53+ switch(role) {

54+ case RoleAppId:

55+ return item->appId();

56+ case RoleName:

57+ return item->name();

58+ case RoleIcon:

59+ return item->icon();

60+ case RolePinned:

61+ return item->pinned();

62+ case RoleCount:

63+ return item->count();

64+ case RoleCountVisible:

65+ return item->countVisible();

66+ case RoleProgress:

67+ return item->progress();

68+ case RoleFocused:

69+ return item->focused();

70+ }

71+

72+ return QVariant();

73+}

74+

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

76+{

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

78+ return 0;

79+ }

80+ return m_list.at(index);

81+}

82+

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

84+{

85+ Q_UNUSED(oldIndex)

86+ Q_UNUSED(newIndex)

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

88+}

89+

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

91+{

92+ Q_UNUSED(appId)

93+ Q_UNUSED(index)

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

95+}

96+

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

98+{

99+ Q_UNUSED(appId)

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

101+}

102+

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

104+{

105+ int index = findApplication(appId);

106+ if (index < 0) {

107+ return;

108+ }

109+

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

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

112+ if (model) {

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

114+

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

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

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

118+

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

120+ } else {

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

122+ }

123+ }

124+}

125+

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

127+{

128+ if (m_user != username) {

129+ m_user = username;

130+ refresh();

131+ }

132+}

133+

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

135+{

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

137+ if (appId.isEmpty()) {

138+ return QString();

139+ }

140+

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

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

143+ }

144+

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

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

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

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

149+}

150+

151+ApplicationManagerInterface *LauncherModel::applicationManager() const

152+{

153+ return nullptr;

154+}

155+

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

157+{

158+ Q_UNUSED(appManager)

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

160+ return;

161+}

162+

163+bool LauncherModel::onlyPinned() const

164+{

165+ return m_onlyPinned;

166+}

167+

168+void LauncherModel::setOnlyPinned(bool onlyPinned)

169+{

170+ if (m_onlyPinned != onlyPinned) {

171+ m_onlyPinned = onlyPinned;

172+ Q_EMIT onlyPinnedChanged();

173+ refresh();

174+ }

175+}

176+

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

178+{

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

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

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

182+ return i;

183+ }

184+ }

185+ return -1;

186+}

187+

188+typedef QList<QVariantMap> VariantMapList;

189+void LauncherModel::refresh()

190+{

191+ QList<QVariantMap> items;

192+

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

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

195+ }

196+

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

198+ QList<LauncherItem*> toBeRemoved;

199+

200+ Q_FOREACH (LauncherItem* item, m_list) {

201+ bool found = false;

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

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

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

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

206+ found = true;

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

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

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

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

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

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

213+ }

214+ break;

215+ }

216+ }

217+ if (!found) {

218+ toBeRemoved.append(item);

219+ }

220+ }

221+

222+ Q_FOREACH (LauncherItem* item, toBeRemoved) {

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

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

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

226+ endRemoveRows();

227+ }

228+

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

230+ int skipped = 0;

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

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

233+

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

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

236+ skipped++;

237+ continue;

238+ }

239+ int newPosition = asIndex - skipped;

240+

241+ int itemIndex = -1;

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

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

244+ itemIndex = i;

245+ break;

246+ }

247+ }

248+

249+ if (itemIndex == -1) {

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

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

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

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

254+ this);

255+ item->setPinned(true);

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

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

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

259+ m_list.insert(newPosition, item);

260+ endInsertRows();

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

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

263+ // Move it to the addedIndex

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

265+ m_list.move(itemIndex, newPosition);

266+ endMoveRows();

267+ }

268+ }

269+}

270+

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

272+{

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

274+ return;

275+ }

276+ refresh();

277+}

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

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

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#ifndef LAUNCHERMODEL_H

18+#define LAUNCHERMODEL_H

19+

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

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

22+

23+#include <QAbstractListModel>

24+

25+class LauncherItem;

26+class GSettings;

27+class AccountsServiceDBusAdaptor;

28+

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

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

31+

32+class LauncherModel: public LauncherModelInterface

33+{

34+ Q_OBJECT

35+

36+public:

37+ LauncherModel(QObject *parent = 0);

38+ ~LauncherModel();

39+

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

41+

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

43+

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

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

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

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

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

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

50+

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

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

53+

54+ bool onlyPinned() const override;

55+ void setOnlyPinned(bool onlyPinned) override;

56+

57+ int findApplication(const QString &appId);

58+

59+public Q_SLOTS:

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

61+ Q_INVOKABLE void refresh();

62+

63+private Q_SLOTS:

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

65+

66+private:

67+ QString m_user;

68+ QList<LauncherItem*> m_list;

69+ AccountsServiceDBusAdaptor *m_accounts;

70+ bool m_onlyPinned;

71+

72+ friend class LauncherModelASTest;

73+};

74+

75+#endif // LAUNCHERMODEL_H

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

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

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+// Qt

18+#include <QtQml/qqml.h>

19+

20+// self

21+#include "plugin.h"

22+

23+// local

24+#include "launchermodelas.h"

25+#include "launcheritem.h"

26+

27+

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

29+

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

31+{

32+ return new LauncherModel();

33+}

34+

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

36+{

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

38+

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

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

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

42+

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

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

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

46+}

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

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

1/*

1/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2014-2015 Canonical, Ltd.

3 *

3 *

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

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

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

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

12 *

12 *

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

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/>.

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

15− *

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

17 */

15 */

18

16

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

17+#ifndef UNITY_LAUNCHER_PLUGIN_H

18+#define UNITY_LAUNCHER_PLUGIN_H

20

19

21−namespace QLightDM

20+#include <QtQml/QQmlEngine>

22−{

21+#include <QtQml/QQmlExtensionPlugin>

23

22

24−UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

23+class UnityLauncherPlugin : public QQmlExtensionPlugin

25− : q_ptr(parent)

26{

24{

27− entries =

25+ Q_OBJECT

28− {

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

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

27+

28+public:

29+ void registerTypes(const char *uri);

30− };

30+};

31−}

32

31

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−/*

2− * Copyright (C) 2013 Canonical, Ltd.

1+/* Copyright (C) 2014-2015 Canonical, Ltd.

3 *

2 *

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

3 * 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

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

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

12 *

11 *

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

12 * 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/>.

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

15− *

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

17 */

14 */

18

15

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

16+#include "quicklistentry.h"

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

17+

18+QuickListEntry::QuickListEntry()

19+{

20+

21+}

22+

23+QString QuickListEntry::actionId() const

24+{

25+ return m_actionId;

26+}

21

27

22−namespace QLightDM

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

23{

29{

30+ m_actionId = actionId;

31+}

24

32

25−GreeterPrivate::GreeterPrivate(Greeter* parent)

33+QString QuickListEntry::text() const

26− : authenticated(false),

27− authenticationUser(),

28− q_ptr(parent)

29{

34{

35+ return m_text;

30}

36}

31

37

32−void GreeterPrivate::handleAuthenticate()

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

33{

39{

34− Q_Q(Greeter);

40+ m_text = text;

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

36}

41}

37

42

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

43+QString QuickListEntry::icon() const

39{

44{

40− Q_Q(Greeter);

45+ return m_icon;

46+}

41

47

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

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

43− q->sendAuthenticationComplete();

49+{

50+ m_icon = icon;

44}

51}

45

52

53+bool QuickListEntry::clickable() const

54+{

55+ return !m_actionId.isEmpty();

46}

56}

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

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

1+/* Copyright (C) 2014-2015 Canonical, Ltd.

2+ *

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

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

5+ * the Free Software Foundation; version 3.

6+ *

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

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

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

10+ * GNU General Public License for more details.

11+ *

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

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

14+ */

15+

16+#ifndef QUICKLISTENTRY_H

17+#define QUICKLISTENTRY_H

18+

19+#include <QString>

20+

21+class QuickListEntry

22+{

23+public:

24+ QuickListEntry();

25+

26+ QString actionId() const;

27+ void setActionId(const QString &actionId);

28+

29+ QString text() const;

30+ void setText(const QString &text);

31+

32+ QString icon() const;

33+ void setIcon(const QString &icon);

34+

35+ bool clickable() const;

36+

37+private:

38+ QString m_actionId;

39+ QString m_text;

40+ QString m_icon;

41+};

42+

43+#endif // QUICKLISTENTRY

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

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

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#include "quicklistmodel.h"

18+

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

20+ QuickListModelInterface(parent)

21+{

22+

23+}

24+

25+QuickListModel::~QuickListModel()

26+{

27+

28+}

29+

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

31+{

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

33+ m_list.append(entry);

34+ endInsertRows();

35+}

36+

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

38+{

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

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

41+ m_list.replace(i, entry);

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

43+ return;

44+ }

45+ }

46+}

47+

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

49+{

50+ return m_list.at(index);

51+}

52+

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

54+{

55+ Q_UNUSED(index)

56+ return m_list.count();

57+}

58+

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

60+{

61+ switch (role) {

62+ case RoleLabel:

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

64+ case RoleIcon:

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

66+ case RoleClickable:

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

68+ }

69+ return QVariant();

70+}

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

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

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#ifndef QUICKLISTMODEL_H

18+#define QUICKLISTMODEL_H

19+

20+#include "quicklistentry.h"

21+

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

23+

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

25+

26+class QuickListModel: public QuickListModelInterface

27+{

28+ Q_OBJECT

29+

30+public:

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

32+

33+ ~QuickListModel();

34+

35+ void appendAction(const QuickListEntry &entry);

36+

37+ /**

38+ * @brief Update an existing action

39+ * @param entry The new, updated entry

40+ *

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

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

43+ */

44+ void updateAction(const QuickListEntry &entry);

45+

46+ QuickListEntry get(int index) const;

47+

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

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

50+

51+private:

52+ QList<QuickListEntry> m_list;

53+};

54+

55+#endif // QUICKLISTMODEL_H

plugins/LightDM/CMakeLists.txt+4−4

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

1−# Dependencies

2−include(FindPkgConfig)

3pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

1pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

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

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

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

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

6

4

5+add_subdirectory(liblightdm)

6+

7include_directories(

7include_directories(

8 ${CMAKE_CURRENT_SOURCE_DIR}

8 ${CMAKE_CURRENT_SOURCE_DIR}

9 ${CMAKE_CURRENT_BINARY_DIR}

9 ${CMAKE_CURRENT_BINARY_DIR}

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

15)

15)

16

16

17set(QMLPLUGIN_SRC

17set(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

19 DBusGreeter.cpp

19 DBusGreeter.cpp

20 DBusGreeterList.cpp

20 DBusGreeterList.cpp

21 Greeter.cpp

21 Greeter.cpp

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

28 )

28 )

29

29

30target_link_libraries(LightDM-qml

30target_link_libraries(LightDM-qml

31− MockLightDM-demo

31+ integratedLightDM

32 unity8-private

32 unity8-private

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

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

34# ${LIBLIGHTDM_LDFLAGS}

34# ${LIBLIGHTDM_LDFLAGS}

plugins/LightDM/Greeter.cpp+1−19

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

17 */

17 */

18

18

19#include "Greeter.h"

19#include "Greeter.h"

20+#include "GreeterPrivate.h"

20#include <libintl.h>

21#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−

40

22

41GreeterPrivate::GreeterPrivate(Greeter* parent)

23GreeterPrivate::GreeterPrivate(Greeter* parent)

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

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

plugins/LightDM/Greeter.h+1−1

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

68 // should switch to this user if possible.

68 // should switch to this user if possible.

69 void requestAuthenticationUser(const QString &user);

69 void requestAuthenticationUser(const QString &user);

70

70

71−private:

71+protected:

72 GreeterPrivate * const d_ptr;

72 GreeterPrivate * const d_ptr;

73

73

74 Q_DECLARE_PRIVATE(Greeter)

74 Q_DECLARE_PRIVATE(Greeter)

plugins/LightDM/GreeterPrivate.hnew file+39

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

1+/*

2+ * Copyright (C) 2014 Canonical, Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#ifndef UNITY_GREETER_PRIVATE_H

18+#define UNITY_GREETER_PRIVATE_H

19+

20+#include <QLightDM/Greeter>

21+

22+class GreeterPrivate

23+{

24+public:

25+ explicit GreeterPrivate(Greeter *parent);

26+

27+ QLightDM::Greeter *m_greeter;

28+ bool m_active;

29+ bool wasPrompted;

30+ bool promptless;

31+

32+protected:

33+ Greeter * const q_ptr;

34+

35+private:

36+ Q_DECLARE_PUBLIC(Greeter)

37+};

38+

39+#endif // UNITY_GREETER_PRIVATE_H

plugins/LightDM/LightDM.qmltypes+2−2

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

114 Method { name: "invalidate" }

114 Method { name: "invalidate" }

115 }

115 }

116 Component {

116 Component {

117− name: "QSortFilterProxyModelQML"

117+ name: "UnitySortFilterProxyModelQML"

118 prototype: "QSortFilterProxyModel"

118 prototype: "QSortFilterProxyModel"

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

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

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

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

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

242 }

242 }

243 Component {

243 Component {

244 name: "UsersModel"

244 name: "UsersModel"

245− prototype: "QSortFilterProxyModelQML"

245+ prototype: "UnitySortFilterProxyModelQML"

246 exports: ["LightDM/Users 0.1"]

246 exports: ["LightDM/Users 0.1"]

247 isCreatable: false

247 isCreatable: false

248 isSingleton: true

248 isSingleton: true

plugins/LightDM/UsersModel.cpp+1−1

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

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

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

59

59

60UsersModel::UsersModel(QObject* parent)

60UsersModel::UsersModel(QObject* parent)

61− : QSortFilterProxyModelQML(parent)

61+ : UnitySortFilterProxyModelQML(parent)

62{

62{

63 setModel(new MangleModel(this));

63 setModel(new MangleModel(this));

64 setSortCaseSensitivity(Qt::CaseInsensitive);

64 setSortCaseSensitivity(Qt::CaseInsensitive);

plugins/LightDM/UsersModel.h+2−2

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

23#ifndef UNITY_USERSMODEL_H

23#ifndef UNITY_USERSMODEL_H

24#define UNITY_USERSMODEL_H

24#define UNITY_USERSMODEL_H

25

25

26−#include <qsortfilterproxymodelqml.h>

26+#include <unitysortfilterproxymodelqml.h>

27#include <QtCore/QObject>

27#include <QtCore/QObject>

28

28

29−class UsersModel : public QSortFilterProxyModelQML

29+class UsersModel : public UnitySortFilterProxyModelQML

30{

30{

31 Q_OBJECT

31 Q_OBJECT

32

32

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

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

1pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

1pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

2

2

3set(LibLightDM_SOURCES

3set(LibLightDM_SOURCES

4− ../Greeter.cpp

4+ Greeter.cpp

5− ../UsersModel.cpp

5+ UsersModel.cpp

6 GreeterPrivate.cpp

6 GreeterPrivate.cpp

7 UsersModelPrivate.cpp

7 UsersModelPrivate.cpp

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

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

9 )

9 )

10

10

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

11+add_library(integratedLightDM STATIC ${LibLightDM_SOURCES})

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

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

13

13

14include_directories(

14include_directories(

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

16 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

16 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

17)

17)

18

18

19−target_link_libraries(MockLightDM-demo

19+target_link_libraries(integratedLightDM

20 ${LIBUSERMETRICSOUTPUT_LDFLAGS}

20 ${LIBUSERMETRICSOUTPUT_LDFLAGS}

21 -lpam

21 -lpam

22)

22)

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

25 -lpam

25 -lpam

26)

26)

27

27

28−qt5_use_modules(MockLightDM-demo Concurrent Gui)

28+qt5_use_modules(integratedLightDM Concurrent Gui)

29qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)

29qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)

30

30

31+set_target_properties(integratedLightDM PROPERTIES COMPILE_FLAGS -fPIC)

31set_target_properties(MockLightDM-demo-shared PROPERTIES

32set_target_properties(MockLightDM-demo-shared PROPERTIES

32 OUTPUT_NAME lightdm-qt5-2)

33 OUTPUT_NAME lightdm-qt5-2)

33

34

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

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

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

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

17 */

17 */

18

18

19+

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

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

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

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

24+

25+

19#include "Greeter.h"

26#include "Greeter.h"

20#include "GreeterPrivate.h"

27#include "GreeterPrivate.h"

21#include <QtCore/QCoreApplication>

28#include <QtCore/QCoreApplication>

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

128

135

129 d->authenticated = false;

136 d->authenticated = false;

130 d->authenticationUser = username;

137 d->authenticationUser = username;

131− d->twoFactorDone = false;

132 d->handleAuthenticate();

138 d->handleAuthenticate();

133}

139}

134

140

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

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

24#include <QtCore/QObject>

24#include <QtCore/QObject>

25#include <QtCore/QVariant>

25#include <QtCore/QVariant>

26

26

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

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

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

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

27

31

28namespace QLightDM

32namespace QLightDM

29{

33{

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

43 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)

47 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)

44 Q_PROPERTY(bool locked READ lockHint CONSTANT)

48 Q_PROPERTY(bool locked READ lockHint CONSTANT)

45

49

46− Q_PROPERTY(QString hostname READ hostname CONSTANT)

47−

48 Q_ENUMS(PromptType MessageType)

50 Q_ENUMS(PromptType MessageType)

49

51

50public:

52public:

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

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

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

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

17 */

17 */

18

18

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

19+#include "Greeter.h"

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

20+#include "GreeterPrivate.h"

21#include <QFuture>

21#include <QFuture>

22#include <QFutureInterface>

22#include <QFutureInterface>

23#include <QFutureWatcher>

23#include <QFutureWatcher>

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

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

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

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

36 bool authenticated;

36 bool authenticated;

37 QString authenticationUser;

37 QString authenticationUser;

38− bool twoFactorDone;

39

38

40 void handleAuthenticate();

39 void handleAuthenticate();

41 void handleRespond(const QString &response);

40 void handleRespond(const QString &response);

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

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

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

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

17 */

17 */

18

18

19+

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

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

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

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

24+

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

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

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

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

21// set our compatibility to Qt4 here too.

27// set our compatibility to Qt4 here too.

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

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

24#include <QtCore/QSharedDataPointer>

24#include <QtCore/QSharedDataPointer>

25#include <QAbstractListModel>

25#include <QAbstractListModel>

26

26

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

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

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

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

27

31

28namespace QLightDM

32namespace QLightDM

29{

33{

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

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

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

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

17 */

17 */

18

18

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

19+#include "UsersModelPrivate.h"

20

20

21#include <QDir>

21#include <QDir>

22#include <QSettings>

22#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−

3pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)

1pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)

4pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)

2pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)

5

3

plugins/Lights/Lights.cpp+9−24

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

44

44

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

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

46{

46{

47+ if (!init()) {

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

49+ return;

50+ }

51+

47 if (m_state != newState) {

52 if (m_state != newState) {

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

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

49 turnOn();

54 turnOn();

50 } else {

55 } else {

51 turnOff();

56 turnOff();

52 }

57 }

58+

59+ m_state = newState;

60+ Q_EMIT stateChanged(m_state);

53 }

61 }

54}

62}

55

63

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

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

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

116 if (err == 0) {

124 if (err == 0) {

117 m_lightDevice = (light_device_t*)device;

125 m_lightDevice = (light_device_t*)device;

126+ turnOff();

118 return true;

127 return true;

119 } else {

128 } else {

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

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

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

127

136

128void Lights::turnOn()

137void Lights::turnOn()

129{

138{

130− if (!init()) {

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

132− return;

133− }

134−

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

136− return;

137− }

138−

139 // pulse

139 // pulse

140 light_state_t state;

140 light_state_t state;

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

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

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

147

147

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

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

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

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

150− } else {

151− m_state = Lights::On;

152− Q_EMIT stateChanged(m_state);

153 }

150 }

154}

151}

155

152

156void Lights::turnOff()

153void Lights::turnOff()

157{

154{

158− if (!init()) {

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

160− return;

161− }

162−

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

164− return;

165− }

166−

167 light_state_t state;

155 light_state_t state;

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

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

169 state.color = 0x00000000;

157 state.color = 0x00000000;

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

174

162

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

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

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

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

177− } else {

178− m_state = Lights::Off;

179− Q_EMIT stateChanged(m_state);

180 }

165 }

181}

166}

plugins/Powerd/CMakeLists.txt−2

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

1−include(FindPkgConfig)

2−

3pkg_search_module(GIO REQUIRED gio-2.0)

1pkg_search_module(GIO REQUIRED gio-2.0)

4

2

5include_directories(

3include_directories(

plugins/ScreenGrabber/ScreenGrabber.qmltypes+1−1

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

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

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

5//

5//

6// This file was auto-generated by:

6// This file was auto-generated by:

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

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

8

8

9Module {

9Module {

10 Component {

10 Component {

plugins/ScreenGrabber/screengrabber.cpp+1−1

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

81QString ScreenGrabber::makeFileName()

81QString ScreenGrabber::makeFileName()

82{

82{

83 QString fileName(fileNamePrefix);

83 QString fileName(fileNamePrefix);

84− fileName.append(QDateTime::currentDateTime().toString("yyyymmdd_hhmmsszzz"));

84+ fileName.append(QDateTime::currentDateTime().toString("yyyyMMdd_hhmmsszzz"));

85 fileName.append(".");

85 fileName.append(".");

86 fileName.append(getFormat());

86 fileName.append(getFormat());

87 return fileName;

87 return fileName;

plugins/Ubuntu/Gestures/Gestures.qmltypes+15−1

@@ -33,7 +33,8 @@ Module {

33 "Rightwards": 0,

33 "Rightwards": 0,

34 "Leftwards": 1,

34 "Leftwards": 1,

35 "Downwards": 2,

35 "Downwards": 2,

36− "Upwards": 3

36+ "Upwards": 3,

37+ "Horizontal": 4

37 }

38 }

38 }

39 }

39 Method {

40 Method {

@@ -151,4 +152,17 @@ Module {

151 exportMetaObjectRevisions: [0]

152 exportMetaObjectRevisions: [0]

152 Signal { name: "pressedOutside" }

153 Signal { name: "pressedOutside" }

153 }

154 }

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+ }

154}

168}

plugins/Unity/DashCommunicator/dashconnection.cpp+30

@@ -19,12 +19,42 @@

19#include <QDBusInterface>

19#include <QDBusInterface>

20#include <QDBusPendingCall>

20#include <QDBusPendingCall>

21

21

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+

22DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):

45DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):

23 AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)

46 AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)

24{

47{

25

48

26}

49}

27

50

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+

28void DashConnection::setCurrentScope(int index, bool animate, bool isSwipe)

58void DashConnection::setCurrentScope(int index, bool animate, bool isSwipe)

29{

59{

30 if (dbusInterface()) {

60 if (dbusInterface()) {

plugins/Unity/DashCommunicator/dashconnection.h+4−1

@@ -20,7 +20,6 @@

20// local

20// local

21#include "abstractdbusservicemonitor.h"

21#include "abstractdbusservicemonitor.h"

22

22

23−

24class DashConnection: public AbstractDBusServiceMonitor

23class DashConnection: public AbstractDBusServiceMonitor

25{

24{

26 Q_OBJECT

25 Q_OBJECT

@@ -29,6 +28,10 @@ public:

29

28

30public Q_SLOTS:

29public Q_SLOTS:

31 void setCurrentScope(int index, bool animate, bool isSwipe);

30 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;

32};

35};

33

36

34#endif

37#endif

plugins/Unity/Indicators/CMakeLists.txt+3−2

@@ -16,18 +16,19 @@ include_directories(

16)

16)

17

17

18set(IndicatorsQML_SOURCES

18set(IndicatorsQML_SOURCES

19+ actionrootstate.cpp

19 indicator.cpp

20 indicator.cpp

20 indicators.h

21 indicators.h

21 indicatorsmanager.cpp

22 indicatorsmanager.cpp

22 indicatorsmodel.cpp

23 indicatorsmodel.cpp

23 menucontentactivator.cpp

24 menucontentactivator.cpp

25+ modelactionrootstate.cpp

24 modelprinter.cpp

26 modelprinter.cpp

25 plugin.cpp

27 plugin.cpp

26− rootactionstate.cpp

28+ rootstateparser.cpp

27 sharedunitymenumodel.cpp

29 sharedunitymenumodel.cpp

28 unitymenumodelcache.cpp

30 unitymenumodelcache.cpp

29 unitymenumodelstack.cpp

31 unitymenumodelstack.cpp

30− visibleindicatorsmodel.cpp

31)

32)

32add_definitions(-DUNITYINDICATORS_LIBRARY)

33add_definitions(-DUNITYINDICATORS_LIBRARY)

33

34

plugins/Unity/Indicators/Indicators.qmltypes+28−45

@@ -7,6 +7,14 @@ import QtQuick.tooling 1.1

7// 'qmlplugindump -notrelocatable Unity.Indicators 0.1 plugins'

7// 'qmlplugindump -notrelocatable Unity.Indicators 0.1 plugins'

8

8

9Module {

9Module {

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+ }

10 Component {

18 Component {

11 name: "ActionState"

19 name: "ActionState"

12 prototype: "QObject"

20 prototype: "QObject"

@@ -23,7 +31,6 @@ Module {

23 }

31 }

24 }

32 }

25 }

33 }

26− Component { name: "ActionStateParser"; prototype: "QObject" }

27 Component {

34 Component {

28 name: "FlatMenuProxyModelRole"

35 name: "FlatMenuProxyModelRole"

29 prototype: "QObject"

36 prototype: "QObject"

@@ -48,10 +55,15 @@ Module {

48 exports: ["Unity.Indicators/IndicatorsManager 0.1"]

55 exports: ["Unity.Indicators/IndicatorsManager 0.1"]

49 exportMetaObjectRevisions: [0]

56 exportMetaObjectRevisions: [0]

50 Property { name: "loaded"; type: "bool"; isReadonly: true }

57 Property { name: "loaded"; type: "bool"; isReadonly: true }

58+ Property { name: "profile"; type: "string" }

51 Signal {

59 Signal {

52 name: "loadedChanged"

60 name: "loadedChanged"

53 Parameter { type: "bool" }

61 Parameter { type: "bool" }

54 }

62 }

63+ Signal {

64+ name: "profileChanged"

65+ Parameter { type: "string" }

66+ }

55 Signal {

67 Signal {

56 name: "indicatorLoaded"

68 name: "indicatorLoaded"

57 Parameter { name: "indicator_name"; type: "string" }

69 Parameter { name: "indicator_name"; type: "string" }

@@ -60,10 +72,7 @@ Module {

60 name: "indicatorAboutToBeUnloaded"

72 name: "indicatorAboutToBeUnloaded"

61 Parameter { name: "indicator_name"; type: "string" }

73 Parameter { name: "indicator_name"; type: "string" }

62 }

74 }

63− Method {

64− name: "load"

75+ Method { name: "load" }

65− Parameter { name: "profile"; type: "string" }

66− }

67 Method { name: "unload" }

76 Method { name: "unload" }

68 }

77 }

69 Component {

78 Component {

@@ -72,14 +81,12 @@ Module {

72 exports: ["Unity.Indicators/IndicatorsModel 0.1"]

81 exports: ["Unity.Indicators/IndicatorsModel 0.1"]

73 exportMetaObjectRevisions: [0]

82 exportMetaObjectRevisions: [0]

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

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

84+ Property { name: "profile"; type: "string" }

75 Signal {

85 Signal {

76 name: "indicatorDataChanged"

86 name: "indicatorDataChanged"

77 Parameter { name: "data"; type: "QVariant" }

87 Parameter { name: "data"; type: "QVariant" }

78 }

88 }

79− Method {

80− name: "load"

89+ Method { name: "load" }

81− Parameter { name: "profile"; type: "string" }

82− }

83 Method { name: "unload" }

90 Method { name: "unload" }

84 Method {

91 Method {

85 name: "data"

92 name: "data"

@@ -99,8 +106,7 @@ Module {

99 values: {

106 values: {

100 "Identifier": 0,

107 "Identifier": 0,

101 "Position": 1,

108 "Position": 1,

102− "IndicatorProperties": 2,

109+ "IndicatorProperties": 2

103− "IsVisible": 3

104 }

110 }

105 }

111 }

106 }

112 }

@@ -146,6 +152,14 @@ Module {

146 exportMetaObjectRevisions: [0]

152 exportMetaObjectRevisions: [0]

147 Property { name: "active"; type: "bool"; isReadonly: true }

153 Property { name: "active"; type: "bool"; isReadonly: true }

148 }

154 }

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+ }

149 Component {

163 Component {

150 name: "ModelPrinter"

164 name: "ModelPrinter"

151 prototype: "QObject"

165 prototype: "QObject"

@@ -186,26 +200,16 @@ Module {

186 }

200 }

187 }

201 }

188 Component {

202 Component {

189− name: "QAbstractProxyModel"

203+ name: "RootStateObject"

190− prototype: "QAbstractItemModel"

204+ prototype: "QObject"

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 }

200 Property { name: "valid"; type: "bool"; isReadonly: true }

205 Property { name: "valid"; type: "bool"; isReadonly: true }

201 Property { name: "title"; type: "string"; isReadonly: true }

206 Property { name: "title"; type: "string"; isReadonly: true }

202 Property { name: "leftLabel"; type: "string"; isReadonly: true }

207 Property { name: "leftLabel"; type: "string"; isReadonly: true }

203 Property { name: "rightLabel"; type: "string"; isReadonly: true }

208 Property { name: "rightLabel"; type: "string"; isReadonly: true }

204 Property { name: "icons"; type: "QStringList"; isReadonly: true }

209 Property { name: "icons"; type: "QStringList"; isReadonly: true }

205 Property { name: "accessibleName"; type: "string"; isReadonly: true }

210 Property { name: "accessibleName"; type: "string"; isReadonly: true }

206− Property { name: "visible"; type: "bool"; isReadonly: true }

211+ Property { name: "indicatorVisible"; type: "bool"; isReadonly: true }

207 Signal { name: "updated" }

212 Signal { name: "updated" }

208− Signal { name: "indexChanged" }

209 }

213 }

210 Component {

214 Component {

211 name: "SharedUnityMenuModel"

215 name: "SharedUnityMenuModel"

@@ -257,25 +261,4 @@ Module {

257 }

261 }

258 Method { name: "pop"; type: "UnityMenuModel*" }

262 Method { name: "pop"; type: "UnityMenuModel*" }

259 }

263 }

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− }

281}

264}

plugins/Unity/Indicators/actionrootstate.cppnew file+97

@@ -0,0 +1,97 @@

1+/*

2+ * Copyright 2014 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#include "actionrootstate.h"

18+

19+#include <qdbusactiongroup.h>

20+#include <QDebug>

21+

22+ActionRootState::ActionRootState(QObject *parent)

23+ : RootStateObject(parent)

24+ , m_actionGroup(nullptr)

25+{

26+}

27+

28+QDBusActionGroup *ActionRootState::actionGroup() const

29+{

30+ return m_actionGroup;

31+}

32+

33+void ActionRootState::setActionGroup(QDBusActionGroup *actionGroup)

34+{

35+ if (m_actionGroup != actionGroup) {

36+ bool wasValid = valid();

37+

38+ if (m_actionGroup) {

39+ disconnect(m_actionGroup, 0, this, 0);

40+ }

41+ m_actionGroup = actionGroup;

42+

43+ if (m_actionGroup) {

44+ connect(m_actionGroup, &QDBusActionGroup::statusChanged, this, [&](bool) { updateActionState(); });

45+ connect(m_actionGroup, &QDBusActionGroup::actionAppear, this, [&](const QString&) { updateActionState(); });

46+ connect(m_actionGroup, &QDBusActionGroup::actionVanish, this, [&](const QString&) { updateActionState(); });

47+ connect(m_actionGroup, &QDBusActionGroup::actionStateChanged, this, [&](QVariant) { updateActionState(); });

48+

49+ connect(m_actionGroup, &QObject::destroyed, this, [&](QObject*) { updateActionState(); });

50+ }

51+ updateActionState();

52+ Q_EMIT actionGroupChanged();

53+

54+ if (wasValid != valid()) Q_EMIT validChanged();

55+ }

56+}

57+

58+QString ActionRootState::actionName() const

59+{

60+ return m_actionName;

61+}

62+

63+void ActionRootState::setActionName(const QString &actionName)

64+{

65+ if (m_actionName != actionName) {

66+ bool wasValid = valid();

67+

68+ m_actionName = actionName;

69+ updateActionState();

70+

71+ Q_EMIT actionNameChanged();

72+

73+ if (wasValid != valid()) Q_EMIT validChanged();

74+ }

75+}

76+

77+bool ActionRootState::valid() const

78+{

79+ return m_actionGroup && m_actionGroup->status() == DBusEnums::Connected &&

80+ !m_actionName.isEmpty() && m_actionGroup->hasAction(m_actionName);

81+}

82+

83+void ActionRootState::updateActionState()

84+{

85+ if (valid()) {

86+ ActionStateParser* oldParser = m_actionGroup->actionStateParser();

87+ m_actionGroup->setActionStateParser(&m_parser);

88+

89+ QVariantMap state = m_actionGroup->actionState(m_actionName).toMap();

90+

91+ m_actionGroup->setActionStateParser(oldParser);

92+

93+ setCurrentState(state);

94+ } else {

95+ setCurrentState(QVariantMap());

96+ }

97+}

plugins/Unity/Indicators/actionrootstate.hnew file+55

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

1+/*

2+ * Copyright 2014 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#ifndef ACTIONROOTSTATE_H

18+#define ACTIONROOTSTATE_H

19+

20+#include "unityindicatorsglobal.h"

21+

22+#include "rootstateparser.h"

23+

24+class QDBusActionGroup;

25+

26+class UNITYINDICATORS_EXPORT ActionRootState : public RootStateObject

27+{

28+ Q_OBJECT

29+ Q_PROPERTY(QDBusActionGroup* actionGroup READ actionGroup WRITE setActionGroup NOTIFY actionGroupChanged)

30+ Q_PROPERTY(QString actionName READ actionName WRITE setActionName NOTIFY actionNameChanged)

31+

32+public:

33+ ActionRootState(QObject *parent = 0);

34+

35+ QDBusActionGroup *actionGroup() const;

36+ void setActionGroup(QDBusActionGroup *actionGroup);

37+

38+ QString actionName() const;

39+ void setActionName(const QString& actionName);

40+

41+ bool valid() const override;

42+

43+Q_SIGNALS:

44+ void actionGroupChanged();

45+ void actionNameChanged();

46+

47+private Q_SLOTS:

48+ void updateActionState();

49+

50+private:

51+ QDBusActionGroup* m_actionGroup;

52+ QString m_actionName;

53+};

54+

55+#endif // ACTIONROOTSTATE_H

plugins/Unity/Indicators/indicator.cpp+23−8

@@ -31,24 +31,26 @@ Indicator::~Indicator()

31{

31{

32}

32}

33

33

34−void Indicator::init(const QString &profile, const QString& busName, const QSettings& settings)

34+void Indicator::init(const QString& busName, const QSettings& settings)

35{

35{

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+ }

37

44

38− QVariant pos = settings.value(profile + "/Position");

39− if (!pos.isValid())

40− pos = settings.value("Indicator Service/Position", QVariant::fromValue(0));

45+ setId(settings.value("Indicator Service/Name").toString());

41− setPosition(pos.toInt());

42

46

43 QString actionObjectPath = settings.value("Indicator Service/ObjectPath").toString();

47 QString actionObjectPath = settings.value("Indicator Service/ObjectPath").toString();

44− QString menuObjectPath = settings.value(profile + "/ObjectPath").toString();

45

48

46 QVariantMap properties;

49 QVariantMap properties;

47 properties.clear();

50 properties.clear();

48 properties.insert("busType", 1);

51 properties.insert("busType", 1);

49 properties.insert("busName", busName);

52 properties.insert("busName", busName);

50 properties.insert("actionsObjectPath", actionObjectPath);

53 properties.insert("actionsObjectPath", actionObjectPath);

51− properties.insert("menuObjectPath", menuObjectPath);

52 setIndicatorProperties(properties);

54 setIndicatorProperties(properties);

53}

55}

54

56

@@ -78,6 +80,19 @@ void Indicator::setPosition(int position)

78 }

80 }

79}

81}

80

82

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+

81QVariant Indicator::indicatorProperties() const

96QVariant Indicator::indicatorProperties() const

82{

97{

83 return m_properties;

98 return m_properties;

plugins/Unity/Indicators/indicator.h+5−1

@@ -35,12 +35,15 @@ public:

35 Indicator(QObject *parent = 0);

35 Indicator(QObject *parent = 0);

36 virtual ~Indicator();

36 virtual ~Indicator();

37

37

38− void init(const QString &profile, const QString& busName, const QSettings& settings);

38+ void init(const QString& busName, const QSettings& settings);

39

39

40 QString identifier() const;

40 QString identifier() const;

41 int position() const;

41 int position() const;

42 QVariant indicatorProperties() const;

42 QVariant indicatorProperties() const;

43

43

44+public Q_SLOTS:

45+ void setProfile(const QString& profile);

46+

44Q_SIGNALS:

47Q_SIGNALS:

45 void identifierChanged(const QString &identifier);

48 void identifierChanged(const QString &identifier);

46 void positionChanged(int position);

49 void positionChanged(int position);

@@ -55,6 +58,7 @@ private:

55 QString m_identifier;

58 QString m_identifier;

56 int m_position;

59 int m_position;

57 QVariant m_properties;

60 QVariant m_properties;

61+ QVariantMap m_settings;

58};

62};

59

63

60#endif // INDICATOR_H

64#endif // INDICATOR_H

plugins/Unity/Indicators/indicators.h+1−2

@@ -74,8 +74,7 @@ public:

74 enum Roles {

74 enum Roles {

75 Identifier = 0,

75 Identifier = 0,

76 Position,

76 Position,

77− IndicatorProperties,

77+ IndicatorProperties

78− IsVisible

79 };

78 };

80

79

81 IndicatorsModelRole(QObject*parent=0):QObject(parent) {}

80 IndicatorsModelRole(QObject*parent=0):QObject(parent) {}

plugins/Unity/Indicators/indicatorsmanager.cpp+17−3

@@ -54,10 +54,9 @@ IndicatorsManager::~IndicatorsManager()

54

54

55}

55}

56

56

57−void IndicatorsManager::load(const QString& profile)

57+void IndicatorsManager::load()

58{

58{

59 unload();

59 unload();

60− m_profile = profile;

61

60

62 QStringList xdgLocations = shellDataDirs();//QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);

61 QStringList xdgLocations = shellDataDirs();//QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);

63

62

@@ -216,6 +215,19 @@ void IndicatorsManager::setLoaded(bool loaded)

216 }

215 }

217}

216}

218

217

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+

219void IndicatorsManager::startVerify(const QString& path)

231void IndicatorsManager::startVerify(const QString& path)

220{

232{

221 QHashIterator<QString, IndicatorData*> iter(m_indicatorsData);

233 QHashIterator<QString, IndicatorData*> iter(m_indicatorsData);

@@ -268,7 +280,9 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)

268 Indicator::Ptr new_indicator(new Indicator(this));

280 Indicator::Ptr new_indicator(new Indicator(this));

269 data->m_indicator = new_indicator;

281 data->m_indicator = new_indicator;

270 QSettings settings(data->m_fileInfo.absoluteFilePath(), QSettings::IniFormat, this);

282 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&)));

272 return new_indicator;

286 return new_indicator;

273}

287}

274

288

plugins/Unity/Indicators/indicatorsmanager.h+6−1

@@ -32,13 +32,17 @@ class UNITYINDICATORS_EXPORT IndicatorsManager : public QObject

32{

32{

33 Q_OBJECT

33 Q_OBJECT

34 Q_PROPERTY(bool loaded READ isLoaded NOTIFY loadedChanged)

34 Q_PROPERTY(bool loaded READ isLoaded NOTIFY loadedChanged)

35+ Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)

35public:

36public:

36 explicit IndicatorsManager(QObject* parent = 0);

37 explicit IndicatorsManager(QObject* parent = 0);

37 ~IndicatorsManager();

38 ~IndicatorsManager();

38

39

39− Q_INVOKABLE void load(const QString& profile);

40+ Q_INVOKABLE void load();

40 Q_INVOKABLE void unload();

41 Q_INVOKABLE void unload();

41

42

43+ QString profile() const;

44+ void setProfile(const QString& profile);

45+

42 Indicator::Ptr indicator(const QString& indicator_name);

46 Indicator::Ptr indicator(const QString& indicator_name);

43

47

44 QList<Indicator::Ptr> indicators();

48 QList<Indicator::Ptr> indicators();

@@ -47,6 +51,7 @@ public:

47

51

48Q_SIGNALS:

52Q_SIGNALS:

49 void loadedChanged(bool);

53 void loadedChanged(bool);

54+ void profileChanged(const QString&);

50

55

51 void indicatorLoaded(const QString& indicator_name);

56 void indicatorLoaded(const QString& indicator_name);

52 void indicatorAboutToBeUnloaded(const QString& indicator_name);

57 void indicatorAboutToBeUnloaded(const QString& indicator_name);

plugins/Unity/Indicators/indicatorsmodel.cpp+25−2

@@ -56,6 +56,7 @@ IndicatorsModel::IndicatorsModel(QObject *parent)

56 m_manager = new IndicatorsManager(this);

56 m_manager = new IndicatorsManager(this);

57 QObject::connect(m_manager, SIGNAL(indicatorLoaded(const QString&)), this, SLOT(onIndicatorLoaded(const QString&)));

57 QObject::connect(m_manager, SIGNAL(indicatorLoaded(const QString&)), this, SLOT(onIndicatorLoaded(const QString&)));

58 QObject::connect(m_manager, SIGNAL(indicatorAboutToBeUnloaded(const QString&)), this, SLOT(onIndicatorAboutToBeUnloaded(const QString&)));

58 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()));

59

60

60 QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

61 QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

61 QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

62 QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

@@ -80,15 +81,37 @@ int IndicatorsModel::count() const

80 return rowCount();

81 return rowCount();

81}

82}

82

83

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+

83/*!

106/*!

84 \qmlmethod IndicatorsModel::unload()

107 \qmlmethod IndicatorsModel::unload()

85

108

86 Load all indicators.

109 Load all indicators.

87*/

110*/

88−void IndicatorsModel::load(const QString& profile)

111+void IndicatorsModel::load()

89{

112{

90 m_indicators.clear();

113 m_indicators.clear();

91− m_manager->load(profile);

114+ m_manager->load();

92}

115}

93

116

94/*!

117/*!

plugins/Unity/Indicators/indicatorsmodel.h+6−1

@@ -34,17 +34,21 @@ class UNITYINDICATORS_EXPORT IndicatorsModel : public QAbstractListModel

34 Q_OBJECT

34 Q_OBJECT

35 Q_ENUMS(Roles)

35 Q_ENUMS(Roles)

36 Q_PROPERTY(int count READ count NOTIFY countChanged)

36 Q_PROPERTY(int count READ count NOTIFY countChanged)

37+ Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)

37

38

38public:

39public:

39

40

40 IndicatorsModel(QObject *parent=0);

41 IndicatorsModel(QObject *parent=0);

41 ~IndicatorsModel();

42 ~IndicatorsModel();

42

43

43− Q_INVOKABLE void load(const QString& profile);

44+ Q_INVOKABLE void load();

44 Q_INVOKABLE void unload();

45 Q_INVOKABLE void unload();

45

46

46 Q_INVOKABLE QVariant data(int row, int role) const;

47 Q_INVOKABLE QVariant data(int row, int role) const;

47

48

49+ QString profile() const;

50+ void setProfile(const QString& profile);

51+

48 /* QAbstractItemModel */

52 /* QAbstractItemModel */

49 QHash<int, QByteArray> roleNames() const;

53 QHash<int, QByteArray> roleNames() const;

50 int columnCount(const QModelIndex &parent = QModelIndex()) const;

54 int columnCount(const QModelIndex &parent = QModelIndex()) const;

@@ -55,6 +59,7 @@ public:

55

59

56Q_SIGNALS:

60Q_SIGNALS:

57 void countChanged();

61 void countChanged();

62+ void profileChanged();

58 void indicatorDataChanged(const QVariant& data);

63 void indicatorDataChanged(const QVariant& data);

59

64

60private Q_SLOTS:

65private Q_SLOTS:

plugins/Unity/Indicators/modelactionrootstate.cppnew file+129

@@ -0,0 +1,129 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+#include "modelactionrootstate.h"

21+#include "indicators.h"

22+

23+#include <unitymenumodel.h>

24+#include <QVariant>

25+#include <QIcon>

26+

27+extern "C" {

28+#include <glib.h>

29+#include <gio/gio.h>

30+}

31+

32+ModelActionRootState::ModelActionRootState(QObject *parent)

33+ : RootStateObject(parent),

34+ m_menu(nullptr)

35+{

36+}

37+

38+ModelActionRootState::~ModelActionRootState()

39+{

40+}

41+

42+UnityMenuModel* ModelActionRootState::menu() const

43+{

44+ return m_menu;

45+}

46+

47+void ModelActionRootState::setMenu(UnityMenuModel* menu)

48+{

49+ if (m_menu != menu) {

50+ bool wasValid = valid();

51+

52+ if (m_menu) {

53+ m_menu->disconnect(this);

54+ }

55+ m_menu = menu;

56+

57+ if (m_menu) {

58+ connect(m_menu, SIGNAL(rowsInserted(const QModelIndex&, int, int)), SLOT(onModelRowsAdded(const QModelIndex&, int, int)));

59+ connect(m_menu, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SLOT(onModelRowsRemoved(const QModelIndex&, int, int)));

60+ connect(m_menu, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)), SLOT(onModelDataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));

61+

62+ connect(m_menu, SIGNAL(destroyed()), SLOT(reset()));

63+ }

64+ updateActionState();

65+ Q_EMIT menuChanged();

66+

67+ if (wasValid != valid())

68+ Q_EMIT validChanged();

69+ }

70+}

71+

72+bool ModelActionRootState::valid() const

73+{

74+ return !currentState().empty();

75+}

76+

77+void ModelActionRootState::onModelRowsAdded(const QModelIndex& parent, int start, int end)

78+{

79+ Q_UNUSED(parent);

80+ if (start == 0 && end >= 0) {

81+ updateActionState();

82+ }

83+}

84+

85+void ModelActionRootState::onModelRowsRemoved(const QModelIndex& parent, int start, int end)

86+{

87+ Q_UNUSED(parent);

88+ if (start == 0 && end >= 0) {

89+ updateActionState();

90+ }

91+}

92+

93+void ModelActionRootState::onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)

94+{

95+ Q_UNUSED(roles);

96+ if (!topLeft.isValid() || !bottomRight.isValid()) {

97+ return;

98+ }

99+

100+ if (topLeft.row() <= 0 && bottomRight.row() >= 0) {

101+ updateActionState();

102+ }

103+}

104+

105+void ModelActionRootState::reset()

106+{

107+ m_menu = nullptr;

108+

109+ Q_EMIT menuChanged();

110+ setCurrentState(QVariantMap());

111+}

112+

113+void ModelActionRootState::updateActionState()

114+{

115+ if (m_menu && m_menu->rowCount() > 0) {

116+ ActionStateParser* oldParser = m_menu->actionStateParser();

117+ m_menu->setActionStateParser(&m_parser);

118+

119+ QVariantMap state = m_menu->get(0, "actionState").toMap();

120+

121+ m_menu->setActionStateParser(oldParser);

122+

123+ setCurrentState(state);

124+ } else if (!m_menu) {

125+ setCurrentState(QVariantMap());

126+ }

127+ // else if m_menu->rowCount() == 0, let's leave existing cache in place

128+ // until the new menu comes in, to avoid flashing the UI empty for a moment

129+}

plugins/Unity/Indicators/modelactionrootstate.hnew file+61

@@ -0,0 +1,61 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+#ifndef MODELACTIONROOTSTATE_H

21+#define MODELACTIONROOTSTATE_H

22+

23+#include "unityindicatorsglobal.h"

24+

25+#include "rootstateparser.h"

26+

27+class UnityMenuModel;

28+

29+class UNITYINDICATORS_EXPORT ModelActionRootState : public RootStateObject

30+{

31+ Q_OBJECT

32+ Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)

33+public:

34+ ModelActionRootState(QObject *parent = 0);

35+ virtual ~ModelActionRootState();

36+

37+ UnityMenuModel* menu() const;

38+ void setMenu(UnityMenuModel* menu);

39+

40+ int index() const;

41+ void setIndex(int index);

42+

43+ bool valid() const override;

44+

45+Q_SIGNALS:

46+ void menuChanged();

47+ void indexChanged();

48+

49+private Q_SLOTS:

50+ void onModelRowsAdded(const QModelIndex& parent, int start, int end);

51+ void onModelRowsRemoved(const QModelIndex& parent, int start, int end);

52+ void onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>&);

53+ void reset();

54+

55+private:

56+ void updateActionState();

57+

58+ UnityMenuModel* m_menu;

59+};

60+

61+#endif // MODELACTIONROOTSTATE_H

plugins/Unity/Indicators/plugin.cpp+4−4

@@ -24,16 +24,16 @@

24#include "plugin.h"

24#include "plugin.h"

25

25

26// local

26// local

27+#include "actionrootstate.h"

27#include "indicators.h"

28#include "indicators.h"

28#include "indicatorsmanager.h"

29#include "indicatorsmanager.h"

29#include "indicatorsmodel.h"

30#include "indicatorsmodel.h"

30#include "menucontentactivator.h"

31#include "menucontentactivator.h"

32+#include "modelactionrootstate.h"

31#include "modelprinter.h"

33#include "modelprinter.h"

32−#include "rootactionstate.h"

33#include "sharedunitymenumodel.h"

34#include "sharedunitymenumodel.h"

34#include "unitymenumodelcache.h"

35#include "unitymenumodelcache.h"

35#include "unitymenumodelstack.h"

36#include "unitymenumodelstack.h"

36−#include "visibleindicatorsmodel.h"

37

37

38#include <unitymenumodel.h>

38#include <unitymenumodel.h>

39

39

@@ -51,9 +51,9 @@ void IndicatorsPlugin::registerTypes(const char *uri)

51 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");

51 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");

52 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");

52 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");

53 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");

53 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");

55 qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");

56 qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");

56− qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

57 qmlRegisterType<SharedUnityMenuModel>(uri, 0, 1, "SharedUnityMenuModel");

57 qmlRegisterType<SharedUnityMenuModel>(uri, 0, 1, "SharedUnityMenuModel");

58

58

59 qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);

59 qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);

plugins/Unity/Indicators/rootactionstate.cpp → plugins/Unity/Indicators/rootstateparser.cpprenamed+74−141

@@ -12,155 +12,18 @@

12 *

12 *

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

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/>.

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

15− *

16− * Authors:

17− * Nick Dedekind <nick.dedekind@canonical.com>

18 */

15 */

19

16

20−#include "rootactionstate.h"

17+#include "rootstateparser.h"

21−#include "indicators.h"

22−

23−#include <unitymenumodel.h>

24−#include <QVariant>

25−#include <QIcon>

26

18

27extern "C" {

19extern "C" {

28#include <glib.h>

20#include <glib.h>

29#include <gio/gio.h>

21#include <gio/gio.h>

30}

22}

31

23

32−RootActionState::RootActionState(QObject *parent)

24+RootStateParser::RootStateParser(QObject* parent)

33− : ActionStateParser(parent),

25+ : 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)

68{

26{

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();

164}

27}

165

28

166static QString iconUri(GIcon *icon)

29static QString iconUri(GIcon *icon)

@@ -209,7 +72,7 @@ static QString iconUri(GIcon *icon)

209 return uri;

72 return uri;

210}

73}

211

74

212−QVariant RootActionState::toQVariant(GVariant* state) const

75+QVariant RootStateParser::toQVariant(GVariant* state) const

213{

76{

214 if (!state) {

77 if (!state) {

215 return QVariant();

78 return QVariant();

@@ -296,3 +159,73 @@ QVariant RootActionState::toQVariant(GVariant* state) const

296 }

159 }

297 return ActionStateParser::toQVariant(state);

160 return ActionStateParser::toQVariant(state);

298}

161}

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 @@

12 *

12 *

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

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/>.

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

15− *

16− * Authors:

17− * Nick Dedekind <nick.dedekind@canonical.com>

18 */

15 */

19

16

20−#ifndef ROOTACTIONSTATE_H

17+#ifndef ROOTSTATEPARSER_H

21−#define ROOTACTIONSTATE_H

18+#define ROOTSTATEPARSER_H

22

19

23#include "unityindicatorsglobal.h"

20#include "unityindicatorsglobal.h"

24

21

25#include <actionstateparser.h>

22#include <actionstateparser.h>

26

23

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+};

28

30

29−class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser

31+class UNITYINDICATORS_EXPORT RootStateObject : public QObject

30{

32{

31 Q_OBJECT

33 Q_OBJECT

32− Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)

33

34

34− Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)

35+ Q_PROPERTY(bool valid READ valid NOTIFY validChanged)

35 Q_PROPERTY(QString title READ title NOTIFY titleChanged)

36 Q_PROPERTY(QString title READ title NOTIFY titleChanged)

36 Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)

37 Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)

37 Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)

38 Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)

@@ -39,16 +40,10 @@ class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser

39 Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)

40 Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)

40 Q_PROPERTY(bool indicatorVisible READ indicatorVisible NOTIFY indicatorVisibleChanged)

41 Q_PROPERTY(bool indicatorVisible READ indicatorVisible NOTIFY indicatorVisibleChanged)

41public:

42public:

42− RootActionState(QObject *parent = 0);

43+ RootStateObject(QObject* parent = 0);

43− virtual ~RootActionState();

44

44

45− UnityMenuModel* menu() const;

45+ virtual bool valid() const = 0;

46− void setMenu(UnityMenuModel* menu);

47

46

48− int index() const;

49− void setIndex(int index);

50−

51− bool isValid() const;

52 QString title() const;

47 QString title() const;

53 QString leftLabel() const;

48 QString leftLabel() const;

54 QString rightLabel() const;

49 QString rightLabel() const;

@@ -56,15 +51,12 @@ public:

56 QString accessibleName() const;

51 QString accessibleName() const;

57 bool indicatorVisible() const;

52 bool indicatorVisible() const;

58

53

59− // from ActionStateParser

54+ QVariantMap currentState() const { return m_currentState; }

60− virtual QVariant toQVariant(GVariant* state) const override;

55+ void setCurrentState(const QVariantMap& currentState);

61

56

62Q_SIGNALS:

57Q_SIGNALS:

63 void updated();

58 void updated();

64

59

65− void menuChanged();

66− void indexChanged();

67−

68 void validChanged();

60 void validChanged();

69 void titleChanged();

61 void titleChanged();

70 void leftLabelChanged();

62 void leftLabelChanged();

@@ -73,17 +65,9 @@ Q_SIGNALS:

73 void accessibleNameChanged();

65 void accessibleNameChanged();

74 void indicatorVisibleChanged();

66 void indicatorVisibleChanged();

75

67

76−private Q_SLOTS:

68+protected:

77− void onModelRowsAdded(const QModelIndex& parent, int start, int end);

69+ RootStateParser m_parser;

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;

70+ QVariantMap m_currentState;

87};

71};

88

72

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

46 QQmlEngine::setObjectOwnership(model, QQmlEngine::CppOwnership);

46 QQmlEngine::setObjectOwnership(model, QQmlEngine::CppOwnership);

47

47

48 QSharedPointer<UnityMenuModel> menuModel(model);

48 QSharedPointer<UnityMenuModel> menuModel(model);

49− connect(model, &QObject::destroyed, this, [this] {

49+

50− QMutableHashIterator<QByteArray, QWeakPointer<UnityMenuModel>> iter(m_registry);

50+ // Keep a shared pointer (rather than weak pointer which would cause the

51− while(iter.hasNext()) {

51+ // model to be deleted when all shared pointers we give out are deleted).

52− auto keyVal = iter.next();

52+ // We want to keep all models cached because when we switch indicator

53− if (keyVal.value().isNull()) {

53+ // profiles, we will be switching paths often. And we want to keep the

54− iter.remove();

54+ // old model around, ready to be used. Otherwise the UI might momentarily

55− break;

55+ // wait as we populate the model from DBus yet again.

56− }

57− }

58− });

59− m_registry[path] = menuModel.toWeakRef();

56+ m_registry[path] = menuModel;

60

57

61 menuModel->setMenuObjectPath(path);

58 menuModel->setMenuObjectPath(path);

62 return menuModel;

59 return menuModel;

plugins/Unity/Indicators/unitymenumodelcache.h+2−2

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

25#include <QObject>

25#include <QObject>

26#include <QHash>

26#include <QHash>

27#include <QPointer>

27#include <QPointer>

28−#include <QWeakPointer>

28+#include <QSharedPointer>

29

29

30class UnityMenuModel;

30class UnityMenuModel;

31

31

@@ -43,7 +43,7 @@ public:

43 Q_INVOKABLE virtual bool contains(const QByteArray& path);

43 Q_INVOKABLE virtual bool contains(const QByteArray& path);

44

44

45protected:

45protected:

46− QHash<QByteArray, QWeakPointer<UnityMenuModel>> m_registry;

46+ QHash<QByteArray, QSharedPointer<UnityMenuModel>> m_registry;

47 static QPointer<UnityMenuModelCache> theCache;

47 static QPointer<UnityMenuModelCache> theCache;

48};

48};

49

49

plugins/Unity/Indicators/visibleindicatorsmodel.cppdeleted−90

@@ -1,90 +0,0 @@

1−/*

2− * Copyright (C) 2012, 2013 Canonical, Ltd.

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−// self

18−#include "visibleindicatorsmodel.h"

19−#include "indicators.h"

20−

21−VisibleIndicatorsModel::VisibleIndicatorsModel(QObject *parent)

22− : QIdentityProxyModel(parent),

23− m_inserting(false)

24−{

25− QObject::connect(this, SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(onBeginRowInserted(QModelIndex, int, int)));

26− QObject::connect(this, SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(onRowInserted(QModelIndex, int, int)));

27−}

28−

29−QHash<int, QByteArray> VisibleIndicatorsModel::roleNames() const

30−{

31− static QHash<int, QByteArray> roles;

32− if (roles.isEmpty())

33− {

34− roles[IndicatorsModelRole::Identifier] = "identifier";

35− roles[IndicatorsModelRole::Position] = "position";

36− roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";

37− roles[IndicatorsModelRole::IsVisible] = "isVisible";

38− }

39− return roles;

40−}

41−

42−void VisibleIndicatorsModel::setSourceModel(QAbstractItemModel *model)

43−{

44− if (sourceModel() != model) {

45− QIdentityProxyModel::setSourceModel(model);

46− Q_EMIT modelChanged();

47− }

48−}

49−

50−QVariantMap VisibleIndicatorsModel::visible() const

51−{

52− return m_visible;

53−}

54−

55−void VisibleIndicatorsModel::onBeginRowInserted(const QModelIndex&, int, int)

56−{

57− m_inserting = true;

58−}

59−

60−void VisibleIndicatorsModel::onRowInserted(const QModelIndex&, int, int)

61−{

62− m_inserting = false;

63−}

64−

65−void VisibleIndicatorsModel::setVisible(const QVariantMap& visible)

66−{

67− if (m_visible != visible) {

68− m_visible = visible;

69− Q_EMIT visibleChanged();

70−

71− // need to tell the view that the visible data has changed.

72− if (!m_inserting && rowCount() > 0) {

73− Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), QVector<int>() << IndicatorsModelRole::IsVisible);

74− }

75− }

76−}

77−

78−QVariant VisibleIndicatorsModel::data(const QModelIndex &index, int role) const

79−{

80− if (role != IndicatorsModelRole::IsVisible) {

81− return QIdentityProxyModel::data(index, role);

82− }

83−

84− if (!index.isValid()) {

85− return false;

86− }

87−

88− QString ident = QIdentityProxyModel::data(index, IndicatorsModelRole::Identifier).toString();

89− return m_visible.value(ident, false).toBool();

90−}

plugins/Unity/Indicators/visibleindicatorsmodel.hdeleted−56

@@ -1,56 +0,0 @@

1−/*

2− * Copyright (C) 2012, 2013 Canonical, Ltd.

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

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

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

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

11− * GNU General Public License for more details.

12− *

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

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

15− *

16− * Authors:

17− * Nick Dedekind <nick.dedekind@canonical.com>

18− */

19−

20−#ifndef VISIBLEINDICATORSMODEL_H

21−#define VISIBLEINDICATORSMODEL_H

22−

23−#include <QIdentityProxyModel>

24−

25−class VisibleIndicatorsModel : public QIdentityProxyModel

26−{

27− Q_OBJECT

28−

29− Q_PROPERTY(QAbstractItemModel* model READ sourceModel WRITE setSourceModel NOTIFY modelChanged)

30− Q_PROPERTY(QVariantMap visible READ visible WRITE setVisible NOTIFY visibleChanged)

31−

32−public:

33− explicit VisibleIndicatorsModel(QObject *parent = 0);

34−

35− virtual void setSourceModel(QAbstractItemModel *model);

36− virtual QHash<int, QByteArray> roleNames() const;

37− virtual QVariant data(const QModelIndex &index, int role) const;

38−

39− QVariantMap visible() const;

40− void setVisible(const QVariantMap& visible);

41−

42−public Q_SLOTS:

43− void onBeginRowInserted(const QModelIndex&, int start, int end);

44− void onRowInserted(const QModelIndex&, int start, int end);

45−

46−Q_SIGNALS:

47− void totalCountChanged();

48− void modelChanged();

49− void visibleChanged();

50−

51−private:

52− QVariantMap m_visible;

53− bool m_inserting;

54−};

55−

56−#endif // VISIBLEINDICATORSMODEL_H

plugins/Unity/Launcher/CMakeLists.txt+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)

3pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)

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

4pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

3pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

5

4

@@ -21,6 +20,7 @@ set(QMLLAUNCHERPLUGIN_SRC

21 dbusinterface.cpp

20 dbusinterface.cpp

22 gsettings.cpp

21 gsettings.cpp

23 desktopfilehandler.cpp

22 desktopfilehandler.cpp

23+ asadapter.cpp

24 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

24 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

25 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

25 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

26 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

26 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

plugins/Unity/Launcher/Launcher.qmltypes+3

@@ -25,6 +25,7 @@ Module {

25 name: "requestRemove"

25 name: "requestRemove"

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

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

27 }

27 }

28+ Method { name: "refresh" }

28 Method {

29 Method {

29 name: "get"

30 name: "get"

30 type: "unity::shell::launcher::LauncherItemInterface*"

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

@@ -136,6 +137,8 @@ Module {

136 type: "unity::shell::application::ApplicationManagerInterface"

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

137 isPointer: true

138 isPointer: true

138 }

139 }

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

141+ Signal { name: "hint" }

139 Method {

142 Method {

140 name: "move"

143 name: "move"

141 Parameter { name: "oldIndex"; type: "int" }

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

plugins/Unity/Launcher/asadapter.cppnew file+60

@@ -0,0 +1,60 @@

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#include "asadapter.h"

18+#include "launcheritem.h"

19+#include "AccountsServiceDBusAdaptor.h"

20+

21+#include <QDebug>

22+

23+ASAdapter::ASAdapter()

24+{

25+ m_accounts = new AccountsServiceDBusAdaptor();

26+ m_user = qgetenv("USER");

27+ if (m_user.isEmpty()) {

28+ qWarning() << "$USER not valid. Account Service integration will not work.";

29+ }

30+}

31+

32+ASAdapter::~ASAdapter()

33+{

34+ m_accounts->deleteLater();

35+}

36+

37+void ASAdapter::syncItems(QList<LauncherItem *> m_list)

38+{

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

40+ QList<QVariantMap> items;

41+

42+ Q_FOREACH(LauncherItem *item, m_list) {

43+ items << itemToVariant(item);

44+ }

45+

46+ m_accounts->setUserPropertyAsync(m_user, "com.canonical.unity.AccountsService", "LauncherItems", QVariant::fromValue(items));

47+ }

48+}

49+

50+QVariantMap ASAdapter::itemToVariant(LauncherItem *item) const

51+{

52+ QVariantMap details;

53+ details.insert("id", item->appId());

54+ details.insert("name", item->name());

55+ details.insert("icon", item->icon());

56+ details.insert("count", item->count());

57+ details.insert("countVisible", item->countVisible());

58+ details.insert("pinned", item->pinned());

59+ return details;

60+}

tests/mocks/Unity/Notifications/MockNotificationTypes.h → plugins/Unity/Launcher/asadapter.hrenamed+24−14

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

1/*

1/*

2− * Copyright 2014 Canonical Ltd.

2+ * Copyright 2014-2015 Canonical Ltd.

3 *

3 *

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

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

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

@@ -12,25 +12,35 @@

12 *

12 *

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

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/>.

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

15− *

16− * Authors:

17− * Mirco Mueller <mirco.mueller@canonical.com>

18 */

15 */

19

16

20−#ifndef MOCK_NOTIFICATION_TYPES_H

17+#ifndef ASADAPTER_H

21−#define MOCK_NOTIFICATION_TYPES_H

18+#define ASADAPTER_H

22

19

23−#include <QObject>

20+#include <QVariantMap>

24

21

25−class MockNotification : public QObject {

22+class LauncherItem;

26− Q_OBJECT

23+class AccountsServiceDBusAdaptor;

27− Q_ENUMS(Type)

24+class QDBusInterface;

28

25

26+class ASAdapter

27+{

29public:

28public:

30− MockNotification(QObject *parent=nullptr);

29+ ASAdapter();

31− virtual ~MockNotification();

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;

32

42

33− enum Type { PlaceHolder, Confirmation, Ephemeral, Interactive, SnapDecision };

43+ friend class LauncherModelTest;

34};

44};

35

45

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)

59 Q_FOREACH(const QString &entry, storedApplications) {

59 Q_FOREACH(const QString &entry, storedApplications) {

60 gSettingsList << QString("appid://%1").arg(entry);

60 gSettingsList << QString("appid://%1").arg(entry);

61 }

61 }

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;

62 m_gSettings->set("items", gSettingsList);

65 m_gSettings->set("items", gSettingsList);

63}

66}

64

67

65void GSettings::onSettingsChanged(const QString &key)

68void GSettings::onSettingsChanged(const QString &key)

66{

69{

67 if (key == "items") {

70 if (key == "items") {

71+ QStringList cachedItems = m_gSettings->get("items").toStringList();

72+ if (m_cachedItems != cachedItems) {

73+ m_cachedItems = cachedItems;

68− Q_EMIT changed();

74+ Q_EMIT changed();

75+ }

69 }

76 }

70}

77}

plugins/Unity/Launcher/gsettings.h+1

@@ -41,6 +41,7 @@ private Q_SLOTS:

41

41

42private:

42private:

43 QGSettings *m_gSettings;

43 QGSettings *m_gSettings;

44+ QStringList m_cachedItems;

44};

45};

45

46

46#endif

47#endif

plugins/Unity/Launcher/launchermodel.cpp+27−7

@@ -22,6 +22,7 @@

22#include "gsettings.h"

22#include "gsettings.h"

23#include "desktopfilehandler.h"

23#include "desktopfilehandler.h"

24#include "dbusinterface.h"

24#include "dbusinterface.h"

25+#include "asadapter.h"

25

26

26#include <unity/shell/application/ApplicationInfoInterface.h>

27#include <unity/shell/application/ApplicationInfoInterface.h>

27

28

@@ -34,6 +35,7 @@ LauncherModel::LauncherModel(QObject *parent):

34 LauncherModelInterface(parent),

35 LauncherModelInterface(parent),

35 m_settings(new GSettings(this)),

36 m_settings(new GSettings(this)),

36 m_dbusIface(new DBusInterface(this)),

37 m_dbusIface(new DBusInterface(this)),

38+ m_asAdapter(new ASAdapter()),

37 m_appManager(0)

39 m_appManager(0)

38{

40{

39 connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);

41 connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);

@@ -50,6 +52,8 @@ LauncherModel::~LauncherModel()

50 while (!m_list.empty()) {

52 while (!m_list.empty()) {

51 m_list.takeFirst()->deleteLater();

53 m_list.takeFirst()->deleteLater();

52 }

54 }

55+

56+ delete m_asAdapter;

53}

57}

54

58

55int LauncherModel::rowCount(const QModelIndex &parent) const

59int LauncherModel::rowCount(const QModelIndex &parent) const

@@ -261,6 +265,15 @@ void LauncherModel::setApplicationManager(unity::shell::application::Application

261 }

265 }

262}

266}

263

267

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+}

264

277

265void LauncherModel::storeAppList()

278void LauncherModel::storeAppList()

266{

279{

@@ -271,6 +284,7 @@ void LauncherModel::storeAppList()

271 }

284 }

272 }

285 }

273 m_settings->setStoredApplications(appIds);

286 m_settings->setStoredApplications(appIds);

287+ m_asAdapter->syncItems(m_list);

274}

288}

275

289

276void LauncherModel::unpin(const QString &appId)

290void LauncherModel::unpin(const QString &appId)

@@ -321,6 +335,7 @@ void LauncherModel::countChanged(const QString &appId, int count)

321 LauncherItem *item = m_list.at(idx);

335 LauncherItem *item = m_list.at(idx);

322 item->setCount(count);

336 item->setCount(count);

323 Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCount);

337 Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCount);

338+ m_asAdapter->syncItems(m_list);

324 }

339 }

325}

340}

326

341

@@ -352,6 +367,7 @@ void LauncherModel::countVisibleChanged(const QString &appId, int countVisible)

352 Q_EMIT hint();

367 Q_EMIT hint();

353 }

368 }

354 }

369 }

370+ m_asAdapter->syncItems(m_list);

355}

371}

356

372

357void LauncherModel::refresh()

373void LauncherModel::refresh()

@@ -433,6 +449,8 @@ void LauncherModel::refresh()

433 if (changed) {

449 if (changed) {

434 Q_EMIT hint();

450 Q_EMIT hint();

435 }

451 }

452+

453+ m_asAdapter->syncItems(m_list);

436}

454}

437

455

438void LauncherModel::applicationAdded(const QModelIndex &parent, int row)

456void LauncherModel::applicationAdded(const QModelIndex &parent, int row)

@@ -450,14 +468,14 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)

450 return;

468 return;

451 }

469 }

452

470

453− bool found = false;

471+ int itemIndex = findApplication(app->appId());

472+ if (itemIndex != -1) {

454− Q_FOREACH(LauncherItem *item, m_list) {

473+ LauncherItem *item = m_list.at(itemIndex);

455− if (app->appId() == item->appId()) {

474+ if (!item->recent()) {

456− found = true;

475+ item->setRecent(true);

457− break;

476+ m_asAdapter->syncItems(m_list);

477+ Q_EMIT dataChanged(index(itemIndex), index(itemIndex), QVector<int>() << RoleRecent);

458 }

478 }

459− }

460− if (found) {

461 // Shall we paint some running/recent app highlight? If yes, do it here.

479 // Shall we paint some running/recent app highlight? If yes, do it here.

462 } else {

480 } else {

463 LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);

481 LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);

@@ -467,6 +485,7 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)

467 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());

485 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());

468 m_list.append(item);

486 m_list.append(item);

469 endInsertRows();

487 endInsertRows();

488+ m_asAdapter->syncItems(m_list);

470 }

489 }

471}

490}

472

491

@@ -486,6 +505,7 @@ void LauncherModel::applicationRemoved(const QModelIndex &parent, int row)

486 beginRemoveRows(QModelIndex(), appIndex, appIndex);

505 beginRemoveRows(QModelIndex(), appIndex, appIndex);

487 m_list.takeAt(appIndex)->deleteLater();

506 m_list.takeAt(appIndex)->deleteLater();

488 endRemoveRows();

507 endRemoveRows();

508+ m_asAdapter->syncItems(m_list);

489 }

509 }

490}

510}

491

511

plugins/Unity/Launcher/launchermodel.h+5

@@ -28,6 +28,7 @@

28class LauncherItem;

28class LauncherItem;

29class GSettings;

29class GSettings;

30class DBusInterface;

30class DBusInterface;

31+class ASAdapter;

31

32

32using namespace unity::shell::launcher;

33using namespace unity::shell::launcher;

33using namespace unity::shell::application;

34using namespace unity::shell::application;

@@ -54,6 +55,9 @@ public:

54 unity::shell::application::ApplicationManagerInterface* applicationManager() const;

55 unity::shell::application::ApplicationManagerInterface* applicationManager() const;

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

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

56

57

58+ bool onlyPinned() const override;

59+ void setOnlyPinned(bool onlyPinned) override;

60+

57 int findApplication(const QString &appId);

61 int findApplication(const QString &appId);

58

62

59public Q_SLOTS:

63public Q_SLOTS:

@@ -79,6 +83,7 @@ private:

79

83

80 GSettings *m_settings;

84 GSettings *m_settings;

81 DBusInterface *m_dbusIface;

85 DBusInterface *m_dbusIface;

86+ ASAdapter *m_asAdapter;

82

87

83 ApplicationManagerInterface *m_appManager;

88 ApplicationManagerInterface *m_appManager;

84

89

plugins/Unity/Session/CMakeLists.txt−2

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

1−include(FindPkgConfig)

2−

3pkg_search_module(GIO REQUIRED gio-2.0)

1pkg_search_module(GIO REQUIRED gio-2.0)

4

2

5include_directories(

3include_directories(

plugins/Unity/Session/Session.qmltypes+5−1

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

9Module {

9Module {

10 Component {

10 Component {

11 name: "DBusUnitySessionService"

11 name: "DBusUnitySessionService"

12− prototype: "QObject"

12+ prototype: "UnityDBusObject"

13 exports: ["Unity.Session/DBusUnitySessionService 0.1"]

13 exports: ["Unity.Session/DBusUnitySessionService 0.1"]

14 isCreatable: false

14 isCreatable: false

15 isSingleton: true

15 isSingleton: true

@@ -33,6 +33,9 @@ Module {

33 Method { name: "RequestLogout" }

33 Method { name: "RequestLogout" }

34 Method { name: "RequestReboot" }

34 Method { name: "RequestReboot" }

35 Method { name: "RequestShutdown" }

35 Method { name: "RequestShutdown" }

36+ Method { name: "logout" }

37+ Method { name: "reboot" }

38+ Method { name: "shutdown" }

36 }

39 }

37 Component {

40 Component {

38 name: "OrientationLock"

41 name: "OrientationLock"

@@ -44,4 +47,5 @@ Module {

44 Property { name: "enabled"; type: "bool"; isReadonly: true }

47 Property { name: "enabled"; type: "bool"; isReadonly: true }

45 Property { name: "savedOrientation"; type: "Qt::ScreenOrientation" }

48 Property { name: "savedOrientation"; type: "Qt::ScreenOrientation" }

46 }

49 }

50+ Component { name: "UnityDBusObject"; prototype: "QObject" }

47}

51}

plugins/Unity/Session/dbusunitysessionservice.cpp+60

@@ -35,6 +35,17 @@ void DBusUnitySessionService::Logout()

35 Q_EMIT logoutReady();

35 Q_EMIT logoutReady();

36}

36}

37

37

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+

38void DBusUnitySessionService::RequestLogout()

49void DBusUnitySessionService::RequestLogout()

39{

50{

40 Q_EMIT logoutRequested(false);

51 Q_EMIT logoutRequested(false);

@@ -71,3 +82,52 @@ void DBusUnitySessionService::RequestShutdown()

71{

82{

72 Q_EMIT shutdownRequested(false);

83 Q_EMIT shutdownRequested(false);

73}

84}

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 @@

17#ifndef DBUSUNITYSESSIONSERVICE_H

17#ifndef DBUSUNITYSESSIONSERVICE_H

18#define DBUSUNITYSESSIONSERVICE_H

18#define DBUSUNITYSESSIONSERVICE_H

19

19

20+#include <QDBusObjectPath>

21+

20#include "unitydbusobject.h"

22#include "unitydbusobject.h"

21

23

24+typedef QList<QDBusObjectPath> QDbusList;

25+Q_DECLARE_METATYPE(QList<QDBusObjectPath>)

26+

22/**

27/**

23 * DBusUnitySessionService provides com.canonical.Unity.Session dbus

28 * DBusUnitySessionService provides com.canonical.Unity.Session dbus

24 * interface.

29 * interface.

@@ -39,6 +44,7 @@ public:

39 Q_INVOKABLE void logout() { Logout(); }

44 Q_INVOKABLE void logout() { Logout(); }

40 Q_INVOKABLE void reboot() { Reboot(); }

45 Q_INVOKABLE void reboot() { Reboot(); }

41 Q_INVOKABLE void shutdown() { Shutdown(); }

46 Q_INVOKABLE void shutdown() { Shutdown(); }

47+ Q_INVOKABLE void endSession() { EndSession(); }

42

48

43Q_SIGNALS:

49Q_SIGNALS:

44 /**

50 /**

@@ -49,7 +55,7 @@ Q_SIGNALS:

49 * @param have_inhibitors if there are any special running applications

55 * @param have_inhibitors if there are any special running applications

50 * which inhibit the logout.

56 * which inhibit the logout.

51 */

57 */

52− void logoutRequested(bool have_inhibitors);

58+ Q_SCRIPTABLE void logoutRequested(bool have_inhibitors);

53

59

54 /**

60 /**

55 * rebootRequested signal

61 * rebootRequested signal

@@ -59,7 +65,7 @@ Q_SIGNALS:

59 * @param have_inhibitors if there are any special running applications

65 * @param have_inhibitors if there are any special running applications

60 * which inhibit the reboot.

66 * which inhibit the reboot.

61 */

67 */

62− void rebootRequested(bool have_inhibitors);

68+ Q_SCRIPTABLE void rebootRequested(bool have_inhibitors);

63

69

64 /**

70 /**

65 * shutdownRequested signal

71 * shutdownRequested signal

@@ -69,7 +75,7 @@ Q_SIGNALS:

69 * @param have_inhibitors if there are any special running applications

75 * @param have_inhibitors if there are any special running applications

70 * which inhibit the shutdown.

76 * which inhibit the shutdown.

71 */

77 */

72− void shutdownRequested(bool have_inhibitors);

78+ Q_SCRIPTABLE void shutdownRequested(bool have_inhibitors);

73

79

74

80

75 /**

81 /**

@@ -139,6 +145,25 @@ public Q_SLOTS:

139 */

145 */

140 Q_SCRIPTABLE void RequestShutdown();

146 Q_SCRIPTABLE void RequestShutdown();

141

147

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();

142};

155};

143

156

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+};

144#endif // DBUSUNITYSESSIONSERVICE_H

169#endif // DBUSUNITYSESSIONSERVICE_H

plugins/Unity/Session/plugin.cpp+1

@@ -26,6 +26,7 @@

26

26

27static QObject *dbusunitysessionservice_provider(QQmlEngine */*engine*/, QJSEngine */*jsEngine*/)

27static QObject *dbusunitysessionservice_provider(QQmlEngine */*engine*/, QJSEngine */*jsEngine*/)

28{

28{

29+ new DBusGnomeSessionManagerWrapper();

29 return new DBusUnitySessionService();

30 return new DBusUnitySessionService();

30}

31}

31

32

plugins/Utils/CMakeLists.txt+5−5

@@ -1,6 +1,3 @@

1−# Dependencies

2−include(FindPkgConfig)

3−

4pkg_search_module(GIO REQUIRED gio-2.0)

1pkg_search_module(GIO REQUIRED gio-2.0)

5

2

6include_directories(

3include_directories(

@@ -11,13 +8,16 @@ include_directories(

11)

8)

12

9

13set(QMLPLUGIN_SRC

10set(QMLPLUGIN_SRC

11+ constants.cpp

12+ inputwatcher.cpp

14 qlimitproxymodelqml.cpp

13 qlimitproxymodelqml.cpp

15− qsortfilterproxymodelqml.cpp

14+ unitysortfilterproxymodelqml.cpp

16 relativetimeformatter.cpp

15 relativetimeformatter.cpp

17 timeformatter.cpp

16 timeformatter.cpp

18 unitymenumodelpaths.cpp

17 unitymenumodelpaths.cpp

19 windowkeysfilter.cpp

18 windowkeysfilter.cpp

20 easingcurve.cpp

19 easingcurve.cpp

20+ windowstatestorage.cpp

21 plugin.cpp

21 plugin.cpp

22 )

22 )

23

23

@@ -33,6 +33,6 @@ target_link_libraries(Utils-qml ${GIO_LDFLAGS})

33# files directly in targets.

33# files directly in targets.

34set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)

34set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)

35

35

36−qt5_use_modules(Utils-qml Qml Quick DBus Network Gui)

36+qt5_use_modules(Utils-qml Qml Quick DBus Network Gui Sql Concurrent)

37

37

38add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)

38add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)

plugins/Utils/Utils.qmltypes+60−41

@@ -60,9 +60,49 @@ Module {

60 Method { name: "invalidate" }

60 Method { name: "invalidate" }

61 }

61 }

62 Component {

62 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"

64 prototype: "QSortFilterProxyModel"

104 prototype: "QSortFilterProxyModel"

65− exports: ["Utils/SortFilterProxyModel 0.1"]

105+ exports: ["Utils/UnitySortFilterProxyModel 0.1"]

66 exportMetaObjectRevisions: [0]

106 exportMetaObjectRevisions: [0]

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

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

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

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

@@ -107,50 +147,29 @@ Module {

107 }

147 }

108 }

148 }

109 Component {

149 Component {

110− name: "RelativeTimeFormatter"

150+ name: "WindowKeysFilter"

151+ defaultProperty: "data"

111− prototype: "TimeFormatter"

152+ prototype: "QQuickItem"

112− exports: ["Utils/RelativeTimeFormatter 0.1"]

153+ exports: ["Utils/WindowKeysFilter 0.1"]

113 exportMetaObjectRevisions: [0]

154 exportMetaObjectRevisions: [0]

114 }

155 }

115 Component {

156 Component {

116− name: "TimeFormatter"

157+ name: "WindowStateStorage"

117 prototype: "QObject"

158 prototype: "QObject"

118− exports: ["Utils/GDateTimeFormatter 0.1", "Utils/TimeFormatter 0.1"]

159+ exports: ["Utils/WindowStateStorage 0.1"]

119− exportMetaObjectRevisions: [0, 0]

160+ isCreatable: false

120− Property { name: "format"; type: "string" }

161+ isSingleton: true

121− Property { name: "timeString"; type: "string"; isReadonly: true }

162+ exportMetaObjectRevisions: [0]

122− Property { name: "time"; type: "qlonglong" }

163+ Method {

123− Signal {

164+ name: "saveGeometry"

124− name: "formatChanged"

125− Parameter { name: "format"; type: "string" }

165+ Parameter { name: "windowId"; type: "string" }

126− }

127− Signal {

128− name: "timeStringChanged"

129− Parameter { name: "timeString"; type: "string" }

166+ Parameter { name: "rect"; type: "QRect" }

130 }

167 }

131− Signal {

168+ Method {

132− name: "timeChanged"

169+ name: "getGeometry"

170+ type: "QRect"

171+ Parameter { name: "windowId"; type: "string" }

133− Parameter { name: "time"; type: "qlonglong" }

172+ Parameter { name: "defaultValue"; type: "QRect" }

134 }

173 }

135 }

174 }

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− }

156}

175}

plugins/Utils/constants.cppnew file+27

@@ -0,0 +1,27 @@

1+/*

2+ * Copyright 2015 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+*/

16+

17+#include "constants.h"

18+

19+Constants::Constants(QObject *parent)

20+ : QObject(parent)

21+{

22+ if (qgetenv("QT_LOAD_TESTABILITY").isEmpty()) {

23+ m_indicatorValueTimeout = 30000;

24+ } else {

25+ m_indicatorValueTimeout = 5000;

26+ }

27+}

plugins/Utils/constants.hnew file+43

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

1+/*

2+ * Copyright 2015 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+*/

16+

17+#ifndef CONSTANTS_H

18+#define CONSTANTS_H

19+

20+#include <QObject>

21+

22+/**

23+ * @brief The Constants class

24+ *

25+ * This singleton class exposes contants to Qml

26+ *

27+ */

28+

29+class Constants: public QObject

30+{

31+ Q_OBJECT

32+ Q_PROPERTY(int indicatorValueTimeout READ indicatorValueTimeout CONSTANT)

33+

34+public:

35+ Constants(QObject *parent = 0);

36+

37+ int indicatorValueTimeout() const { return m_indicatorValueTimeout; }

38+

39+private:

40+ int m_indicatorValueTimeout;

41+};

42+

43+#endif

plugins/Utils/inputwatcher.cppnew file+118

@@ -0,0 +1,118 @@

1+/*

2+ * Copyright (C) 2015 Canonical, Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ *

16+ */

17+

18+#include "inputwatcher.h"

19+

20+#include <QMouseEvent>

21+

22+InputWatcher::InputWatcher(QObject *parent)

23+ : QObject(parent)

24+ , m_mousePressed(false)

25+ , m_touchPressed(false)

26+{

27+}

28+

29+QObject *InputWatcher::target() const

30+{

31+ return m_target;

32+}

33+

34+void InputWatcher::setTarget(QObject *value)

35+{

36+ if (m_target == value) {

37+ return;

38+ }

39+

40+ if (m_target) {

41+ m_target->removeEventFilter(this);

42+ }

43+

44+ setMousePressed(false);

45+ setTouchPressed(false);

46+

47+ m_target = value;

48+ if (m_target) {

49+ m_target->installEventFilter(this);

50+ }

51+

52+ Q_EMIT targetChanged(value);

53+}

54+

55+bool InputWatcher::targetPressed() const

56+{

57+ return m_mousePressed || m_touchPressed;

58+}

59+

60+bool InputWatcher::eventFilter(QObject* /*watched*/, QEvent *event)

61+{

62+ switch (event->type()) {

63+ case QEvent::TouchBegin:

64+ setTouchPressed(true);

65+ break;

66+ case QEvent::TouchEnd:

67+ setTouchPressed(false);

68+ break;

69+ case QEvent::MouseButtonPress:

70+ {

71+ QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);

72+ if (mouseEvent->button() == Qt::LeftButton) {

73+ setMousePressed(true);

74+ }

75+ }

76+ break;

77+ case QEvent::MouseButtonRelease:

78+ {

79+ QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);

80+ if (mouseEvent->button() == Qt::LeftButton) {

81+ setMousePressed(false);

82+ }

83+ }

84+ break;

85+ default:

86+ // Not interested

87+ break;

88+ }

89+

90+ // We never filter them out. We are just watching.

91+ return false;

92+}

93+

94+void InputWatcher::setMousePressed(bool value)

95+{

96+ if (value == m_mousePressed) {

97+ return;

98+ }

99+

100+ bool oldPressed = targetPressed();

101+ m_mousePressed = value;

102+ if (targetPressed() != oldPressed) {

103+ Q_EMIT targetPressedChanged(targetPressed());

104+ }

105+}

106+

107+void InputWatcher::setTouchPressed(bool value)

108+{

109+ if (value == m_touchPressed) {

110+ return;

111+ }

112+

113+ bool oldPressed = targetPressed();

114+ m_touchPressed = value;

115+ if (targetPressed() != oldPressed) {

116+ Q_EMIT targetPressedChanged(targetPressed());

117+ }

118+}

plugins/Utils/inputwatcher.hnew file+58

@@ -0,0 +1,58 @@

1+/*

2+ * Copyright (C) 2015 Canonical, Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ *

16+ */

17+

18+#ifndef UNITY_INPUTWATCHER_H

19+#define UNITY_INPUTWATCHER_H

20+

21+#include <QObject>

22+#include <QPointer>

23+

24+/*

25+ Monitors the target object for input events to figure out whether it's pressed

26+ or not.

27+ */

28+class InputWatcher : public QObject

29+{

30+ Q_OBJECT

31+ Q_PROPERTY(QObject* target READ target WRITE setTarget NOTIFY targetChanged)

32+

33+ // Whether the target object is pressed (by either touch or mouse)

34+ Q_PROPERTY(bool targetPressed READ targetPressed NOTIFY targetPressedChanged)

35+public:

36+ InputWatcher(QObject *parent = nullptr);

37+

38+ QObject *target() const;

39+ void setTarget(QObject *value);

40+

41+ bool targetPressed() const;

42+

43+ bool eventFilter(QObject *watched, QEvent *event) override;

44+

45+Q_SIGNALS:

46+ void targetChanged(QObject *value);

47+ void targetPressedChanged(bool value);

48+

49+private:

50+ void setMousePressed(bool value);

51+ void setTouchPressed(bool value);

52+

53+ bool m_mousePressed;

54+ bool m_touchPressed;

55+ QPointer<QObject> m_target;

56+};

57+

58+#endif // UNITY_INPUTWATCHER_H

plugins/Utils/plugin.cpp+22−2

@@ -26,26 +26,46 @@

26#include "plugin.h"

26#include "plugin.h"

27

27

28// local

28// local

29+#include "inputwatcher.h"

29#include "qlimitproxymodelqml.h"

30#include "qlimitproxymodelqml.h"

30−#include "qsortfilterproxymodelqml.h"

31+#include "unitysortfilterproxymodelqml.h"

31#include "relativetimeformatter.h"

32#include "relativetimeformatter.h"

32#include "timeformatter.h"

33#include "timeformatter.h"

33#include "unitymenumodelpaths.h"

34#include "unitymenumodelpaths.h"

34#include "windowkeysfilter.h"

35#include "windowkeysfilter.h"

35#include "easingcurve.h"

36#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+}

36

53

37void UtilsPlugin::registerTypes(const char *uri)

54void UtilsPlugin::registerTypes(const char *uri)

38{

55{

39 Q_ASSERT(uri == QLatin1String("Utils"));

56 Q_ASSERT(uri == QLatin1String("Utils"));

40 qmlRegisterType<QAbstractItemModel>();

57 qmlRegisterType<QAbstractItemModel>();

41 qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");

58 qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");

42− qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");

59+ qmlRegisterType<UnitySortFilterProxyModelQML>(uri, 0, 1, "UnitySortFilterProxyModel");

43 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");

60 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");

44 qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");

61 qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");

45 qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");

62 qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");

46 qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");

63 qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");

47 qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");

64 qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");

48 qmlRegisterType<RelativeTimeFormatter>(uri, 0, 1, "RelativeTimeFormatter");

65 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);

49}

69}

50

70

51void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

71void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

plugins/Utils/qsortfilterproxymodelqml.cpp → plugins/Utils/unitysortfilterproxymodelqml.cpprenamed+15−15

@@ -15,12 +15,12 @@

15 */

15 */

16

16

17// self

17// self

18−#include "qsortfilterproxymodelqml.h"

18+#include "unitysortfilterproxymodelqml.h"

19

19

20// Qt

20// Qt

21#include <QDebug>

21#include <QDebug>

22

22

23−QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)

23+UnitySortFilterProxyModelQML::UnitySortFilterProxyModelQML(QObject *parent)

24 : QSortFilterProxyModel(parent)

24 : QSortFilterProxyModel(parent)

25 , m_invertMatch(false)

25 , m_invertMatch(false)

26{

26{

@@ -32,7 +32,7 @@ QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)

32/*

32/*

33 * Enter row index of filtered/sorted model, returns row index of source model

33 * Enter row index of filtered/sorted model, returns row index of source model

34 */

34 */

35−int QSortFilterProxyModelQML::mapRowToSource(int row)

35+int UnitySortFilterProxyModelQML::mapRowToSource(int row)

36{

36{

37 if (sourceModel() == nullptr)

37 if (sourceModel() == nullptr)

38 return -1;

38 return -1;

@@ -40,13 +40,13 @@ int QSortFilterProxyModelQML::mapRowToSource(int row)

40 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();

40 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();

41}

41}

42

42

43−QHash<int, QByteArray> QSortFilterProxyModelQML::roleNames() const

43+QHash<int, QByteArray> UnitySortFilterProxyModelQML::roleNames() const

44{

44{

45 return sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();

45 return sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();

46}

46}

47

47

48void

48void

49−QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)

49+UnitySortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)

50{

50{

51 if (itemModel == nullptr) {

51 if (itemModel == nullptr) {

52 return;

52 return;

@@ -69,7 +69,7 @@ QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)

69}

69}

70

70

71QVariantMap

71QVariantMap

72−QSortFilterProxyModelQML::get(int row)

72+UnitySortFilterProxyModelQML::get(int row)

73{

73{

74 QVariantMap res;

74 QVariantMap res;

75 const QHash<int, QByteArray> roles = roleNames();

75 const QHash<int, QByteArray> roles = roleNames();

@@ -81,7 +81,7 @@ QSortFilterProxyModelQML::get(int row)

81}

81}

82

82

83QVariant

83QVariant

84−QSortFilterProxyModelQML::data(int row, int role)

84+UnitySortFilterProxyModelQML::data(int row, int role)

85{

85{

86 if (sourceModel() == nullptr) {

86 if (sourceModel() == nullptr) {

87 return QVariant();

87 return QVariant();

@@ -91,7 +91,7 @@ QSortFilterProxyModelQML::data(int row, int role)

91}

91}

92

92

93int

93int

94−QSortFilterProxyModelQML::totalCount() const

94+UnitySortFilterProxyModelQML::totalCount() const

95{

95{

96 if (sourceModel() != nullptr) {

96 if (sourceModel() != nullptr) {

97 return sourceModel()->rowCount();

97 return sourceModel()->rowCount();

@@ -101,19 +101,19 @@ QSortFilterProxyModelQML::totalCount() const

101}

101}

102

102

103int

103int

104−QSortFilterProxyModelQML::count()

104+UnitySortFilterProxyModelQML::count()

105{

105{

106 return rowCount();

106 return rowCount();

107}

107}

108

108

109bool

109bool

110−QSortFilterProxyModelQML::invertMatch() const

110+UnitySortFilterProxyModelQML::invertMatch() const

111{

111{

112 return m_invertMatch;

112 return m_invertMatch;

113}

113}

114

114

115void

115void

116−QSortFilterProxyModelQML::setInvertMatch(bool invertMatch)

116+UnitySortFilterProxyModelQML::setInvertMatch(bool invertMatch)

117{

117{

118 if (invertMatch != m_invertMatch) {

118 if (invertMatch != m_invertMatch) {

119 m_invertMatch = invertMatch;

119 m_invertMatch = invertMatch;

@@ -123,7 +123,7 @@ QSortFilterProxyModelQML::setInvertMatch(bool invertMatch)

123}

123}

124

124

125bool

125bool

126−QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,

126+UnitySortFilterProxyModelQML::filterAcceptsRow(int sourceRow,

127 const QModelIndex &sourceParent) const

127 const QModelIndex &sourceParent) const

128{

128{

129 // If there's no regexp set, always accept all rows indepenently of the invertMatch setting

129 // If there's no regexp set, always accept all rows indepenently of the invertMatch setting

@@ -136,7 +136,7 @@ QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,

136}

136}

137

137

138int

138int

139−QSortFilterProxyModelQML::findFirst(int role, const QVariant& value) const

139+UnitySortFilterProxyModelQML::findFirst(int role, const QVariant& value) const

140{

140{

141 QModelIndexList matches = match(index(0, 0), role, value, 1, Qt::MatchExactly);

141 QModelIndexList matches = match(index(0, 0), role, value, 1, Qt::MatchExactly);

142 if (!matches.isEmpty()) {

142 if (!matches.isEmpty()) {

@@ -147,7 +147,7 @@ QSortFilterProxyModelQML::findFirst(int role, const QVariant& value) const

147}

147}

148

148

149int

149int

150−QSortFilterProxyModelQML::mapFromSource(int row)

150+UnitySortFilterProxyModelQML::mapFromSource(int row)

151{

151{

152 if (sourceModel() != nullptr) {

152 if (sourceModel() != nullptr) {

153 return QSortFilterProxyModel::mapFromSource(sourceModel()->index(row, 0)).row();

153 return QSortFilterProxyModel::mapFromSource(sourceModel()->index(row, 0)).row();

@@ -157,7 +157,7 @@ QSortFilterProxyModelQML::mapFromSource(int row)

157}

157}

158

158

159int

159int

160−QSortFilterProxyModelQML::mapToSource(int row)

160+UnitySortFilterProxyModelQML::mapToSource(int row)

161{

161{

162 if (sourceModel() != nullptr) {

162 if (sourceModel() != nullptr) {

163 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();

163 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();

plugins/Utils/qsortfilterproxymodelqml.h → plugins/Utils/unitysortfilterproxymodelqml.hrenamed+5−5

@@ -14,12 +14,12 @@

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

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

15 */

15 */

16

16

17−#ifndef QSORTFILTERPROXYMODELQML_H

17+#ifndef UNITYSORTFILTERPROXYMODELQML_H

18−#define QSORTFILTERPROXYMODELQML_H

18+#define UNITYSORTFILTERPROXYMODELQML_H

19

19

20#include <QSortFilterProxyModel>

20#include <QSortFilterProxyModel>

21

21

22−class QSortFilterProxyModelQML : public QSortFilterProxyModel

22+class UnitySortFilterProxyModelQML : public QSortFilterProxyModel

23{

23{

24 Q_OBJECT

24 Q_OBJECT

25

25

@@ -29,7 +29,7 @@ class QSortFilterProxyModelQML : public QSortFilterProxyModel

29 Q_PROPERTY(bool invertMatch READ invertMatch WRITE setInvertMatch NOTIFY invertMatchChanged)

29 Q_PROPERTY(bool invertMatch READ invertMatch WRITE setInvertMatch NOTIFY invertMatchChanged)

30

30

31public:

31public:

32− explicit QSortFilterProxyModelQML(QObject *parent = 0);

32+ explicit UnitySortFilterProxyModelQML(QObject *parent = 0);

33

33

34 Q_INVOKABLE QVariantMap get(int row); // Use with caution, it can be slow to query all the roles

34 Q_INVOKABLE QVariantMap get(int row); // Use with caution, it can be slow to query all the roles

35 Q_INVOKABLE QVariant data(int row, int role);

35 Q_INVOKABLE QVariant data(int row, int role);

@@ -60,4 +60,4 @@ private:

60 bool m_invertMatch;

60 bool m_invertMatch;

61};

61};

62

62

63−#endif // QSORTFILTERPROXYMODELQML_H

63+#endif // UNITYSORTFILTERPROXYMODELQML_H

plugins/Utils/windowstatestorage.cppnew file+117

@@ -0,0 +1,117 @@

1+/*

2+ * Copyright 2015 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#include "windowstatestorage.h"

18+

19+#include <QtConcurrent>

20+#include <QDebug>

21+#include <QFutureSynchronizer>

22+#include <QSqlQuery>

23+#include <QSqlError>

24+#include <QSqlResult>

25+#include <QRect>

26+

27+QMutex WindowStateStorage::s_mutex;

28+

29+WindowStateStorage::WindowStateStorage(QObject *parent):

30+ QObject(parent)

31+{

32+ QString dbPath = QDir::homePath() + "/.cache/unity8/";

33+ m_db = QSqlDatabase::addDatabase("QSQLITE");

34+ QDir dir;

35+ dir.mkpath(dbPath);

36+ m_db.setDatabaseName(dbPath + "windowstatestorage.sqlite");

37+ initdb();

38+}

39+

40+WindowStateStorage::~WindowStateStorage()

41+{

42+ QFutureSynchronizer<void> futureSync;

43+ for (int i = 0; i < m_asyncQueries.count(); ++i) {

44+ futureSync.addFuture(m_asyncQueries[i]);

45+ }

46+ futureSync.waitForFinished();

47+ m_db.close();

48+}

49+

50+void WindowStateStorage::saveGeometry(const QString &windowId, const QRect &rect)

51+{

52+ QMutexLocker mutexLocker(&s_mutex);

53+

54+ QString queryString = QString("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")

55+ .arg(windowId)

56+ .arg(rect.x())

57+ .arg(rect.y())

58+ .arg(rect.width())

59+ .arg(rect.height());

60+

61+ QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);

62+ m_asyncQueries.append(future);

63+

64+ QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();

65+ futureWatcher->setFuture(future);

66+ connect(futureWatcher, &QFutureWatcher<void>::finished,

67+ this,

68+ [=](){ m_asyncQueries.removeAll(futureWatcher->future());

69+ futureWatcher->deleteLater(); });

70+}

71+

72+void WindowStateStorage::executeAsyncQuery(const QString &queryString)

73+{

74+ QMutexLocker l(&s_mutex);

75+ QSqlQuery query;

76+

77+ bool ok = query.exec(queryString);

78+ if (!ok) {

79+ qWarning() << "Error executing query" << queryString

80+ << "Driver error:" << query.lastError().driverText()

81+ << "Database error:" << query.lastError().databaseText();

82+ }

83+}

84+

85+QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue)

86+{

87+ QMutexLocker l(&s_mutex);

88+ QString queryString = QString("SELECT * FROM geometry WHERE windowId = '%1';")

89+ .arg(windowId);

90+ QSqlQuery query;

91+

92+ bool ok = query.exec(queryString);

93+ if (!ok) {

94+ qWarning() << "Error retrieving window state for" << windowId

95+ << "Driver error:" << query.lastError().driverText()

96+ << "Database error:" << query.lastError().databaseText();

97+ return defaultValue;

98+ }

99+ if (!query.first()) {

100+ return defaultValue;

101+ }

102+ return QRect(query.value("x").toInt(), query.value("y").toInt(), query.value("width").toInt(), query.value("height").toInt());

103+}

104+

105+void WindowStateStorage::initdb()

106+{

107+ m_db.open();

108+ if (!m_db.open()) {

109+ qWarning() << "Error opening state database:" << m_db.lastError().driverText() << m_db.lastError().databaseText();

110+ return;

111+ }

112+

113+ if (!m_db.tables().contains("geometry")) {

114+ QSqlQuery query;

115+ query.exec("CREATE TABLE geometry(windowId TEXT UNIQUE, x INTEGER, y INTEGER, width INTEGER, height INTEGER);");

116+ }

117+}

plugins/Utils/windowstatestorage.hnew file+42

@@ -0,0 +1,42 @@

1+/*

2+ * Copyright 2015 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#include <QObject>

18+#include <QSqlDatabase>

19+#include <QMutex>

20+#include <QFuture>

21+

22+class WindowStateStorage: public QObject

23+{

24+ Q_OBJECT

25+public:

26+ WindowStateStorage(QObject *parent = 0);

27+ virtual ~WindowStateStorage();

28+

29+ Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);

30+ Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue);

31+

32+private:

33+ void initdb();

34+

35+ static void executeAsyncQuery(const QString &queryString);

36+ static QMutex s_mutex;

37+

38+ // NB: This is accessed from threads. Make sure to mutex it.

39+ QSqlDatabase m_db;

40+

41+ QList< QFuture<void> > m_asyncQueries;

42+};

plugins/Wizard/Wizard.qmltypes−3

@@ -11,8 +11,6 @@ Module {

11 name: "PageList"

11 name: "PageList"

12 prototype: "QObject"

12 prototype: "QObject"

13 exports: ["Wizard/PageList 0.1"]

13 exports: ["Wizard/PageList 0.1"]

14− isCreatable: false

15− isSingleton: true

16 exportMetaObjectRevisions: [0]

14 exportMetaObjectRevisions: [0]

17 Property { name: "index"; type: "int"; isReadonly: true }

15 Property { name: "index"; type: "int"; isReadonly: true }

18 Property { name: "numPages"; type: "int"; isReadonly: true }

16 Property { name: "numPages"; type: "int"; isReadonly: true }

@@ -33,4 +31,3 @@ Module {

33 }

31 }

34 }

32 }

35}

33}

36−

po/am.po+321−186

@@ -7,18 +7,18 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11−"PO-Revision-Date: 2014-11-06 00:53+0000\n"

11+"PO-Revision-Date: 2015-03-19 23:16+0000\n"

12"Last-Translator: samson <Unknown>\n"

12"Last-Translator: samson <Unknown>\n"

13"Language-Team: Amharic <am@li.org>\n"

13"Language-Team: Amharic <am@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr "የ መግቢያ ቃል: "

23msgstr "የ መግቢያ ቃል: "

24

24

@@ -31,64 +31,91 @@ msgstr "አቋራጭ ማጣበቂያ"

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "አቋራጭ መለያያ"

32msgstr "አቋራጭ መለያያ"

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr "አካሉ ተቆልፏል"

36msgstr "አካሉ ተቆልፏል"

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ሀረግ ለማስገባት በ መሞከር ምክንያት ስልኩ ተቆልፏል"

40msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ሀረግ ለማስገባት በ መሞከር ምክንያት ስልኩ ተቆልፏል"

41

41

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

43msgid "You have been locked out due to too many failed passcode attempts."

43msgid "You have been locked out due to too many failed passcode attempts."

44msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ኮድ ለማስገባት በ መሞከር ምክንያት ስልኩ ተቆልፏል"

44msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ኮድ ለማስገባት በ መሞከር ምክንያት ስልኩ ተቆልፏል"

45

45

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

47#, qt-format

47#, qt-format

48msgid "Please wait %1 minute and then try again…"

48msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] "እባክዎን ይቆዩ %1 ደቂቃ እና ከዛ እንደ ገና ይምክሩ…"

50msgstr[0] "እባክዎን ይቆዩ %1 ደቂቃ እና ከዛ እንደ ገና ይምክሩ…"

51msgstr[1] "እባክዎን ይቆዩ %1 ደቂቃዎች እና ከዛ እንደ ገና ይምክሩ…"

51msgstr[1] "እባክዎን ይቆዩ %1 ደቂቃዎች እና ከዛ እንደ ገና ይምክሩ…"

52

52

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

54msgid "Log out"

55msgid "Log out"

55msgstr "መውጫ"

56msgstr "መውጫ"

56

57

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

58msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

59msgstr "በእርግጥ መውጣት ይፈልጋሉ?"

60msgstr "በእርግጥ መውጣት ይፈልጋሉ?"

60

61

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:70

62−#: qml/Components/Dialogs.qml:122

63+msgctxt "Button: Lock the system"

63−msgid "No"

64+msgid "Lock"

64−msgstr "አይ"

65+msgstr "መቆለፊያ"

65

66

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

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

67−#: qml/Components/Dialogs.qml:129

73+#: qml/Components/Dialogs.qml:171

68−msgid "Yes"

74+msgid "Cancel"

69−msgstr "አዎ"

75+msgstr "መሰረዣ"

70

76

71−#: qml/Components/Dialogs.qml:94

77+#: qml/Components/Dialogs.qml:96

78+msgctxt "Title: Reboot/Shut down dialog"

72msgid "Shut down"

79msgid "Shut down"

73msgstr "ማጥፊያ"

80msgstr "ማጥፊያ"

74

81

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

76msgid "Are you sure you want to shut down?"

83msgid "Are you sure you want to shut down?"

77msgstr "በእርግጥ ማጥፋት ይፈልጋሉ?"

84msgstr "በእርግጥ ማጥፋት ይፈልጋሉ?"

78

85

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"

80msgid "Reboot"

98msgid "Reboot"

81msgstr "እንደገና ማስነሻ"

99msgstr "እንደገና ማስነሻ"

82

100

83−#: qml/Components/Dialogs.qml:120

101+#: qml/Components/Dialogs.qml:128

84msgid "Are you sure you want to reboot?"

102msgid "Are you sure you want to reboot?"

85msgstr "በእርግጥ እንደገና ማስነሳት ይፈልጋሉ?"

103msgstr "በእርግጥ እንደገና ማስነሳት ይፈልጋሉ?"

86

104

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"

88msgid "Power"

115msgid "Power"

89msgstr "ሐይል"

116msgstr "ሐይል"

90

117

91−#: qml/Components/Dialogs.qml:145

118+#: qml/Components/Dialogs.qml:151

92msgid ""

119msgid ""

93"Are you sure you would like\n"

120"Are you sure you would like\n"

94"to power off?"

121"to power off?"

@@ -96,65 +123,16 @@ msgstr ""

96"በእርግጥ ሐይሉን ማጥፋት\n"

123"በእርግጥ ሐይሉን ማጥፋት\n"

97"ይፈልጋሉ?"

124"ይፈልጋሉ?"

98

125

99−#: qml/Components/Dialogs.qml:147

126+#: qml/Components/Dialogs.qml:153

127+msgctxt "Button: Power off the system"

100msgid "Power off"

128msgid "Power off"

101−msgstr "ማጥፊያ"

129+msgstr "ሐይል ማጥፊያ"

102

130

103−#: qml/Components/Dialogs.qml:157

131+#: qml/Components/Dialogs.qml:162

132+msgctxt "Button: Restart the system"

104msgid "Restart"

133msgid "Restart"

105msgstr "እንደገና ማስጀመሪያ"

134msgstr "እንደገና ማስጀመሪያ"

106

135

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<br><br>Tap on the screen to start"

155−msgstr ""

156−"አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"

157−

158#: qml/Components/Lockscreen.qml:238

136#: qml/Components/Lockscreen.qml:238

159msgid "Return to Call"

137msgid "Return to Call"

160msgstr "ወደ ጥሪ መመለሻ"

138msgstr "ወደ ጥሪ መመለሻ"

@@ -167,32 +145,39 @@ msgstr "የ ድንገተኛ ጥሪ"

167msgid "OK"

145msgid "OK"

168msgstr "እሺ"

146msgstr "እሺ"

169

147

170−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

148+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

171msgid "See less"

149msgid "See less"

172msgstr "አነስተኛ መመልከቻ"

150msgstr "አነስተኛ መመልከቻ"

173

151

174−#: qml/Dash/GenericScopeView.qml:431

152+#: qml/Dash/GenericScopeView.qml:533

175msgid "See all"

153msgid "See all"

176msgstr "ሁሉንም መመልከቻ"

154msgstr "ሁሉንም መመልከቻ"

177

155

178−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

156+#: qml/Dash/GenericScopeView.qml:595

179−#: qml/Panel/SearchIndicator.qml:27

157+msgctxt "Label: Hint for dash search line edit"

180msgid "Search"

158msgid "Search"

181msgstr "መፈለጊያ"

159msgstr "መፈለጊያ"

182

160

183−#: qml/Dash/PageHeader.qml:260

161+#: qml/Dash/PageHeader.qml:269

162+msgctxt "Button: Open the Ubuntu Store"

184msgid "Store"

163msgid "Store"

185msgstr "ማስቀመጫ"

164msgstr "ማስቀመጫ"

186

165

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"

188msgid "Settings"

173msgid "Settings"

189−msgstr "ማሰናጃ"

174+msgstr "ማሰናጃዎች"

190

175

191−#: qml/Dash/PageHeader.qml:284

176+#: qml/Dash/PageHeader.qml:293

192msgid "Remove from Favorites"

177msgid "Remove from Favorites"

193msgstr "ከምወዳቸው ማስወገጃ"

178msgstr "ከምወዳቸው ማስወገጃ"

194

179

195−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

196msgid "Add to Favorites"

181msgid "Add to Favorites"

197msgstr "ወደምወዳቸው መጨመሪያ"

182msgstr "ወደምወዳቸው መጨመሪያ"

198

183

@@ -224,22 +209,92 @@ msgstr "ይሳቡ ለማነቃቃት…"

224msgid "Release to refresh…"

209msgid "Release to refresh…"

225msgstr "ይልቀቁ ለማነቃቃት…"

210msgstr "ይልቀቁ ለማነቃቃት…"

226

211

212+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

213+msgid "Enable location data"

214+msgstr "የአካባቢ ዳታ ማስቻያ"

215+

227−#: qml/Dash/ScopesList.qml:63

216+#: qml/Dash/ScopesList.qml:66

228msgid "Manage"

217msgid "Manage"

229−msgstr ""

218+msgstr "አስተዳዳሪ"

230

219

231−#: qml/Dash/ScopesList.qml:107

220+#: qml/Dash/ScopesList.qml:112

232msgid "Home"

221msgid "Home"

233−msgstr ""

222+msgstr "ቤት"

234

223

235−#: qml/Dash/ScopesList.qml:108

224+#: qml/Dash/ScopesList.qml:113

236msgid "Also installed"

225msgid "Also installed"

237−msgstr ""

226+msgstr "እንዲሁም የተገጠሙ"

238

227

239−#: qml/Greeter/Greeter.qml:174

228+#: qml/Greeter/CoverPage.qml:107

240msgid "Unlock"

229msgid "Unlock"

241msgstr "መክፈቻ"

230msgstr "መክፈቻ"

242

231

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+

243#: qml/Notifications/NotificationMenuItemFactory.qml:128

298#: qml/Notifications/NotificationMenuItemFactory.qml:128

244msgid "Show password"

299msgid "Show password"

245msgstr "የመግቢያ ቃል ማሳያ"

300msgstr "የመግቢያ ቃል ማሳያ"

@@ -280,6 +335,11 @@ msgstr "ጨርሷል"

280msgid "Failed, tap to retry"

335msgid "Failed, tap to retry"

281msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"

336msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"

282

337

338+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

339+msgctxt "Label: Hint in message indicator line edit"

340+msgid "Reply"

341+msgstr "መመለሻ"

342+

283#: qml/Panel/Indicators/ModemInfoItem.qml:105

343#: qml/Panel/Indicators/ModemInfoItem.qml:105

284msgid "Unlock SIM"

344msgid "Unlock SIM"

285msgstr "ሲም መክፈቻ"

345msgstr "ሲም መክፈቻ"

@@ -288,240 +348,256 @@ msgstr "ሲም መክፈቻ"

288msgid "Roaming"

348msgid "Roaming"

289msgstr "ማዘዋወሪያ"

349msgstr "ማዘዋወሪያ"

290

350

291−#: qml/Shell.qml:367

351+#: qml/Tutorial/TutorialBottomFinish.qml:24

292−#, qt-format

352+msgid "This action does different things for different apps"

293−msgid "Enter %1"

353+msgstr "ይህ ተግባር ለተለያዩ መተግበሪያዎች የተለያየ ነገር ይሰራል"

294−msgstr "ማስገቢያ %1"

295

354

296−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

355+#: qml/Tutorial/TutorialBottomFinish.qml:25

297−msgid "Enter passphrase"

356+msgid "Tap here to finish."

298−msgstr "የ ማለፊያ ሀረግ ያስገቡ"

357+msgstr "እዚህ መታ ይድርጉ ለመጨረስ"

299

358

300−#: qml/Shell.qml:369

359+#: qml/Tutorial/TutorialBottom.qml:28

301−msgid "Enter passcode"

360+msgid "Open special menus"

302−msgstr "የ ማለፊያ ኮድ ያስገቡ"

361+msgstr "የተለዩ ዝርዝሮች መክፈቻ"

303

362

304−#: qml/Shell.qml:370

363+#: qml/Tutorial/TutorialBottom.qml:29

305−#, qt-format

364+msgid "Swipe up from the bottom edge."

306−msgid "Sorry, incorrect %1"

365+msgstr "ከ ታች ጠርዝ በኩል ወደ ላይ ይጥረጉ"

307−msgstr "አዝናለሁ: የተሳሳተ%1"

308

366

309−#: qml/Shell.qml:371

367+#: qml/Tutorial/TutorialLeftFinish.qml:24

310−msgid "Sorry, incorrect passphrase"

368+msgid "These are the shortcuts to favorite apps"

311−msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"

369+msgstr "እነዚህ አቋራጮች ናቸው እርስዎ ለሚወዷቸው መተግበሪያዎች"

312

370

313−#: qml/Shell.qml:372

371+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

314−msgid "Please re-enter"

372+msgid "Tap here to continue."

315−msgstr "እባክዎን እንደገና-ያስገቡ"

373+msgstr "እዚህ መታ ይድርጉ ለመቀጠል"

316

374

317−#: qml/Shell.qml:373

375+#: qml/Tutorial/TutorialLeft.qml:26

318−msgid "Sorry, incorrect passcode"

376+msgid "Open the launcher"

319−msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"

377+msgstr "ማስጀመሪያውን መክፈቻ"

320

378

321−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

379+#: qml/Tutorial/TutorialLeft.qml:27

322−msgid "Sorry, incorrect passphrase."

380+msgid "Short swipe from the left edge."

323−msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"

381+msgstr "ከ ግራ ጠርዝ በኩል በትንሹ ይጥረጉ"

324

382

325−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

383+#: qml/Tutorial/TutorialPage.qml:178

326−msgid "Sorry, incorrect passcode."

384+msgid "You almost got it!"

327−msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"

385+msgstr "እርስዎ አሁን እያገኙት ነው!"

328

386

329−#: qml/Shell.qml:469

387+#: qml/Tutorial/TutorialPage.qml:195

330−msgid "This will be your last attempt."

388+msgid "Try again."

331−msgstr "ይህ የመጨረሻ ሙከራዎ ነው"

389+msgstr "እንደገና ይሞክሩ"

332

390

333−#: qml/Shell.qml:471

391+#: qml/Tutorial/TutorialRight.qml:31

334−msgid ""

392+msgid "To view open apps"

335−"If passphrase is entered incorrectly, your phone will conduct a factory "

393+msgstr "ለመመልከት መተግበሪያዎች ይክፈቱ"

336−"reset and all personal data will be deleted."

337−msgstr ""

338−"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

339−"ይጠፋል"

340

394

341−#: qml/Shell.qml:472

395+#: qml/Tutorial/TutorialRight.qml:32

342−msgid ""

396+msgid "Long swipe from the right edge."

343−"If passcode is entered incorrectly, your phone will conduct a factory reset "

397+msgstr "ከ ቀኝ ጠርዝ በኩል በረጅሙ ይጥረጉ"

344−"and all personal data will be deleted."

398+

345−msgstr ""

399+#: qml/Tutorial/TutorialRight.qml:122

346−"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

400+msgid "View all your running tasks."

347−"ይጠፋል"

401+msgstr "እርስዎ የሚያስኬዱትን ተግባሮች በሙሉ መመልከቻ"

348

402

349#: qml/Wizard/Page.qml:89

403#: qml/Wizard/Page.qml:89

404+msgctxt "Button: Go back one page in the Wizard"

350msgid "Back"

405msgid "Back"

351−msgstr ""

406+msgstr "ወደ ኋላ"

352

407

353#: qml/Wizard/Pages/10-welcome.qml:27

408#: qml/Wizard/Pages/10-welcome.qml:27

354msgid "Hi!"

409msgid "Hi!"

355−msgstr ""

410+msgstr "ሰላም"

356

411

357#: qml/Wizard/Pages/10-welcome.qml:44

412#: qml/Wizard/Pages/10-welcome.qml:44

358msgid "Welcome to your Ubuntu phone."

413msgid "Welcome to your Ubuntu phone."

359−msgstr ""

414+msgstr "እንኳን ደህና መጡ ወደ እርስዎ ኡቡንቱ ስልክ"

360

415

361#: qml/Wizard/Pages/10-welcome.qml:52

416#: qml/Wizard/Pages/10-welcome.qml:52

362msgid "Let’s get started."

417msgid "Let’s get started."

363−msgstr ""

418+msgstr "ስራ እንጀምር"

364

419

365#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

420#: 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

367#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

422#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

368#: qml/Wizard/Pages/passwd-set.qml:90

423#: qml/Wizard/Pages/passwd-set.qml:90

369msgid "Continue"

424msgid "Continue"

370−msgstr ""

425+msgstr "ይቀጥሉ"

371

426

372#: qml/Wizard/Pages/20-sim.qml:25

427#: qml/Wizard/Pages/20-sim.qml:25

373msgid "Add a SIM card and restart your device"

428msgid "Add a SIM card and restart your device"

374−msgstr ""

429+msgstr "የ ሲም ካርድ ይጨምሩ እና አካሉን እንደገና ያስነሱ"

375

430

376−#: qml/Wizard/Pages/20-sim.qml:55

431+#: qml/Wizard/Pages/20-sim.qml:59

377msgid "Without it, you won’t be able to make calls or use text messaging."

432msgid "Without it, you won’t be able to make calls or use text messaging."

378−msgstr ""

433+msgstr "ያለ እሱ ጥሪ መፈጸም ወይንም የ ጽሁፍ መልእክት መላክ አይችሉም"

379

434

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

381msgid "Skip"

436msgid "Skip"

382−msgstr ""

437+msgstr "መዝለያ"

383

438

384#: qml/Wizard/Pages/30-passwd-type.qml:39

439#: qml/Wizard/Pages/30-passwd-type.qml:39

385msgid "Lock security"

440msgid "Lock security"

386−msgstr ""

441+msgstr "ደህንነት መቆለፊያ"

387

442

388#: qml/Wizard/Pages/30-passwd-type.qml:74

443#: qml/Wizard/Pages/30-passwd-type.qml:74

389msgid "Please select how you’d like to unlock your phone."

444msgid "Please select how you’d like to unlock your phone."

390−msgstr ""

445+msgstr "እባክዎን የ እርስዎን ስልክ እንዴት እንደሚከፍቱ ይምረጡ"

391

446

392#: qml/Wizard/Pages/30-passwd-type.qml:97

447#: qml/Wizard/Pages/30-passwd-type.qml:97

448+msgctxt "Label: Type of security method"

393msgid "Swipe"

449msgid "Swipe"

394−msgstr ""

450+msgstr "መጥረጊያ"

395

451

396#: qml/Wizard/Pages/30-passwd-type.qml:98

452#: qml/Wizard/Pages/30-passwd-type.qml:98

453+msgctxt "Label: Description of security method"

397msgid "No security"

454msgid "No security"

398−msgstr ""

455+msgstr "ደህንነት አልተገኘም"

399

456

400#: qml/Wizard/Pages/30-passwd-type.qml:100

457#: qml/Wizard/Pages/30-passwd-type.qml:100

458+msgctxt "Label: Type of security method"

401msgid "Passcode"

459msgid "Passcode"

402−msgstr ""

460+msgstr "ማለፊያ ኮድ"

403

461

404#: qml/Wizard/Pages/30-passwd-type.qml:101

462#: qml/Wizard/Pages/30-passwd-type.qml:101

463+msgctxt "Label: Description of security method"

405msgid "4 digits only"

464msgid "4 digits only"

406−msgstr ""

465+msgstr "4 ዲጂት ብቻ"

407

466

408#: qml/Wizard/Pages/30-passwd-type.qml:103

467#: qml/Wizard/Pages/30-passwd-type.qml:103

468+msgctxt "Label: Type of security method"

409msgid "Passphrase"

469msgid "Passphrase"

410−msgstr ""

470+msgstr "የማለፊያ ሐረግ"

411

471

412#: qml/Wizard/Pages/30-passwd-type.qml:104

472#: qml/Wizard/Pages/30-passwd-type.qml:104

473+msgctxt "Label: Description of security method"

413msgid "Numbers and letters"

474msgid "Numbers and letters"

414−msgstr ""

475+msgstr "ቁጥሮች እና ፊደሎች"

415

476

416−#: qml/Wizard/Pages/40-wifi.qml:28

477+#: qml/Wizard/Pages/40-wifi.qml:29

417msgid "Connect to Wi‑Fi"

478msgid "Connect to Wi‑Fi"

418−msgstr ""

479+msgstr "ወደ ዋይ‑ፋይ መገናኛ"

419

480

420−#: qml/Wizard/Pages/40-wifi.qml:147

481+#: qml/Wizard/Pages/40-wifi.qml:168

421msgid "Available networks…"

482msgid "Available networks…"

422−msgstr ""

483+msgstr "ዝግጁ ኔትዎርኮች…"

423

484

424−#: qml/Wizard/Pages/40-wifi.qml:148

485+#: qml/Wizard/Pages/40-wifi.qml:169

425msgid "No available networks."

486msgid "No available networks."

426−msgstr ""

487+msgstr "ዝግጁ ኔትዎርኮች አልተገኙም"

427

488

428#: qml/Wizard/Pages/50-location.qml:27

489#: qml/Wizard/Pages/50-location.qml:27

429msgid "Location"

490msgid "Location"

430−msgstr ""

491+msgstr "አካባቢ"

431

492

432#: qml/Wizard/Pages/50-location.qml:62

493#: qml/Wizard/Pages/50-location.qml:62

433msgid "Let the phone detect your location:"

494msgid "Let the phone detect your location:"

434−msgstr ""

495+msgstr "እባክዎን እርስዎ ያሉበትን አካባቢ ስልኩ እራሱ ይፈልግ:"

435

496

436#: qml/Wizard/Pages/50-location.qml:69

497#: qml/Wizard/Pages/50-location.qml:69

437msgid "Using GPS only (less accurate)"

498msgid "Using GPS only (less accurate)"

438−msgstr ""

499+msgstr "ጂፒኤስን ብቻ መጠቀሚያ(በጣም ቅርብ)"

439

500

440#: qml/Wizard/Pages/50-location.qml:86

501#: qml/Wizard/Pages/50-location.qml:86

441msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

502msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

442−msgstr ""

503+msgstr "ይጠቀሙ ጂፒኤስ ግልጽ ያልሆነ ዋይ-ፋይ እና ተንቀሳቃሽ ኔትዎርክ መረጃ (ይመከራሉ)"

443

504

444#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

505#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

445#: qml/Wizard/Pages/50-location.qml:103

506#: qml/Wizard/Pages/50-location.qml:103

446msgid ""

507msgid ""

447"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

508"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

448"conditions</a>."

509"conditions</a>."

449−msgstr ""

510+msgstr "ይህን ምርጫ በመምረጥ ተስማምቻለሁ ከ Nokia HERE <a href='#'>ውሎች እና ሁኔታዎች ጋር</a>."

450

511

451#: qml/Wizard/Pages/50-location.qml:112

512#: qml/Wizard/Pages/50-location.qml:112

452msgid "Not at all"

513msgid "Not at all"

453−msgstr ""

514+msgstr "አይደለም"

454

515

455#: qml/Wizard/Pages/50-location.qml:124

516#: qml/Wizard/Pages/50-location.qml:124

456msgid "You can change your mind later in <b>System Settings</b>."

517msgid "You can change your mind later in <b>System Settings</b>."

457−msgstr ""

518+msgstr "እርስዎ በኋላ መቀየር ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b>."

458

519

459#: qml/Wizard/Pages/60-reporting.qml:24

520#: qml/Wizard/Pages/60-reporting.qml:24

460msgid "Improving your experience"

521msgid "Improving your experience"

461−msgstr ""

522+msgstr "የ እርስዎን ልምምድ ማሻሻያ"

462

523

463#: qml/Wizard/Pages/60-reporting.qml:36

524#: qml/Wizard/Pages/60-reporting.qml:36

464msgid ""

525msgid ""

465"Your phone is set up to automatically report errors to Canonical and its "

526"Your phone is set up to automatically report errors to Canonical and its "

466"partners, the makers of the operating system."

527"partners, the makers of the operating system."

467msgstr ""

528msgstr ""

529+"የ እርስዎ ስልክ ራሱ በራሱ የ ስህተት መግለጫዎች ወደ Canonical and its partners, የ መስሪያ ስርአት "

530+"አምራቾች"

468

531

469#: qml/Wizard/Pages/60-reporting.qml:43

532#: qml/Wizard/Pages/60-reporting.qml:43

470msgid ""

533msgid ""

471"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

534"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

472"Privacy</b>"

535"Privacy</b>"

473msgstr ""

536msgstr ""

537+"ይህን ግልጋሎት ማሰናከል ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b> under <b>Security &amp; Privacy</b>"

474

538

475#: qml/Wizard/Pages/80-finished.qml:24

539#: qml/Wizard/Pages/80-finished.qml:24

476msgid "All done"

540msgid "All done"

477−msgstr ""

541+msgstr "ሁሉም ተፈጽሟል"

478

542

479#: qml/Wizard/Pages/80-finished.qml:39

543#: qml/Wizard/Pages/80-finished.qml:39

480msgid "Nice work!"

544msgid "Nice work!"

481−msgstr ""

545+msgstr "ጥሩ ሰርተዋል!"

482

546

483#: qml/Wizard/Pages/80-finished.qml:46

547#: qml/Wizard/Pages/80-finished.qml:46

484msgid "Your phone is now ready to use."

548msgid "Your phone is now ready to use."

485−msgstr ""

549+msgstr "ስልኩ አሁን ለመጠቀም ዝግጁ ነው"

486

550

487#: qml/Wizard/Pages/80-finished.qml:53

551#: qml/Wizard/Pages/80-finished.qml:53

488msgid "Finish"

552msgid "Finish"

489−msgstr ""

553+msgstr "መጨረሻ"

490

554

491#: qml/Wizard/Pages/here-terms.qml:27

555#: qml/Wizard/Pages/here-terms.qml:27

492msgid "Terms & Conditions"

556msgid "Terms & Conditions"

493−msgstr ""

557+msgstr "ውሎች & ሁኔታዎች"

494

558

495#: qml/Wizard/Pages/passwd-confirm.qml:49

559#: qml/Wizard/Pages/passwd-confirm.qml:49

496msgid "Confirm passphrase"

560msgid "Confirm passphrase"

497−msgstr ""

561+msgstr "የ ማለፊያ ሐረግ ማረጋገጫ"

498

562

499#: qml/Wizard/Pages/passwd-confirm.qml:50

563#: qml/Wizard/Pages/passwd-confirm.qml:50

500msgid "Confirm passcode"

564msgid "Confirm passcode"

501−msgstr ""

565+msgstr "የማለፊያ ኮድ ማረጋገጫ"

502

566

503#: qml/Wizard/Pages/passwd-confirm.qml:53

567#: qml/Wizard/Pages/passwd-confirm.qml:53

504#: qml/Wizard/Pages/passwd-confirm.qml:54

568#: qml/Wizard/Pages/passwd-confirm.qml:54

505msgid "Please try again."

569msgid "Please try again."

506−msgstr ""

570+msgstr "እባክዎን እንደገና ይሞክሩ"

507

571

508#: qml/Wizard/Pages/passwd-set.qml:61

572#: qml/Wizard/Pages/passwd-set.qml:61

509msgid "Choose your passcode"

573msgid "Choose your passcode"

510−msgstr ""

574+msgstr "የ እርስዎን የማለፊያ ኮድ ይምረጡ"

511

575

512#: qml/Wizard/Pages/passwd-set.qml:68

576#: qml/Wizard/Pages/passwd-set.qml:68

513msgid "Passphrase must be 4 characters long"

577msgid "Passphrase must be 4 characters long"

514−msgstr ""

578+msgstr "የ ማለፊያ ሀረግ ቢያንስ 4 ባህሪዎች መሆን አለበት"

515

579

516#: qml/Wizard/StackButton.qml:39

580#: qml/Wizard/StackButton.qml:39

517#, qt-format

581#, qt-format

518msgid "〈 %1"

582msgid "〈 %1"

519−msgstr ""

583+msgstr "〈 %1"

520

584

521#: qml/Wizard/StackButton.qml:42

585#: qml/Wizard/StackButton.qml:42

522#, qt-format

586#, qt-format

523msgid "%1 〉"

587msgid "%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 "የቀኝ ጠርዝ"

525

601

526#~ msgid "Type or say a command"

602#~ msgid "Type or say a command"

527#~ msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"

603#~ msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"

@@ -538,14 +614,73 @@ msgstr ""

538#~ msgid "Confirm"

614#~ msgid "Confirm"

539#~ msgstr "ማረጋገጫ"

615#~ msgstr "ማረጋገጫ"

540

616

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+

541#~ msgid "Favorites"

638#~ msgid "Favorites"

542#~ msgstr "የምወዳቸው"

639#~ msgstr "የምወዳቸው"

543

640

544#~ msgid "All"

641#~ msgid "All"

545#~ msgstr "ሁሉንም"

642#~ msgstr "ሁሉንም"

546

643

644+#~ msgid "Store"

645+#~ msgstr "ማስቀመጫ"

646+

547#~ msgid "Done"

647#~ msgid "Done"

548#~ msgstr "ጨርሷል"

648#~ msgstr "ጨርሷል"

549

649

650+#~ msgid "Power off"

651+#~ msgstr "ማጥፊያ"

652+

653+#~ msgid "Power"

654+#~ msgstr "ሐይል"

655+

656+#~ msgid "Log out"

657+#~ msgstr "መውጫ"

658+

659+#~ msgid "Shut down"

660+#~ msgstr "ማጥፊያ"

661+

662+#~ msgid "Reboot"

663+#~ msgstr "እንደገና ማስነሻ"

664+

665+#~ msgid "Settings"

666+#~ msgstr "ማሰናጃ"

667+

668+#~ msgid ""

669+#~ "You have now mastered the edge gestures and can start using the "

670+#~ "phone<br><br>Tap on the screen to start"

671+#~ msgstr ""

672+#~ "አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"

673+

674+#~ msgid "Restart"

675+#~ msgstr "እንደገና ማስጀመሪያ"

676+

550#~ msgid "Manage Scopes"

677#~ msgid "Manage Scopes"

551#~ msgstr "የ ክልል አስተዳዳሪ"

678#~ 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 ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11"PO-Revision-Date: 2014-05-22 08:22+0000\n"

11"PO-Revision-Date: 2014-05-22 08:22+0000\n"

12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"

12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"

13"Language-Team: Arabic <ar@li.org>\n"

13"Language-Team: Arabic <ar@li.org>\n"

@@ -16,10 +16,10 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "

17"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "

18"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"

18"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"

19+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

20−"X-Generator: Launchpad (build 17286)\n"

20+"X-Generator: Launchpad (build 17413)\n"

21

21

22−#: plugins/LightDM/Greeter.cpp:130

22+#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

23msgid "Password: "

24msgstr ""

24msgstr ""

25

25

@@ -32,129 +32,105 @@ msgstr ""

32msgid "Unpin shortcut"

32msgid "Unpin shortcut"

33msgstr ""

33msgstr ""

34

34

35−#: qml/Components/DelayedLockscreen.qml:47

35+#: qml/Components/DelayedLockscreen.qml:49

36msgid "Device Locked"

36msgid "Device Locked"

37msgstr ""

37msgstr ""

38

38

39−#: qml/Components/DelayedLockscreen.qml:62

39+#: qml/Components/DelayedLockscreen.qml:64

40msgid "You have been locked out due to too many failed passphrase attempts."

40msgid "You have been locked out due to too many failed passphrase attempts."

41msgstr ""

41msgstr ""

42

42

43−#: qml/Components/DelayedLockscreen.qml:63

43+#: qml/Components/DelayedLockscreen.qml:65

44msgid "You have been locked out due to too many failed passcode attempts."

44msgid "You have been locked out due to too many failed passcode attempts."

45msgstr ""

45msgstr ""

46

46

47−#: qml/Components/DelayedLockscreen.qml:72

47+#: qml/Components/DelayedLockscreen.qml:74

48#, qt-format

48#, qt-format

49msgid "Please wait %1 minute and then try again…"

49msgid "Please wait %1 minute and then try again…"

50msgid_plural "Please wait %1 minutes and then try again…"

50msgid_plural "Please wait %1 minutes and then try again…"

51msgstr[0] ""

51msgstr[0] ""

52msgstr[1] ""

52msgstr[1] ""

53

53

54−#: qml/Components/Dialogs.qml:70

54+#: qml/Components/Dialogs.qml:67

55+msgctxt "Title: Lock/Log out dialog"

55msgid "Log out"

56msgid "Log out"

56msgstr ""

57msgstr ""

57

58

58−#: qml/Components/Dialogs.qml:71

59+#: qml/Components/Dialogs.qml:68

59msgid "Are you sure you want to log out?"

60msgid "Are you sure you want to log out?"

60msgstr ""

61msgstr ""

61

62

62−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63+#: qml/Components/Dialogs.qml:70

63−#: qml/Components/Dialogs.qml:122

64+msgctxt "Button: Lock the system"

64−msgid "No"

65+msgid "Lock"

65msgstr ""

66msgstr ""

66

67

67−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68+#: qml/Components/Dialogs.qml:77

68−#: qml/Components/Dialogs.qml:129

69+msgctxt "Button: Log out from the system"

69−msgid "Yes"

70+msgid "Log Out"

70msgstr ""

71msgstr ""

71

72

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"

73msgid "Shut down"

80msgid "Shut down"

74msgstr ""

81msgstr ""

75

82

76−#: qml/Components/Dialogs.qml:95

83+#: qml/Components/Dialogs.qml:97

77msgid "Are you sure you want to shut down?"

84msgid "Are you sure you want to shut down?"

78msgstr ""

85msgstr ""

79

86

80−#: qml/Components/Dialogs.qml:119

87+#: qml/Components/Dialogs.qml:99

88+msgctxt "Button: Reboot the system"

81msgid "Reboot"

89msgid "Reboot"

82msgstr ""

90msgstr ""

83

91

84−#: qml/Components/Dialogs.qml:120

92+#: qml/Components/Dialogs.qml:107

85−msgid "Are you sure you want to reboot?"

93+msgctxt "Button: Shut down the system"

94+msgid "Shut down"

86msgstr ""

95msgstr ""

87

96

88−#: qml/Components/Dialogs.qml:144

97+#: qml/Components/Dialogs.qml:127

98+msgctxt "Title: Reboot dialog"

89−msgid "Power"

99+msgid "Reboot"

90msgstr ""

100msgstr ""

91

101

92−#: qml/Components/Dialogs.qml:145

102+#: qml/Components/Dialogs.qml:128

93−msgid ""

94−"Are you sure you would like\n"

103+msgid "Are you sure you want to reboot?"

95−"to power off?"

96msgstr ""

104msgstr ""

97

105

98−#: qml/Components/Dialogs.qml:147

106+#: qml/Components/Dialogs.qml:130

99−msgid "Power off"

107+msgid "No"

100msgstr ""

108msgstr ""

101

109

102−#: qml/Components/Dialogs.qml:157

110+#: qml/Components/Dialogs.qml:136

103−msgid "Restart"

111+msgid "Yes"

104msgstr ""

112msgstr ""

105

113

106−#: qml/Components/Dialogs.qml:167

114+#: qml/Components/Dialogs.qml:150

115+msgctxt "Title: Power off/Restart dialog"

107−msgid "Cancel"

116+msgid "Power"

108msgstr ""

117msgstr ""

109

118

110−#: qml/Components/EdgeDemoOverlay.qml:151

119+#: qml/Components/Dialogs.qml:151

111−msgid "Skip intro"

120+msgid ""

112−msgstr "تخطي المقدمة"

121+"Are you sure you would like\n"

113−

122+"to power off?"

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"

144msgstr ""

123msgstr ""

145−"اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"

146

124

147−#: qml/Components/EdgeDemo.qml:242

125+#: qml/Components/Dialogs.qml:153

148−msgid "Well done"

126+msgctxt "Button: Power off the system"

127+msgid "Power off"

149−msgstr "أحسنت!"

128+msgstr ""

150

129

151−#: qml/Components/EdgeDemo.qml:243

130+#: qml/Components/Dialogs.qml:162

131+msgctxt "Button: Restart the system"

152−msgid ""

132+msgid "Restart"

153−"You have now mastered the edge gestures and can start using the "

154−"phone<br><br>Tap on the screen to start"

155msgstr ""

133msgstr ""

156−"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "

157−"الشاشة للبدء"

158

134

159#: qml/Components/Lockscreen.qml:238

135#: qml/Components/Lockscreen.qml:238

160msgid "Return to Call"

136msgid "Return to Call"

@@ -168,32 +144,39 @@ msgstr "مكالمة طوارئ"

168msgid "OK"

144msgid "OK"

169msgstr ""

145msgstr ""

170

146

171−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

147+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

172msgid "See less"

148msgid "See less"

173msgstr "شاهد أقل"

149msgstr "شاهد أقل"

174

150

175−#: qml/Dash/GenericScopeView.qml:431

151+#: qml/Dash/GenericScopeView.qml:533

176msgid "See all"

152msgid "See all"

177msgstr ""

153msgstr ""

178

154

179−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

155+#: qml/Dash/GenericScopeView.qml:595

180−#: qml/Panel/SearchIndicator.qml:27

156+msgctxt "Label: Hint for dash search line edit"

181msgid "Search"

157msgid "Search"

182−msgstr "ابحث"

158+msgstr ""

183

159

184−#: qml/Dash/PageHeader.qml:260

160+#: qml/Dash/PageHeader.qml:269

161+msgctxt "Button: Open the Ubuntu Store"

185msgid "Store"

162msgid "Store"

186msgstr ""

163msgstr ""

187

164

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"

189msgid "Settings"

172msgid "Settings"

190msgstr ""

173msgstr ""

191

174

192−#: qml/Dash/PageHeader.qml:284

175+#: qml/Dash/PageHeader.qml:293

193msgid "Remove from Favorites"

176msgid "Remove from Favorites"

194msgstr ""

177msgstr ""

195

178

196−#: qml/Dash/PageHeader.qml:284

179+#: qml/Dash/PageHeader.qml:293

197msgid "Add to Favorites"

180msgid "Add to Favorites"

198msgstr ""

181msgstr ""

199

182

@@ -225,22 +208,88 @@ msgstr ""

225msgid "Release to refresh…"

208msgid "Release to refresh…"

226msgstr ""

209msgstr ""

227

210

211+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

212+msgid "Enable location data"

213+msgstr ""

214+

228−#: qml/Dash/ScopesList.qml:63

215+#: qml/Dash/ScopesList.qml:66

229msgid "Manage"

216msgid "Manage"

230msgstr ""

217msgstr ""

231

218

232−#: qml/Dash/ScopesList.qml:107

219+#: qml/Dash/ScopesList.qml:112

233msgid "Home"

220msgid "Home"

234msgstr ""

221msgstr ""

235

222

236−#: qml/Dash/ScopesList.qml:108

223+#: qml/Dash/ScopesList.qml:113

237msgid "Also installed"

224msgid "Also installed"

238msgstr ""

225msgstr ""

239

226

240−#: qml/Greeter/Greeter.qml:174

227+#: qml/Greeter/CoverPage.qml:107

241msgid "Unlock"

228msgid "Unlock"

242msgstr ""

229msgstr ""

243

230

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+

244#: qml/Notifications/NotificationMenuItemFactory.qml:128

293#: qml/Notifications/NotificationMenuItemFactory.qml:128

245msgid "Show password"

294msgid "Show password"

246msgstr "عرض كلمة السر"

295msgstr "عرض كلمة السر"

@@ -281,6 +330,11 @@ msgstr ""

281msgid "Failed, tap to retry"

330msgid "Failed, tap to retry"

282msgstr ""

331msgstr ""

283

332

333+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

334+msgctxt "Label: Hint in message indicator line edit"

335+msgid "Reply"

336+msgstr ""

337+

284#: qml/Panel/Indicators/ModemInfoItem.qml:105

338#: qml/Panel/Indicators/ModemInfoItem.qml:105

285msgid "Unlock SIM"

339msgid "Unlock SIM"

286msgstr ""

340msgstr ""

@@ -289,61 +343,60 @@ msgstr ""

289msgid "Roaming"

343msgid "Roaming"

290msgstr ""

344msgstr ""

291

345

292−#: qml/Shell.qml:367

346+#: qml/Tutorial/TutorialBottomFinish.qml:24

293−#, qt-format

347+msgid "This action does different things for different apps"

294−msgid "Enter %1"

295msgstr ""

348msgstr ""

296

349

297−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

350+#: qml/Tutorial/TutorialBottomFinish.qml:25

298−msgid "Enter passphrase"

351+msgid "Tap here to finish."

299msgstr ""

352msgstr ""

300

353

301−#: qml/Shell.qml:369

354+#: qml/Tutorial/TutorialBottom.qml:28

302−msgid "Enter passcode"

355+msgid "Open special menus"

303msgstr ""

356msgstr ""

304

357

305−#: qml/Shell.qml:370

358+#: qml/Tutorial/TutorialBottom.qml:29

306−#, qt-format

359+msgid "Swipe up from the bottom edge."

307−msgid "Sorry, incorrect %1"

308msgstr ""

360msgstr ""

309

361

310−#: qml/Shell.qml:371

362+#: qml/Tutorial/TutorialLeftFinish.qml:24

311−msgid "Sorry, incorrect passphrase"

363+msgid "These are the shortcuts to favorite apps"

312msgstr ""

364msgstr ""

313

365

314−#: qml/Shell.qml:372

366+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

315−msgid "Please re-enter"

367+msgid "Tap here to continue."

316msgstr ""

368msgstr ""

317

369

318−#: qml/Shell.qml:373

370+#: qml/Tutorial/TutorialLeft.qml:26

319−msgid "Sorry, incorrect passcode"

371+msgid "Open the launcher"

320msgstr ""

372msgstr ""

321

373

322−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

374+#: qml/Tutorial/TutorialLeft.qml:27

323−msgid "Sorry, incorrect passphrase."

375+msgid "Short swipe from the left edge."

324msgstr ""

376msgstr ""

325

377

326−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

378+#: qml/Tutorial/TutorialPage.qml:178

327−msgid "Sorry, incorrect passcode."

379+msgid "You almost got it!"

328msgstr ""

380msgstr ""

329

381

330−#: qml/Shell.qml:469

382+#: qml/Tutorial/TutorialPage.qml:195

331−msgid "This will be your last attempt."

383+msgid "Try again."

332msgstr ""

384msgstr ""

333

385

334−#: qml/Shell.qml:471

386+#: qml/Tutorial/TutorialRight.qml:31

335−msgid ""

387+msgid "To view open apps"

336−"If passphrase is entered incorrectly, your phone will conduct a factory "

337−"reset and all personal data will be deleted."

338msgstr ""

388msgstr ""

339

389

340−#: qml/Shell.qml:472

390+#: qml/Tutorial/TutorialRight.qml:32

341−msgid ""

391+msgid "Long swipe from the right edge."

342−"If passcode is entered incorrectly, your phone will conduct a factory reset "

392+msgstr ""

343−"and all personal data will be deleted."

393+

394+#: qml/Tutorial/TutorialRight.qml:122

395+msgid "View all your running tasks."

344msgstr ""

396msgstr ""

345

397

346#: qml/Wizard/Page.qml:89

398#: qml/Wizard/Page.qml:89

399+msgctxt "Button: Go back one page in the Wizard"

347msgid "Back"

400msgid "Back"

348msgstr ""

401msgstr ""

349

402

@@ -360,7 +413,7 @@ msgid "Let’s get started."

360msgstr ""

413msgstr ""

361

414

362#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

415#: 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

364#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

417#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

365#: qml/Wizard/Pages/passwd-set.qml:90

418#: qml/Wizard/Pages/passwd-set.qml:90

366msgid "Continue"

419msgid "Continue"

@@ -370,11 +423,11 @@ msgstr ""

370msgid "Add a SIM card and restart your device"

423msgid "Add a SIM card and restart your device"

371msgstr ""

424msgstr ""

372

425

373−#: qml/Wizard/Pages/20-sim.qml:55

426+#: qml/Wizard/Pages/20-sim.qml:59

374msgid "Without it, you won’t be able to make calls or use text messaging."

427msgid "Without it, you won’t be able to make calls or use text messaging."

375msgstr ""

428msgstr ""

376

429

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

378msgid "Skip"

431msgid "Skip"

379msgstr ""

432msgstr ""

380

433

@@ -387,38 +440,44 @@ msgid "Please select how you’d like to unlock your phone."

387msgstr ""

440msgstr ""

388

441

389#: qml/Wizard/Pages/30-passwd-type.qml:97

442#: qml/Wizard/Pages/30-passwd-type.qml:97

443+msgctxt "Label: Type of security method"

390msgid "Swipe"

444msgid "Swipe"

391msgstr ""

445msgstr ""

392

446

393#: qml/Wizard/Pages/30-passwd-type.qml:98

447#: qml/Wizard/Pages/30-passwd-type.qml:98

448+msgctxt "Label: Description of security method"

394msgid "No security"

449msgid "No security"

395msgstr ""

450msgstr ""

396

451

397#: qml/Wizard/Pages/30-passwd-type.qml:100

452#: qml/Wizard/Pages/30-passwd-type.qml:100

453+msgctxt "Label: Type of security method"

398msgid "Passcode"

454msgid "Passcode"

399msgstr ""

455msgstr ""

400

456

401#: qml/Wizard/Pages/30-passwd-type.qml:101

457#: qml/Wizard/Pages/30-passwd-type.qml:101

458+msgctxt "Label: Description of security method"

402msgid "4 digits only"

459msgid "4 digits only"

403msgstr ""

460msgstr ""

404

461

405#: qml/Wizard/Pages/30-passwd-type.qml:103

462#: qml/Wizard/Pages/30-passwd-type.qml:103

463+msgctxt "Label: Type of security method"

406msgid "Passphrase"

464msgid "Passphrase"

407msgstr ""

465msgstr ""

408

466

409#: qml/Wizard/Pages/30-passwd-type.qml:104

467#: qml/Wizard/Pages/30-passwd-type.qml:104

468+msgctxt "Label: Description of security method"

410msgid "Numbers and letters"

469msgid "Numbers and letters"

411msgstr ""

470msgstr ""

412

471

413−#: qml/Wizard/Pages/40-wifi.qml:28

472+#: qml/Wizard/Pages/40-wifi.qml:29

414msgid "Connect to Wi‑Fi"

473msgid "Connect to Wi‑Fi"

415msgstr ""

474msgstr ""

416

475

417−#: qml/Wizard/Pages/40-wifi.qml:147

476+#: qml/Wizard/Pages/40-wifi.qml:168

418msgid "Available networks…"

477msgid "Available networks…"

419msgstr ""

478msgstr ""

420

479

421−#: qml/Wizard/Pages/40-wifi.qml:148

480+#: qml/Wizard/Pages/40-wifi.qml:169

422msgid "No available networks."

481msgid "No available networks."

423msgstr ""

482msgstr ""

424

483

@@ -534,3 +593,44 @@ msgstr ""

534

593

535#~ msgid "Speaking..."

594#~ msgid "Speaking..."

536#~ msgstr "تتكلم الآن..."

595#~ msgstr "تتكلم الآن..."

596+

597+#~ msgid "Search"

598+#~ msgstr "ابحث"

599+

600+#~ msgid "Try swiping from the top edge to access the indicators"

601+#~ msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"

602+

603+#~ msgid "Top edge"

604+#~ msgstr "الحافة العلوية"

605+

606+#~ msgid "Close"

607+#~ msgstr "أغلق"

608+

609+#~ msgid "Swipe up again to close the settings screen"

610+#~ msgstr "اسحب اصعبك لأعلى مرة أخرى لغلق شاشة الإعدادات"

611+

612+#~ msgid "Skip intro"

613+#~ msgstr "تخطي المقدمة"

614+

615+#~ msgid "Try swiping from the right edge to unlock the phone"

616+#~ msgstr "اسحب اصبعك من الحافة اليمنى لفتح قفل الهاتف"

617+

618+#~ msgid "Right edge"

619+#~ msgstr "الحافة اليمنى"

620+

621+#~ msgid "Left edge"

622+#~ msgstr "الحافة اليسرى"

623+

624+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

625+#~ msgstr ""

626+#~ "اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"

627+

628+#~ msgid "Well done"

629+#~ msgstr "أحسنت!"

630+

631+#~ msgid ""

632+#~ "You have now mastered the edge gestures and can start using the "

633+#~ "phone<br><br>Tap on the screen to start"

634+#~ msgstr ""

635+#~ "أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "

636+#~ "الشاشة للبدء"

po/ast.po+315−184

@@ -7,18 +7,18 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11−"PO-Revision-Date: 2014-11-08 18:24+0000\n"

11+"PO-Revision-Date: 2015-03-02 18:12+0000\n"

12"Last-Translator: ivarela <ivarela@ubuntu.com>\n"

12"Last-Translator: ivarela <ivarela@ubuntu.com>\n"

13"Language-Team: Asturian <ast@li.org>\n"

13"Language-Team: Asturian <ast@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr "Contraseña: "

23msgstr "Contraseña: "

24

24

@@ -31,65 +31,92 @@ msgstr "Anclar"

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Desanclar"

32msgstr "Desanclar"

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr "Preséu bloquiáu"

36msgstr "Preséu bloquiáu"

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr "Quedasti bloquiáu polos escesivos intentos fallíos de frase de pasu."

40msgstr "Quedasti bloquiáu polos escesivos intentos fallíos de frase de pasu."

41

41

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

43msgid "You have been locked out due to too many failed passcode attempts."

43msgid "You have been locked out due to too many failed passcode attempts."

44msgstr ""

44msgstr ""

45"Quedasti bloquiáu polos escesivos intentos fallíos de códigu de pasu."

45"Quedasti bloquiáu polos escesivos intentos fallíos de códigu de pasu."

46

46

47−#: qml/Components/DelayedLockscreen.qml:72

47+#: qml/Components/DelayedLockscreen.qml:74

48#, qt-format

48#, qt-format

49msgid "Please wait %1 minute and then try again…"

49msgid "Please wait %1 minute and then try again…"

50msgid_plural "Please wait %1 minutes and then try again…"

50msgid_plural "Please wait %1 minutes and then try again…"

51msgstr[0] "Espera %1 minutu y vuelvi a intentalo…"

51msgstr[0] "Espera %1 minutu y vuelvi a intentalo…"

52msgstr[1] "Espera %1 minutos y vuelvi a intentalo…"

52msgstr[1] "Espera %1 minutos y vuelvi a intentalo…"

53

53

54−#: qml/Components/Dialogs.qml:70

54+#: qml/Components/Dialogs.qml:67

55+msgctxt "Title: Lock/Log out dialog"

55msgid "Log out"

56msgid "Log out"

56−msgstr "Zarrar sesión"

57+msgstr ""

57

58

58−#: qml/Components/Dialogs.qml:71

59+#: qml/Components/Dialogs.qml:68

59msgid "Are you sure you want to log out?"

60msgid "Are you sure you want to log out?"

60msgstr "De xuru que quies zarrar la sesión?"

61msgstr "De xuru que quies zarrar la sesión?"

61

62

62−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63+#: qml/Components/Dialogs.qml:70

63−#: qml/Components/Dialogs.qml:122

64+msgctxt "Button: Lock the system"

64−msgid "No"

65+msgid "Lock"

65−msgstr "Non"

66+msgstr ""

66

67

67−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

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

68−#: qml/Components/Dialogs.qml:129

74+#: qml/Components/Dialogs.qml:171

69−msgid "Yes"

75+msgid "Cancel"

70−msgstr "Sí"

76+msgstr "Encaboxar"

71

77

72−#: qml/Components/Dialogs.qml:94

78+#: qml/Components/Dialogs.qml:96

79+msgctxt "Title: Reboot/Shut down dialog"

73msgid "Shut down"

80msgid "Shut down"

74−msgstr "Apagar"

81+msgstr ""

75

82

76−#: qml/Components/Dialogs.qml:95

83+#: qml/Components/Dialogs.qml:97

77msgid "Are you sure you want to shut down?"

84msgid "Are you sure you want to shut down?"

78msgstr "De xuru que quies apagar?"

85msgstr "De xuru que quies apagar?"

79

86

80−#: qml/Components/Dialogs.qml:119

87+#: qml/Components/Dialogs.qml:99

88+msgctxt "Button: Reboot the system"

81msgid "Reboot"

89msgid "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 ""

83

101

84−#: qml/Components/Dialogs.qml:120

102+#: qml/Components/Dialogs.qml:128

85msgid "Are you sure you want to reboot?"

103msgid "Are you sure you want to reboot?"

86msgstr "De xuru que quies reaniciar?"

104msgstr "De xuru que quies reaniciar?"

87

105

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"

89msgid "Power"

116msgid "Power"

90−msgstr "Enerxía"

117+msgstr ""

91

118

92−#: qml/Components/Dialogs.qml:145

119+#: qml/Components/Dialogs.qml:151

93msgid ""

120msgid ""

94"Are you sure you would like\n"

121"Are you sure you would like\n"

95"to power off?"

122"to power off?"

@@ -97,67 +124,15 @@ msgstr ""

97"De xuru que quies\n"

124"De xuru que quies\n"

98"apagar?"

125"apagar?"

99

126

100−#: qml/Components/Dialogs.qml:147

127+#: qml/Components/Dialogs.qml:153

128+msgctxt "Button: Power off the system"

101msgid "Power off"

129msgid "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"

146msgstr ""

130msgstr ""

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"

153

131

154−#: qml/Components/EdgeDemo.qml:243

132+#: qml/Components/Dialogs.qml:162

133+msgctxt "Button: Restart the system"

155−msgid ""

134+msgid "Restart"

156−"You have now mastered the edge gestures and can start using the "

157−"phone<br><br>Tap on the screen to start"

158msgstr ""

135msgstr ""

159−"Agora yá domines los xestos de los berbesos y pues entamar a usar el "

160−"teléfonu<br><br>Toca la pantalla pa comenzar"

161

136

162#: qml/Components/Lockscreen.qml:238

137#: qml/Components/Lockscreen.qml:238

163msgid "Return to Call"

138msgid "Return to Call"

@@ -171,32 +146,39 @@ msgstr "Llamada d'emerxencia"

171msgid "OK"

146msgid "OK"

172msgstr "Aceutar"

147msgstr "Aceutar"

173

148

174−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

149+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

175msgid "See less"

150msgid "See less"

176msgstr "Ver menos"

151msgstr "Ver menos"

177

152

178−#: qml/Dash/GenericScopeView.qml:431

153+#: qml/Dash/GenericScopeView.qml:533

179msgid "See all"

154msgid "See all"

180msgstr "Ver too"

155msgstr "Ver too"

181

156

182−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

157+#: qml/Dash/GenericScopeView.qml:595

183−#: qml/Panel/SearchIndicator.qml:27

158+msgctxt "Label: Hint for dash search line edit"

184msgid "Search"

159msgid "Search"

185−msgstr "Guetar"

160+msgstr ""

186

161

187−#: qml/Dash/PageHeader.qml:260

162+#: qml/Dash/PageHeader.qml:269

163+msgctxt "Button: Open the Ubuntu Store"

188msgid "Store"

164msgid "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 ""

190

171

191−#: qml/Dash/PageHeader.qml:277

172+#: qml/Dash/PageHeader.qml:286

173+msgctxt "Button: Show the current dash scope settings"

192msgid "Settings"

174msgid "Settings"

193−msgstr "Axustes"

175+msgstr ""

194

176

195−#: qml/Dash/PageHeader.qml:284

177+#: qml/Dash/PageHeader.qml:293

196msgid "Remove from Favorites"

178msgid "Remove from Favorites"

197msgstr "Desaniciar de favoritos"

179msgstr "Desaniciar de favoritos"

198

180

199−#: qml/Dash/PageHeader.qml:284

181+#: qml/Dash/PageHeader.qml:293

200msgid "Add to Favorites"

182msgid "Add to Favorites"

201msgstr "Amestar a favoritos"

183msgstr "Amestar a favoritos"

202

184

@@ -228,22 +210,92 @@ msgstr "Tirar p'anovar..."

228msgid "Release to refresh…"

210msgid "Release to refresh…"

229msgstr "Soltar p'anovar..."

211msgstr "Soltar p'anovar..."

230

212

213+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

214+msgid "Enable location data"

215+msgstr "Activar datos de llocalización"

216+

231−#: qml/Dash/ScopesList.qml:63

217+#: qml/Dash/ScopesList.qml:66

232msgid "Manage"

218msgid "Manage"

233−msgstr ""

219+msgstr "Alministrar"

234

220

235−#: qml/Dash/ScopesList.qml:107

221+#: qml/Dash/ScopesList.qml:112

236msgid "Home"

222msgid "Home"

237−msgstr ""

223+msgstr "Aniciu"

238

224

239−#: qml/Dash/ScopesList.qml:108

225+#: qml/Dash/ScopesList.qml:113

240msgid "Also installed"

226msgid "Also installed"

241−msgstr ""

227+msgstr "Tamién instalaos"

242

228

243−#: qml/Greeter/Greeter.qml:174

229+#: qml/Greeter/CoverPage.qml:107

244msgid "Unlock"

230msgid "Unlock"

245msgstr "Desbloquiar"

231msgstr "Desbloquiar"

246

232

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+

247#: qml/Notifications/NotificationMenuItemFactory.qml:128

299#: qml/Notifications/NotificationMenuItemFactory.qml:128

248msgid "Show password"

300msgid "Show password"

249msgstr "Amosar contraseña"

301msgstr "Amosar contraseña"

@@ -284,6 +336,11 @@ msgstr "Finó"

284msgid "Failed, tap to retry"

336msgid "Failed, tap to retry"

285msgstr "Falló, toca pa reintentar"

337msgstr "Falló, toca pa reintentar"

286

338

339+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

340+msgctxt "Label: Hint in message indicator line edit"

341+msgid "Reply"

342+msgstr ""

343+

287#: qml/Panel/Indicators/ModemInfoItem.qml:105

344#: qml/Panel/Indicators/ModemInfoItem.qml:105

288msgid "Unlock SIM"

345msgid "Unlock SIM"

289msgstr "Desbloquiar SIM"

346msgstr "Desbloquiar SIM"

@@ -292,158 +349,160 @@ msgstr "Desbloquiar SIM"

292msgid "Roaming"

349msgid "Roaming"

293msgstr "Roaming"

350msgstr "Roaming"

294

351

295−#: qml/Shell.qml:367

352+#: qml/Tutorial/TutorialBottomFinish.qml:24

296−#, qt-format

353+msgid "This action does different things for different apps"

297−msgid "Enter %1"

354+msgstr "Esta aición tiene efeutos distintos en cada aplicación"

298−msgstr "Escribi %1"

299

355

300−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

356+#: qml/Tutorial/TutorialBottomFinish.qml:25

301−msgid "Enter passphrase"

357+msgid "Tap here to finish."

302−msgstr "Escribi la frase contraseña"

358+msgstr "Toca equí pa finar."

303

359

304−#: qml/Shell.qml:369

360+#: qml/Tutorial/TutorialBottom.qml:28

305−msgid "Enter passcode"

361+msgid "Open special menus"

306−msgstr "Escribi'l códigu de pasu"

362+msgstr "Abrir menús especiales"

307

363

308−#: qml/Shell.qml:370

364+#: qml/Tutorial/TutorialBottom.qml:29

309−#, qt-format

365+msgid "Swipe up from the bottom edge."

310−msgid "Sorry, incorrect %1"

366+msgstr ""

311−msgstr "Sentímoslo, %1 incorreutu"

312

367

313−#: qml/Shell.qml:371

368+#: qml/Tutorial/TutorialLeftFinish.qml:24

314−msgid "Sorry, incorrect passphrase"

369+msgid "These are the shortcuts to favorite apps"

315−msgstr "Sentímoslo, contraseña incorreuta"

370+msgstr ""

316

371

317−#: qml/Shell.qml:372

372+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

318−msgid "Please re-enter"

373+msgid "Tap here to continue."

319−msgstr "Vuelvi a escribila"

374+msgstr "Toca equí pa siguir."

320

375

321−#: qml/Shell.qml:373

376+#: qml/Tutorial/TutorialLeft.qml:26

322−msgid "Sorry, incorrect passcode"

377+msgid "Open the launcher"

323−msgstr "Sentímoslo, códigu de pasu incorreutu"

378+msgstr "Abrir el llanzador"

324

379

325−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

380+#: qml/Tutorial/TutorialLeft.qml:27

326−msgid "Sorry, incorrect passphrase."

381+msgid "Short swipe from the left edge."

327−msgstr "Fras de pasu incorreuta"

382+msgstr ""

328

383

329−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

384+#: qml/Tutorial/TutorialPage.qml:178

330−msgid "Sorry, incorrect passcode."

385+msgid "You almost got it!"

331−msgstr "Códigu de pasu incorreutu"

386+msgstr ""

332

387

333−#: qml/Shell.qml:469

388+#: qml/Tutorial/TutorialPage.qml:195

334−msgid "This will be your last attempt."

389+msgid "Try again."

335−msgstr "Esti ye'l caberu intentu."

390+msgstr ""

336

391

337−#: qml/Shell.qml:471

392+#: qml/Tutorial/TutorialRight.qml:31

338−msgid ""

393+msgid "To view open apps"

339−"If passphrase is entered incorrectly, your phone will conduct a factory "

340−"reset and all personal data will be deleted."

341msgstr ""

394msgstr ""

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."

344

395

345−#: qml/Shell.qml:472

396+#: qml/Tutorial/TutorialRight.qml:32

346−msgid ""

397+msgid "Long swipe from the right edge."

347−"If passcode is entered incorrectly, your phone will conduct a factory reset "

398+msgstr ""

348−"and all personal data will be deleted."

399+

400+#: qml/Tutorial/TutorialRight.qml:122

401+msgid "View all your running tasks."

349msgstr ""

402msgstr ""

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."

352

403

353#: qml/Wizard/Page.qml:89

404#: qml/Wizard/Page.qml:89

405+msgctxt "Button: Go back one page in the Wizard"

354msgid "Back"

406msgid "Back"

355msgstr ""

407msgstr ""

356

408

357#: qml/Wizard/Pages/10-welcome.qml:27

409#: qml/Wizard/Pages/10-welcome.qml:27

358msgid "Hi!"

410msgid "Hi!"

359−msgstr ""

411+msgstr "Hola!"

360

412

361#: qml/Wizard/Pages/10-welcome.qml:44

413#: qml/Wizard/Pages/10-welcome.qml:44

362msgid "Welcome to your Ubuntu phone."

414msgid "Welcome to your Ubuntu phone."

363−msgstr ""

415+msgstr "Dámoste l'acoyida a Ubuntu Phone"

364

416

365#: qml/Wizard/Pages/10-welcome.qml:52

417#: qml/Wizard/Pages/10-welcome.qml:52

366msgid "Let’s get started."

418msgid "Let’s get started."

367−msgstr ""

419+msgstr "Entamamos."

368

420

369#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

421#: 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

371#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

423#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

372#: qml/Wizard/Pages/passwd-set.qml:90

424#: qml/Wizard/Pages/passwd-set.qml:90

373msgid "Continue"

425msgid "Continue"

374−msgstr ""

426+msgstr "Siguir"

375

427

376#: qml/Wizard/Pages/20-sim.qml:25

428#: qml/Wizard/Pages/20-sim.qml:25

377msgid "Add a SIM card and restart your device"

429msgid "Add a SIM card and restart your device"

378−msgstr ""

430+msgstr "Amiesta una tarxeta SIM y reanicia'l preséu"

379

431

380−#: qml/Wizard/Pages/20-sim.qml:55

432+#: qml/Wizard/Pages/20-sim.qml:59

381msgid "Without it, you won’t be able to make calls or use text messaging."

433msgid "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."

383

435

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

385msgid "Skip"

437msgid "Skip"

386−msgstr ""

438+msgstr "Omitir"

387

439

388#: qml/Wizard/Pages/30-passwd-type.qml:39

440#: qml/Wizard/Pages/30-passwd-type.qml:39

389msgid "Lock security"

441msgid "Lock security"

390−msgstr ""

442+msgstr "Seguridá de bloquéu"

391

443

392#: qml/Wizard/Pages/30-passwd-type.qml:74

444#: qml/Wizard/Pages/30-passwd-type.qml:74

393msgid "Please select how you’d like to unlock your phone."

445msgid "Please select how you’d like to unlock your phone."

394−msgstr ""

446+msgstr "Seleiciona cómo te prestaría desbloquiar el teléfonu."

395

447

396#: qml/Wizard/Pages/30-passwd-type.qml:97

448#: qml/Wizard/Pages/30-passwd-type.qml:97

449+msgctxt "Label: Type of security method"

397msgid "Swipe"

450msgid "Swipe"

398msgstr ""

451msgstr ""

399

452

400#: qml/Wizard/Pages/30-passwd-type.qml:98

453#: qml/Wizard/Pages/30-passwd-type.qml:98

454+msgctxt "Label: Description of security method"

401msgid "No security"

455msgid "No security"

402msgstr ""

456msgstr ""

403

457

404#: qml/Wizard/Pages/30-passwd-type.qml:100

458#: qml/Wizard/Pages/30-passwd-type.qml:100

459+msgctxt "Label: Type of security method"

405msgid "Passcode"

460msgid "Passcode"

406msgstr ""

461msgstr ""

407

462

408#: qml/Wizard/Pages/30-passwd-type.qml:101

463#: qml/Wizard/Pages/30-passwd-type.qml:101

464+msgctxt "Label: Description of security method"

409msgid "4 digits only"

465msgid "4 digits only"

410msgstr ""

466msgstr ""

411

467

412#: qml/Wizard/Pages/30-passwd-type.qml:103

468#: qml/Wizard/Pages/30-passwd-type.qml:103

469+msgctxt "Label: Type of security method"

413msgid "Passphrase"

470msgid "Passphrase"

414msgstr ""

471msgstr ""

415

472

416#: qml/Wizard/Pages/30-passwd-type.qml:104

473#: qml/Wizard/Pages/30-passwd-type.qml:104

474+msgctxt "Label: Description of security method"

417msgid "Numbers and letters"

475msgid "Numbers and letters"

418msgstr ""

476msgstr ""

419

477

420−#: qml/Wizard/Pages/40-wifi.qml:28

478+#: qml/Wizard/Pages/40-wifi.qml:29

421msgid "Connect to Wi‑Fi"

479msgid "Connect to Wi‑Fi"

422−msgstr ""

480+msgstr "Coneutar a WiFi"

423

481

424−#: qml/Wizard/Pages/40-wifi.qml:147

482+#: qml/Wizard/Pages/40-wifi.qml:168

425msgid "Available networks…"

483msgid "Available networks…"

426−msgstr ""

484+msgstr "Redes disponibles..."

427

485

428−#: qml/Wizard/Pages/40-wifi.qml:148

486+#: qml/Wizard/Pages/40-wifi.qml:169

429msgid "No available networks."

487msgid "No available networks."

430−msgstr ""

488+msgstr "Nun hai redes disponibles"

431

489

432#: qml/Wizard/Pages/50-location.qml:27

490#: qml/Wizard/Pages/50-location.qml:27

433msgid "Location"

491msgid "Location"

434−msgstr ""

492+msgstr "Llocalización"

435

493

436#: qml/Wizard/Pages/50-location.qml:62

494#: qml/Wizard/Pages/50-location.qml:62

437msgid "Let the phone detect your location:"

495msgid "Let the phone detect your location:"

438−msgstr ""

496+msgstr "Permitir al teléfonu deteutar la llocalización:"

439

497

440#: qml/Wizard/Pages/50-location.qml:69

498#: qml/Wizard/Pages/50-location.qml:69

441msgid "Using GPS only (less accurate)"

499msgid "Using GPS only (less accurate)"

442−msgstr ""

500+msgstr "Namái usando GPS (menos precisión)"

443

501

444#: qml/Wizard/Pages/50-location.qml:86

502#: qml/Wizard/Pages/50-location.qml:86

445msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

503msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

446msgstr ""

504msgstr ""

505+"Usando GPS, Wifi anónimes ya información de redes móviles (recomiéndase)"

447

506

448#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

507#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

449#: qml/Wizard/Pages/50-location.qml:103

508#: qml/Wizard/Pages/50-location.qml:103

@@ -451,81 +510,119 @@ msgid ""

451"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

510"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

452"conditions</a>."

511"conditions</a>."

453msgstr ""

512msgstr ""

513+"Seleicionando esta opción, aceutes los <a href='#'>términos y "

514+"condiciones</a> de Nokia HERE."

454

515

455#: qml/Wizard/Pages/50-location.qml:112

516#: qml/Wizard/Pages/50-location.qml:112

456msgid "Not at all"

517msgid "Not at all"

457−msgstr ""

518+msgstr "De nengún mou"

458

519

459#: qml/Wizard/Pages/50-location.qml:124

520#: qml/Wizard/Pages/50-location.qml:124

460msgid "You can change your mind later in <b>System Settings</b>."

521msgid "You can change your mind later in <b>System Settings</b>."

461−msgstr ""

522+msgstr "Pues cambialo dempués n'<b>Axustes del sistema</b>."

462

523

463#: qml/Wizard/Pages/60-reporting.qml:24

524#: qml/Wizard/Pages/60-reporting.qml:24

464msgid "Improving your experience"

525msgid "Improving your experience"

465−msgstr ""

526+msgstr "Ameyorar la esperiencia"

466

527

467#: qml/Wizard/Pages/60-reporting.qml:36

528#: qml/Wizard/Pages/60-reporting.qml:36

468msgid ""

529msgid ""

469"Your phone is set up to automatically report errors to Canonical and its "

530"Your phone is set up to automatically report errors to Canonical and its "

470"partners, the makers of the operating system."

531"partners, the makers of the operating system."

471msgstr ""

532msgstr ""

533+"El teléfonu ta configuráu pa informar automáticamente de los fallos a "

534+"Canonical y asociaos, los fabricantes del sistema operativu."

472

535

473#: qml/Wizard/Pages/60-reporting.qml:43

536#: qml/Wizard/Pages/60-reporting.qml:43

474msgid ""

537msgid ""

475"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

538"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

476"Privacy</b>"

539"Privacy</b>"

477msgstr ""

540msgstr ""

541+"Esto pue desactivase nos <b>Axustes del sistema</b> en <b>Seguranza y "

542+"privacidá</b>"

478

543

479#: qml/Wizard/Pages/80-finished.qml:24

544#: qml/Wizard/Pages/80-finished.qml:24

480msgid "All done"

545msgid "All done"

481−msgstr ""

546+msgstr "Too fecho"

482

547

483#: qml/Wizard/Pages/80-finished.qml:39

548#: qml/Wizard/Pages/80-finished.qml:39

484msgid "Nice work!"

549msgid "Nice work!"

485−msgstr ""

550+msgstr "Bon trabayu!"

486

551

487#: qml/Wizard/Pages/80-finished.qml:46

552#: qml/Wizard/Pages/80-finished.qml:46

488msgid "Your phone is now ready to use."

553msgid "Your phone is now ready to use."

489−msgstr ""

554+msgstr "El teléfonu yá ta preparáu pa usar."

490

555

491#: qml/Wizard/Pages/80-finished.qml:53

556#: qml/Wizard/Pages/80-finished.qml:53

492msgid "Finish"

557msgid "Finish"

493−msgstr ""

558+msgstr "Finar"

494

559

495#: qml/Wizard/Pages/here-terms.qml:27

560#: qml/Wizard/Pages/here-terms.qml:27

496msgid "Terms & Conditions"

561msgid "Terms & Conditions"

497−msgstr ""

562+msgstr "Términos y condiciones"

498

563

499#: qml/Wizard/Pages/passwd-confirm.qml:49

564#: qml/Wizard/Pages/passwd-confirm.qml:49

500msgid "Confirm passphrase"

565msgid "Confirm passphrase"

501−msgstr ""

566+msgstr "Confirmar fras secreta"

502

567

503#: qml/Wizard/Pages/passwd-confirm.qml:50

568#: qml/Wizard/Pages/passwd-confirm.qml:50

504msgid "Confirm passcode"

569msgid "Confirm passcode"

505−msgstr ""

570+msgstr "Confirmar el códigu de pasu"

506

571

507#: qml/Wizard/Pages/passwd-confirm.qml:53

572#: qml/Wizard/Pages/passwd-confirm.qml:53

508#: qml/Wizard/Pages/passwd-confirm.qml:54

573#: qml/Wizard/Pages/passwd-confirm.qml:54

509msgid "Please try again."

574msgid "Please try again."

510−msgstr ""

575+msgstr "Vuelvi a intentalo."

511

576

512#: qml/Wizard/Pages/passwd-set.qml:61

577#: qml/Wizard/Pages/passwd-set.qml:61

513msgid "Choose your passcode"

578msgid "Choose your passcode"

514−msgstr ""

579+msgstr "Escueyi'l códigu de pasu"

515

580

516#: qml/Wizard/Pages/passwd-set.qml:68

581#: qml/Wizard/Pages/passwd-set.qml:68

517msgid "Passphrase must be 4 characters long"

582msgid "Passphrase must be 4 characters long"

518−msgstr ""

583+msgstr "La fras de contraseña tien de ser de 4 caráuteres"

519

584

520#: qml/Wizard/StackButton.qml:39

585#: qml/Wizard/StackButton.qml:39

521#, qt-format

586#, qt-format

522msgid "〈 %1"

587msgid "〈 %1"

523−msgstr ""

588+msgstr "〈 %1"

524

589

525#: qml/Wizard/StackButton.qml:42

590#: qml/Wizard/StackButton.qml:42

526#, qt-format

591#, qt-format

527msgid "%1 〉"

592msgid "%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"

529

626

530#~ msgid "Confirm"

627#~ msgid "Confirm"

531#~ msgstr "Confirmar"

628#~ msgstr "Confirmar"

@@ -542,6 +639,34 @@ msgstr ""

542#~ msgid "Speak Now..."

639#~ msgid "Speak Now..."

543#~ msgstr "Fala agora…"

640#~ msgstr "Fala agora…"

544

641

642+#~ msgid "Search"

643+#~ msgstr "Guetar"

644+

645+#~ msgid ""

646+#~ "You have now mastered the edge gestures and can start using the "

647+#~ "phone<br><br>Tap on the screen to start"

648+#~ msgstr ""

649+#~ "Agora yá domines los xestos de los berbesos y pues entamar a usar el "

650+#~ "teléfonu<br><br>Toca la pantalla pa comenzar"

651+

652+#~ msgid "Power"

653+#~ msgstr "Enerxía"

654+

655+#~ msgid "Log out"

656+#~ msgstr "Zarrar sesión"

657+

658+#~ msgid "Reboot"

659+#~ msgstr "Reaniciar"

660+

661+#~ msgid "Shut down"

662+#~ msgstr "Apagar"

663+

664+#~ msgid "Settings"

665+#~ msgstr "Axustes"

666+

667+#~ msgid "Power off"

668+#~ msgstr "Apagar"

669+

545#~ msgid "Done"

670#~ msgid "Done"

546#~ msgstr "Fecho"

671#~ msgstr "Fecho"

547

672

@@ -551,5 +676,11 @@ msgstr ""

551#~ msgid "All"

676#~ msgid "All"

552#~ msgstr "Too"

677#~ msgstr "Too"

553

678

679+#~ msgid "Store"

680+#~ msgstr "Tienda"

681+

682+#~ msgid "Restart"

683+#~ msgstr "Reaniciar"

684+

554#~ msgid "Manage Scopes"

685#~ msgid "Manage Scopes"

555#~ msgstr "Xestionar ámbitos"

686#~ msgstr "Xestionar ámbitos"

po/az.po+257−142

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11"PO-Revision-Date: 2014-09-03 16:39+0000\n"

11"PO-Revision-Date: 2014-09-03 16:39+0000\n"

12"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"

12"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"

13"Language-Team: Azerbaijani <az@li.org>\n"

13"Language-Team: Azerbaijani <az@li.org>\n"

@@ -15,10 +15,10 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr "Şifrә: "

23msgstr "Şifrә: "

24

24

@@ -31,129 +31,105 @@ msgstr "Pin qısayolu"

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Açma qısayolu"

32msgstr "Açma qısayolu"

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr ""

36msgstr ""

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

40msgstr ""

41

41

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

43msgid "You have been locked out due to too many failed passcode attempts."

43msgid "You have been locked out due to too many failed passcode attempts."

44msgstr ""

44msgstr ""

45

45

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

47#, qt-format

47#, qt-format

48msgid "Please wait %1 minute and then try again…"

48msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] ""

50msgstr[0] ""

51msgstr[1] ""

51msgstr[1] ""

52

52

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

54msgid "Log out"

55msgid "Log out"

55−msgstr "Çıxış"

56+msgstr ""

56

57

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

58msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

59msgstr "Çıxmaq istәdiyinizdәn әminsiniz?"

60msgstr "Çıxmaq istәdiyinizdәn әminsiniz?"

60

61

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:70

62−#: qml/Components/Dialogs.qml:122

63+msgctxt "Button: Lock the system"

63−msgid "No"

64+msgid "Lock"

64−msgstr "Yox"

65+msgstr ""

65

66

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

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

67−#: qml/Components/Dialogs.qml:129

73+#: qml/Components/Dialogs.qml:171

68−msgid "Yes"

74+msgid "Cancel"

69−msgstr "Hə"

75+msgstr "İmtina"

70

76

71−#: qml/Components/Dialogs.qml:94

77+#: qml/Components/Dialogs.qml:96

78+msgctxt "Title: Reboot/Shut down dialog"

72msgid "Shut down"

79msgid "Shut down"

73−msgstr "Sistemi Söndür"

80+msgstr ""

74

81

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

76msgid "Are you sure you want to shut down?"

83msgid "Are you sure you want to shut down?"

77msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"

84msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"

78

85

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"

80msgid "Reboot"

98msgid "Reboot"

81−msgstr "Yenidən yüklə"

99+msgstr ""

82

100

83−#: qml/Components/Dialogs.qml:120

101+#: qml/Components/Dialogs.qml:128

84msgid "Are you sure you want to reboot?"

102msgid "Are you sure you want to reboot?"

85msgstr "Yenidәn başlatmaq istәdiyinizә әminsiniz?"

103msgstr "Yenidәn başlatmaq istәdiyinizә әminsiniz?"

86

104

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"

88msgid "Power"

115msgid "Power"

89msgstr ""

116msgstr ""

90

117

91−#: qml/Components/Dialogs.qml:145

118+#: qml/Components/Dialogs.qml:151

92msgid ""

119msgid ""

93"Are you sure you would like\n"

120"Are you sure you would like\n"

94"to power off?"

121"to power off?"

95msgstr ""

122msgstr ""

96

123

97−#: qml/Components/Dialogs.qml:147

124+#: qml/Components/Dialogs.qml:153

125+msgctxt "Button: Power off the system"

98msgid "Power off"

126msgid "Power off"

99−msgstr "Söndür"

100−

101−#: qml/Components/Dialogs.qml:157

102−msgid "Restart"

103msgstr ""

127msgstr ""

104

128

105−#: qml/Components/Dialogs.qml:167

129+#: qml/Components/Dialogs.qml:162

106−msgid "Cancel"

130+msgctxt "Button: Restart the system"

107−msgstr "İmtina"

131+msgid "Restart"

108−

109−#: qml/Components/EdgeDemoOverlay.qml:151

110−msgid "Skip intro"

111−msgstr "Tәqdimatı keç"

112−

113−#: qml/Components/EdgeDemo.qml:125

114−msgid "Right edge"

115−msgstr "Sağ Künc"

116−

117−#: qml/Components/EdgeDemo.qml:126

118−msgid "Try swiping from the right edge to unlock the phone"

119−msgstr "Kilidi açmaq üçün sağ küncdən sürüşdürün"

120−

121−#: qml/Components/EdgeDemo.qml:157

122−msgid "Top edge"

123−msgstr "Yuxarı künc"

124−

125−#: qml/Components/EdgeDemo.qml:158

126−msgid "Try swiping from the top edge to access the indicators"

127−msgstr "Göstəriciləri görmәk üçün yuxarı küncdən sürüşdürün"

128−

129−#: qml/Components/EdgeDemo.qml:183

130−msgid "Close"

131−msgstr "Bağla"

132−

133−#: qml/Components/EdgeDemo.qml:184

134−msgid "Swipe up again to close the settings screen"

135−msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı sürüşdürün"

136−

137−#: qml/Components/EdgeDemo.qml:214

138−msgid "Left edge"

139−msgstr "Sol künc"

140−

141−#: qml/Components/EdgeDemo.qml:215

142−msgid "Swipe from the left to reveal the launcher for quick access to apps"

143−msgstr ""

144−"Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"

145−

146−#: qml/Components/EdgeDemo.qml:242

147−msgid "Well done"

148−msgstr "Təbriklər"

149−

150−#: qml/Components/EdgeDemo.qml:243

151−msgid ""

152−"You have now mastered the edge gestures and can start using the "

153−"phone<br><br>Tap on the screen to start"

154msgstr ""

132msgstr ""

155−"Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "

156−"bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"

157

133

158#: qml/Components/Lockscreen.qml:238

134#: qml/Components/Lockscreen.qml:238

159msgid "Return to Call"

135msgid "Return to Call"

@@ -167,32 +143,39 @@ msgstr "Zərurət zəngi"

167msgid "OK"

143msgid "OK"

168msgstr "Oldu"

144msgstr "Oldu"

169

145

170−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

171msgid "See less"

147msgid "See less"

172msgstr "Daha azını gör"

148msgstr "Daha azını gör"

173

149

174−#: qml/Dash/GenericScopeView.qml:431

150+#: qml/Dash/GenericScopeView.qml:533

175msgid "See all"

151msgid "See all"

176msgstr "Hamısını gör"

152msgstr "Hamısını gör"

177

153

178−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

154+#: qml/Dash/GenericScopeView.qml:595

179−#: qml/Panel/SearchIndicator.qml:27

155+msgctxt "Label: Hint for dash search line edit"

180msgid "Search"

156msgid "Search"

181−msgstr "Axtar"

157+msgstr ""

182

158

183−#: qml/Dash/PageHeader.qml:260

159+#: qml/Dash/PageHeader.qml:269

160+msgctxt "Button: Open the Ubuntu Store"

184msgid "Store"

161msgid "Store"

185msgstr ""

162msgstr ""

186

163

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"

188msgid "Settings"

171msgid "Settings"

189−msgstr "Tənzimləmələr"

172+msgstr ""

190

173

191−#: qml/Dash/PageHeader.qml:284

174+#: qml/Dash/PageHeader.qml:293

192msgid "Remove from Favorites"

175msgid "Remove from Favorites"

193msgstr "Seçilmişlәrdәn çıxart"

176msgstr "Seçilmişlәrdәn çıxart"

194

177

195−#: qml/Dash/PageHeader.qml:284

178+#: qml/Dash/PageHeader.qml:293

196msgid "Add to Favorites"

179msgid "Add to Favorites"

197msgstr "Seçilmişlәrә әlavә et"

180msgstr "Seçilmişlәrә әlavә et"

198

181

@@ -224,22 +207,92 @@ msgstr ""

224msgid "Release to refresh…"

207msgid "Release to refresh…"

225msgstr ""

208msgstr ""

226

209

210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

211+msgid "Enable location data"

212+msgstr ""

213+

227−#: qml/Dash/ScopesList.qml:63

214+#: qml/Dash/ScopesList.qml:66

228msgid "Manage"

215msgid "Manage"

229msgstr ""

216msgstr ""

230

217

231−#: qml/Dash/ScopesList.qml:107

218+#: qml/Dash/ScopesList.qml:112

232msgid "Home"

219msgid "Home"

233msgstr ""

220msgstr ""

234

221

235−#: qml/Dash/ScopesList.qml:108

222+#: qml/Dash/ScopesList.qml:113

236msgid "Also installed"

223msgid "Also installed"

237msgstr ""

224msgstr ""

238

225

239−#: qml/Greeter/Greeter.qml:174

226+#: qml/Greeter/CoverPage.qml:107

240msgid "Unlock"

227msgid "Unlock"

241msgstr ""

228msgstr ""

242

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 "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+

243#: qml/Notifications/NotificationMenuItemFactory.qml:128

296#: qml/Notifications/NotificationMenuItemFactory.qml:128

244msgid "Show password"

297msgid "Show password"

245msgstr "Şifrәni göstәr"

298msgstr "Şifrәni göstәr"

@@ -280,6 +333,11 @@ msgstr "Bitdi"

280msgid "Failed, tap to retry"

333msgid "Failed, tap to retry"

281msgstr "Alınmadı. Yenidәn cәhd etmək üçün toxunun"

334msgstr "Alınmadı. Yenidәn cәhd etmək üçün toxunun"

282

335

336+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

337+msgctxt "Label: Hint in message indicator line edit"

338+msgid "Reply"

339+msgstr ""

340+

283#: qml/Panel/Indicators/ModemInfoItem.qml:105

341#: qml/Panel/Indicators/ModemInfoItem.qml:105

284msgid "Unlock SIM"

342msgid "Unlock SIM"

285msgstr "SIM kilidini aç"

343msgstr "SIM kilidini aç"

@@ -288,65 +346,60 @@ msgstr "SIM kilidini aç"

288msgid "Roaming"

346msgid "Roaming"

289msgstr "Rominq"

347msgstr "Rominq"

290

348

291−#: qml/Shell.qml:367

349+#: qml/Tutorial/TutorialBottomFinish.qml:24

292−#, qt-format

350+msgid "This action does different things for different apps"

293−msgid "Enter %1"

294msgstr ""

351msgstr ""

295

352

296−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

353+#: qml/Tutorial/TutorialBottomFinish.qml:25

297−msgid "Enter passphrase"

354+msgid "Tap here to finish."

298msgstr ""

355msgstr ""

299

356

300−#: qml/Shell.qml:369

357+#: qml/Tutorial/TutorialBottom.qml:28

301−msgid "Enter passcode"

358+msgid "Open special menus"

302msgstr ""

359msgstr ""

303

360

304−#: qml/Shell.qml:370

361+#: qml/Tutorial/TutorialBottom.qml:29

305−#, qt-format

362+msgid "Swipe up from the bottom edge."

306−msgid "Sorry, incorrect %1"

363+msgstr ""

307−msgstr "Bağışlayın, %1 yanlışdır"

308

364

309−#: qml/Shell.qml:371

365+#: qml/Tutorial/TutorialLeftFinish.qml:24

310−msgid "Sorry, incorrect passphrase"

366+msgid "These are the shortcuts to favorite apps"

311−msgstr "Bağışlayın, açar söz yanlışdır"

367+msgstr ""

312

368

313−#: qml/Shell.qml:372

369+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

314−msgid "Please re-enter"

370+msgid "Tap here to continue."

315msgstr ""

371msgstr ""

316

372

317−#: qml/Shell.qml:373

373+#: qml/Tutorial/TutorialLeft.qml:26

318−msgid "Sorry, incorrect passcode"

374+msgid "Open the launcher"

319msgstr ""

375msgstr ""

320

376

321−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

377+#: qml/Tutorial/TutorialLeft.qml:27

322−msgid "Sorry, incorrect passphrase."

378+msgid "Short swipe from the left edge."

323−msgstr "Bağışlayın, açar söz yanlışdır."

379+msgstr ""

324

380

325−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

381+#: qml/Tutorial/TutorialPage.qml:178

326−msgid "Sorry, incorrect passcode."

382+msgid "You almost got it!"

327−msgstr "Təəssüf ki, açar kod yanlışdır."

383+msgstr ""

328

384

329−#: qml/Shell.qml:469

385+#: qml/Tutorial/TutorialPage.qml:195

330−msgid "This will be your last attempt."

386+msgid "Try again."

331−msgstr "Bu sizin son cəhdiniz olacaq."

387+msgstr ""

332

388

333−#: qml/Shell.qml:471

389+#: qml/Tutorial/TutorialRight.qml:31

334−msgid ""

390+msgid "To view open apps"

335−"If passphrase is entered incorrectly, your phone will conduct a factory "

336−"reset and all personal data will be deleted."

337msgstr ""

391msgstr ""

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."

340

392

341−#: qml/Shell.qml:472

393+#: qml/Tutorial/TutorialRight.qml:32

342−msgid ""

394+msgid "Long swipe from the right edge."

343−"If passcode is entered incorrectly, your phone will conduct a factory reset "

395+msgstr ""

344−"and all personal data will be deleted."

396+

397+#: qml/Tutorial/TutorialRight.qml:122

398+msgid "View all your running tasks."

345msgstr ""

399msgstr ""

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."

348

400

349#: qml/Wizard/Page.qml:89

401#: qml/Wizard/Page.qml:89

402+msgctxt "Button: Go back one page in the Wizard"

350msgid "Back"

403msgid "Back"

351msgstr ""

404msgstr ""

352

405

@@ -363,7 +416,7 @@ msgid "Let’s get started."

363msgstr ""

416msgstr ""

364

417

365#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

418#: 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

367#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

420#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

368#: qml/Wizard/Pages/passwd-set.qml:90

421#: qml/Wizard/Pages/passwd-set.qml:90

369msgid "Continue"

422msgid "Continue"

@@ -373,11 +426,11 @@ msgstr ""

373msgid "Add a SIM card and restart your device"

426msgid "Add a SIM card and restart your device"

374msgstr ""

427msgstr ""

375

428

376−#: qml/Wizard/Pages/20-sim.qml:55

429+#: qml/Wizard/Pages/20-sim.qml:59

377msgid "Without it, you won’t be able to make calls or use text messaging."

430msgid "Without it, you won’t be able to make calls or use text messaging."

378msgstr ""

431msgstr ""

379

432

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

381msgid "Skip"

434msgid "Skip"

382msgstr ""

435msgstr ""

383

436

@@ -390,38 +443,44 @@ msgid "Please select how you’d like to unlock your phone."

390msgstr ""

443msgstr ""

391

444

392#: qml/Wizard/Pages/30-passwd-type.qml:97

445#: qml/Wizard/Pages/30-passwd-type.qml:97

446+msgctxt "Label: Type of security method"

393msgid "Swipe"

447msgid "Swipe"

394msgstr ""

448msgstr ""

395

449

396#: qml/Wizard/Pages/30-passwd-type.qml:98

450#: qml/Wizard/Pages/30-passwd-type.qml:98

451+msgctxt "Label: Description of security method"

397msgid "No security"

452msgid "No security"

398msgstr ""

453msgstr ""

399

454

400#: qml/Wizard/Pages/30-passwd-type.qml:100

455#: qml/Wizard/Pages/30-passwd-type.qml:100

456+msgctxt "Label: Type of security method"

401msgid "Passcode"

457msgid "Passcode"

402msgstr ""

458msgstr ""

403

459

404#: qml/Wizard/Pages/30-passwd-type.qml:101

460#: qml/Wizard/Pages/30-passwd-type.qml:101

461+msgctxt "Label: Description of security method"

405msgid "4 digits only"

462msgid "4 digits only"

406msgstr ""

463msgstr ""

407

464

408#: qml/Wizard/Pages/30-passwd-type.qml:103

465#: qml/Wizard/Pages/30-passwd-type.qml:103

466+msgctxt "Label: Type of security method"

409msgid "Passphrase"

467msgid "Passphrase"

410msgstr ""

468msgstr ""

411

469

412#: qml/Wizard/Pages/30-passwd-type.qml:104

470#: qml/Wizard/Pages/30-passwd-type.qml:104

471+msgctxt "Label: Description of security method"

413msgid "Numbers and letters"

472msgid "Numbers and letters"

414msgstr ""

473msgstr ""

415

474

416−#: qml/Wizard/Pages/40-wifi.qml:28

475+#: qml/Wizard/Pages/40-wifi.qml:29

417msgid "Connect to Wi‑Fi"

476msgid "Connect to Wi‑Fi"

418msgstr ""

477msgstr ""

419

478

420−#: qml/Wizard/Pages/40-wifi.qml:147

479+#: qml/Wizard/Pages/40-wifi.qml:168

421msgid "Available networks…"

480msgid "Available networks…"

422msgstr ""

481msgstr ""

423

482

424−#: qml/Wizard/Pages/40-wifi.qml:148

483+#: qml/Wizard/Pages/40-wifi.qml:169

425msgid "No available networks."

484msgid "No available networks."

426msgstr ""

485msgstr ""

427

486

@@ -526,6 +585,24 @@ msgstr ""

526#~ msgid "Confirm"

585#~ msgid "Confirm"

527#~ msgstr "Təsdiqlə"

586#~ msgstr "Təsdiqlə"

528

587

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+

529#~ msgid "Speaking..."

606#~ msgid "Speaking..."

530#~ msgstr "Danışır..."

607#~ msgstr "Danışır..."

531

608

@@ -535,6 +612,13 @@ msgstr ""

535#~ msgid "Speak Now..."

612#~ msgid "Speak Now..."

536#~ msgstr "Danışın..."

613#~ msgstr "Danışın..."

537

614

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+

538#~ msgid "All"

622#~ msgid "All"

539#~ msgstr "Hamısı"

623#~ msgstr "Hamısı"

540

624

@@ -544,5 +628,36 @@ msgstr ""

544#~ msgid "Done"

628#~ msgid "Done"

545#~ msgstr "Başa çatdı"

629#~ msgstr "Başa çatdı"

546

630

631+#~ msgid "Log out"

632+#~ msgstr "Çıxış"

633+

634+#~ msgid "Shut down"

635+#~ msgstr "Sistemi Söndür"

636+

637+#~ msgid "Reboot"

638+#~ msgstr "Yenidən yüklə"

639+

640+#~ msgid "Try swiping from the top edge to access the indicators"

641+#~ msgstr "Göstəriciləri görmәk üçün yuxarı küncdən sürüşdürün"

642+

643+#~ msgid "Skip intro"

644+#~ msgstr "Tәqdimatı keç"

645+

646+#~ msgid "Try swiping from the right edge to unlock the phone"

647+#~ msgstr "Kilidi açmaq üçün sağ küncdən sürüşdürün"

648+

649+#~ msgid "Swipe up again to close the settings screen"

650+#~ msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı sürüşdürün"

651+

652+#~ msgid ""

653+#~ "You have now mastered the edge gestures and can start using the "

654+#~ "phone<br><br>Tap on the screen to start"

655+#~ msgstr ""

656+#~ "Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "

657+#~ "bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"

658+

659+#~ msgid "Settings"

660+#~ msgstr "Tənzimləmələr"

661+

547#~ msgid "Type or say a command"

662#~ msgid "Type or say a command"

548#~ msgstr "Bir әmr söyləyin və ya yazın"

663#~ msgstr "Bir әmr söyləyin və ya yazın"

po/be.po+349−188

@@ -7,433 +7,506 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11−"PO-Revision-Date: 2014-09-24 17:12+0000\n"

11+"PO-Revision-Date: 2015-02-07 19:04+0000\n"

12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

12+"Last-Translator: Mikhail_SaTuRn <mikhail_saturn@tut.by>\n"

13"Language-Team: Belarusian <be@li.org>\n"

13"Language-Team: Belarusian <be@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

17"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

19−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

19+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

20−"X-Generator: Launchpad (build 17286)\n"

20+"X-Generator: Launchpad (build 17413)\n"

21

21

22−#: plugins/LightDM/Greeter.cpp:130

22+#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

23msgid "Password: "

24−msgstr ""

24+msgstr "Пароль: "

25

25

26#: plugins/Unity/Launcher/launcheritem.cpp:45

26#: plugins/Unity/Launcher/launcheritem.cpp:45

27#: plugins/Unity/Launcher/launcheritem.cpp:100

27#: plugins/Unity/Launcher/launcheritem.cpp:100

28msgid "Pin shortcut"

28msgid "Pin shortcut"

29−msgstr ""

29+msgstr "Заблакаваць кнопку"

30

30

31#: plugins/Unity/Launcher/launcheritem.cpp:100

31#: plugins/Unity/Launcher/launcheritem.cpp:100

32msgid "Unpin shortcut"

32msgid "Unpin shortcut"

33−msgstr ""

33+msgstr "Разблакаваць кнопку"

34

34

35−#: qml/Components/DelayedLockscreen.qml:47

35+#: qml/Components/DelayedLockscreen.qml:49

36msgid "Device Locked"

36msgid "Device Locked"

37−msgstr ""

37+msgstr "Прылада заблакаваная"

38

38

39−#: qml/Components/DelayedLockscreen.qml:62

39+#: qml/Components/DelayedLockscreen.qml:64

40msgid "You have been locked out due to too many failed passphrase attempts."

40msgid "You have been locked out due to too many failed passphrase attempts."

41msgstr ""

41msgstr ""

42+"Вы былі заблакаваныя з-за занадта вялікай колькасці няўдалых спробаў."

42

43

43−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

44msgid "You have been locked out due to too many failed passcode attempts."

45msgid "You have been locked out due to too many failed passcode attempts."

45msgstr ""

46msgstr ""

47+"Вы былі заблакаваныя з-за занадта вялікай колькасці няўдалых спробаў уводу "

48+"код доступу."

46

49

47−#: qml/Components/DelayedLockscreen.qml:72

50+#: qml/Components/DelayedLockscreen.qml:74

48#, qt-format

51#, qt-format

49msgid "Please wait %1 minute and then try again…"

52msgid "Please wait %1 minute and then try again…"

50msgid_plural "Please wait %1 minutes and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

51−msgstr[0] ""

54+msgstr[0] "Пачакайце %1 хвіліну і паўтарыце спробу…"

52−msgstr[1] ""

55+msgstr[1] "Пачакайце %1 хвіліны і паўтарыце спробу…"

56+msgstr[2] "Пачакайце %1 хвілінаў і паўтарыце спробу…"

53

57

54−#: qml/Components/Dialogs.qml:70

58+#: qml/Components/Dialogs.qml:67

59+msgctxt "Title: Lock/Log out dialog"

55msgid "Log out"

60msgid "Log out"

56msgstr ""

61msgstr ""

57

62

58−#: qml/Components/Dialogs.qml:71

63+#: qml/Components/Dialogs.qml:68

59msgid "Are you sure you want to log out?"

64msgid "Are you sure you want to log out?"

60−msgstr ""

65+msgstr "Вы насамрэч хочаце выйсці?"

61

66

62−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

67+#: qml/Components/Dialogs.qml:70

63−#: qml/Components/Dialogs.qml:122

68+msgctxt "Button: Lock the system"

64−msgid "No"

69+msgid "Lock"

65msgstr ""

70msgstr ""

66

71

67−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

72+#: qml/Components/Dialogs.qml:77

68−#: qml/Components/Dialogs.qml:129

73+msgctxt "Button: Log out from the system"

69−msgid "Yes"

74+msgid "Log Out"

70msgstr ""

75msgstr ""

71

76

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"

73msgid "Shut down"

84msgid "Shut down"

74msgstr ""

85msgstr ""

75

86

76−#: qml/Components/Dialogs.qml:95

87+#: qml/Components/Dialogs.qml:97

77msgid "Are you sure you want to shut down?"

88msgid "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"

78msgstr ""

99msgstr ""

79

100

80−#: qml/Components/Dialogs.qml:119

101+#: qml/Components/Dialogs.qml:127

102+msgctxt "Title: Reboot dialog"

81msgid "Reboot"

103msgid "Reboot"

82msgstr ""

104msgstr ""

83

105

84−#: qml/Components/Dialogs.qml:120

106+#: qml/Components/Dialogs.qml:128

85msgid "Are you sure you want to reboot?"

107msgid "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 "Так"

87

117

88−#: qml/Components/Dialogs.qml:144

118+#: qml/Components/Dialogs.qml:150

119+msgctxt "Title: Power off/Restart dialog"

89msgid "Power"

120msgid "Power"

90msgstr ""

121msgstr ""

91

122

92−#: qml/Components/Dialogs.qml:145

123+#: qml/Components/Dialogs.qml:151

93msgid ""

124msgid ""

94"Are you sure you would like\n"

125"Are you sure you would like\n"

95"to power off?"

126"to power off?"

96msgstr ""

127msgstr ""

128+"Вы сапраўды хочаце выключыць\n"

129+"сілкаванне?"

97

130

98−#: qml/Components/Dialogs.qml:147

131+#: qml/Components/Dialogs.qml:153

132+msgctxt "Button: Power off the system"

99msgid "Power off"

133msgid "Power off"

100msgstr ""

134msgstr ""

101

135

102−#: qml/Components/Dialogs.qml:157

136+#: qml/Components/Dialogs.qml:162

137+msgctxt "Button: Restart the system"

103msgid "Restart"

138msgid "Restart"

104msgstr ""

139msgstr ""

105

140

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<br><br>Tap on the screen to start"

154−msgstr ""

155−

156#: qml/Components/Lockscreen.qml:238

141#: qml/Components/Lockscreen.qml:238

157msgid "Return to Call"

142msgid "Return to Call"

158−msgstr ""

143+msgstr "Вярнуцца да выкліку"

159

144

160#: qml/Components/Lockscreen.qml:238

145#: qml/Components/Lockscreen.qml:238

161msgid "Emergency Call"

146msgid "Emergency Call"

162−msgstr ""

147+msgstr "Терміновы выклік"

163

148

164#: qml/Components/Lockscreen.qml:270

149#: qml/Components/Lockscreen.qml:270

165msgid "OK"

150msgid "OK"

166−msgstr ""

151+msgstr "Добра"

167

152

168−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

153+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

169msgid "See less"

154msgid "See less"

170−msgstr ""

155+msgstr "Карацей"

171

156

172−#: qml/Dash/GenericScopeView.qml:431

157+#: qml/Dash/GenericScopeView.qml:533

173msgid "See all"

158msgid "See all"

174−msgstr ""

159+msgstr "Больш падрабязна"

175

160

176−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

161+#: qml/Dash/GenericScopeView.qml:595

177−#: qml/Panel/SearchIndicator.qml:27

162+msgctxt "Label: Hint for dash search line edit"

178msgid "Search"

163msgid "Search"

179msgstr ""

164msgstr ""

180

165

181−#: qml/Dash/PageHeader.qml:260

166+#: qml/Dash/PageHeader.qml:269

167+msgctxt "Button: Open the Ubuntu Store"

182msgid "Store"

168msgid "Store"

183msgstr ""

169msgstr ""

184

170

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"

186msgid "Settings"

178msgid "Settings"

187msgstr ""

179msgstr ""

188

180

189−#: qml/Dash/PageHeader.qml:284

181+#: qml/Dash/PageHeader.qml:293

190msgid "Remove from Favorites"

182msgid "Remove from Favorites"

191−msgstr ""

183+msgstr "Выдаліць з абранага"

192

184

193−#: qml/Dash/PageHeader.qml:284

185+#: qml/Dash/PageHeader.qml:293

194msgid "Add to Favorites"

186msgid "Add to Favorites"

195−msgstr ""

187+msgstr "Дадаць да абранага"

196

188

197#: qml/Dash/Previews/PreviewActionCombo.qml:35

189#: qml/Dash/Previews/PreviewActionCombo.qml:35

198msgid "More..."

190msgid "More..."

199−msgstr ""

191+msgstr "Болей…"

200

192

201#: qml/Dash/Previews/PreviewActionCombo.qml:35

193#: qml/Dash/Previews/PreviewActionCombo.qml:35

202msgid "Less..."

194msgid "Less..."

203−msgstr ""

195+msgstr "Менш..."

204

196

205#: qml/Dash/Previews/PreviewRatingInput.qml:81

197#: qml/Dash/Previews/PreviewRatingInput.qml:81

206msgid "Rate this"

198msgid "Rate this"

207−msgstr ""

199+msgstr "Ацаніць"

208

200

209#: qml/Dash/Previews/PreviewRatingInput.qml:126

201#: qml/Dash/Previews/PreviewRatingInput.qml:126

210msgid "Add a review"

202msgid "Add a review"

211−msgstr ""

203+msgstr "Дадаць рэцэнзію"

212

204

213#: qml/Dash/Previews/PreviewRatingInput.qml:166

205#: qml/Dash/Previews/PreviewRatingInput.qml:166

214msgid "Send"

206msgid "Send"

215−msgstr ""

207+msgstr "Адправіць"

216

208

217#: qml/Dash/PullToRefreshScopeStyle.qml:55

209#: qml/Dash/PullToRefreshScopeStyle.qml:55

218msgid "Pull to refresh…"

210msgid "Pull to refresh…"

219−msgstr ""

211+msgstr "Пацягніце для абнаўлення ..."

220

212

221#: qml/Dash/PullToRefreshScopeStyle.qml:60

213#: qml/Dash/PullToRefreshScopeStyle.qml:60

222msgid "Release to refresh…"

214msgid "Release to refresh…"

215+msgstr "Адпусціце для абнаўлення ..."

216+

217+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

218+msgid "Enable location data"

223msgstr ""

219msgstr ""

224

220

225−#: qml/Dash/ScopesList.qml:63

221+#: qml/Dash/ScopesList.qml:66

226msgid "Manage"

222msgid "Manage"

227−msgstr ""

223+msgstr "Кіраванне"

228

224

229−#: qml/Dash/ScopesList.qml:107

225+#: qml/Dash/ScopesList.qml:112

230msgid "Home"

226msgid "Home"

231−msgstr ""

227+msgstr "Дом"

232

228

233−#: qml/Dash/ScopesList.qml:108

229+#: qml/Dash/ScopesList.qml:113

234msgid "Also installed"

230msgid "Also installed"

235−msgstr ""

231+msgstr "Таксама ўсталявана"

236

232

237−#: qml/Greeter/Greeter.qml:174

233+#: qml/Greeter/CoverPage.qml:107

238msgid "Unlock"

234msgid "Unlock"

235+msgstr "Разблакаваць"

236+

237+#: qml/Greeter/LoginList.qml:236

238+msgid "Retry"

239msgstr ""

239msgstr ""

240

240

241+#: qml/Greeter/LoginList.qml:237

242+msgid "Tap to unlock"

243+msgstr ""

244+

245+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

246+msgid "Sorry, incorrect passphrase."

247+msgstr "Даруце, няслушны пароль"

248+

249+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

250+msgid "Sorry, incorrect passcode."

251+msgstr "Даруйце, няслушны код"

252+

253+#: qml/Greeter/NarrowView.qml:55

254+msgid "This will be your last attempt."

255+msgstr "Апошняя спроба."

256+

257+#: qml/Greeter/NarrowView.qml:57

258+msgid ""

259+"If passphrase is entered incorrectly, your phone will conduct a factory "

260+"reset and all personal data will be deleted."

261+msgstr ""

262+"Калі пароль паказаны няправільна, тэлефон вернецца ў зыходны стан, усе "

263+"асабістыя дадзеныя будуць выдаленыя."

264+

265+#: qml/Greeter/NarrowView.qml:58

266+msgid ""

267+"If passcode is entered incorrectly, your phone will conduct a factory reset "

268+"and all personal data will be deleted."

269+msgstr ""

270+"Калі пароль уведзены няправільна, то ваш тэлефон будзе праводзіць скід да "

271+"завадскіх налад і ўсе асабістыя дадзеныя будуць выдаленыя."

272+

273+#: qml/Greeter/NarrowView.qml:115

274+#, qt-format

275+msgid "Enter %1"

276+msgstr "Увядзіце %1"

277+

278+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

279+msgid "Enter passphrase"

280+msgstr "Увядзіце парольную фразу"

281+

282+#: qml/Greeter/NarrowView.qml:117

283+msgid "Enter passcode"

284+msgstr "Увядзіце код"

285+

286+#: qml/Greeter/NarrowView.qml:118

287+#, qt-format

288+msgid "Sorry, incorrect %1"

289+msgstr "Даруйце, некарэктны %1"

290+

291+#: qml/Greeter/NarrowView.qml:119

292+msgid "Sorry, incorrect passphrase"

293+msgstr "Даруйце, няслушны пароль"

294+

295+#: qml/Greeter/NarrowView.qml:120

296+msgid "Please re-enter"

297+msgstr "Калі ласка паўтарыце ўвод"

298+

299+#: qml/Greeter/NarrowView.qml:121

300+msgid "Sorry, incorrect passcode"

301+msgstr "Даруйце, няслушны код"

302+

241#: qml/Notifications/NotificationMenuItemFactory.qml:128

303#: qml/Notifications/NotificationMenuItemFactory.qml:128

242msgid "Show password"

304msgid "Show password"

243−msgstr ""

305+msgstr "Паказаць пароль"

244

306

245#: qml/Panel/ActiveCallHint.qml:79

307#: qml/Panel/ActiveCallHint.qml:79

246msgid "Tap to return to call..."

308msgid "Tap to return to call..."

247−msgstr ""

309+msgstr "Націсніце, каб вярнуцца да выкліку..."

248

310

249#: qml/Panel/ActiveCallHint.qml:92

311#: qml/Panel/ActiveCallHint.qml:92

250msgid "Conference"

312msgid "Conference"

251−msgstr ""

313+msgstr "Канферэнцыя"

252

314

253#: qml/Panel/Indicators/MenuItemFactory.qml:643

315#: qml/Panel/Indicators/MenuItemFactory.qml:643

254msgid "Nothing is playing"

316msgid "Nothing is playing"

255−msgstr ""

317+msgstr "Анічога не прайграецца"

256

318

257#: qml/Panel/Indicators/MenuItemFactory.qml:791

319#: qml/Panel/Indicators/MenuItemFactory.qml:791

258msgid "In queue…"

320msgid "In queue…"

259−msgstr ""

321+msgstr "У чарзе..."

260

322

261#: qml/Panel/Indicators/MenuItemFactory.qml:795

323#: qml/Panel/Indicators/MenuItemFactory.qml:795

262msgid "Downloading"

324msgid "Downloading"

263−msgstr ""

325+msgstr "Запампоўка"

264

326

265#: qml/Panel/Indicators/MenuItemFactory.qml:797

327#: qml/Panel/Indicators/MenuItemFactory.qml:797

266msgid "Paused, tap to resume"

328msgid "Paused, tap to resume"

267−msgstr ""

329+msgstr "Прыпынена, націсніце для працягу"

268

330

269#: qml/Panel/Indicators/MenuItemFactory.qml:799

331#: qml/Panel/Indicators/MenuItemFactory.qml:799

270msgid "Canceled"

332msgid "Canceled"

271−msgstr ""

333+msgstr "Скасавана"

272

334

273#: qml/Panel/Indicators/MenuItemFactory.qml:801

335#: qml/Panel/Indicators/MenuItemFactory.qml:801

274msgid "Finished"

336msgid "Finished"

275−msgstr ""

337+msgstr "Скончана"

276

338

277#: qml/Panel/Indicators/MenuItemFactory.qml:803

339#: qml/Panel/Indicators/MenuItemFactory.qml:803

278msgid "Failed, tap to retry"

340msgid "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"

279msgstr ""

346msgstr ""

280

347

281#: qml/Panel/Indicators/ModemInfoItem.qml:105

348#: qml/Panel/Indicators/ModemInfoItem.qml:105

282msgid "Unlock SIM"

349msgid "Unlock SIM"

283−msgstr ""

350+msgstr "Разблакаваць SIM"

284

351

285#: qml/Panel/Indicators/RoamingIndication.qml:27

352#: qml/Panel/Indicators/RoamingIndication.qml:27

286msgid "Roaming"

353msgid "Roaming"

354+msgstr "Роўмінг"

355+

356+#: qml/Tutorial/TutorialBottomFinish.qml:24

357+msgid "This action does different things for different apps"

287msgstr ""

358msgstr ""

288

359

289−#: qml/Shell.qml:367

360+#: qml/Tutorial/TutorialBottomFinish.qml:25

290−#, qt-format

361+msgid "Tap here to finish."

291−msgid "Enter %1"

292msgstr ""

362msgstr ""

293

363

294−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

364+#: qml/Tutorial/TutorialBottom.qml:28

295−msgid "Enter passphrase"

365+msgid "Open special menus"

296msgstr ""

366msgstr ""

297

367

298−#: qml/Shell.qml:369

368+#: qml/Tutorial/TutorialBottom.qml:29

299−msgid "Enter passcode"

369+msgid "Swipe up from the bottom edge."

300msgstr ""

370msgstr ""

301

371

302−#: qml/Shell.qml:370

372+#: qml/Tutorial/TutorialLeftFinish.qml:24

303−#, qt-format

373+msgid "These are the shortcuts to favorite apps"

304−msgid "Sorry, incorrect %1"

305msgstr ""

374msgstr ""

306

375

307−#: qml/Shell.qml:371

376+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

308−msgid "Sorry, incorrect passphrase"

377+msgid "Tap here to continue."

309msgstr ""

378msgstr ""

310

379

311−#: qml/Shell.qml:372

380+#: qml/Tutorial/TutorialLeft.qml:26

312−msgid "Please re-enter"

381+msgid "Open the launcher"

313msgstr ""

382msgstr ""

314

383

315−#: qml/Shell.qml:373

384+#: qml/Tutorial/TutorialLeft.qml:27

316−msgid "Sorry, incorrect passcode"

385+msgid "Short swipe from the left edge."

317msgstr ""

386msgstr ""

318

387

319−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

388+#: qml/Tutorial/TutorialPage.qml:178

320−msgid "Sorry, incorrect passphrase."

389+msgid "You almost got it!"

321msgstr ""

390msgstr ""

322

391

323−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

392+#: qml/Tutorial/TutorialPage.qml:195

324−msgid "Sorry, incorrect passcode."

393+msgid "Try again."

325msgstr ""

394msgstr ""

326

395

327−#: qml/Shell.qml:469

396+#: qml/Tutorial/TutorialRight.qml:31

328−msgid "This will be your last attempt."

397+msgid "To view open apps"

329msgstr ""

398msgstr ""

330

399

331−#: qml/Shell.qml:471

400+#: qml/Tutorial/TutorialRight.qml:32

332−msgid ""

401+msgid "Long swipe from the right edge."

333−"If passphrase is entered incorrectly, your phone will conduct a factory "

334−"reset and all personal data will be deleted."

335msgstr ""

402msgstr ""

336

403

337−#: qml/Shell.qml:472

404+#: qml/Tutorial/TutorialRight.qml:122

338−msgid ""

405+msgid "View all your running tasks."

339−"If passcode is entered incorrectly, your phone will conduct a factory reset "

340−"and all personal data will be deleted."

341msgstr ""

406msgstr ""

342

407

343#: qml/Wizard/Page.qml:89

408#: qml/Wizard/Page.qml:89

409+msgctxt "Button: Go back one page in the Wizard"

344msgid "Back"

410msgid "Back"

345msgstr ""

411msgstr ""

346

412

347#: qml/Wizard/Pages/10-welcome.qml:27

413#: qml/Wizard/Pages/10-welcome.qml:27

348msgid "Hi!"

414msgid "Hi!"

349−msgstr ""

415+msgstr "Вітай!"

350

416

351#: qml/Wizard/Pages/10-welcome.qml:44

417#: qml/Wizard/Pages/10-welcome.qml:44

352msgid "Welcome to your Ubuntu phone."

418msgid "Welcome to your Ubuntu phone."

353−msgstr ""

419+msgstr "Вітаем Вас у сістэме тэлефона Ubuntu."

354

420

355#: qml/Wizard/Pages/10-welcome.qml:52

421#: qml/Wizard/Pages/10-welcome.qml:52

356msgid "Let’s get started."

422msgid "Let’s get started."

357−msgstr ""

423+msgstr "Пачнем."

358

424

359#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

425#: 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

361#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

427#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

362#: qml/Wizard/Pages/passwd-set.qml:90

428#: qml/Wizard/Pages/passwd-set.qml:90

363msgid "Continue"

429msgid "Continue"

364−msgstr ""

430+msgstr "Працягнуць"

365

431

366#: qml/Wizard/Pages/20-sim.qml:25

432#: qml/Wizard/Pages/20-sim.qml:25

367msgid "Add a SIM card and restart your device"

433msgid "Add a SIM card and restart your device"

368−msgstr ""

434+msgstr "Дадайце SIM-карту і перазагрузіце Вашую прыладу"

369

435

370−#: qml/Wizard/Pages/20-sim.qml:55

436+#: qml/Wizard/Pages/20-sim.qml:59

371msgid "Without it, you won’t be able to make calls or use text messaging."

437msgid "Without it, you won’t be able to make calls or use text messaging."

372−msgstr ""

438+msgstr "Без яе вы не зможаце тэлефанаваць ці адпраўляць паведамленні."

373

439

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

375msgid "Skip"

441msgid "Skip"

376−msgstr ""

442+msgstr "Прапусціць"

377

443

378#: qml/Wizard/Pages/30-passwd-type.qml:39

444#: qml/Wizard/Pages/30-passwd-type.qml:39

379msgid "Lock security"

445msgid "Lock security"

380−msgstr ""

446+msgstr "Блакаванне бяспекі"

381

447

382#: qml/Wizard/Pages/30-passwd-type.qml:74

448#: qml/Wizard/Pages/30-passwd-type.qml:74

383msgid "Please select how you’d like to unlock your phone."

449msgid "Please select how you’d like to unlock your phone."

384−msgstr ""

450+msgstr "Калі ласка, абярыце спосаб разблакавання тэлефона."

385

451

386#: qml/Wizard/Pages/30-passwd-type.qml:97

452#: qml/Wizard/Pages/30-passwd-type.qml:97

453+msgctxt "Label: Type of security method"

387msgid "Swipe"

454msgid "Swipe"

388msgstr ""

455msgstr ""

389

456

390#: qml/Wizard/Pages/30-passwd-type.qml:98

457#: qml/Wizard/Pages/30-passwd-type.qml:98

458+msgctxt "Label: Description of security method"

391msgid "No security"

459msgid "No security"

392msgstr ""

460msgstr ""

393

461

394#: qml/Wizard/Pages/30-passwd-type.qml:100

462#: qml/Wizard/Pages/30-passwd-type.qml:100

463+msgctxt "Label: Type of security method"

395msgid "Passcode"

464msgid "Passcode"

396msgstr ""

465msgstr ""

397

466

398#: qml/Wizard/Pages/30-passwd-type.qml:101

467#: qml/Wizard/Pages/30-passwd-type.qml:101

468+msgctxt "Label: Description of security method"

399msgid "4 digits only"

469msgid "4 digits only"

400msgstr ""

470msgstr ""

401

471

402#: qml/Wizard/Pages/30-passwd-type.qml:103

472#: qml/Wizard/Pages/30-passwd-type.qml:103

473+msgctxt "Label: Type of security method"

403msgid "Passphrase"

474msgid "Passphrase"

404msgstr ""

475msgstr ""

405

476

406#: qml/Wizard/Pages/30-passwd-type.qml:104

477#: qml/Wizard/Pages/30-passwd-type.qml:104

478+msgctxt "Label: Description of security method"

407msgid "Numbers and letters"

479msgid "Numbers and letters"

408msgstr ""

480msgstr ""

409

481

410−#: qml/Wizard/Pages/40-wifi.qml:28

482+#: qml/Wizard/Pages/40-wifi.qml:29

411msgid "Connect to Wi‑Fi"

483msgid "Connect to Wi‑Fi"

412−msgstr ""

484+msgstr "Злучыцца з Wi-Fi"

413

485

414−#: qml/Wizard/Pages/40-wifi.qml:147

486+#: qml/Wizard/Pages/40-wifi.qml:168

415msgid "Available networks…"

487msgid "Available networks…"

416−msgstr ""

488+msgstr "Даступныя сеткі..."

417

489

418−#: qml/Wizard/Pages/40-wifi.qml:148

490+#: qml/Wizard/Pages/40-wifi.qml:169

419msgid "No available networks."

491msgid "No available networks."

420−msgstr ""

492+msgstr "Няма даступных сетак."

421

493

422#: qml/Wizard/Pages/50-location.qml:27

494#: qml/Wizard/Pages/50-location.qml:27

423msgid "Location"

495msgid "Location"

424−msgstr ""

496+msgstr "Месца"

425

497

426#: qml/Wizard/Pages/50-location.qml:62

498#: qml/Wizard/Pages/50-location.qml:62

427msgid "Let the phone detect your location:"

499msgid "Let the phone detect your location:"

428−msgstr ""

500+msgstr "Дазволіць тэлефону вызначаць месцазнаходжанне:"

429

501

430#: qml/Wizard/Pages/50-location.qml:69

502#: qml/Wizard/Pages/50-location.qml:69

431msgid "Using GPS only (less accurate)"

503msgid "Using GPS only (less accurate)"

432−msgstr ""

504+msgstr "З дапамогай толькі GPS (найменш дакладна)"

433

505

434#: qml/Wizard/Pages/50-location.qml:86

506#: qml/Wizard/Pages/50-location.qml:86

435msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

507msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

436msgstr ""

508msgstr ""

509+"На аснове GPS, ананімізаванага Wi-Fi і дадзеных сотавай сеткі (рэкамендуецца)"

437

510

438#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

511#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

439#: qml/Wizard/Pages/50-location.qml:103

512#: qml/Wizard/Pages/50-location.qml:103

@@ -441,78 +514,166 @@ msgid ""

441"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

514"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

442"conditions</a>."

515"conditions</a>."

443msgstr ""

516msgstr ""

517+"Выбарам гэтага варыянту дзеянняў вы згаджаецеся з <a href='#'> умовамі "

518+"прадстаўлення паслуг Nokia HERE</a>."

444

519

445#: qml/Wizard/Pages/50-location.qml:112

520#: qml/Wizard/Pages/50-location.qml:112

446msgid "Not at all"

521msgid "Not at all"

447−msgstr ""

522+msgstr "Не дазваляць"

448

523

449#: qml/Wizard/Pages/50-location.qml:124

524#: qml/Wizard/Pages/50-location.qml:124

450msgid "You can change your mind later in <b>System Settings</b>."

525msgid "You can change your mind later in <b>System Settings</b>."

451−msgstr ""

526+msgstr "Пасля змяніць налады можна з дапамогай <b>Сістэмных параметраў</b>."

452

527

453#: qml/Wizard/Pages/60-reporting.qml:24

528#: qml/Wizard/Pages/60-reporting.qml:24

454msgid "Improving your experience"

529msgid "Improving your experience"

455−msgstr ""

530+msgstr "Спрашчэнне вашай працы"

456

531

457#: qml/Wizard/Pages/60-reporting.qml:36

532#: qml/Wizard/Pages/60-reporting.qml:36

458msgid ""

533msgid ""

459"Your phone is set up to automatically report errors to Canonical and its "

534"Your phone is set up to automatically report errors to Canonical and its "

460"partners, the makers of the operating system."

535"partners, the makers of the operating system."

461msgstr ""

536msgstr ""

537+"Ваш тэлефон настроены на аўтаматычную адпраўку справаздач пра памылкі ў "

538+"Canonical і партнёрскія установы, вытворцам аперацыйнай сістэмы."

462

539

463#: qml/Wizard/Pages/60-reporting.qml:43

540#: qml/Wizard/Pages/60-reporting.qml:43

464msgid ""

541msgid ""

465"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

542"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

466"Privacy</b>"

543"Privacy</b>"

467msgstr ""

544msgstr ""

545+"Гэтае можна адключыць у <b>Сістэмных параметрах</b>, <b>Бяспека &amp; "

546+"канфедэнцыйнасць</b>"

468

547

469#: qml/Wizard/Pages/80-finished.qml:24

548#: qml/Wizard/Pages/80-finished.qml:24

470msgid "All done"

549msgid "All done"

471−msgstr ""

550+msgstr "Зроблена"

472

551

473#: qml/Wizard/Pages/80-finished.qml:39

552#: qml/Wizard/Pages/80-finished.qml:39

474msgid "Nice work!"

553msgid "Nice work!"

475−msgstr ""

554+msgstr "Выдатная праца!"

476

555

477#: qml/Wizard/Pages/80-finished.qml:46

556#: qml/Wizard/Pages/80-finished.qml:46

478msgid "Your phone is now ready to use."

557msgid "Your phone is now ready to use."

479−msgstr ""

558+msgstr "Цяпер Вашым тэлефонам можна карыстацца."

480

559

481#: qml/Wizard/Pages/80-finished.qml:53

560#: qml/Wizard/Pages/80-finished.qml:53

482msgid "Finish"

561msgid "Finish"

483−msgstr ""

562+msgstr "Скончыць"

484

563

485#: qml/Wizard/Pages/here-terms.qml:27

564#: qml/Wizard/Pages/here-terms.qml:27

486msgid "Terms & Conditions"

565msgid "Terms & Conditions"

487−msgstr ""

566+msgstr "Умовы карыстання"

488

567

489#: qml/Wizard/Pages/passwd-confirm.qml:49

568#: qml/Wizard/Pages/passwd-confirm.qml:49

490msgid "Confirm passphrase"

569msgid "Confirm passphrase"

491−msgstr ""

570+msgstr "Пацвердзіце пароль"

492

571

493#: qml/Wizard/Pages/passwd-confirm.qml:50

572#: qml/Wizard/Pages/passwd-confirm.qml:50

494msgid "Confirm passcode"

573msgid "Confirm passcode"

495−msgstr ""

574+msgstr "Пацвердзіце код"

496

575

497#: qml/Wizard/Pages/passwd-confirm.qml:53

576#: qml/Wizard/Pages/passwd-confirm.qml:53

498#: qml/Wizard/Pages/passwd-confirm.qml:54

577#: qml/Wizard/Pages/passwd-confirm.qml:54

499msgid "Please try again."

578msgid "Please try again."

500−msgstr ""

579+msgstr "Калі ласка, паспрабуйце яшчэ раз."

501

580

502#: qml/Wizard/Pages/passwd-set.qml:61

581#: qml/Wizard/Pages/passwd-set.qml:61

503msgid "Choose your passcode"

582msgid "Choose your passcode"

504−msgstr ""

583+msgstr "Выберыце ваш код-пароль"

505

584

506#: qml/Wizard/Pages/passwd-set.qml:68

585#: qml/Wizard/Pages/passwd-set.qml:68

507msgid "Passphrase must be 4 characters long"

586msgid "Passphrase must be 4 characters long"

508−msgstr ""

587+msgstr "Пароль мусіць складацца мінімум з 4 сімвалаў"

509

588

510#: qml/Wizard/StackButton.qml:39

589#: qml/Wizard/StackButton.qml:39

511#, qt-format

590#, qt-format

512msgid "〈 %1"

591msgid "〈 %1"

513−msgstr ""

592+msgstr "〈 %1"

514

593

515#: qml/Wizard/StackButton.qml:42

594#: qml/Wizard/StackButton.qml:42

516#, qt-format

595#, qt-format

517msgid "%1 〉"

596msgid "%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<br><br>Tap on the screen to start"

674+#~ msgstr ""

675+#~ "Вамі наладжаныя дзеянні на дакрананні па краях экрана. Цяпер тэлефон можна "

676+#~ "выкарыстоўваць.<br><br>Дакраніцеся да экрана, каб пачаць."

677+

678+#~ msgid "Store"

679+#~ msgstr "Крама"

po/bg.po+228−131

@@ -7,18 +7,18 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11−"PO-Revision-Date: 2014-04-01 14:08+0000\n"

11+"PO-Revision-Date: 2015-04-12 14:43+0000\n"

12−"Last-Translator: Atanas Kovachki <Unknown>\n"

12+"Last-Translator: George Karavasilev <kokoto-java@ubuntu.com>\n"

13"Language-Team: Bulgarian <bg@li.org>\n"

13"Language-Team: Bulgarian <bg@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-04-14 05:33+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17423)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr ""

23msgstr ""

24

24

@@ -31,132 +31,106 @@ msgstr ""

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr ""

32msgstr ""

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr ""

36msgstr ""

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

40msgstr ""

41

41

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

43msgid "You have been locked out due to too many failed passcode attempts."

43msgid "You have been locked out due to too many failed passcode attempts."

44msgstr ""

44msgstr ""

45

45

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

47#, qt-format

47#, qt-format

48msgid "Please wait %1 minute and then try again…"

48msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] ""

50msgstr[0] ""

51msgstr[1] ""

51msgstr[1] ""

52

52

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

54msgid "Log out"

55msgid "Log out"

55msgstr ""

56msgstr ""

56

57

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

58msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

59msgstr ""

60msgstr ""

60

61

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:70

62−#: qml/Components/Dialogs.qml:122

63+msgctxt "Button: Lock the system"

63−msgid "No"

64+msgid "Lock"

64msgstr ""

65msgstr ""

65

66

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:77

67−#: qml/Components/Dialogs.qml:129

68+msgctxt "Button: Log out from the system"

68−msgid "Yes"

69+msgid "Log Out"

69msgstr ""

70msgstr ""

70

71

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"

72msgid "Shut down"

79msgid "Shut down"

73msgstr ""

80msgstr ""

74

81

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

76msgid "Are you sure you want to shut down?"

83msgid "Are you sure you want to shut down?"

77msgstr ""

84msgstr ""

78

85

79−#: qml/Components/Dialogs.qml:119

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

80msgid "Reboot"

88msgid "Reboot"

81msgstr ""

89msgstr ""

82

90

83−#: qml/Components/Dialogs.qml:120

91+#: qml/Components/Dialogs.qml:107

84−msgid "Are you sure you want to reboot?"

92+msgctxt "Button: Shut down the system"

85−msgstr ""

86−

87−#: qml/Components/Dialogs.qml:144

88−msgid "Power"

93+msgid "Shut down"

89−msgstr ""

90−

91−#: qml/Components/Dialogs.qml:145

92−msgid ""

93−"Are you sure you would like\n"

94−"to power off?"

95msgstr ""

94msgstr ""

96

95

97−#: qml/Components/Dialogs.qml:147

96+#: qml/Components/Dialogs.qml:127

97+msgctxt "Title: Reboot dialog"

98−msgid "Power off"

98+msgid "Reboot"

99msgstr ""

99msgstr ""

100

100

101−#: qml/Components/Dialogs.qml:157

101+#: qml/Components/Dialogs.qml:128

102−msgid "Restart"

102+msgid "Are you sure you want to reboot?"

103msgstr ""

103msgstr ""

104

104

105−#: qml/Components/Dialogs.qml:167

105+#: qml/Components/Dialogs.qml:130

106−msgid "Cancel"

106+msgid "No"

107msgstr ""

107msgstr ""

108

108

109−#: qml/Components/EdgeDemoOverlay.qml:151

109+#: qml/Components/Dialogs.qml:136

110−msgid "Skip intro"

110+msgid "Yes"

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"

119msgstr ""

111msgstr ""

120−"Опитайте се да приплъзнете пръста си от десния край към левия, за да "

121−"отключите телефона"

122

112

123−#: qml/Components/EdgeDemo.qml:157

113+#: qml/Components/Dialogs.qml:150

124−msgid "Top edge"

114+msgctxt "Title: Power off/Restart dialog"

125−msgstr "Горен край"

115+msgid "Power"

126−

127−#: qml/Components/EdgeDemo.qml:158

128−msgid "Try swiping from the top edge to access the indicators"

129msgstr ""

116msgstr ""

130−"Опитайте се да приплъзнете пръста си от горния край към долния, за да "

131−"получите достъп до индикаторите"

132

117

133−#: qml/Components/EdgeDemo.qml:183

118+#: qml/Components/Dialogs.qml:151

134−msgid "Close"

119+msgid ""

135−msgstr "Затвори"

120+"Are you sure you would like\n"

136−

121+"to power off?"

137−#: qml/Components/EdgeDemo.qml:184

138−msgid "Swipe up again to close the settings screen"

139msgstr ""

122msgstr ""

140−"Отново приплъзнете пръста си нагоре за да затворите екрана с настройките"

123+"Искате ли да \n"

141−

124+"изключите захранването на устройството?"

142−#: qml/Components/EdgeDemo.qml:214

143−msgid "Left edge"

144−msgstr "Ляв край"

145

125

146−#: qml/Components/EdgeDemo.qml:215

126+#: qml/Components/Dialogs.qml:153

147−msgid "Swipe from the left to reveal the launcher for quick access to apps"

127+msgctxt "Button: Power off the system"

128+msgid "Power off"

148msgstr ""

129msgstr ""

149−"Приплъзнете пръста си от левия край към десния, за да отворите стартера за "

150−"бърз достъп до приложенията"

151−

152−#: qml/Components/EdgeDemo.qml:242

153−msgid "Well done"

154−msgstr "Великолепно"

155

130

156−#: qml/Components/EdgeDemo.qml:243

131+#: qml/Components/Dialogs.qml:162

132+msgctxt "Button: Restart the system"

157−msgid ""

133+msgid "Restart"

158−"You have now mastered the edge gestures and can start using the "

159−"phone<br><br>Tap on the screen to start"

160msgstr ""

134msgstr ""

161

135

162#: qml/Components/Lockscreen.qml:238

136#: qml/Components/Lockscreen.qml:238

@@ -171,32 +145,39 @@ msgstr "Спешно повикване"

171msgid "OK"

145msgid "OK"

172msgstr ""

146msgstr ""

173

147

174−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

148+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

175msgid "See less"

149msgid "See less"

176msgstr ""

150msgstr ""

177

151

178−#: qml/Dash/GenericScopeView.qml:431

152+#: qml/Dash/GenericScopeView.qml:533

179msgid "See all"

153msgid "See all"

180msgstr ""

154msgstr ""

181

155

182−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

156+#: qml/Dash/GenericScopeView.qml:595

183−#: qml/Panel/SearchIndicator.qml:27

157+msgctxt "Label: Hint for dash search line edit"

184msgid "Search"

158msgid "Search"

185−msgstr "Търсене"

159+msgstr ""

186

160

187−#: qml/Dash/PageHeader.qml:260

161+#: qml/Dash/PageHeader.qml:269

162+msgctxt "Button: Open the Ubuntu Store"

188msgid "Store"

163msgid "Store"

189msgstr ""

164msgstr ""

190

165

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"

192msgid "Settings"

173msgid "Settings"

193msgstr ""

174msgstr ""

194

175

195−#: qml/Dash/PageHeader.qml:284

176+#: qml/Dash/PageHeader.qml:293

196msgid "Remove from Favorites"

177msgid "Remove from Favorites"

197msgstr ""

178msgstr ""

198

179

199−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

200msgid "Add to Favorites"

181msgid "Add to Favorites"

201msgstr ""

182msgstr ""

202

183

@@ -228,22 +209,88 @@ msgstr ""

228msgid "Release to refresh…"

209msgid "Release to refresh…"

229msgstr ""

210msgstr ""

230

211

212+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

213+msgid "Enable location data"

214+msgstr ""

215+

231−#: qml/Dash/ScopesList.qml:63

216+#: qml/Dash/ScopesList.qml:66

232msgid "Manage"

217msgid "Manage"

233msgstr ""

218msgstr ""

234

219

235−#: qml/Dash/ScopesList.qml:107

220+#: qml/Dash/ScopesList.qml:112

236msgid "Home"

221msgid "Home"

237msgstr ""

222msgstr ""

238

223

239−#: qml/Dash/ScopesList.qml:108

224+#: qml/Dash/ScopesList.qml:113

240msgid "Also installed"

225msgid "Also installed"

241msgstr ""

226msgstr ""

242

227

243−#: qml/Greeter/Greeter.qml:174

228+#: qml/Greeter/CoverPage.qml:107

244msgid "Unlock"

229msgid "Unlock"

245msgstr ""

230msgstr ""

246

231

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+

247#: qml/Notifications/NotificationMenuItemFactory.qml:128

294#: qml/Notifications/NotificationMenuItemFactory.qml:128

248msgid "Show password"

295msgid "Show password"

249msgstr "Покажи паролата"

296msgstr "Покажи паролата"

@@ -284,6 +331,11 @@ msgstr ""

284msgid "Failed, tap to retry"

331msgid "Failed, tap to retry"

285msgstr ""

332msgstr ""

286

333

334+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

335+msgctxt "Label: Hint in message indicator line edit"

336+msgid "Reply"

337+msgstr ""

338+

287#: qml/Panel/Indicators/ModemInfoItem.qml:105

339#: qml/Panel/Indicators/ModemInfoItem.qml:105

288msgid "Unlock SIM"

340msgid "Unlock SIM"

289msgstr ""

341msgstr ""

@@ -292,61 +344,60 @@ msgstr ""

292msgid "Roaming"

344msgid "Roaming"

293msgstr ""

345msgstr ""

294

346

295−#: qml/Shell.qml:367

347+#: qml/Tutorial/TutorialBottomFinish.qml:24

296−#, qt-format

348+msgid "This action does different things for different apps"

297−msgid "Enter %1"

298msgstr ""

349msgstr ""

299

350

300−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

351+#: qml/Tutorial/TutorialBottomFinish.qml:25

301−msgid "Enter passphrase"

352+msgid "Tap here to finish."

302msgstr ""

353msgstr ""

303

354

304−#: qml/Shell.qml:369

355+#: qml/Tutorial/TutorialBottom.qml:28

305−msgid "Enter passcode"

356+msgid "Open special menus"

306msgstr ""

357msgstr ""

307

358

308−#: qml/Shell.qml:370

359+#: qml/Tutorial/TutorialBottom.qml:29

309−#, qt-format

360+msgid "Swipe up from the bottom edge."

310−msgid "Sorry, incorrect %1"

311msgstr ""

361msgstr ""

312

362

313−#: qml/Shell.qml:371

363+#: qml/Tutorial/TutorialLeftFinish.qml:24

314−msgid "Sorry, incorrect passphrase"

364+msgid "These are the shortcuts to favorite apps"

315msgstr ""

365msgstr ""

316

366

317−#: qml/Shell.qml:372

367+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

318−msgid "Please re-enter"

368+msgid "Tap here to continue."

319msgstr ""

369msgstr ""

320

370

321−#: qml/Shell.qml:373

371+#: qml/Tutorial/TutorialLeft.qml:26

322−msgid "Sorry, incorrect passcode"

372+msgid "Open the launcher"

323msgstr ""

373msgstr ""

324

374

325−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

375+#: qml/Tutorial/TutorialLeft.qml:27

326−msgid "Sorry, incorrect passphrase."

376+msgid "Short swipe from the left edge."

327msgstr ""

377msgstr ""

328

378

329−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

379+#: qml/Tutorial/TutorialPage.qml:178

330−msgid "Sorry, incorrect passcode."

380+msgid "You almost got it!"

331msgstr ""

381msgstr ""

332

382

333−#: qml/Shell.qml:469

383+#: qml/Tutorial/TutorialPage.qml:195

334−msgid "This will be your last attempt."

384+msgid "Try again."

335msgstr ""

385msgstr ""

336

386

337−#: qml/Shell.qml:471

387+#: qml/Tutorial/TutorialRight.qml:31

338−msgid ""

388+msgid "To view open apps"

339−"If passphrase is entered incorrectly, your phone will conduct a factory "

340−"reset and all personal data will be deleted."

341msgstr ""

389msgstr ""

342

390

343−#: qml/Shell.qml:472

391+#: qml/Tutorial/TutorialRight.qml:32

344−msgid ""

392+msgid "Long swipe from the right edge."

345−"If passcode is entered incorrectly, your phone will conduct a factory reset "

393+msgstr ""

346−"and all personal data will be deleted."

394+

395+#: qml/Tutorial/TutorialRight.qml:122

396+msgid "View all your running tasks."

347msgstr ""

397msgstr ""

348

398

349#: qml/Wizard/Page.qml:89

399#: qml/Wizard/Page.qml:89

400+msgctxt "Button: Go back one page in the Wizard"

350msgid "Back"

401msgid "Back"

351msgstr ""

402msgstr ""

352

403

@@ -363,7 +414,7 @@ msgid "Let’s get started."

363msgstr ""

414msgstr ""

364

415

365#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

416#: 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

367#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

418#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

368#: qml/Wizard/Pages/passwd-set.qml:90

419#: qml/Wizard/Pages/passwd-set.qml:90

369msgid "Continue"

420msgid "Continue"

@@ -373,11 +424,11 @@ msgstr ""

373msgid "Add a SIM card and restart your device"

424msgid "Add a SIM card and restart your device"

374msgstr ""

425msgstr ""

375

426

376−#: qml/Wizard/Pages/20-sim.qml:55

427+#: qml/Wizard/Pages/20-sim.qml:59

377msgid "Without it, you won’t be able to make calls or use text messaging."

428msgid "Without it, you won’t be able to make calls or use text messaging."

378msgstr ""

429msgstr ""

379

430

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

381msgid "Skip"

432msgid "Skip"

382msgstr ""

433msgstr ""

383

434

@@ -390,38 +441,44 @@ msgid "Please select how you’d like to unlock your phone."

390msgstr ""

441msgstr ""

391

442

392#: qml/Wizard/Pages/30-passwd-type.qml:97

443#: qml/Wizard/Pages/30-passwd-type.qml:97

444+msgctxt "Label: Type of security method"

393msgid "Swipe"

445msgid "Swipe"

394msgstr ""

446msgstr ""

395

447

396#: qml/Wizard/Pages/30-passwd-type.qml:98

448#: qml/Wizard/Pages/30-passwd-type.qml:98

449+msgctxt "Label: Description of security method"

397msgid "No security"

450msgid "No security"

398msgstr ""

451msgstr ""

399

452

400#: qml/Wizard/Pages/30-passwd-type.qml:100

453#: qml/Wizard/Pages/30-passwd-type.qml:100

454+msgctxt "Label: Type of security method"

401msgid "Passcode"

455msgid "Passcode"

402msgstr ""

456msgstr ""

403

457

404#: qml/Wizard/Pages/30-passwd-type.qml:101

458#: qml/Wizard/Pages/30-passwd-type.qml:101

459+msgctxt "Label: Description of security method"

405msgid "4 digits only"

460msgid "4 digits only"

406msgstr ""

461msgstr ""

407

462

408#: qml/Wizard/Pages/30-passwd-type.qml:103

463#: qml/Wizard/Pages/30-passwd-type.qml:103

464+msgctxt "Label: Type of security method"

409msgid "Passphrase"

465msgid "Passphrase"

410msgstr ""

466msgstr ""

411

467

412#: qml/Wizard/Pages/30-passwd-type.qml:104

468#: qml/Wizard/Pages/30-passwd-type.qml:104

469+msgctxt "Label: Description of security method"

413msgid "Numbers and letters"

470msgid "Numbers and letters"

414msgstr ""

471msgstr ""

415

472

416−#: qml/Wizard/Pages/40-wifi.qml:28

473+#: qml/Wizard/Pages/40-wifi.qml:29

417msgid "Connect to Wi‑Fi"

474msgid "Connect to Wi‑Fi"

418msgstr ""

475msgstr ""

419

476

420−#: qml/Wizard/Pages/40-wifi.qml:147

477+#: qml/Wizard/Pages/40-wifi.qml:168

421msgid "Available networks…"

478msgid "Available networks…"

422msgstr ""

479msgstr ""

423

480

424−#: qml/Wizard/Pages/40-wifi.qml:148

481+#: qml/Wizard/Pages/40-wifi.qml:169

425msgid "No available networks."

482msgid "No available networks."

426msgstr ""

483msgstr ""

427

484

@@ -526,6 +583,21 @@ msgstr ""

526#~ msgid "Confirm"

583#~ msgid "Confirm"

527#~ msgstr "Потвърди"

584#~ msgstr "Потвърди"

528

585

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+

529#~ msgid "Type or say a command"

601#~ msgid "Type or say a command"

530#~ msgstr "Въведете или кажете команда"

602#~ msgstr "Въведете или кажете команда"

531

603

@@ -535,5 +607,30 @@ msgstr ""

535#~ msgid "Speak Now..."

607#~ msgid "Speak Now..."

536#~ msgstr "Говорете сега..."

608#~ msgstr "Говорете сега..."

537

609

610+#~ msgid "Well done"

611+#~ msgstr "Великолепно"

612+

613+#~ msgid "Skip intro"

614+#~ msgstr "Пропусни интрото"

615+

538#~ msgid "Loading. Please Wait..."

616#~ msgid "Loading. Please Wait..."

539#~ msgstr "Зарежда се. Моля, почакайте..."

617#~ 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 ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11−"PO-Revision-Date: 2014-12-16 07:27+0000\n"

11+"PO-Revision-Date: 2015-03-25 07:36+0000\n"

12"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"

12"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"

13"Language-Team: Breton <br@li.org>\n"

13"Language-Team: Breton <br@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-17 07:06+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-26 05:27+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr "Ger-tremen : "

23msgstr "Ger-tremen : "

24

24

@@ -31,68 +31,95 @@ msgstr "Spilhennañ ar verradenn"

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Dispilhennañ ar verradenn"

32msgstr "Dispilhennañ ar verradenn"

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr "Benveg prennet"

36msgstr "Benveg prennet"

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

40msgstr ""

41"Prennet eo bet ho penveg abalamour da re a daolioù-esae c'hwitet evit merkañ "

41"Prennet eo bet ho penveg abalamour da re a daolioù-esae c'hwitet evit merkañ "

42"ho frazenn-dremen."

42"ho frazenn-dremen."

43

43

44−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

45msgid "You have been locked out due to too many failed passcode attempts."

45msgid "You have been locked out due to too many failed passcode attempts."

46msgstr ""

46msgstr ""

47"Prennet eo bet ho penveg abalamour da re a daolioù-esae evit merkañ ho kod-"

47"Prennet eo bet ho penveg abalamour da re a daolioù-esae evit merkañ ho kod-"

48"tremen."

48"tremen."

49

49

50−#: qml/Components/DelayedLockscreen.qml:72

50+#: qml/Components/DelayedLockscreen.qml:74

51#, qt-format

51#, qt-format

52msgid "Please wait %1 minute and then try again…"

52msgid "Please wait %1 minute and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

54msgstr[0] "Gortozit %1 vunutenn, mar plij, hag esaeit en-dro..."

54msgstr[0] "Gortozit %1 vunutenn, mar plij, hag esaeit en-dro..."

55msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."

55msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."

56

56

57−#: qml/Components/Dialogs.qml:70

57+#: qml/Components/Dialogs.qml:67

58+msgctxt "Title: Lock/Log out dialog"

58msgid "Log out"

59msgid "Log out"

59msgstr "Digevreañ"

60msgstr "Digevreañ"

60

61

61−#: qml/Components/Dialogs.qml:71

62+#: qml/Components/Dialogs.qml:68

62msgid "Are you sure you want to log out?"

63msgid "Are you sure you want to log out?"

63msgstr "Ha sur oc'h e fell deoc'h digevreañ ?"

64msgstr "Ha sur oc'h e fell deoc'h digevreañ ?"

64

65

65−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66+#: qml/Components/Dialogs.qml:70

66−#: qml/Components/Dialogs.qml:122

67+msgctxt "Button: Lock the system"

67−msgid "No"

68+msgid "Lock"

68−msgstr "N'on ket"

69+msgstr "Prennañ"

69

70

70−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

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

71−#: qml/Components/Dialogs.qml:129

77+#: qml/Components/Dialogs.qml:171

72−msgid "Yes"

78+msgid "Cancel"

73−msgstr "Ya"

79+msgstr "Nullañ"

74

80

75−#: qml/Components/Dialogs.qml:94

81+#: qml/Components/Dialogs.qml:96

82+msgctxt "Title: Reboot/Shut down dialog"

76msgid "Shut down"

83msgid "Shut down"

77msgstr "Lazhañ ar benveg"

84msgstr "Lazhañ ar benveg"

78

85

79−#: qml/Components/Dialogs.qml:95

86+#: qml/Components/Dialogs.qml:97

80msgid "Are you sure you want to shut down?"

87msgid "Are you sure you want to shut down?"

81msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"

88msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"

82

89

83−#: qml/Components/Dialogs.qml:119

90+#: qml/Components/Dialogs.qml:99

91+msgctxt "Button: Reboot the system"

84msgid "Reboot"

92msgid "Reboot"

85msgstr "Adloc'hañ"

93msgstr "Adloc'hañ"

86

94

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

88msgid "Are you sure you want to reboot?"

106msgid "Are you sure you want to reboot?"

89msgstr "Ha sur oc'h e fell deoc'h adloc'hañ ?"

107msgstr "Ha sur oc'h e fell deoc'h adloc'hañ ?"

90

108

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"

92msgid "Power"

119msgid "Power"

93−msgstr "Tredan"

120+msgstr "Enaouiñ"

94

121

95−#: qml/Components/Dialogs.qml:145

122+#: qml/Components/Dialogs.qml:151

96msgid ""

123msgid ""

97"Are you sure you would like\n"

124"Are you sure you would like\n"

98"to power off?"

125"to power off?"

@@ -100,71 +127,16 @@ msgstr ""

100"Ha sur oc'h e fell deoc'h\n"

127"Ha sur oc'h e fell deoc'h\n"

101"troc'hañ an tredan ?"

128"troc'hañ an tredan ?"

102

129

103−#: qml/Components/Dialogs.qml:147

130+#: qml/Components/Dialogs.qml:153

131+msgctxt "Button: Power off the system"

104msgid "Power off"

132msgid "Power off"

105msgstr "Lazhañ"

133msgstr "Lazhañ"

106

134

107−#: qml/Components/Dialogs.qml:157

135+#: qml/Components/Dialogs.qml:162

136+msgctxt "Button: Restart the system"

108msgid "Restart"

137msgid "Restart"

109msgstr "Adloc'hañ"

138msgstr "Adloc'hañ"

110

139

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<br><br>Tap on the screen to start"

164−msgstr ""

165−"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "

166−"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"

167−

168#: qml/Components/Lockscreen.qml:238

140#: qml/Components/Lockscreen.qml:238

169msgid "Return to Call"

141msgid "Return to Call"

170msgstr "Distreiñ d'ar bellgomzadenn"

142msgstr "Distreiñ d'ar bellgomzadenn"

@@ -177,32 +149,39 @@ msgstr "Pellgomzadenn vallus"

177msgid "OK"

149msgid "OK"

178msgstr "Mat eo"

150msgstr "Mat eo"

179

151

180−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

181msgid "See less"

153msgid "See less"

182msgstr "Gwelet nebeutoc'h"

154msgstr "Gwelet nebeutoc'h"

183

155

184−#: qml/Dash/GenericScopeView.qml:431

156+#: qml/Dash/GenericScopeView.qml:533

185msgid "See all"

157msgid "See all"

186msgstr "Gwelet pep tra"

158msgstr "Gwelet pep tra"

187

159

188−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

160+#: qml/Dash/GenericScopeView.qml:595

189−#: qml/Panel/SearchIndicator.qml:27

161+msgctxt "Label: Hint for dash search line edit"

190msgid "Search"

162msgid "Search"

191msgstr "Klask"

163msgstr "Klask"

192

164

193−#: qml/Dash/PageHeader.qml:260

165+#: qml/Dash/PageHeader.qml:269

166+msgctxt "Button: Open the Ubuntu Store"

194msgid "Store"

167msgid "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"

196

174

197−#: qml/Dash/PageHeader.qml:277

175+#: qml/Dash/PageHeader.qml:286

176+msgctxt "Button: Show the current dash scope settings"

198msgid "Settings"

177msgid "Settings"

199msgstr "Arventennoù"

178msgstr "Arventennoù"

200

179

201−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

202msgid "Remove from Favorites"

181msgid "Remove from Favorites"

203msgstr "Lemel eus ar sinedoù"

182msgstr "Lemel eus ar sinedoù"

204

183

205−#: qml/Dash/PageHeader.qml:284

184+#: qml/Dash/PageHeader.qml:293

206msgid "Add to Favorites"

185msgid "Add to Favorites"

207msgstr "Ouzhpennañ d'ar sinedoù"

186msgstr "Ouzhpennañ d'ar sinedoù"

208

187

@@ -234,22 +213,92 @@ msgstr "Tennañ evit freskaat..."

234msgid "Release to refresh…"

213msgid "Release to refresh…"

235msgstr "Lezel da vont evit freskaat..."

214msgstr "Lezel da vont evit freskaat..."

236

215

216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

217+msgid "Enable location data"

218+msgstr "Gweredekaat ar roadennoù lec'hiañ"

219+

237−#: qml/Dash/ScopesList.qml:63

220+#: qml/Dash/ScopesList.qml:66

238msgid "Manage"

221msgid "Manage"

239msgstr "Merañ"

222msgstr "Merañ"

240

223

241−#: qml/Dash/ScopesList.qml:107

224+#: qml/Dash/ScopesList.qml:112

242msgid "Home"

225msgid "Home"

243msgstr "Er gêr"

226msgstr "Er gêr"

244

227

245−#: qml/Dash/ScopesList.qml:108

228+#: qml/Dash/ScopesList.qml:113

246msgid "Also installed"

229msgid "Also installed"

247msgstr "Staliet ivez"

230msgstr "Staliet ivez"

248

231

249−#: qml/Greeter/Greeter.qml:174

232+#: qml/Greeter/CoverPage.qml:107

250msgid "Unlock"

233msgid "Unlock"

251msgstr "Dibrennañ"

234msgstr "Dibrennañ"

252

235

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+

253#: qml/Notifications/NotificationMenuItemFactory.qml:128

302#: qml/Notifications/NotificationMenuItemFactory.qml:128

254msgid "Show password"

303msgid "Show password"

255msgstr "Diskouez ar ger-tremen"

304msgstr "Diskouez ar ger-tremen"

@@ -290,6 +339,11 @@ msgstr "Echu"

290msgid "Failed, tap to retry"

339msgid "Failed, tap to retry"

291msgstr "C'hwitet, touchit evit adkregiñ"

340msgstr "C'hwitet, touchit evit adkregiñ"

292

341

342+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

343+msgctxt "Label: Hint in message indicator line edit"

344+msgid "Reply"

345+msgstr "Respont"

346+

293#: qml/Panel/Indicators/ModemInfoItem.qml:105

347#: qml/Panel/Indicators/ModemInfoItem.qml:105

294msgid "Unlock SIM"

348msgid "Unlock SIM"

295msgstr "Dibrennañ ar gartenn SIM"

349msgstr "Dibrennañ ar gartenn SIM"

@@ -298,65 +352,60 @@ msgstr "Dibrennañ ar gartenn SIM"

298msgid "Roaming"

352msgid "Roaming"

299msgstr "O kantren"

353msgstr "O kantren"

300

354

301−#: qml/Shell.qml:367

355+#: qml/Tutorial/TutorialBottomFinish.qml:24

302−#, qt-format

356+msgid "This action does different things for different apps"

303−msgid "Enter %1"

357+msgstr "An ober-mañ a ra meur a dra evit meur a arload"

304−msgstr "Merkañ %1"

305

358

306−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

359+#: qml/Tutorial/TutorialBottomFinish.qml:25

307−msgid "Enter passphrase"

360+msgid "Tap here to finish."

308−msgstr "Merkañ ar frazenn-dremen"

361+msgstr "Pouezañ amañ evit echuiñ."

309

362

310−#: qml/Shell.qml:369

363+#: qml/Tutorial/TutorialBottom.qml:28

311−msgid "Enter passcode"

364+msgid "Open special menus"

312−msgstr "Merkañ ar c'hod-tremen"

365+msgstr "Digeriñ al lañserioù ispisial"

313

366

314−#: qml/Shell.qml:370

367+#: qml/Tutorial/TutorialBottom.qml:29

315−#, qt-format

368+msgid "Swipe up from the bottom edge."

316−msgid "Sorry, incorrect %1"

369+msgstr "Riklit war-du an nec'h adalek an traoñ"

317−msgstr "Siwazh, %1 direizh"

318

370

319−#: qml/Shell.qml:371

371+#: qml/Tutorial/TutorialLeftFinish.qml:24

320−msgid "Sorry, incorrect passphrase"

372+msgid "These are the shortcuts to favorite apps"

321−msgstr "Siwazh, frazenn-dremen direizh"

373+msgstr "Berradennoù war-du hoc'h arloadoù gwellañ-deuet eo ar re-mañ"

322

374

323−#: qml/Shell.qml:372

375+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

324−msgid "Please re-enter"

376+msgid "Tap here to continue."

325−msgstr "Adverkañ, mar plij"

377+msgstr "Pouzañ amañ evit kenderc'hel"

326

378

327−#: qml/Shell.qml:373

379+#: qml/Tutorial/TutorialLeft.qml:26

328−msgid "Sorry, incorrect passcode"

380+msgid "Open the launcher"

329−msgstr "Digarezit, kod-tremen direizh"

381+msgstr "Digeriñ al lañser"

330

382

331−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

383+#: qml/Tutorial/TutorialLeft.qml:27

332−msgid "Sorry, incorrect passphrase."

384+msgid "Short swipe from the left edge."

333−msgstr "Siwazh, frazenn-dremen direizh"

385+msgstr "Riklik dousik adalek ar bord kleiz."

334

386

335−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

387+#: qml/Tutorial/TutorialPage.qml:178

336−msgid "Sorry, incorrect passcode."

388+msgid "You almost got it!"

337−msgstr "Siwazh, kod-tremen direizh"

389+msgstr "Deuet eo ganeoc'h pe dost ?"

338

390

339−#: qml/Shell.qml:469

391+#: qml/Tutorial/TutorialPage.qml:195

340−msgid "This will be your last attempt."

392+msgid "Try again."

341−msgstr "Ho taol-esae diwezhañ e vo."

393+msgstr "Esaeit en-dro."

342

394

343−#: qml/Shell.qml:471

395+#: qml/Tutorial/TutorialRight.qml:31

344−msgid ""

396+msgid "To view open apps"

345−"If passphrase is entered incorrectly, your phone will conduct a factory "

397+msgstr "Evit gwelet an arloadoù digor"

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"

350

398

351−#: qml/Shell.qml:472

399+#: qml/Tutorial/TutorialRight.qml:32

352−msgid ""

400+msgid "Long swipe from the right edge."

353−"If passcode is entered incorrectly, your phone will conduct a factory reset "

401+msgstr "Riklit pell adalek ar bord dehoù."

354−"and all personal data will be deleted."

402+

355−msgstr ""

403+#: qml/Tutorial/TutorialRight.qml:122

356−"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "

404+msgid "View all your running tasks."

357−"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."

405+msgstr "Gwelet an holl drevelloù a ya en-dro."

358

406

359#: qml/Wizard/Page.qml:89

407#: qml/Wizard/Page.qml:89

408+msgctxt "Button: Go back one page in the Wizard"

360msgid "Back"

409msgid "Back"

361msgstr "Distreiñ"

410msgstr "Distreiñ"

362

411

@@ -373,7 +422,7 @@ msgid "Let’s get started."

373msgstr "Krogomp ganti."

422msgstr "Krogomp ganti."

374

423

375#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

424#: 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

377#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

426#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

378#: qml/Wizard/Pages/passwd-set.qml:90

427#: qml/Wizard/Pages/passwd-set.qml:90

379msgid "Continue"

428msgid "Continue"

@@ -383,11 +432,11 @@ msgstr "Kenderc'hel"

383msgid "Add a SIM card and restart your device"

432msgid "Add a SIM card and restart your device"

384msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"

433msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"

385

434

386−#: qml/Wizard/Pages/20-sim.qml:55

435+#: qml/Wizard/Pages/20-sim.qml:59

387msgid "Without it, you won’t be able to make calls or use text messaging."

436msgid "Without it, you won’t be able to make calls or use text messaging."

388msgstr "Ne vioc'h ket evit pellgomz pe kas kemennadennoù hepti."

437msgstr "Ne vioc'h ket evit pellgomz pe kas kemennadennoù hepti."

389

438

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

391msgid "Skip"

440msgid "Skip"

392msgstr "Tremen hebiou"

441msgstr "Tremen hebiou"

393

442

@@ -401,38 +450,44 @@ msgstr ""

401"Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."

450"Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."

402

451

403#: qml/Wizard/Pages/30-passwd-type.qml:97

452#: qml/Wizard/Pages/30-passwd-type.qml:97

453+msgctxt "Label: Type of security method"

404msgid "Swipe"

454msgid "Swipe"

405msgstr "Riklañ"

455msgstr "Riklañ"

406

456

407#: qml/Wizard/Pages/30-passwd-type.qml:98

457#: qml/Wizard/Pages/30-passwd-type.qml:98

458+msgctxt "Label: Description of security method"

408msgid "No security"

459msgid "No security"

409msgstr "Tamm surentez ebet"

460msgstr "Tamm surentez ebet"

410

461

411#: qml/Wizard/Pages/30-passwd-type.qml:100

462#: qml/Wizard/Pages/30-passwd-type.qml:100

463+msgctxt "Label: Type of security method"

412msgid "Passcode"

464msgid "Passcode"

413msgstr "Kod-tremen"

465msgstr "Kod-tremen"

414

466

415#: qml/Wizard/Pages/30-passwd-type.qml:101

467#: qml/Wizard/Pages/30-passwd-type.qml:101

468+msgctxt "Label: Description of security method"

416msgid "4 digits only"

469msgid "4 digits only"

417msgstr "4 sifr hepken"

470msgstr "4 sifr hepken"

418

471

419#: qml/Wizard/Pages/30-passwd-type.qml:103

472#: qml/Wizard/Pages/30-passwd-type.qml:103

473+msgctxt "Label: Type of security method"

420msgid "Passphrase"

474msgid "Passphrase"

421msgstr "Frazenn-dremen"

475msgstr "Frazenn-dremen"

422

476

423#: qml/Wizard/Pages/30-passwd-type.qml:104

477#: qml/Wizard/Pages/30-passwd-type.qml:104

478+msgctxt "Label: Description of security method"

424msgid "Numbers and letters"

479msgid "Numbers and letters"

425msgstr "Sifroù ha lizherennoù"

480msgstr "Sifroù ha lizherennoù"

426

481

427−#: qml/Wizard/Pages/40-wifi.qml:28

482+#: qml/Wizard/Pages/40-wifi.qml:29

428msgid "Connect to Wi‑Fi"

483msgid "Connect to Wi‑Fi"

429msgstr "Kevreañ ouzh ar Wi-Fi"

484msgstr "Kevreañ ouzh ar Wi-Fi"

430

485

431−#: qml/Wizard/Pages/40-wifi.qml:147

486+#: qml/Wizard/Pages/40-wifi.qml:168

432msgid "Available networks…"

487msgid "Available networks…"

433msgstr "Rouedadoù a c'haller kaout..."

488msgstr "Rouedadoù a c'haller kaout..."

434

489

435−#: qml/Wizard/Pages/40-wifi.qml:148

490+#: qml/Wizard/Pages/40-wifi.qml:169

436msgid "No available networks."

491msgid "No available networks."

437msgstr "N'eus rouedad ebet da gaout."

492msgstr "N'eus rouedad ebet da gaout."

438

493

@@ -541,6 +596,28 @@ msgstr "〈 %1"

541msgid "%1 〉"

596msgid "%1 〉"

542msgstr "%1 〉"

597msgstr "%1 〉"

543

598

599+#~ msgid "Close"

600+#~ msgstr "Serriñ"

601+

602+#~ msgid "Top edge"

603+#~ msgstr "Bord uhelañ"

604+

605+#~ msgid "Left edge"

606+#~ msgstr "Bord kleiz"

607+

608+#~ msgid "Skip intro"

609+#~ msgstr "Tremen hep sellet ouzh an digoradur"

610+

611+#~ msgid "Right edge"

612+#~ msgstr "Bord dehoù"

613+

614+#~ msgid ""

615+#~ "You have now mastered the edge gestures and can start using the "

616+#~ "phone<br><br>Tap on the screen to start"

617+#~ msgstr ""

618+#~ "Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "

619+#~ "pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"

620+

544#~ msgid "Loading. Please Wait..."

621#~ msgid "Loading. Please Wait..."

545#~ msgstr "O kargañ. Gortozit, mar plij..."

622#~ msgstr "O kargañ. Gortozit, mar plij..."

546

623

@@ -553,9 +630,38 @@ msgstr "%1 〉"

553#~ msgid "Confirm"

630#~ msgid "Confirm"

554#~ msgstr "Kadarnaat"

631#~ msgstr "Kadarnaat"

555

632

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+

556#~ msgid "Type or say a command"

656#~ msgid "Type or say a command"

557#~ msgstr "Skrivit pe lavarit un urzhiad"

657#~ msgstr "Skrivit pe lavarit un urzhiad"

558

658

659+#~ msgid "Store"

660+#~ msgstr "Enrollañ"

661+

662+#~ msgid "Power off"

663+#~ msgstr "Lazhañ"

664+

559#~ msgid "Done"

665#~ msgid "Done"

560#~ msgstr "Graet eo"

666#~ msgstr "Graet eo"

561

667

@@ -565,5 +671,23 @@ msgstr "%1 〉"

565#~ msgid "Favorites"

671#~ msgid "Favorites"

566#~ msgstr "Gwellañ deuet"

672#~ msgstr "Gwellañ deuet"

567

673

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+

568#~ msgid "Manage Scopes"

692#~ msgid "Manage Scopes"

569#~ msgstr "Merañ ar c'hefluskerioù enklask"

693#~ msgstr "Merañ ar c'hefluskerioù enklask"

po/bs.po+195−121

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11"PO-Revision-Date: 2014-01-16 22:33+0000\n"

11"PO-Revision-Date: 2014-01-16 22:33+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Bosnian <bs@li.org>\n"

13"Language-Team: Bosnian <bs@li.org>\n"

@@ -16,10 +16,10 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

19+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

20−"X-Generator: Launchpad (build 17286)\n"

20+"X-Generator: Launchpad (build 17413)\n"

21

21

22−#: plugins/LightDM/Greeter.cpp:130

22+#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

23msgid "Password: "

24msgstr ""

24msgstr ""

25

25

@@ -32,125 +32,104 @@ msgstr ""

32msgid "Unpin shortcut"

32msgid "Unpin shortcut"

33msgstr ""

33msgstr ""

34

34

35−#: qml/Components/DelayedLockscreen.qml:47

35+#: qml/Components/DelayedLockscreen.qml:49

36msgid "Device Locked"

36msgid "Device Locked"

37msgstr ""

37msgstr ""

38

38

39−#: qml/Components/DelayedLockscreen.qml:62

39+#: qml/Components/DelayedLockscreen.qml:64

40msgid "You have been locked out due to too many failed passphrase attempts."

40msgid "You have been locked out due to too many failed passphrase attempts."

41msgstr ""

41msgstr ""

42

42

43−#: qml/Components/DelayedLockscreen.qml:63

43+#: qml/Components/DelayedLockscreen.qml:65

44msgid "You have been locked out due to too many failed passcode attempts."

44msgid "You have been locked out due to too many failed passcode attempts."

45msgstr ""

45msgstr ""

46

46

47−#: qml/Components/DelayedLockscreen.qml:72

47+#: qml/Components/DelayedLockscreen.qml:74

48#, qt-format

48#, qt-format

49msgid "Please wait %1 minute and then try again…"

49msgid "Please wait %1 minute and then try again…"

50msgid_plural "Please wait %1 minutes and then try again…"

50msgid_plural "Please wait %1 minutes and then try again…"

51msgstr[0] ""

51msgstr[0] ""

52msgstr[1] ""

52msgstr[1] ""

53

53

54−#: qml/Components/Dialogs.qml:70

54+#: qml/Components/Dialogs.qml:67

55+msgctxt "Title: Lock/Log out dialog"

55msgid "Log out"

56msgid "Log out"

56msgstr ""

57msgstr ""

57

58

58−#: qml/Components/Dialogs.qml:71

59+#: qml/Components/Dialogs.qml:68

59msgid "Are you sure you want to log out?"

60msgid "Are you sure you want to log out?"

60msgstr ""

61msgstr ""

61

62

62−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63+#: qml/Components/Dialogs.qml:70

63−#: qml/Components/Dialogs.qml:122

64+msgctxt "Button: Lock the system"

64−msgid "No"

65+msgid "Lock"

65msgstr ""

66msgstr ""

66

67

67−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68+#: qml/Components/Dialogs.qml:77

68−#: qml/Components/Dialogs.qml:129

69+msgctxt "Button: Log out from the system"

69−msgid "Yes"

70+msgid "Log Out"

70msgstr ""

71msgstr ""

71

72

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"

73msgid "Shut down"

80msgid "Shut down"

74msgstr ""

81msgstr ""

75

82

76−#: qml/Components/Dialogs.qml:95

83+#: qml/Components/Dialogs.qml:97

77msgid "Are you sure you want to shut down?"

84msgid "Are you sure you want to shut down?"

78msgstr ""

85msgstr ""

79

86

80−#: qml/Components/Dialogs.qml:119

87+#: qml/Components/Dialogs.qml:99

88+msgctxt "Button: Reboot the system"

81msgid "Reboot"

89msgid "Reboot"

82msgstr ""

90msgstr ""

83

91

84−#: qml/Components/Dialogs.qml:120

92+#: qml/Components/Dialogs.qml:107

85−msgid "Are you sure you want to reboot?"

93+msgctxt "Button: Shut down the system"

86−msgstr ""

94+msgid "Shut down"

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"

104msgstr ""

95msgstr ""

105

96

106−#: qml/Components/Dialogs.qml:167

97+#: qml/Components/Dialogs.qml:127

98+msgctxt "Title: Reboot dialog"

107−msgid "Cancel"

99+msgid "Reboot"

108msgstr ""

100msgstr ""

109

101

110−#: qml/Components/EdgeDemoOverlay.qml:151

102+#: qml/Components/Dialogs.qml:128

111−msgid "Skip intro"

103+msgid "Are you sure you want to reboot?"

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"

120msgstr ""

104msgstr ""

121

105

122−#: qml/Components/EdgeDemo.qml:157

106+#: qml/Components/Dialogs.qml:130

123−msgid "Top edge"

107+msgid "No"

124−msgstr "Gornja ivica"

125−

126−#: qml/Components/EdgeDemo.qml:158

127−msgid "Try swiping from the top edge to access the indicators"

128msgstr ""

108msgstr ""

129

109

130−#: qml/Components/EdgeDemo.qml:183

110+#: qml/Components/Dialogs.qml:136

131−msgid "Close"

111+msgid "Yes"

132−msgstr "Zatvori"

133−

134−#: qml/Components/EdgeDemo.qml:184

135−msgid "Swipe up again to close the settings screen"

136msgstr ""

112msgstr ""

137

113

138−#: qml/Components/EdgeDemo.qml:214

114+#: qml/Components/Dialogs.qml:150

115+msgctxt "Title: Power off/Restart dialog"

139−msgid "Left edge"

116+msgid "Power"

140msgstr ""

117msgstr ""

141

118

142−#: qml/Components/EdgeDemo.qml:215

119+#: qml/Components/Dialogs.qml:151

143−msgid "Swipe from the left to reveal the launcher for quick access to apps"

120+msgid ""

121+"Are you sure you would like\n"

122+"to power off?"

144msgstr ""

123msgstr ""

145

124

146−#: qml/Components/EdgeDemo.qml:242

125+#: qml/Components/Dialogs.qml:153

147−msgid "Well done"

126+msgctxt "Button: Power off the system"

127+msgid "Power off"

148msgstr ""

128msgstr ""

149

129

150−#: qml/Components/EdgeDemo.qml:243

130+#: qml/Components/Dialogs.qml:162

131+msgctxt "Button: Restart the system"

151−msgid ""

132+msgid "Restart"

152−"You have now mastered the edge gestures and can start using the "

153−"phone<br><br>Tap on the screen to start"

154msgstr ""

133msgstr ""

155

134

156#: qml/Components/Lockscreen.qml:238

135#: qml/Components/Lockscreen.qml:238

@@ -165,32 +144,39 @@ msgstr ""

165msgid "OK"

144msgid "OK"

166msgstr ""

145msgstr ""

167

146

168−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

147+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

169msgid "See less"

148msgid "See less"

170msgstr ""

149msgstr ""

171

150

172−#: qml/Dash/GenericScopeView.qml:431

151+#: qml/Dash/GenericScopeView.qml:533

173msgid "See all"

152msgid "See all"

174msgstr ""

153msgstr ""

175

154

176−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

155+#: qml/Dash/GenericScopeView.qml:595

177−#: qml/Panel/SearchIndicator.qml:27

156+msgctxt "Label: Hint for dash search line edit"

178msgid "Search"

157msgid "Search"

179msgstr ""

158msgstr ""

180

159

181−#: qml/Dash/PageHeader.qml:260

160+#: qml/Dash/PageHeader.qml:269

161+msgctxt "Button: Open the Ubuntu Store"

182msgid "Store"

162msgid "Store"

183msgstr ""

163msgstr ""

184

164

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"

186msgid "Settings"

172msgid "Settings"

187msgstr ""

173msgstr ""

188

174

189−#: qml/Dash/PageHeader.qml:284

175+#: qml/Dash/PageHeader.qml:293

190msgid "Remove from Favorites"

176msgid "Remove from Favorites"

191msgstr ""

177msgstr ""

192

178

193−#: qml/Dash/PageHeader.qml:284

179+#: qml/Dash/PageHeader.qml:293

194msgid "Add to Favorites"

180msgid "Add to Favorites"

195msgstr ""

181msgstr ""

196

182

@@ -222,22 +208,88 @@ msgstr ""

222msgid "Release to refresh…"

208msgid "Release to refresh…"

223msgstr ""

209msgstr ""

224

210

211+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

212+msgid "Enable location data"

213+msgstr ""

214+

225−#: qml/Dash/ScopesList.qml:63

215+#: qml/Dash/ScopesList.qml:66

226msgid "Manage"

216msgid "Manage"

227msgstr ""

217msgstr ""

228

218

229−#: qml/Dash/ScopesList.qml:107

219+#: qml/Dash/ScopesList.qml:112

230msgid "Home"

220msgid "Home"

231msgstr ""

221msgstr ""

232

222

233−#: qml/Dash/ScopesList.qml:108

223+#: qml/Dash/ScopesList.qml:113

234msgid "Also installed"

224msgid "Also installed"

235msgstr ""

225msgstr ""

236

226

237−#: qml/Greeter/Greeter.qml:174

227+#: qml/Greeter/CoverPage.qml:107

238msgid "Unlock"

228msgid "Unlock"

239msgstr ""

229msgstr ""

240

230

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+

241#: qml/Notifications/NotificationMenuItemFactory.qml:128

293#: qml/Notifications/NotificationMenuItemFactory.qml:128

242msgid "Show password"

294msgid "Show password"

243msgstr ""

295msgstr ""

@@ -278,6 +330,11 @@ msgstr ""

278msgid "Failed, tap to retry"

330msgid "Failed, tap to retry"

279msgstr ""

331msgstr ""

280

332

333+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

334+msgctxt "Label: Hint in message indicator line edit"

335+msgid "Reply"

336+msgstr ""

337+

281#: qml/Panel/Indicators/ModemInfoItem.qml:105

338#: qml/Panel/Indicators/ModemInfoItem.qml:105

282msgid "Unlock SIM"

339msgid "Unlock SIM"

283msgstr ""

340msgstr ""

@@ -286,61 +343,60 @@ msgstr ""

286msgid "Roaming"

343msgid "Roaming"

287msgstr ""

344msgstr ""

288

345

289−#: qml/Shell.qml:367

346+#: qml/Tutorial/TutorialBottomFinish.qml:24

290−#, qt-format

347+msgid "This action does different things for different apps"

291−msgid "Enter %1"

292msgstr ""

348msgstr ""

293

349

294−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

350+#: qml/Tutorial/TutorialBottomFinish.qml:25

295−msgid "Enter passphrase"

351+msgid "Tap here to finish."

296msgstr ""

352msgstr ""

297

353

298−#: qml/Shell.qml:369

354+#: qml/Tutorial/TutorialBottom.qml:28

299−msgid "Enter passcode"

355+msgid "Open special menus"

300msgstr ""

356msgstr ""

301

357

302−#: qml/Shell.qml:370

358+#: qml/Tutorial/TutorialBottom.qml:29

303−#, qt-format

359+msgid "Swipe up from the bottom edge."

304−msgid "Sorry, incorrect %1"

305msgstr ""

360msgstr ""

306

361

307−#: qml/Shell.qml:371

362+#: qml/Tutorial/TutorialLeftFinish.qml:24

308−msgid "Sorry, incorrect passphrase"

363+msgid "These are the shortcuts to favorite apps"

309msgstr ""

364msgstr ""

310

365

311−#: qml/Shell.qml:372

366+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

312−msgid "Please re-enter"

367+msgid "Tap here to continue."

313msgstr ""

368msgstr ""

314

369

315−#: qml/Shell.qml:373

370+#: qml/Tutorial/TutorialLeft.qml:26

316−msgid "Sorry, incorrect passcode"

371+msgid "Open the launcher"

317msgstr ""

372msgstr ""

318

373

319−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

374+#: qml/Tutorial/TutorialLeft.qml:27

320−msgid "Sorry, incorrect passphrase."

375+msgid "Short swipe from the left edge."

321msgstr ""

376msgstr ""

322

377

323−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

378+#: qml/Tutorial/TutorialPage.qml:178

324−msgid "Sorry, incorrect passcode."

379+msgid "You almost got it!"

325msgstr ""

380msgstr ""

326

381

327−#: qml/Shell.qml:469

382+#: qml/Tutorial/TutorialPage.qml:195

328−msgid "This will be your last attempt."

383+msgid "Try again."

329msgstr ""

384msgstr ""

330

385

331−#: qml/Shell.qml:471

386+#: qml/Tutorial/TutorialRight.qml:31

332−msgid ""

387+msgid "To view open apps"

333−"If passphrase is entered incorrectly, your phone will conduct a factory "

334−"reset and all personal data will be deleted."

335msgstr ""

388msgstr ""

336

389

337−#: qml/Shell.qml:472

390+#: qml/Tutorial/TutorialRight.qml:32

338−msgid ""

391+msgid "Long swipe from the right edge."

339−"If passcode is entered incorrectly, your phone will conduct a factory reset "

392+msgstr ""

340−"and all personal data will be deleted."

393+

394+#: qml/Tutorial/TutorialRight.qml:122

395+msgid "View all your running tasks."

341msgstr ""

396msgstr ""

342

397

343#: qml/Wizard/Page.qml:89

398#: qml/Wizard/Page.qml:89

399+msgctxt "Button: Go back one page in the Wizard"

344msgid "Back"

400msgid "Back"

345msgstr ""

401msgstr ""

346

402

@@ -357,7 +413,7 @@ msgid "Let’s get started."

357msgstr ""

413msgstr ""

358

414

359#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

415#: 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

361#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

417#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

362#: qml/Wizard/Pages/passwd-set.qml:90

418#: qml/Wizard/Pages/passwd-set.qml:90

363msgid "Continue"

419msgid "Continue"

@@ -367,11 +423,11 @@ msgstr ""

367msgid "Add a SIM card and restart your device"

423msgid "Add a SIM card and restart your device"

368msgstr ""

424msgstr ""

369

425

370−#: qml/Wizard/Pages/20-sim.qml:55

426+#: qml/Wizard/Pages/20-sim.qml:59

371msgid "Without it, you won’t be able to make calls or use text messaging."

427msgid "Without it, you won’t be able to make calls or use text messaging."

372msgstr ""

428msgstr ""

373

429

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

375msgid "Skip"

431msgid "Skip"

376msgstr ""

432msgstr ""

377

433

@@ -384,38 +440,44 @@ msgid "Please select how you’d like to unlock your phone."

384msgstr ""

440msgstr ""

385

441

386#: qml/Wizard/Pages/30-passwd-type.qml:97

442#: qml/Wizard/Pages/30-passwd-type.qml:97

443+msgctxt "Label: Type of security method"

387msgid "Swipe"

444msgid "Swipe"

388msgstr ""

445msgstr ""

389

446

390#: qml/Wizard/Pages/30-passwd-type.qml:98

447#: qml/Wizard/Pages/30-passwd-type.qml:98

448+msgctxt "Label: Description of security method"

391msgid "No security"

449msgid "No security"

392msgstr ""

450msgstr ""

393

451

394#: qml/Wizard/Pages/30-passwd-type.qml:100

452#: qml/Wizard/Pages/30-passwd-type.qml:100

453+msgctxt "Label: Type of security method"

395msgid "Passcode"

454msgid "Passcode"

396msgstr ""

455msgstr ""

397

456

398#: qml/Wizard/Pages/30-passwd-type.qml:101

457#: qml/Wizard/Pages/30-passwd-type.qml:101

458+msgctxt "Label: Description of security method"

399msgid "4 digits only"

459msgid "4 digits only"

400msgstr ""

460msgstr ""

401

461

402#: qml/Wizard/Pages/30-passwd-type.qml:103

462#: qml/Wizard/Pages/30-passwd-type.qml:103

463+msgctxt "Label: Type of security method"

403msgid "Passphrase"

464msgid "Passphrase"

404msgstr ""

465msgstr ""

405

466

406#: qml/Wizard/Pages/30-passwd-type.qml:104

467#: qml/Wizard/Pages/30-passwd-type.qml:104

468+msgctxt "Label: Description of security method"

407msgid "Numbers and letters"

469msgid "Numbers and letters"

408msgstr ""

470msgstr ""

409

471

410−#: qml/Wizard/Pages/40-wifi.qml:28

472+#: qml/Wizard/Pages/40-wifi.qml:29

411msgid "Connect to Wi‑Fi"

473msgid "Connect to Wi‑Fi"

412msgstr ""

474msgstr ""

413

475

414−#: qml/Wizard/Pages/40-wifi.qml:147

476+#: qml/Wizard/Pages/40-wifi.qml:168

415msgid "Available networks…"

477msgid "Available networks…"

416msgstr ""

478msgstr ""

417

479

418−#: qml/Wizard/Pages/40-wifi.qml:148

480+#: qml/Wizard/Pages/40-wifi.qml:169

419msgid "No available networks."

481msgid "No available networks."

420msgstr ""

482msgstr ""

421

483

@@ -516,3 +578,15 @@ msgstr ""

516#, qt-format

578#, qt-format

517msgid "%1 〉"

579msgid "%1 〉"

518msgstr ""

580msgstr ""

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 ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11−"PO-Revision-Date: 2014-11-10 09:22+0000\n"

11+"PO-Revision-Date: 2015-03-07 11:45+0000\n"

12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

13"Language-Team: Catalan <ca@li.org>\n"

13"Language-Team: Catalan <ca@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr "Contrasenya: "

23msgstr "Contrasenya: "

24

24

@@ -31,68 +31,95 @@ msgstr "Enganxa la drecera"

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Desenganxa la drecera"

32msgstr "Desenganxa la drecera"

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr "Dispositiu bloquejat"

36msgstr "Dispositiu bloquejat"

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

40msgstr ""

41"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "

41"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "

42"d'intents d'introducció de la contrasenya."

42"d'intents d'introducció de la contrasenya."

43

43

44−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

45msgid "You have been locked out due to too many failed passcode attempts."

45msgid "You have been locked out due to too many failed passcode attempts."

46msgstr ""

46msgstr ""

47"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "

47"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "

48"d'intents d'introducció del codi d'accés."

48"d'intents d'introducció del codi d'accés."

49

49

50−#: qml/Components/DelayedLockscreen.qml:72

50+#: qml/Components/DelayedLockscreen.qml:74

51#, qt-format

51#, qt-format

52msgid "Please wait %1 minute and then try again…"

52msgid "Please wait %1 minute and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

54msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."

54msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."

55msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."

55msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."

56

56

57−#: qml/Components/Dialogs.qml:70

57+#: qml/Components/Dialogs.qml:67

58+msgctxt "Title: Lock/Log out dialog"

58msgid "Log out"

59msgid "Log out"

59−msgstr "Surt"

60+msgstr ""

60

61

61−#: qml/Components/Dialogs.qml:71

62+#: qml/Components/Dialogs.qml:68

62msgid "Are you sure you want to log out?"

63msgid "Are you sure you want to log out?"

63msgstr "Segur que voleu sortir?"

64msgstr "Segur que voleu sortir?"

64

65

65−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66+#: qml/Components/Dialogs.qml:70

66−#: qml/Components/Dialogs.qml:122

67+msgctxt "Button: Lock the system"

67−msgid "No"

68+msgid "Lock"

68−msgstr "No"

69+msgstr ""

69

70

70−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

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

71−#: qml/Components/Dialogs.qml:129

77+#: qml/Components/Dialogs.qml:171

72−msgid "Yes"

78+msgid "Cancel"

73−msgstr "Sí"

79+msgstr "Cancel·la"

74

80

75−#: qml/Components/Dialogs.qml:94

81+#: qml/Components/Dialogs.qml:96

82+msgctxt "Title: Reboot/Shut down dialog"

76msgid "Shut down"

83msgid "Shut down"

77−msgstr "Apaga"

84+msgstr ""

78

85

79−#: qml/Components/Dialogs.qml:95

86+#: qml/Components/Dialogs.qml:97

80msgid "Are you sure you want to shut down?"

87msgid "Are you sure you want to shut down?"

81msgstr "Segur que voleu apagar?"

88msgstr "Segur que voleu apagar?"

82

89

83−#: qml/Components/Dialogs.qml:119

90+#: qml/Components/Dialogs.qml:99

91+msgctxt "Button: Reboot the system"

84msgid "Reboot"

92msgid "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 ""

86

104

87−#: qml/Components/Dialogs.qml:120

105+#: qml/Components/Dialogs.qml:128

88msgid "Are you sure you want to reboot?"

106msgid "Are you sure you want to reboot?"

89msgstr "Segur que voleu reiniciar?"

107msgstr "Segur que voleu reiniciar?"

90

108

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"

92msgid "Power"

119msgid "Power"

93−msgstr "Energia"

120+msgstr ""

94

121

95−#: qml/Components/Dialogs.qml:145

122+#: qml/Components/Dialogs.qml:151

96msgid ""

123msgid ""

97"Are you sure you would like\n"

124"Are you sure you would like\n"

98"to power off?"

125"to power off?"

@@ -100,71 +127,15 @@ msgstr ""

100"Segur que voleu\n"

127"Segur que voleu\n"

101"apagar?"

128"apagar?"

102

129

103−#: qml/Components/Dialogs.qml:147

130+#: qml/Components/Dialogs.qml:153

131+msgctxt "Button: Power off the system"

104msgid "Power off"

132msgid "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"

153msgstr ""

133msgstr ""

154−"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

155−"ràpidament a les aplicacions"

156−

157−#: qml/Components/EdgeDemo.qml:242

158−msgid "Well done"

159−msgstr "Enhorabona!"

160

134

161−#: qml/Components/EdgeDemo.qml:243

135+#: qml/Components/Dialogs.qml:162

136+msgctxt "Button: Restart the system"

162−msgid ""

137+msgid "Restart"

163−"You have now mastered the edge gestures and can start using the "

164−"phone<br><br>Tap on the screen to start"

165msgstr ""

138msgstr ""

166−"Ja heu après com utilitzar els gestos de les vores per fer servir el "

167−"telèfon<br><br>Feu un toc a la pantalla per començar"

168

139

169#: qml/Components/Lockscreen.qml:238

140#: qml/Components/Lockscreen.qml:238

170msgid "Return to Call"

141msgid "Return to Call"

@@ -178,32 +149,39 @@ msgstr "Trucada d'emergència"

178msgid "OK"

149msgid "OK"

179msgstr "D'acord"

150msgstr "D'acord"

180

151

181−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

182msgid "See less"

153msgid "See less"

183msgstr "Mostra'n menys"

154msgstr "Mostra'n menys"

184

155

185−#: qml/Dash/GenericScopeView.qml:431

156+#: qml/Dash/GenericScopeView.qml:533

186msgid "See all"

157msgid "See all"

187msgstr "Mostra-ho tot"

158msgstr "Mostra-ho tot"

188

159

189−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

160+#: qml/Dash/GenericScopeView.qml:595

190−#: qml/Panel/SearchIndicator.qml:27

161+msgctxt "Label: Hint for dash search line edit"

191msgid "Search"

162msgid "Search"

192−msgstr "Cerca"

163+msgstr ""

193

164

194−#: qml/Dash/PageHeader.qml:260

165+#: qml/Dash/PageHeader.qml:269

166+msgctxt "Button: Open the Ubuntu Store"

195msgid "Store"

167msgid "Store"

196−msgstr "Botiga"

168+msgstr ""

197

169

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"

199msgid "Settings"

177msgid "Settings"

200−msgstr "Paràmetres"

178+msgstr ""

201

179

202−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

203msgid "Remove from Favorites"

181msgid "Remove from Favorites"

204msgstr "Suprimeix dels preferits"

182msgstr "Suprimeix dels preferits"

205

183

206−#: qml/Dash/PageHeader.qml:284

184+#: qml/Dash/PageHeader.qml:293

207msgid "Add to Favorites"

185msgid "Add to Favorites"

208msgstr "Afegeix als preferits"

186msgstr "Afegeix als preferits"

209

187

@@ -235,22 +213,94 @@ msgstr "Estireu per actualitzar..."

235msgid "Release to refresh…"

213msgid "Release to refresh…"

236msgstr "Deixeu anar per actualitzar..."

214msgstr "Deixeu anar per actualitzar..."

237

215

216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

217+msgid "Enable location data"

218+msgstr "Habilita les dades d'ubicació"

219+

238−#: qml/Dash/ScopesList.qml:63

220+#: qml/Dash/ScopesList.qml:66

239msgid "Manage"

221msgid "Manage"

240−msgstr ""

222+msgstr "Gestiona"

241

223

242−#: qml/Dash/ScopesList.qml:107

224+#: qml/Dash/ScopesList.qml:112

243msgid "Home"

225msgid "Home"

244−msgstr ""

226+msgstr "Inici"

245

227

246−#: qml/Dash/ScopesList.qml:108

228+#: qml/Dash/ScopesList.qml:113

247msgid "Also installed"

229msgid "Also installed"

248−msgstr ""

230+msgstr "També instal·lat"

249

231

250−#: qml/Greeter/Greeter.qml:174

232+#: qml/Greeter/CoverPage.qml:107

251msgid "Unlock"

233msgid "Unlock"

252msgstr "Desbloca"

234msgstr "Desbloca"

253

235

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+

254#: qml/Notifications/NotificationMenuItemFactory.qml:128

304#: qml/Notifications/NotificationMenuItemFactory.qml:128

255msgid "Show password"

305msgid "Show password"

256msgstr "Mostra la contrasenya"

306msgstr "Mostra la contrasenya"

@@ -291,6 +341,11 @@ msgstr "S'ha finalitzat"

291msgid "Failed, tap to retry"

341msgid "Failed, tap to retry"

292msgstr "Ha fallat, feu un toc per tornar-ho a intentar"

342msgstr "Ha fallat, feu un toc per tornar-ho a intentar"

293

343

344+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

345+msgctxt "Label: Hint in message indicator line edit"

346+msgid "Reply"

347+msgstr ""

348+

294#: qml/Panel/Indicators/ModemInfoItem.qml:105

349#: qml/Panel/Indicators/ModemInfoItem.qml:105

295msgid "Unlock SIM"

350msgid "Unlock SIM"

296msgstr "Desbloca la SIM"

351msgstr "Desbloca la SIM"

@@ -299,160 +354,161 @@ msgstr "Desbloca la SIM"

299msgid "Roaming"

354msgid "Roaming"

300msgstr "Itinerància"

355msgstr "Itinerància"

301

356

302−#: qml/Shell.qml:367

357+#: qml/Tutorial/TutorialBottomFinish.qml:24

303−#, qt-format

358+msgid "This action does different things for different apps"

304−msgid "Enter %1"

359+msgstr "Aquesta acció fa coses diferents depenent de l'aplicació"

305−msgstr "Introduïu: %1"

306

360

307−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

361+#: qml/Tutorial/TutorialBottomFinish.qml:25

308−msgid "Enter passphrase"

362+msgid "Tap here to finish."

309−msgstr "Introduïu la contrasenya"

363+msgstr "Feu un toc per finalitzar."

310

364

311−#: qml/Shell.qml:369

365+#: qml/Tutorial/TutorialBottom.qml:28

312−msgid "Enter passcode"

366+msgid "Open special menus"

313−msgstr "Introduïu el codi d'accés"

367+msgstr "Obre els menús especials"

314

368

315−#: qml/Shell.qml:370

369+#: qml/Tutorial/TutorialBottom.qml:29

316−#, qt-format

370+msgid "Swipe up from the bottom edge."

317−msgid "Sorry, incorrect %1"

371+msgstr "Llisqueu el dit des de la vora inferior."

318−msgstr "Incorrecte (%1)"

319

372

320−#: qml/Shell.qml:371

373+#: qml/Tutorial/TutorialLeftFinish.qml:24

321−msgid "Sorry, incorrect passphrase"

374+msgid "These are the shortcuts to favorite apps"

322−msgstr "La contrasenya no és correcta"

375+msgstr "Aquestes són les dreceres a les aplicacions preferides"

323

376

324−#: qml/Shell.qml:372

377+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

325−msgid "Please re-enter"

378+msgid "Tap here to continue."

326−msgstr "Torneu-ho a introduir"

379+msgstr "Feu un toc per continuar."

327

380

328−#: qml/Shell.qml:373

381+#: qml/Tutorial/TutorialLeft.qml:26

329−msgid "Sorry, incorrect passcode"

382+msgid "Open the launcher"

330−msgstr "El codi d'accés no és correcte"

383+msgstr "Obre el llançador"

331

384

332−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

385+#: qml/Tutorial/TutorialLeft.qml:27

333−msgid "Sorry, incorrect passphrase."

386+msgid "Short swipe from the left edge."

334−msgstr "La contrasenya és incorrecta"

387+msgstr "Lliscament curt des de la vora esquerra."

335

388

336−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

389+#: qml/Tutorial/TutorialPage.qml:178

337−msgid "Sorry, incorrect passcode."

390+msgid "You almost got it!"

338−msgstr "El codi d'accés no és correcte"

391+msgstr "Ja gairebé ho teniu!"

339

392

340−#: qml/Shell.qml:469

393+#: qml/Tutorial/TutorialPage.qml:195

341−msgid "This will be your last attempt."

394+msgid "Try again."

342−msgstr "Aquest serà el darrer intent."

395+msgstr "Torneu-ho a provar."

343

396

344−#: qml/Shell.qml:471

397+#: qml/Tutorial/TutorialRight.qml:31

345−msgid ""

398+msgid "To view open apps"

346−"If passphrase is entered incorrectly, your phone will conduct a factory "

399+msgstr "Per veure les aplicacions obertes"

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."

352

400

353−#: qml/Shell.qml:472

401+#: qml/Tutorial/TutorialRight.qml:32

354−msgid ""

402+msgid "Long swipe from the right edge."

355−"If passcode is entered incorrectly, your phone will conduct a factory reset "

403+msgstr "Lliscament llarg des de la vora dreta."

356−"and all personal data will be deleted."

404+

357−msgstr ""

405+#: qml/Tutorial/TutorialRight.qml:122

358−"Si el codi d'accés s'introdueix de manera incorrecta, el telèfon es "

406+msgid "View all your running tasks."

359−"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

407+msgstr "Mostra totes les tasques en execució."

360−"personals."

361

408

362#: qml/Wizard/Page.qml:89

409#: qml/Wizard/Page.qml:89

410+msgctxt "Button: Go back one page in the Wizard"

363msgid "Back"

411msgid "Back"

364msgstr ""

412msgstr ""

365

413

366#: qml/Wizard/Pages/10-welcome.qml:27

414#: qml/Wizard/Pages/10-welcome.qml:27

367msgid "Hi!"

415msgid "Hi!"

368−msgstr ""

416+msgstr "Hola!"

369

417

370#: qml/Wizard/Pages/10-welcome.qml:44

418#: qml/Wizard/Pages/10-welcome.qml:44

371msgid "Welcome to your Ubuntu phone."

419msgid "Welcome to your Ubuntu phone."

372−msgstr ""

420+msgstr "Us donem la benvinguda al vostre telèfon Ubuntu."

373

421

374#: qml/Wizard/Pages/10-welcome.qml:52

422#: qml/Wizard/Pages/10-welcome.qml:52

375msgid "Let’s get started."

423msgid "Let’s get started."

376−msgstr ""

424+msgstr "Comencem."

377

425

378#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

426#: 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

380#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

428#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

381#: qml/Wizard/Pages/passwd-set.qml:90

429#: qml/Wizard/Pages/passwd-set.qml:90

382msgid "Continue"

430msgid "Continue"

383−msgstr ""

431+msgstr "Continua"

384

432

385#: qml/Wizard/Pages/20-sim.qml:25

433#: qml/Wizard/Pages/20-sim.qml:25

386msgid "Add a SIM card and restart your device"

434msgid "Add a SIM card and restart your device"

387−msgstr ""

435+msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"

388

436

389−#: qml/Wizard/Pages/20-sim.qml:55

437+#: qml/Wizard/Pages/20-sim.qml:59

390msgid "Without it, you won’t be able to make calls or use text messaging."

438msgid "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."

392

440

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

394msgid "Skip"

442msgid "Skip"

395−msgstr ""

443+msgstr "Omet"

396

444

397#: qml/Wizard/Pages/30-passwd-type.qml:39

445#: qml/Wizard/Pages/30-passwd-type.qml:39

398msgid "Lock security"

446msgid "Lock security"

399−msgstr ""

447+msgstr "Seguretat del bloqueig"

400

448

401#: qml/Wizard/Pages/30-passwd-type.qml:74

449#: qml/Wizard/Pages/30-passwd-type.qml:74

402msgid "Please select how you’d like to unlock your phone."

450msgid "Please select how you’d like to unlock your phone."

403−msgstr ""

451+msgstr "Seleccioneu com voleu desblocar el telèfon."

404

452

405#: qml/Wizard/Pages/30-passwd-type.qml:97

453#: qml/Wizard/Pages/30-passwd-type.qml:97

454+msgctxt "Label: Type of security method"

406msgid "Swipe"

455msgid "Swipe"

407msgstr ""

456msgstr ""

408

457

409#: qml/Wizard/Pages/30-passwd-type.qml:98

458#: qml/Wizard/Pages/30-passwd-type.qml:98

459+msgctxt "Label: Description of security method"

410msgid "No security"

460msgid "No security"

411msgstr ""

461msgstr ""

412

462

413#: qml/Wizard/Pages/30-passwd-type.qml:100

463#: qml/Wizard/Pages/30-passwd-type.qml:100

464+msgctxt "Label: Type of security method"

414msgid "Passcode"

465msgid "Passcode"

415msgstr ""

466msgstr ""

416

467

417#: qml/Wizard/Pages/30-passwd-type.qml:101

468#: qml/Wizard/Pages/30-passwd-type.qml:101

469+msgctxt "Label: Description of security method"

418msgid "4 digits only"

470msgid "4 digits only"

419msgstr ""

471msgstr ""

420

472

421#: qml/Wizard/Pages/30-passwd-type.qml:103

473#: qml/Wizard/Pages/30-passwd-type.qml:103

474+msgctxt "Label: Type of security method"

422msgid "Passphrase"

475msgid "Passphrase"

423msgstr ""

476msgstr ""

424

477

425#: qml/Wizard/Pages/30-passwd-type.qml:104

478#: qml/Wizard/Pages/30-passwd-type.qml:104

479+msgctxt "Label: Description of security method"

426msgid "Numbers and letters"

480msgid "Numbers and letters"

427msgstr ""

481msgstr ""

428

482

429−#: qml/Wizard/Pages/40-wifi.qml:28

483+#: qml/Wizard/Pages/40-wifi.qml:29

430msgid "Connect to Wi‑Fi"

484msgid "Connect to Wi‑Fi"

431−msgstr ""

485+msgstr "Connecta't a la Wi-Fi"

432

486

433−#: qml/Wizard/Pages/40-wifi.qml:147

487+#: qml/Wizard/Pages/40-wifi.qml:168

434msgid "Available networks…"

488msgid "Available networks…"

435−msgstr ""

489+msgstr "Xarxes disponibles..."

436

490

437−#: qml/Wizard/Pages/40-wifi.qml:148

491+#: qml/Wizard/Pages/40-wifi.qml:169

438msgid "No available networks."

492msgid "No available networks."

439−msgstr ""

493+msgstr "No hi ha xarxes disponibles"

440

494

441#: qml/Wizard/Pages/50-location.qml:27

495#: qml/Wizard/Pages/50-location.qml:27

442msgid "Location"

496msgid "Location"

443−msgstr ""

497+msgstr "Ubicació"

444

498

445#: qml/Wizard/Pages/50-location.qml:62

499#: qml/Wizard/Pages/50-location.qml:62

446msgid "Let the phone detect your location:"

500msgid "Let the phone detect your location:"

447−msgstr ""

501+msgstr "Fes que el telèfon detecti la meva ubicació:"

448

502

449#: qml/Wizard/Pages/50-location.qml:69

503#: qml/Wizard/Pages/50-location.qml:69

450msgid "Using GPS only (less accurate)"

504msgid "Using GPS only (less accurate)"

451−msgstr ""

505+msgstr "Utilitza només el GPS (menys precís)"

452

506

453#: qml/Wizard/Pages/50-location.qml:86

507#: qml/Wizard/Pages/50-location.qml:86

454msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

508msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

455msgstr ""

509msgstr ""

510+"Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "

511+"(recomanat)"

456

512

457#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

513#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

458#: qml/Wizard/Pages/50-location.qml:103

514#: qml/Wizard/Pages/50-location.qml:103

@@ -460,81 +516,88 @@ msgid ""

460"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

516"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

461"conditions</a>."

517"conditions</a>."

462msgstr ""

518msgstr ""

519+"Si seleccioneu aquesta opció, accepteu <a href='#'>les condicions generals "

520+"del servei Nokia HERE</a>."

463

521

464#: qml/Wizard/Pages/50-location.qml:112

522#: qml/Wizard/Pages/50-location.qml:112

465msgid "Not at all"

523msgid "Not at all"

466−msgstr ""

524+msgstr "No"

467

525

468#: qml/Wizard/Pages/50-location.qml:124

526#: qml/Wizard/Pages/50-location.qml:124

469msgid "You can change your mind later in <b>System Settings</b>."

527msgid "You can change your mind later in <b>System Settings</b>."

470msgstr ""

528msgstr ""

529+"Podeu canviar-ho més endavant a l'aplicació <b>Paràmetres del sistema</b>"

471

530

472#: qml/Wizard/Pages/60-reporting.qml:24

531#: qml/Wizard/Pages/60-reporting.qml:24

473msgid "Improving your experience"

532msgid "Improving your experience"

474−msgstr ""

533+msgstr "Millora de l'experiència"

475

534

476#: qml/Wizard/Pages/60-reporting.qml:36

535#: qml/Wizard/Pages/60-reporting.qml:36

477msgid ""

536msgid ""

478"Your phone is set up to automatically report errors to Canonical and its "

537"Your phone is set up to automatically report errors to Canonical and its "

479"partners, the makers of the operating system."

538"partners, the makers of the operating system."

480msgstr ""

539msgstr ""

540+"Aquest telèfon està configurat per enviar errors de manera automàtica a "

541+"Canonical i associats, els creadors del sistema operatiu."

481

542

482#: qml/Wizard/Pages/60-reporting.qml:43

543#: qml/Wizard/Pages/60-reporting.qml:43

483msgid ""

544msgid ""

484"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

545"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

485"Privacy</b>"

546"Privacy</b>"

486msgstr ""

547msgstr ""

548+"Podeu inhabilitar-ho a <b>Configuració del sistema</b>, a la secció "

549+"<b>Seguretat i privadesa</b>"

487

550

488#: qml/Wizard/Pages/80-finished.qml:24

551#: qml/Wizard/Pages/80-finished.qml:24

489msgid "All done"

552msgid "All done"

490−msgstr ""

553+msgstr "Tot fet"

491

554

492#: qml/Wizard/Pages/80-finished.qml:39

555#: qml/Wizard/Pages/80-finished.qml:39

493msgid "Nice work!"

556msgid "Nice work!"

494−msgstr ""

557+msgstr "Bona feina!"

495

558

496#: qml/Wizard/Pages/80-finished.qml:46

559#: qml/Wizard/Pages/80-finished.qml:46

497msgid "Your phone is now ready to use."

560msgid "Your phone is now ready to use."

498−msgstr ""

561+msgstr "Ja podeu utilitzar el vostre telèfon."

499

562

500#: qml/Wizard/Pages/80-finished.qml:53

563#: qml/Wizard/Pages/80-finished.qml:53

501msgid "Finish"

564msgid "Finish"

502−msgstr ""

565+msgstr "Finalitza"

503

566

504#: qml/Wizard/Pages/here-terms.qml:27

567#: qml/Wizard/Pages/here-terms.qml:27

505msgid "Terms & Conditions"

568msgid "Terms & Conditions"

506−msgstr ""

569+msgstr "Condicions generals"

507

570

508#: qml/Wizard/Pages/passwd-confirm.qml:49

571#: qml/Wizard/Pages/passwd-confirm.qml:49

509msgid "Confirm passphrase"

572msgid "Confirm passphrase"

510−msgstr ""

573+msgstr "Confirmeu la contrasenya"

511

574

512#: qml/Wizard/Pages/passwd-confirm.qml:50

575#: qml/Wizard/Pages/passwd-confirm.qml:50

513msgid "Confirm passcode"

576msgid "Confirm passcode"

514−msgstr ""

577+msgstr "Confirmeu el codi d'accés"

515

578

516#: qml/Wizard/Pages/passwd-confirm.qml:53

579#: qml/Wizard/Pages/passwd-confirm.qml:53

517#: qml/Wizard/Pages/passwd-confirm.qml:54

580#: qml/Wizard/Pages/passwd-confirm.qml:54

518msgid "Please try again."

581msgid "Please try again."

519−msgstr ""

582+msgstr "Torneu-ho a intentar."

520

583

521#: qml/Wizard/Pages/passwd-set.qml:61

584#: qml/Wizard/Pages/passwd-set.qml:61

522msgid "Choose your passcode"

585msgid "Choose your passcode"

523−msgstr ""

586+msgstr "Trieu el codi d'accés"

524

587

525#: qml/Wizard/Pages/passwd-set.qml:68

588#: qml/Wizard/Pages/passwd-set.qml:68

526msgid "Passphrase must be 4 characters long"

589msgid "Passphrase must be 4 characters long"

527−msgstr ""

590+msgstr "La contrasenya ha de tenir 4 caràcters com a mínim"

528

591

529#: qml/Wizard/StackButton.qml:39

592#: qml/Wizard/StackButton.qml:39

530#, qt-format

593#, qt-format

531msgid "〈 %1"

594msgid "〈 %1"

532−msgstr ""

595+msgstr "〈 %1"

533

596

534#: qml/Wizard/StackButton.qml:42

597#: qml/Wizard/StackButton.qml:42

535#, qt-format

598#, qt-format

536msgid "%1 〉"

599msgid "%1 〉"

537−msgstr ""

600+msgstr "%1 〉"

538

601

539#~ msgid "Confirm"

602#~ msgid "Confirm"

540#~ msgstr "Confirma"

603#~ msgstr "Confirma"

@@ -551,6 +614,55 @@ msgstr ""

551#~ msgid "Speaking..."

614#~ msgid "Speaking..."

552#~ msgstr "S'està parlant..."

615#~ msgstr "S'està parlant..."

553

616

617+#~ msgid "Search"

618+#~ msgstr "Cerca"

619+

620+#~ msgid "Right edge"

621+#~ msgstr "Vora dreta"

622+

623+#~ msgid "Top edge"

624+#~ msgstr "Vora superior"

625+

626+#~ msgid "Well done"

627+#~ msgstr "Enhorabona!"

628+

629+#~ msgid "Left edge"

630+#~ msgstr "Vora esquerra"

631+

632+#~ msgid "Try swiping from the top edge to access the indicators"

633+#~ msgstr ""

634+#~ "Proveu de lliscar el dit des de la vora superior per accedir als indicadors"

635+

636+#~ msgid "Close"

637+#~ msgstr "Tanca"

638+

639+#~ msgid "Swipe up again to close the settings screen"

640+#~ msgstr ""

641+#~ "Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "

642+#~ "configuració"

643+

644+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

645+#~ msgstr ""

646+#~ "Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

647+#~ "ràpidament a les aplicacions"

648+

649+#~ msgid "Skip intro"

650+#~ msgstr "Omet la introducció"

651+

652+#~ msgid "Try swiping from the right edge to unlock the phone"

653+#~ msgstr ""

654+#~ "Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"

655+

656+#~ msgid ""

657+#~ "You have now mastered the edge gestures and can start using the "

658+#~ "phone<br><br>Tap on the screen to start"

659+#~ msgstr ""

660+#~ "Ja heu après com utilitzar els gestos de les vores per fer servir el "

661+#~ "telèfon<br><br>Feu un toc a la pantalla per començar"

662+

663+#~ msgid "Store"

664+#~ msgstr "Botiga"

665+

554#~ msgid "Done"

666#~ msgid "Done"

555#~ msgstr "Fet"

667#~ msgstr "Fet"

556

668

@@ -560,5 +672,26 @@ msgstr ""

560#~ msgid "All"

672#~ msgid "All"

561#~ msgstr "Totes"

673#~ msgstr "Totes"

562

674

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+

563#~ msgid "Manage Scopes"

696#~ msgid "Manage Scopes"

564#~ msgstr "Gestioneu les lents"

697#~ msgstr "Gestioneu les lents"

po/ca@valencia.po+332−199

@@ -1,24 +1,24 @@

1−# Catalan translation for unity8

1+# Catalan translation for unity

2−# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014

2+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013

3−# This file is distributed under the same license as the unity8 package.

3+# This file is distributed under the same license as the unity package.

4−# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.

5#

5#

6msgid ""

6msgid ""

7msgstr ""

7msgstr ""

8−"Project-Id-Version: unity8\n"

8+"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11−"PO-Revision-Date: 2014-11-23 07:17+0000\n"

11+"PO-Revision-Date: 2015-02-22 15:22+0000\n"

12−"Last-Translator: Pau Iranzo <Unknown>\n"

12+"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

13"Language-Team: Catalan <ca@li.org>\n"

13"Language-Team: Catalan <ca@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr "Contrasenya: "

23msgstr "Contrasenya: "

24

24

@@ -31,68 +31,95 @@ msgstr "Apega la drecera"

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Desenganxa la drecera"

32msgstr "Desenganxa la drecera"

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr "Dispositiu bloquejat"

36msgstr "Dispositiu bloquejat"

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

40msgstr ""

41"Se vos ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "

41"Se vos ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "

42"d'intents d'introducció de la contrasenya."

42"d'intents d'introducció de la contrasenya."

43

43

44−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

45msgid "You have been locked out due to too many failed passcode attempts."

45msgid "You have been locked out due to too many failed passcode attempts."

46msgstr ""

46msgstr ""

47"Se vos ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "

47"Se vos ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "

48"d'intents d'introducció del codi d'accés."

48"d'intents d'introducció del codi d'accés."

49

49

50−#: qml/Components/DelayedLockscreen.qml:72

50+#: qml/Components/DelayedLockscreen.qml:74

51#, qt-format

51#, qt-format

52msgid "Please wait %1 minute and then try again…"

52msgid "Please wait %1 minute and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

54msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."

54msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."

55msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."

55msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."

56

56

57−#: qml/Components/Dialogs.qml:70

57+#: qml/Components/Dialogs.qml:67

58+msgctxt "Title: Lock/Log out dialog"

58msgid "Log out"

59msgid "Log out"

59−msgstr "Ix"

60+msgstr ""

60

61

61−#: qml/Components/Dialogs.qml:71

62+#: qml/Components/Dialogs.qml:68

62msgid "Are you sure you want to log out?"

63msgid "Are you sure you want to log out?"

63msgstr "Segur que voleu eixir?"

64msgstr "Segur que voleu eixir?"

64

65

65−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66+#: qml/Components/Dialogs.qml:70

66−#: qml/Components/Dialogs.qml:122

67+msgctxt "Button: Lock the system"

67−msgid "No"

68+msgid "Lock"

68−msgstr "No"

69+msgstr ""

69

70

70−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71+#: qml/Components/Dialogs.qml:77

71−#: qml/Components/Dialogs.qml:129

72+msgctxt "Button: Log out from the system"

72−msgid "Yes"

73+msgid "Log Out"

73−msgstr "Sí"

74+msgstr ""

74

75

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"

76msgid "Shut down"

83msgid "Shut down"

77−msgstr "Apaga"

84+msgstr ""

78

85

79−#: qml/Components/Dialogs.qml:95

86+#: qml/Components/Dialogs.qml:97

80msgid "Are you sure you want to shut down?"

87msgid "Are you sure you want to shut down?"

81msgstr "Segur que voleu apagar?"

88msgstr "Segur que voleu apagar?"

82

89

83−#: qml/Components/Dialogs.qml:119

90+#: qml/Components/Dialogs.qml:99

91+msgctxt "Button: Reboot the system"

84msgid "Reboot"

92msgid "Reboot"

85−msgstr "Reinicia"

93+msgstr ""

86

94

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

88msgid "Are you sure you want to reboot?"

106msgid "Are you sure you want to reboot?"

89msgstr "Segur que voleu reiniciar?"

107msgstr "Segur que voleu reiniciar?"

90

108

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"

92msgid "Power"

119msgid "Power"

93−msgstr "Energia"

120+msgstr ""

94

121

95−#: qml/Components/Dialogs.qml:145

122+#: qml/Components/Dialogs.qml:151

96msgid ""

123msgid ""

97"Are you sure you would like\n"

124"Are you sure you would like\n"

98"to power off?"

125"to power off?"

@@ -100,75 +127,19 @@ msgstr ""

100"Segur que voleu\n"

127"Segur que voleu\n"

101"apagar?"

128"apagar?"

102

129

103−#: qml/Components/Dialogs.qml:147

130+#: qml/Components/Dialogs.qml:153

131+msgctxt "Button: Power off the system"

104msgid "Power off"

132msgid "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"

153msgstr ""

133msgstr ""

154−"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

155−"ràpidament a les aplicacions"

156

134

157−#: qml/Components/EdgeDemo.qml:242

135+#: qml/Components/Dialogs.qml:162

158−msgid "Well done"

136+msgctxt "Button: Restart the system"

159−msgstr "Enhorabona!"

137+msgid "Restart"

160−

161−#: qml/Components/EdgeDemo.qml:243

162−msgid ""

163−"You have now mastered the edge gestures and can start using the "

164−"phone<br><br>Tap on the screen to start"

165msgstr ""

138msgstr ""

166−"Ja heu aprés com utilitzar els gestos de les vores per fer servir el "

167−"telèfon<br><br>Feu un toc a la pantalla per començar"

168

139

169#: qml/Components/Lockscreen.qml:238

140#: qml/Components/Lockscreen.qml:238

170msgid "Return to Call"

141msgid "Return to Call"

171−msgstr "Torna a la trucada"

142+msgstr "Torna a la cridada"

172

143

173#: qml/Components/Lockscreen.qml:238

144#: qml/Components/Lockscreen.qml:238

174msgid "Emergency Call"

145msgid "Emergency Call"

@@ -178,32 +149,39 @@ msgstr "Cridada d'emergència"

178msgid "OK"

149msgid "OK"

179msgstr "D'acord"

150msgstr "D'acord"

180

151

181−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

182msgid "See less"

153msgid "See less"

183msgstr "Mostra'n menys"

154msgstr "Mostra'n menys"

184

155

185−#: qml/Dash/GenericScopeView.qml:431

156+#: qml/Dash/GenericScopeView.qml:533

186msgid "See all"

157msgid "See all"

187msgstr "Mostra-ho tot"

158msgstr "Mostra-ho tot"

188

159

189−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

160+#: qml/Dash/GenericScopeView.qml:595

190−#: qml/Panel/SearchIndicator.qml:27

161+msgctxt "Label: Hint for dash search line edit"

191msgid "Search"

162msgid "Search"

192−msgstr "Cerca"

163+msgstr ""

193

164

194−#: qml/Dash/PageHeader.qml:260

165+#: qml/Dash/PageHeader.qml:269

166+msgctxt "Button: Open the Ubuntu Store"

195msgid "Store"

167msgid "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 ""

197

174

198−#: qml/Dash/PageHeader.qml:277

175+#: qml/Dash/PageHeader.qml:286

176+msgctxt "Button: Show the current dash scope settings"

199msgid "Settings"

177msgid "Settings"

200−msgstr "Paràmetres"

178+msgstr ""

201

179

202−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

203msgid "Remove from Favorites"

181msgid "Remove from Favorites"

204msgstr "Suprimeix dels preferits"

182msgstr "Suprimeix dels preferits"

205

183

206−#: qml/Dash/PageHeader.qml:284

184+#: qml/Dash/PageHeader.qml:293

207msgid "Add to Favorites"

185msgid "Add to Favorites"

208msgstr "Afig als preferits"

186msgstr "Afig als preferits"

209

187

@@ -235,22 +213,94 @@ msgstr "Estireu per actualitzar..."

235msgid "Release to refresh…"

213msgid "Release to refresh…"

236msgstr "Deixeu anar per actualitzar..."

214msgstr "Deixeu anar per actualitzar..."

237

215

216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

217+msgid "Enable location data"

218+msgstr "Habilita les dades d'ubicació"

219+

238−#: qml/Dash/ScopesList.qml:63

220+#: qml/Dash/ScopesList.qml:66

239msgid "Manage"

221msgid "Manage"

240−msgstr ""

222+msgstr "Gestiona"

241

223

242−#: qml/Dash/ScopesList.qml:107

224+#: qml/Dash/ScopesList.qml:112

243msgid "Home"

225msgid "Home"

244−msgstr ""

226+msgstr "Inici"

245

227

246−#: qml/Dash/ScopesList.qml:108

228+#: qml/Dash/ScopesList.qml:113

247msgid "Also installed"

229msgid "Also installed"

248−msgstr ""

230+msgstr "També instal·lat"

249

231

250−#: qml/Greeter/Greeter.qml:174

232+#: qml/Greeter/CoverPage.qml:107

251msgid "Unlock"

233msgid "Unlock"

252msgstr "Desbloca"

234msgstr "Desbloca"

253

235

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+

254#: qml/Notifications/NotificationMenuItemFactory.qml:128

304#: qml/Notifications/NotificationMenuItemFactory.qml:128

255msgid "Show password"

305msgid "Show password"

256msgstr "Mostra la contrasenya"

306msgstr "Mostra la contrasenya"

@@ -291,6 +341,11 @@ msgstr "S'ha finalitzat"

291msgid "Failed, tap to retry"

341msgid "Failed, tap to retry"

292msgstr "Ha fallat, feu un toc per tornar-ho a intentar"

342msgstr "Ha fallat, feu un toc per tornar-ho a intentar"

293

343

344+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

345+msgctxt "Label: Hint in message indicator line edit"

346+msgid "Reply"

347+msgstr ""

348+

294#: qml/Panel/Indicators/ModemInfoItem.qml:105

349#: qml/Panel/Indicators/ModemInfoItem.qml:105

295msgid "Unlock SIM"

350msgid "Unlock SIM"

296msgstr "Desbloca la SIM"

351msgstr "Desbloca la SIM"

@@ -299,160 +354,161 @@ msgstr "Desbloca la SIM"

299msgid "Roaming"

354msgid "Roaming"

300msgstr "Itinerància"

355msgstr "Itinerància"

301

356

302−#: qml/Shell.qml:367

357+#: qml/Tutorial/TutorialBottomFinish.qml:24

303−#, qt-format

358+msgid "This action does different things for different apps"

304−msgid "Enter %1"

305−msgstr "Introduïu: %1"

359+msgstr ""

306

360

307−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

361+#: qml/Tutorial/TutorialBottomFinish.qml:25

308−msgid "Enter passphrase"

362+msgid "Tap here to finish."

309−msgstr "Introduïu la contrasenya"

363+msgstr ""

310

364

311−#: qml/Shell.qml:369

365+#: qml/Tutorial/TutorialBottom.qml:28

312−msgid "Enter passcode"

366+msgid "Open special menus"

313−msgstr "Introduïu el codi d'accés"

367+msgstr ""

314

368

315−#: qml/Shell.qml:370

369+#: qml/Tutorial/TutorialBottom.qml:29

316−#, qt-format

370+msgid "Swipe up from the bottom edge."

317−msgid "Sorry, incorrect %1"

318−msgstr "Incorrecte (%1)"

371+msgstr ""

319

372

320−#: qml/Shell.qml:371

373+#: qml/Tutorial/TutorialLeftFinish.qml:24

321−msgid "Sorry, incorrect passphrase"

374+msgid "These are the shortcuts to favorite apps"

322−msgstr "La contrasenya no és correcta"

375+msgstr ""

323

376

324−#: qml/Shell.qml:372

377+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

325−msgid "Please re-enter"

378+msgid "Tap here to continue."

326−msgstr "Torneu-ho a introduir"

379+msgstr ""

327

380

328−#: qml/Shell.qml:373

381+#: qml/Tutorial/TutorialLeft.qml:26

329−msgid "Sorry, incorrect passcode"

382+msgid "Open the launcher"

330−msgstr "El codi d'accés no és correcte"

383+msgstr ""

331

384

332−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

385+#: qml/Tutorial/TutorialLeft.qml:27

333−msgid "Sorry, incorrect passphrase."

386+msgid "Short swipe from the left edge."

334−msgstr "La contrasenya és incorrecta"

387+msgstr ""

335

388

336−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

389+#: qml/Tutorial/TutorialPage.qml:178

337−msgid "Sorry, incorrect passcode."

390+msgid "You almost got it!"

338−msgstr "El codi d'accés no és correcte"

391+msgstr ""

339

392

340−#: qml/Shell.qml:469

393+#: qml/Tutorial/TutorialPage.qml:195

341−msgid "This will be your last attempt."

394+msgid "Try again."

342−msgstr "Este serà el darrer intent."

395+msgstr ""

343

396

344−#: qml/Shell.qml:471

397+#: qml/Tutorial/TutorialRight.qml:31

345−msgid ""

398+msgid "To view open apps"

346−"If passphrase is entered incorrectly, your phone will conduct a factory "

347−"reset and all personal data will be deleted."

348msgstr ""

399msgstr ""

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."

352

400

353−#: qml/Shell.qml:472

401+#: qml/Tutorial/TutorialRight.qml:32

354−msgid ""

402+msgid "Long swipe from the right edge."

355−"If passcode is entered incorrectly, your phone will conduct a factory reset "

403+msgstr ""

356−"and all personal data will be deleted."

404+

405+#: qml/Tutorial/TutorialRight.qml:122

406+msgid "View all your running tasks."

357msgstr ""

407msgstr ""

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."

361

408

362#: qml/Wizard/Page.qml:89

409#: qml/Wizard/Page.qml:89

410+msgctxt "Button: Go back one page in the Wizard"

363msgid "Back"

411msgid "Back"

364msgstr ""

412msgstr ""

365

413

366#: qml/Wizard/Pages/10-welcome.qml:27

414#: qml/Wizard/Pages/10-welcome.qml:27

367msgid "Hi!"

415msgid "Hi!"

368−msgstr ""

416+msgstr "Hola!"

369

417

370#: qml/Wizard/Pages/10-welcome.qml:44

418#: qml/Wizard/Pages/10-welcome.qml:44

371msgid "Welcome to your Ubuntu phone."

419msgid "Welcome to your Ubuntu phone."

372−msgstr ""

420+msgstr "Vos donem la benvinguda al vostre telèfon Ubuntu."

373

421

374#: qml/Wizard/Pages/10-welcome.qml:52

422#: qml/Wizard/Pages/10-welcome.qml:52

375msgid "Let’s get started."

423msgid "Let’s get started."

376−msgstr ""

424+msgstr "Comencem."

377

425

378#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

426#: 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

380#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

428#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

381#: qml/Wizard/Pages/passwd-set.qml:90

429#: qml/Wizard/Pages/passwd-set.qml:90

382msgid "Continue"

430msgid "Continue"

383−msgstr ""

431+msgstr "Continua"

384

432

385#: qml/Wizard/Pages/20-sim.qml:25

433#: qml/Wizard/Pages/20-sim.qml:25

386msgid "Add a SIM card and restart your device"

434msgid "Add a SIM card and restart your device"

387−msgstr ""

435+msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"

388

436

389−#: qml/Wizard/Pages/20-sim.qml:55

437+#: qml/Wizard/Pages/20-sim.qml:59

390msgid "Without it, you won’t be able to make calls or use text messaging."

438msgid "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."

392

440

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

394msgid "Skip"

442msgid "Skip"

395−msgstr ""

443+msgstr "Omet"

396

444

397#: qml/Wizard/Pages/30-passwd-type.qml:39

445#: qml/Wizard/Pages/30-passwd-type.qml:39

398msgid "Lock security"

446msgid "Lock security"

399−msgstr ""

447+msgstr "Seguretat del bloqueig"

400

448

401#: qml/Wizard/Pages/30-passwd-type.qml:74

449#: qml/Wizard/Pages/30-passwd-type.qml:74

402msgid "Please select how you’d like to unlock your phone."

450msgid "Please select how you’d like to unlock your phone."

403−msgstr ""

451+msgstr "Seleccioneu com voleu desblocar el telèfon."

404

452

405#: qml/Wizard/Pages/30-passwd-type.qml:97

453#: qml/Wizard/Pages/30-passwd-type.qml:97

454+msgctxt "Label: Type of security method"

406msgid "Swipe"

455msgid "Swipe"

407msgstr ""

456msgstr ""

408

457

409#: qml/Wizard/Pages/30-passwd-type.qml:98

458#: qml/Wizard/Pages/30-passwd-type.qml:98

459+msgctxt "Label: Description of security method"

410msgid "No security"

460msgid "No security"

411msgstr ""

461msgstr ""

412

462

413#: qml/Wizard/Pages/30-passwd-type.qml:100

463#: qml/Wizard/Pages/30-passwd-type.qml:100

464+msgctxt "Label: Type of security method"

414msgid "Passcode"

465msgid "Passcode"

415msgstr ""

466msgstr ""

416

467

417#: qml/Wizard/Pages/30-passwd-type.qml:101

468#: qml/Wizard/Pages/30-passwd-type.qml:101

469+msgctxt "Label: Description of security method"

418msgid "4 digits only"

470msgid "4 digits only"

419msgstr ""

471msgstr ""

420

472

421#: qml/Wizard/Pages/30-passwd-type.qml:103

473#: qml/Wizard/Pages/30-passwd-type.qml:103

474+msgctxt "Label: Type of security method"

422msgid "Passphrase"

475msgid "Passphrase"

423msgstr ""

476msgstr ""

424

477

425#: qml/Wizard/Pages/30-passwd-type.qml:104

478#: qml/Wizard/Pages/30-passwd-type.qml:104

479+msgctxt "Label: Description of security method"

426msgid "Numbers and letters"

480msgid "Numbers and letters"

427msgstr ""

481msgstr ""

428

482

429−#: qml/Wizard/Pages/40-wifi.qml:28

483+#: qml/Wizard/Pages/40-wifi.qml:29

430msgid "Connect to Wi‑Fi"

484msgid "Connect to Wi‑Fi"

431−msgstr ""

485+msgstr "Connecta't a la Wi-Fi"

432

486

433−#: qml/Wizard/Pages/40-wifi.qml:147

487+#: qml/Wizard/Pages/40-wifi.qml:168

434msgid "Available networks…"

488msgid "Available networks…"

435−msgstr ""

489+msgstr "Xarxes disponibles..."

436

490

437−#: qml/Wizard/Pages/40-wifi.qml:148

491+#: qml/Wizard/Pages/40-wifi.qml:169

438msgid "No available networks."

492msgid "No available networks."

439−msgstr ""

493+msgstr "No hi ha xarxes disponibles"

440

494

441#: qml/Wizard/Pages/50-location.qml:27

495#: qml/Wizard/Pages/50-location.qml:27

442msgid "Location"

496msgid "Location"

443−msgstr ""

497+msgstr "Ubicació"

444

498

445#: qml/Wizard/Pages/50-location.qml:62

499#: qml/Wizard/Pages/50-location.qml:62

446msgid "Let the phone detect your location:"

500msgid "Let the phone detect your location:"

447−msgstr ""

501+msgstr "Fes que el telèfon detecti la meua ubicació:"

448

502

449#: qml/Wizard/Pages/50-location.qml:69

503#: qml/Wizard/Pages/50-location.qml:69

450msgid "Using GPS only (less accurate)"

504msgid "Using GPS only (less accurate)"

451−msgstr ""

505+msgstr "Utilitza només el GPS (menys precís)"

452

506

453#: qml/Wizard/Pages/50-location.qml:86

507#: qml/Wizard/Pages/50-location.qml:86

454msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

508msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

455msgstr ""

509msgstr ""

510+"Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "

511+"(recomanat)"

456

512

457#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

513#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

458#: qml/Wizard/Pages/50-location.qml:103

514#: qml/Wizard/Pages/50-location.qml:103

@@ -460,81 +516,148 @@ msgid ""

460"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

516"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

461"conditions</a>."

517"conditions</a>."

462msgstr ""

518msgstr ""

519+"Si seleccioneu esta opció, accepteu <a href='#'>les condicions generals del "

520+"servei Nokia HERE</a>."

463

521

464#: qml/Wizard/Pages/50-location.qml:112

522#: qml/Wizard/Pages/50-location.qml:112

465msgid "Not at all"

523msgid "Not at all"

466−msgstr ""

524+msgstr "No"

467

525

468#: qml/Wizard/Pages/50-location.qml:124

526#: qml/Wizard/Pages/50-location.qml:124

469msgid "You can change your mind later in <b>System Settings</b>."

527msgid "You can change your mind later in <b>System Settings</b>."

470msgstr ""

528msgstr ""

529+"Podeu canviar-ho més avant a l'aplicació <b>Paràmetres del sistema</b>"

471

530

472#: qml/Wizard/Pages/60-reporting.qml:24

531#: qml/Wizard/Pages/60-reporting.qml:24

473msgid "Improving your experience"

532msgid "Improving your experience"

474−msgstr ""

533+msgstr "Millora de l'experiència"

475

534

476#: qml/Wizard/Pages/60-reporting.qml:36

535#: qml/Wizard/Pages/60-reporting.qml:36

477msgid ""

536msgid ""

478"Your phone is set up to automatically report errors to Canonical and its "

537"Your phone is set up to automatically report errors to Canonical and its "

479"partners, the makers of the operating system."

538"partners, the makers of the operating system."

480msgstr ""

539msgstr ""

540+"Este telèfon està configurat per enviar errors de manera automàtica a "

541+"Canonical i associats, els creadors del sistema operatiu."

481

542

482#: qml/Wizard/Pages/60-reporting.qml:43

543#: qml/Wizard/Pages/60-reporting.qml:43

483msgid ""

544msgid ""

484"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

545"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

485"Privacy</b>"

546"Privacy</b>"

486msgstr ""

547msgstr ""

548+"Podeu inhabilitar-ho a <b>Configuració del sistema</b>, a la secció "

549+"<b>Seguretat i privadesa</b>"

487

550

488#: qml/Wizard/Pages/80-finished.qml:24

551#: qml/Wizard/Pages/80-finished.qml:24

489msgid "All done"

552msgid "All done"

490−msgstr ""

553+msgstr "Tot fet"

491

554

492#: qml/Wizard/Pages/80-finished.qml:39

555#: qml/Wizard/Pages/80-finished.qml:39

493msgid "Nice work!"

556msgid "Nice work!"

494−msgstr ""

557+msgstr "Bona faena!"

495

558

496#: qml/Wizard/Pages/80-finished.qml:46

559#: qml/Wizard/Pages/80-finished.qml:46

497msgid "Your phone is now ready to use."

560msgid "Your phone is now ready to use."

498−msgstr ""

561+msgstr "Ja podeu utilitzar el vostre telèfon."

499

562

500#: qml/Wizard/Pages/80-finished.qml:53

563#: qml/Wizard/Pages/80-finished.qml:53

501msgid "Finish"

564msgid "Finish"

502−msgstr ""

565+msgstr "Finalitza"

503

566

504#: qml/Wizard/Pages/here-terms.qml:27

567#: qml/Wizard/Pages/here-terms.qml:27

505msgid "Terms & Conditions"

568msgid "Terms & Conditions"

506−msgstr ""

569+msgstr "Condicions generals"

507

570

508#: qml/Wizard/Pages/passwd-confirm.qml:49

571#: qml/Wizard/Pages/passwd-confirm.qml:49

509msgid "Confirm passphrase"

572msgid "Confirm passphrase"

510−msgstr ""

573+msgstr "Confirmeu la contrasenya"

511

574

512#: qml/Wizard/Pages/passwd-confirm.qml:50

575#: qml/Wizard/Pages/passwd-confirm.qml:50

513msgid "Confirm passcode"

576msgid "Confirm passcode"

514−msgstr ""

577+msgstr "Confirmeu el codi d'accés"

515

578

516#: qml/Wizard/Pages/passwd-confirm.qml:53

579#: qml/Wizard/Pages/passwd-confirm.qml:53

517#: qml/Wizard/Pages/passwd-confirm.qml:54

580#: qml/Wizard/Pages/passwd-confirm.qml:54

518msgid "Please try again."

581msgid "Please try again."

519−msgstr ""

582+msgstr "Torneu-ho a intentar."

520

583

521#: qml/Wizard/Pages/passwd-set.qml:61

584#: qml/Wizard/Pages/passwd-set.qml:61

522msgid "Choose your passcode"

585msgid "Choose your passcode"

523−msgstr ""

586+msgstr "Trieu el codi d'accés"

524

587

525#: qml/Wizard/Pages/passwd-set.qml:68

588#: qml/Wizard/Pages/passwd-set.qml:68

526msgid "Passphrase must be 4 characters long"

589msgid "Passphrase must be 4 characters long"

527−msgstr ""

590+msgstr "La contrasenya ha de tindre 4 caràcters com a mínim"

528

591

529#: qml/Wizard/StackButton.qml:39

592#: qml/Wizard/StackButton.qml:39

530#, qt-format

593#, qt-format

531msgid "〈 %1"

594msgid "〈 %1"

532−msgstr ""

595+msgstr "〈 %1"

533

596

534#: qml/Wizard/StackButton.qml:42

597#: qml/Wizard/StackButton.qml:42

535#, qt-format

598#, qt-format

536msgid "%1 〉"

599msgid "%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"

538

661

539#~ msgid "Manage Scopes"

662#~ msgid "Manage Scopes"

540#~ msgstr "Gestioneu les lents"

663#~ msgstr "Gestioneu les lents"

@@ -542,6 +665,9 @@ msgstr ""

542#~ msgid "Done"

665#~ msgid "Done"

543#~ msgstr "Fet"

666#~ msgstr "Fet"

544

667

668+#~ msgid "Store"

669+#~ msgstr "Botiga"

670+

545#~ msgid "Favorites"

671#~ msgid "Favorites"

546#~ msgstr "Preferides"

672#~ msgstr "Preferides"

547

673

@@ -551,9 +677,6 @@ msgstr ""

551#~ msgid "Confirm"

677#~ msgid "Confirm"

552#~ msgstr "Confirma"

678#~ msgstr "Confirma"

553

679

554−#~ msgid "Type or say a command"

555−#~ msgstr "Escriviu o pronuncieu una orde"

556−

557#~ msgid "Loading. Please Wait..."

680#~ msgid "Loading. Please Wait..."

558#~ msgstr "S'està carregant. Espereu-vos un moment..."

681#~ msgstr "S'està carregant. Espereu-vos un moment..."

559

682

@@ -562,3 +685,13 @@ msgstr ""

562

685

563#~ msgid "Speaking..."

686#~ msgid "Speaking..."

564#~ msgstr "S'està parlant..."

687#~ msgstr "S'està parlant..."

688+

689+#~ msgid "Type or say a command"

690+#~ msgstr "Escriviu o pronuncieu una ordre"

691+

692+#~ msgid ""

693+#~ "You have now mastered the edge gestures and can start using the "

694+#~ "phone<br><br>Tap on the screen to start"

695+#~ msgstr ""

696+#~ "Ja heu après com utilitzar els gestos de les vores per fer servir el "

697+#~ "telèfon<br><br>Feu un toc a la pantalla per començar"

po/ce.ponew file+579

@@ -0,0 +1,579 @@

1+# Chechen translation for unity8

2+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.

5+#

6+msgid ""

7+msgstr ""

8+"Project-Id-Version: unity8\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"

11+"PO-Revision-Date: 2015-02-15 04:01+0000\n"

12+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13+"Language-Team: Chechen <ce@li.org>\n"

14+"MIME-Version: 1.0\n"

15+"Content-Type: text/plain; charset=UTF-8\n"

16+"Content-Transfer-Encoding: 8bit\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19+"X-Generator: Launchpad (build 17413)\n"

20+

21+#: plugins/LightDM/Greeter.cpp:112

22+msgid "Password: "

23+msgstr ""

24+

25+#: plugins/Unity/Launcher/launcheritem.cpp:45

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27+msgid "Pin shortcut"

28+msgstr ""

29+

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31+msgid "Unpin shortcut"

32+msgstr ""

33+

34+#: qml/Components/DelayedLockscreen.qml:49

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:64

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:65

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:74

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

55+msgid "Log out"

56+msgstr ""

57+

58+#: qml/Components/Dialogs.qml:68

59+msgid "Are you sure you want to log out?"

60+msgstr ""

61+

62+#: qml/Components/Dialogs.qml:70

63+msgctxt "Button: Lock the system"

64+msgid "Lock"

65+msgstr ""

66+

67+#: qml/Components/Dialogs.qml:77

68+msgctxt "Button: Log out from the system"

69+msgid "Log Out"

70+msgstr ""

71+

72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115

73+#: qml/Components/Dialogs.qml:171

74+msgid "Cancel"

75+msgstr ""

76+

77+#: qml/Components/Dialogs.qml:96

78+msgctxt "Title: Reboot/Shut down dialog"

79+msgid "Shut down"

80+msgstr ""

81+

82+#: qml/Components/Dialogs.qml:97

83+msgid "Are you sure you want to shut down?"

84+msgstr ""

85+

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

88+msgid "Reboot"

89+msgstr ""

90+

91+#: qml/Components/Dialogs.qml:107

92+msgctxt "Button: Shut down the system"

93+msgid "Shut down"

94+msgstr ""

95+

96+#: qml/Components/Dialogs.qml:127

97+msgctxt "Title: Reboot dialog"

98+msgid "Reboot"

99+msgstr ""

100+

101+#: qml/Components/Dialogs.qml:128

102+msgid "Are you sure you want to reboot?"

103+msgstr ""

104+

105+#: qml/Components/Dialogs.qml:130

106+msgid "No"

107+msgstr ""

108+

109+#: qml/Components/Dialogs.qml:136

110+msgid "Yes"

111+msgstr ""

112+

113+#: qml/Components/Dialogs.qml:150

114+msgctxt "Title: Power off/Restart dialog"

115+msgid "Power"

116+msgstr ""

117+

118+#: qml/Components/Dialogs.qml:151

119+msgid ""

120+"Are you sure you would like\n"

121+"to power off?"

122+msgstr ""

123+

124+#: qml/Components/Dialogs.qml:153

125+msgctxt "Button: Power off the system"

126+msgid "Power off"

127+msgstr ""

128+

129+#: qml/Components/Dialogs.qml:162

130+msgctxt "Button: Restart the system"

131+msgid "Restart"

132+msgstr ""

133+

134+#: qml/Components/Lockscreen.qml:238

135+msgid "Return to Call"

136+msgstr ""

137+

138+#: qml/Components/Lockscreen.qml:238

139+msgid "Emergency Call"

140+msgstr ""

141+

142+#: qml/Components/Lockscreen.qml:270

143+msgid "OK"

144+msgstr ""

145+

146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

147+msgid "See less"

148+msgstr ""

149+

150+#: qml/Dash/GenericScopeView.qml:533

151+msgid "See all"

152+msgstr ""

153+

154+#: qml/Dash/GenericScopeView.qml:595

155+msgctxt "Label: Hint for dash search line edit"

156+msgid "Search"

157+msgstr ""

158+

159+#: qml/Dash/PageHeader.qml:269

160+msgctxt "Button: Open the Ubuntu Store"

161+msgid "Store"

162+msgstr ""

163+

164+#: qml/Dash/PageHeader.qml:276

165+msgctxt "Button: Start a search in the current dash scope"

166+msgid "Search"

167+msgstr ""

168+

169+#: qml/Dash/PageHeader.qml:286

170+msgctxt "Button: Show the current dash scope settings"

171+msgid "Settings"

172+msgstr ""

173+

174+#: qml/Dash/PageHeader.qml:293

175+msgid "Remove from Favorites"

176+msgstr ""

177+

178+#: qml/Dash/PageHeader.qml:293

179+msgid "Add to Favorites"

180+msgstr ""

181+

182+#: qml/Dash/Previews/PreviewActionCombo.qml:35

183+msgid "More..."

184+msgstr ""

185+

186+#: qml/Dash/Previews/PreviewActionCombo.qml:35

187+msgid "Less..."

188+msgstr ""

189+

190+#: qml/Dash/Previews/PreviewRatingInput.qml:81

191+msgid "Rate this"

192+msgstr ""

193+

194+#: qml/Dash/Previews/PreviewRatingInput.qml:126

195+msgid "Add a review"

196+msgstr ""

197+

198+#: qml/Dash/Previews/PreviewRatingInput.qml:166

199+msgid "Send"

200+msgstr ""

201+

202+#: qml/Dash/PullToRefreshScopeStyle.qml:55

203+msgid "Pull to refresh…"

204+msgstr ""

205+

206+#: qml/Dash/PullToRefreshScopeStyle.qml:60

207+msgid "Release to refresh…"

208+msgstr ""

209+

210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

211+msgid "Enable location data"

212+msgstr ""

213+

214+#: qml/Dash/ScopesList.qml:66

215+msgid "Manage"

216+msgstr ""

217+

218+#: qml/Dash/ScopesList.qml:112

219+msgid "Home"

220+msgstr ""

221+

222+#: qml/Dash/ScopesList.qml:113

223+msgid "Also installed"

224+msgstr ""

225+

226+#: qml/Greeter/CoverPage.qml:107

227+msgid "Unlock"

228+msgstr ""

229+

230+#: qml/Greeter/LoginList.qml:236

231+msgid "Retry"

232+msgstr ""

233+

234+#: qml/Greeter/LoginList.qml:237

235+msgid "Tap to unlock"

236+msgstr ""

237+

238+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53

239+msgid "Sorry, incorrect passphrase."

240+msgstr ""

241+

242+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54

243+msgid "Sorry, incorrect passcode."

244+msgstr ""

245+

246+#: qml/Greeter/NarrowView.qml:55

247+msgid "This will be your last attempt."

248+msgstr ""

249+

250+#: qml/Greeter/NarrowView.qml:57

251+msgid ""

252+"If passphrase is entered incorrectly, your phone will conduct a factory "

253+"reset and all personal data will be deleted."

254+msgstr ""

255+

256+#: qml/Greeter/NarrowView.qml:58

257+msgid ""

258+"If passcode is entered incorrectly, your phone will conduct a factory reset "

259+"and all personal data will be deleted."

260+msgstr ""

261+

262+#: qml/Greeter/NarrowView.qml:115

263+#, qt-format

264+msgid "Enter %1"

265+msgstr ""

266+

267+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60

268+msgid "Enter passphrase"

269+msgstr ""

270+

271+#: qml/Greeter/NarrowView.qml:117

272+msgid "Enter passcode"

273+msgstr ""

274+

275+#: qml/Greeter/NarrowView.qml:118

276+#, qt-format

277+msgid "Sorry, incorrect %1"

278+msgstr ""

279+

280+#: qml/Greeter/NarrowView.qml:119

281+msgid "Sorry, incorrect passphrase"

282+msgstr ""

283+

284+#: qml/Greeter/NarrowView.qml:120

285+msgid "Please re-enter"

286+msgstr ""

287+

288+#: qml/Greeter/NarrowView.qml:121

289+msgid "Sorry, incorrect passcode"

290+msgstr ""

291+

292+#: qml/Notifications/NotificationMenuItemFactory.qml:128

293+msgid "Show password"

294+msgstr ""

295+

296+#: qml/Panel/ActiveCallHint.qml:79

297+msgid "Tap to return to call..."

298+msgstr ""

299+

300+#: qml/Panel/ActiveCallHint.qml:92

301+msgid "Conference"

302+msgstr ""

303+

304+#: qml/Panel/Indicators/MenuItemFactory.qml:643

305+msgid "Nothing is playing"

306+msgstr ""

307+

308+#: qml/Panel/Indicators/MenuItemFactory.qml:791

309+msgid "In queue…"

310+msgstr ""

311+

312+#: qml/Panel/Indicators/MenuItemFactory.qml:795

313+msgid "Downloading"

314+msgstr ""

315+

316+#: qml/Panel/Indicators/MenuItemFactory.qml:797

317+msgid "Paused, tap to resume"

318+msgstr ""

319+

320+#: qml/Panel/Indicators/MenuItemFactory.qml:799

321+msgid "Canceled"

322+msgstr ""

323+

324+#: qml/Panel/Indicators/MenuItemFactory.qml:801

325+msgid "Finished"

326+msgstr ""

327+

328+#: qml/Panel/Indicators/MenuItemFactory.qml:803

329+msgid "Failed, tap to retry"

330+msgstr ""

331+

332+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

333+msgctxt "Label: Hint in message indicator line edit"

334+msgid "Reply"

335+msgstr ""

336+

337+#: qml/Panel/Indicators/ModemInfoItem.qml:105

338+msgid "Unlock SIM"

339+msgstr ""

340+

341+#: qml/Panel/Indicators/RoamingIndication.qml:27

342+msgid "Roaming"

343+msgstr ""

344+

345+#: qml/Tutorial/TutorialBottomFinish.qml:24

346+msgid "This action does different things for different apps"

347+msgstr ""

348+

349+#: qml/Tutorial/TutorialBottomFinish.qml:25

350+msgid "Tap here to finish."

351+msgstr ""

352+

353+#: qml/Tutorial/TutorialBottom.qml:28

354+msgid "Open special menus"

355+msgstr ""

356+

357+#: qml/Tutorial/TutorialBottom.qml:29

358+msgid "Swipe up from the bottom edge."

359+msgstr ""

360+

361+#: qml/Tutorial/TutorialLeftFinish.qml:24

362+msgid "These are the shortcuts to favorite apps"

363+msgstr ""

364+

365+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

366+msgid "Tap here to continue."

367+msgstr ""

368+

369+#: qml/Tutorial/TutorialLeft.qml:26

370+msgid "Open the launcher"

371+msgstr ""

372+

373+#: qml/Tutorial/TutorialLeft.qml:27

374+msgid "Short swipe from the left edge."

375+msgstr ""

376+

377+#: qml/Tutorial/TutorialPage.qml:178

378+msgid "You almost got it!"

379+msgstr ""

380+

381+#: qml/Tutorial/TutorialPage.qml:195

382+msgid "Try again."

383+msgstr ""

384+

385+#: qml/Tutorial/TutorialRight.qml:31

386+msgid "To view open apps"

387+msgstr ""

388+

389+#: qml/Tutorial/TutorialRight.qml:32

390+msgid "Long swipe from the right edge."

391+msgstr ""

392+

393+#: qml/Tutorial/TutorialRight.qml:122

394+msgid "View all your running tasks."

395+msgstr ""

396+

397+#: qml/Wizard/Page.qml:89

398+msgctxt "Button: Go back one page in the Wizard"

399+msgid "Back"

400+msgstr ""

401+

402+#: qml/Wizard/Pages/10-welcome.qml:27

403+msgid "Hi!"

404+msgstr ""

405+

406+#: qml/Wizard/Pages/10-welcome.qml:44

407+msgid "Welcome to your Ubuntu phone."

408+msgstr ""

409+

410+#: qml/Wizard/Pages/10-welcome.qml:52

411+msgid "Let’s get started."

412+msgstr ""

413+

414+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

415+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131

416+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

417+#: qml/Wizard/Pages/passwd-set.qml:90

418+msgid "Continue"

419+msgstr ""

420+

421+#: qml/Wizard/Pages/20-sim.qml:25

422+msgid "Add a SIM card and restart your device"

423+msgstr ""

424+

425+#: qml/Wizard/Pages/20-sim.qml:59

426+msgid "Without it, you won’t be able to make calls or use text messaging."

427+msgstr ""

428+

429+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

430+msgid "Skip"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/30-passwd-type.qml:39

434+msgid "Lock security"

435+msgstr ""

436+

437+#: qml/Wizard/Pages/30-passwd-type.qml:74

438+msgid "Please select how you’d like to unlock your phone."

439+msgstr ""

440+

441+#: qml/Wizard/Pages/30-passwd-type.qml:97

442+msgctxt "Label: Type of security method"

443+msgid "Swipe"

444+msgstr ""

445+

446+#: qml/Wizard/Pages/30-passwd-type.qml:98

447+msgctxt "Label: Description of security method"

448+msgid "No security"

449+msgstr ""

450+

451+#: qml/Wizard/Pages/30-passwd-type.qml:100

452+msgctxt "Label: Type of security method"

453+msgid "Passcode"

454+msgstr ""

455+

456+#: qml/Wizard/Pages/30-passwd-type.qml:101

457+msgctxt "Label: Description of security method"

458+msgid "4 digits only"

459+msgstr ""

460+

461+#: qml/Wizard/Pages/30-passwd-type.qml:103

462+msgctxt "Label: Type of security method"

463+msgid "Passphrase"

464+msgstr ""

465+

466+#: qml/Wizard/Pages/30-passwd-type.qml:104

467+msgctxt "Label: Description of security method"

468+msgid "Numbers and letters"

469+msgstr ""

470+

471+#: qml/Wizard/Pages/40-wifi.qml:29

472+msgid "Connect to Wi‑Fi"

473+msgstr ""

474+

475+#: qml/Wizard/Pages/40-wifi.qml:168

476+msgid "Available networks…"

477+msgstr ""

478+

479+#: qml/Wizard/Pages/40-wifi.qml:169

480+msgid "No available networks."

481+msgstr ""

482+

483+#: qml/Wizard/Pages/50-location.qml:27

484+msgid "Location"

485+msgstr ""

486+

487+#: qml/Wizard/Pages/50-location.qml:62

488+msgid "Let the phone detect your location:"

489+msgstr ""

490+

491+#: qml/Wizard/Pages/50-location.qml:69

492+msgid "Using GPS only (less accurate)"

493+msgstr ""

494+

495+#: qml/Wizard/Pages/50-location.qml:86

496+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

497+msgstr ""

498+

499+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

500+#: qml/Wizard/Pages/50-location.qml:103

501+msgid ""

502+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

503+"conditions</a>."

504+msgstr ""

505+

506+#: qml/Wizard/Pages/50-location.qml:112

507+msgid "Not at all"

508+msgstr ""

509+

510+#: qml/Wizard/Pages/50-location.qml:124

511+msgid "You can change your mind later in <b>System Settings</b>."

512+msgstr ""

513+

514+#: qml/Wizard/Pages/60-reporting.qml:24

515+msgid "Improving your experience"

516+msgstr ""

517+

518+#: qml/Wizard/Pages/60-reporting.qml:36

519+msgid ""

520+"Your phone is set up to automatically report errors to Canonical and its "

521+"partners, the makers of the operating system."

522+msgstr ""

523+

524+#: qml/Wizard/Pages/60-reporting.qml:43

525+msgid ""

526+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

527+"Privacy</b>"

528+msgstr ""

529+

530+#: qml/Wizard/Pages/80-finished.qml:24

531+msgid "All done"

532+msgstr ""

533+

534+#: qml/Wizard/Pages/80-finished.qml:39

535+msgid "Nice work!"

536+msgstr ""

537+

538+#: qml/Wizard/Pages/80-finished.qml:46

539+msgid "Your phone is now ready to use."

540+msgstr ""

541+

542+#: qml/Wizard/Pages/80-finished.qml:53

543+msgid "Finish"

544+msgstr ""

545+

546+#: qml/Wizard/Pages/here-terms.qml:27

547+msgid "Terms & Conditions"

548+msgstr ""

549+

550+#: qml/Wizard/Pages/passwd-confirm.qml:49

551+msgid "Confirm passphrase"

552+msgstr ""

553+

554+#: qml/Wizard/Pages/passwd-confirm.qml:50

555+msgid "Confirm passcode"

556+msgstr ""

557+

558+#: qml/Wizard/Pages/passwd-confirm.qml:53

559+#: qml/Wizard/Pages/passwd-confirm.qml:54

560+msgid "Please try again."

561+msgstr ""

562+

563+#: qml/Wizard/Pages/passwd-set.qml:61

564+msgid "Choose your passcode"

565+msgstr ""

566+

567+#: qml/Wizard/Pages/passwd-set.qml:68

568+msgid "Passphrase must be 4 characters long"

569+msgstr ""

570+

571+#: qml/Wizard/StackButton.qml:39

572+#, qt-format

573+msgid "〈 %1"

574+msgstr ""

575+

576+#: qml/Wizard/StackButton.qml:42

577+#, qt-format

578+msgid "%1 〉"

579+msgstr ""

po/ckb.po+218−123

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11"PO-Revision-Date: 2014-01-21 11:05+0000\n"

11"PO-Revision-Date: 2014-01-21 11:05+0000\n"

12"Last-Translator: Aras <aras.noori@gmail.com>\n"

12"Last-Translator: Aras <aras.noori@gmail.com>\n"

13"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"

13"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"

@@ -15,10 +15,10 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr ""

23msgstr ""

24

24

@@ -31,127 +31,106 @@ msgstr ""

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr ""

32msgstr ""

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr ""

36msgstr ""

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

40msgstr ""

41

41

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

43msgid "You have been locked out due to too many failed passcode attempts."

43msgid "You have been locked out due to too many failed passcode attempts."

44msgstr ""

44msgstr ""

45

45

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

47#, qt-format

47#, qt-format

48msgid "Please wait %1 minute and then try again…"

48msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] ""

50msgstr[0] ""

51msgstr[1] ""

51msgstr[1] ""

52

52

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

54msgid "Log out"

55msgid "Log out"

55msgstr ""

56msgstr ""

56

57

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

58msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

59msgstr ""

60msgstr ""

60

61

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:70

62−#: qml/Components/Dialogs.qml:122

63+msgctxt "Button: Lock the system"

63−msgid "No"

64+msgid "Lock"

64msgstr ""

65msgstr ""

65

66

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:77

67−#: qml/Components/Dialogs.qml:129

68+msgctxt "Button: Log out from the system"

68−msgid "Yes"

69+msgid "Log Out"

69msgstr ""

70msgstr ""

70

71

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"

72msgid "Shut down"

79msgid "Shut down"

73msgstr ""

80msgstr ""

74

81

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

76msgid "Are you sure you want to shut down?"

83msgid "Are you sure you want to shut down?"

77msgstr ""

84msgstr ""

78

85

79−#: qml/Components/Dialogs.qml:119

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

80msgid "Reboot"

88msgid "Reboot"

81msgstr ""

89msgstr ""

82

90

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

84msgid "Are you sure you want to reboot?"

102msgid "Are you sure you want to reboot?"

85msgstr ""

103msgstr ""

86

104

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"

88msgid "Power"

115msgid "Power"

89msgstr ""

116msgstr ""

90

117

91−#: qml/Components/Dialogs.qml:145

118+#: qml/Components/Dialogs.qml:151

92msgid ""

119msgid ""

93"Are you sure you would like\n"

120"Are you sure you would like\n"

94"to power off?"

121"to power off?"

95msgstr ""

122msgstr ""

96

123

97−#: qml/Components/Dialogs.qml:147

124+#: qml/Components/Dialogs.qml:153

125+msgctxt "Button: Power off the system"

98msgid "Power off"

126msgid "Power off"

99msgstr ""

127msgstr ""

100

128

101−#: qml/Components/Dialogs.qml:157

129+#: qml/Components/Dialogs.qml:162

130+msgctxt "Button: Restart the system"

102msgid "Restart"

131msgid "Restart"

103msgstr ""

132msgstr ""

104

133

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<br><br>Tap on the screen to start"

153−msgstr ""

154−

155#: qml/Components/Lockscreen.qml:238

134#: qml/Components/Lockscreen.qml:238

156msgid "Return to Call"

135msgid "Return to Call"

157msgstr ""

136msgstr ""

@@ -164,32 +143,39 @@ msgstr "هێڵی فریاگوزاری"

164msgid "OK"

143msgid "OK"

165msgstr ""

144msgstr ""

166

145

167−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

168msgid "See less"

147msgid "See less"

169msgstr ""

148msgstr ""

170

149

171−#: qml/Dash/GenericScopeView.qml:431

150+#: qml/Dash/GenericScopeView.qml:533

172msgid "See all"

151msgid "See all"

173msgstr ""

152msgstr ""

174

153

175−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

154+#: qml/Dash/GenericScopeView.qml:595

176−#: qml/Panel/SearchIndicator.qml:27

155+msgctxt "Label: Hint for dash search line edit"

177msgid "Search"

156msgid "Search"

178−msgstr "گەڕان"

157+msgstr ""

179

158

180−#: qml/Dash/PageHeader.qml:260

159+#: qml/Dash/PageHeader.qml:269

160+msgctxt "Button: Open the Ubuntu Store"

181msgid "Store"

161msgid "Store"

182msgstr ""

162msgstr ""

183

163

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"

185msgid "Settings"

171msgid "Settings"

186msgstr ""

172msgstr ""

187

173

188−#: qml/Dash/PageHeader.qml:284

174+#: qml/Dash/PageHeader.qml:293

189msgid "Remove from Favorites"

175msgid "Remove from Favorites"

190msgstr ""

176msgstr ""

191

177

192−#: qml/Dash/PageHeader.qml:284

178+#: qml/Dash/PageHeader.qml:293

193msgid "Add to Favorites"

179msgid "Add to Favorites"

194msgstr ""

180msgstr ""

195

181

@@ -221,22 +207,88 @@ msgstr ""

221msgid "Release to refresh…"

207msgid "Release to refresh…"

222msgstr ""

208msgstr ""

223

209

210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

211+msgid "Enable location data"

212+msgstr ""

213+

224−#: qml/Dash/ScopesList.qml:63

214+#: qml/Dash/ScopesList.qml:66

225msgid "Manage"

215msgid "Manage"

226msgstr ""

216msgstr ""

227

217

228−#: qml/Dash/ScopesList.qml:107

218+#: qml/Dash/ScopesList.qml:112

229msgid "Home"

219msgid "Home"

230msgstr ""

220msgstr ""

231

221

232−#: qml/Dash/ScopesList.qml:108

222+#: qml/Dash/ScopesList.qml:113

233msgid "Also installed"

223msgid "Also installed"

234msgstr ""

224msgstr ""

235

225

236−#: qml/Greeter/Greeter.qml:174

226+#: qml/Greeter/CoverPage.qml:107

237msgid "Unlock"

227msgid "Unlock"

238msgstr ""

228msgstr ""

239

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+

240#: qml/Notifications/NotificationMenuItemFactory.qml:128

292#: qml/Notifications/NotificationMenuItemFactory.qml:128

241msgid "Show password"

293msgid "Show password"

242msgstr "تێپەڕەوشە پیشان بدە"

294msgstr "تێپەڕەوشە پیشان بدە"

@@ -277,6 +329,11 @@ msgstr ""

277msgid "Failed, tap to retry"

329msgid "Failed, tap to retry"

278msgstr ""

330msgstr ""

279

331

332+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

333+msgctxt "Label: Hint in message indicator line edit"

334+msgid "Reply"

335+msgstr ""

336+

280#: qml/Panel/Indicators/ModemInfoItem.qml:105

337#: qml/Panel/Indicators/ModemInfoItem.qml:105

281msgid "Unlock SIM"

338msgid "Unlock SIM"

282msgstr ""

339msgstr ""

@@ -285,61 +342,60 @@ msgstr ""

285msgid "Roaming"

342msgid "Roaming"

286msgstr ""

343msgstr ""

287

344

288−#: qml/Shell.qml:367

345+#: qml/Tutorial/TutorialBottomFinish.qml:24

289−#, qt-format

346+msgid "This action does different things for different apps"

290−msgid "Enter %1"

291msgstr ""

347msgstr ""

292

348

293−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

349+#: qml/Tutorial/TutorialBottomFinish.qml:25

294−msgid "Enter passphrase"

350+msgid "Tap here to finish."

295msgstr ""

351msgstr ""

296

352

297−#: qml/Shell.qml:369

353+#: qml/Tutorial/TutorialBottom.qml:28

298−msgid "Enter passcode"

354+msgid "Open special menus"

299msgstr ""

355msgstr ""

300

356

301−#: qml/Shell.qml:370

357+#: qml/Tutorial/TutorialBottom.qml:29

302−#, qt-format

358+msgid "Swipe up from the bottom edge."

303−msgid "Sorry, incorrect %1"

304msgstr ""

359msgstr ""

305

360

306−#: qml/Shell.qml:371

361+#: qml/Tutorial/TutorialLeftFinish.qml:24

307−msgid "Sorry, incorrect passphrase"

362+msgid "These are the shortcuts to favorite apps"

308msgstr ""

363msgstr ""

309

364

310−#: qml/Shell.qml:372

365+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

311−msgid "Please re-enter"

366+msgid "Tap here to continue."

312msgstr ""

367msgstr ""

313

368

314−#: qml/Shell.qml:373

369+#: qml/Tutorial/TutorialLeft.qml:26

315−msgid "Sorry, incorrect passcode"

370+msgid "Open the launcher"

316msgstr ""

371msgstr ""

317

372

318−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

373+#: qml/Tutorial/TutorialLeft.qml:27

319−msgid "Sorry, incorrect passphrase."

374+msgid "Short swipe from the left edge."

320msgstr ""

375msgstr ""

321

376

322−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

377+#: qml/Tutorial/TutorialPage.qml:178

323−msgid "Sorry, incorrect passcode."

378+msgid "You almost got it!"

324msgstr ""

379msgstr ""

325

380

326−#: qml/Shell.qml:469

381+#: qml/Tutorial/TutorialPage.qml:195

327−msgid "This will be your last attempt."

382+msgid "Try again."

328msgstr ""

383msgstr ""

329

384

330−#: qml/Shell.qml:471

385+#: qml/Tutorial/TutorialRight.qml:31

331−msgid ""

386+msgid "To view open apps"

332−"If passphrase is entered incorrectly, your phone will conduct a factory "

333−"reset and all personal data will be deleted."

334msgstr ""

387msgstr ""

335

388

336−#: qml/Shell.qml:472

389+#: qml/Tutorial/TutorialRight.qml:32

337−msgid ""

390+msgid "Long swipe from the right edge."

338−"If passcode is entered incorrectly, your phone will conduct a factory reset "

391+msgstr ""

339−"and all personal data will be deleted."

392+

393+#: qml/Tutorial/TutorialRight.qml:122

394+msgid "View all your running tasks."

340msgstr ""

395msgstr ""

341

396

342#: qml/Wizard/Page.qml:89

397#: qml/Wizard/Page.qml:89

398+msgctxt "Button: Go back one page in the Wizard"

343msgid "Back"

399msgid "Back"

344msgstr ""

400msgstr ""

345

401

@@ -356,7 +412,7 @@ msgid "Let’s get started."

356msgstr ""

412msgstr ""

357

413

358#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

414#: 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

360#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

416#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

361#: qml/Wizard/Pages/passwd-set.qml:90

417#: qml/Wizard/Pages/passwd-set.qml:90

362msgid "Continue"

418msgid "Continue"

@@ -366,11 +422,11 @@ msgstr ""

366msgid "Add a SIM card and restart your device"

422msgid "Add a SIM card and restart your device"

367msgstr ""

423msgstr ""

368

424

369−#: qml/Wizard/Pages/20-sim.qml:55

425+#: qml/Wizard/Pages/20-sim.qml:59

370msgid "Without it, you won’t be able to make calls or use text messaging."

426msgid "Without it, you won’t be able to make calls or use text messaging."

371msgstr ""

427msgstr ""

372

428

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

374msgid "Skip"

430msgid "Skip"

375msgstr ""

431msgstr ""

376

432

@@ -383,38 +439,44 @@ msgid "Please select how you’d like to unlock your phone."

383msgstr ""

439msgstr ""

384

440

385#: qml/Wizard/Pages/30-passwd-type.qml:97

441#: qml/Wizard/Pages/30-passwd-type.qml:97

442+msgctxt "Label: Type of security method"

386msgid "Swipe"

443msgid "Swipe"

387msgstr ""

444msgstr ""

388

445

389#: qml/Wizard/Pages/30-passwd-type.qml:98

446#: qml/Wizard/Pages/30-passwd-type.qml:98

447+msgctxt "Label: Description of security method"

390msgid "No security"

448msgid "No security"

391msgstr ""

449msgstr ""

392

450

393#: qml/Wizard/Pages/30-passwd-type.qml:100

451#: qml/Wizard/Pages/30-passwd-type.qml:100

452+msgctxt "Label: Type of security method"

394msgid "Passcode"

453msgid "Passcode"

395msgstr ""

454msgstr ""

396

455

397#: qml/Wizard/Pages/30-passwd-type.qml:101

456#: qml/Wizard/Pages/30-passwd-type.qml:101

457+msgctxt "Label: Description of security method"

398msgid "4 digits only"

458msgid "4 digits only"

399msgstr ""

459msgstr ""

400

460

401#: qml/Wizard/Pages/30-passwd-type.qml:103

461#: qml/Wizard/Pages/30-passwd-type.qml:103

462+msgctxt "Label: Type of security method"

402msgid "Passphrase"

463msgid "Passphrase"

403msgstr ""

464msgstr ""

404

465

405#: qml/Wizard/Pages/30-passwd-type.qml:104

466#: qml/Wizard/Pages/30-passwd-type.qml:104

467+msgctxt "Label: Description of security method"

406msgid "Numbers and letters"

468msgid "Numbers and letters"

407msgstr ""

469msgstr ""

408

470

409−#: qml/Wizard/Pages/40-wifi.qml:28

471+#: qml/Wizard/Pages/40-wifi.qml:29

410msgid "Connect to Wi‑Fi"

472msgid "Connect to Wi‑Fi"

411msgstr ""

473msgstr ""

412

474

413−#: qml/Wizard/Pages/40-wifi.qml:147

475+#: qml/Wizard/Pages/40-wifi.qml:168

414msgid "Available networks…"

476msgid "Available networks…"

415msgstr ""

477msgstr ""

416

478

417−#: qml/Wizard/Pages/40-wifi.qml:148

479+#: qml/Wizard/Pages/40-wifi.qml:169

418msgid "No available networks."

480msgid "No available networks."

419msgstr ""

481msgstr ""

420

482

@@ -516,6 +578,27 @@ msgstr ""

516msgid "%1 〉"

578msgid "%1 〉"

517msgstr ""

579msgstr ""

518

580

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+

519#~ msgid "Speaking..."

602#~ msgid "Speaking..."

520#~ msgstr "قسە دەکات..."

603#~ msgstr "قسە دەکات..."

521

604

@@ -525,6 +608,18 @@ msgstr ""

525#~ msgid "Confirm"

608#~ msgid "Confirm"

526#~ msgstr "پشتڕاستکردنەوە"

609#~ msgstr "پشتڕاستکردنەوە"

527

610

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+

528#~ msgid "Type or say a command"

623#~ msgid "Type or say a command"

529#~ msgstr "فەرمانێک بێژە یان بنووسە"

624#~ msgstr "فەرمانێک بێژە یان بنووسە"

530

625

po/cs.po+218−123

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11"PO-Revision-Date: 2014-01-08 10:11+0000\n"

11"PO-Revision-Date: 2014-01-08 10:11+0000\n"

12"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"

12"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"

13"Language-Team: Czech <cs@li.org>\n"

13"Language-Team: Czech <cs@li.org>\n"

@@ -15,10 +15,10 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

17"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"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr ""

23msgstr ""

24

24

@@ -31,127 +31,106 @@ msgstr ""

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr ""

32msgstr ""

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr ""

36msgstr ""

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

40msgstr ""

41

41

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

43msgid "You have been locked out due to too many failed passcode attempts."

43msgid "You have been locked out due to too many failed passcode attempts."

44msgstr ""

44msgstr ""

45

45

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

47#, qt-format

47#, qt-format

48msgid "Please wait %1 minute and then try again…"

48msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] ""

50msgstr[0] ""

51msgstr[1] ""

51msgstr[1] ""

52

52

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

54msgid "Log out"

55msgid "Log out"

55msgstr ""

56msgstr ""

56

57

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

58msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

59msgstr ""

60msgstr ""

60

61

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:70

62−#: qml/Components/Dialogs.qml:122

63+msgctxt "Button: Lock the system"

63−msgid "No"

64+msgid "Lock"

64msgstr ""

65msgstr ""

65

66

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:77

67−#: qml/Components/Dialogs.qml:129

68+msgctxt "Button: Log out from the system"

68−msgid "Yes"

69+msgid "Log Out"

69msgstr ""

70msgstr ""

70

71

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"

72msgid "Shut down"

79msgid "Shut down"

73msgstr ""

80msgstr ""

74

81

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

76msgid "Are you sure you want to shut down?"

83msgid "Are you sure you want to shut down?"

77msgstr ""

84msgstr ""

78

85

79−#: qml/Components/Dialogs.qml:119

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

80msgid "Reboot"

88msgid "Reboot"

81msgstr ""

89msgstr ""

82

90

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

84msgid "Are you sure you want to reboot?"

102msgid "Are you sure you want to reboot?"

85msgstr ""

103msgstr ""

86

104

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"

88msgid "Power"

115msgid "Power"

89msgstr ""

116msgstr ""

90

117

91−#: qml/Components/Dialogs.qml:145

118+#: qml/Components/Dialogs.qml:151

92msgid ""

119msgid ""

93"Are you sure you would like\n"

120"Are you sure you would like\n"

94"to power off?"

121"to power off?"

95msgstr ""

122msgstr ""

96

123

97−#: qml/Components/Dialogs.qml:147

124+#: qml/Components/Dialogs.qml:153

125+msgctxt "Button: Power off the system"

98msgid "Power off"

126msgid "Power off"

99msgstr ""

127msgstr ""

100

128

101−#: qml/Components/Dialogs.qml:157

129+#: qml/Components/Dialogs.qml:162

130+msgctxt "Button: Restart the system"

102msgid "Restart"

131msgid "Restart"

103msgstr ""

132msgstr ""

104

133

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<br><br>Tap on the screen to start"

153−msgstr ""

154−

155#: qml/Components/Lockscreen.qml:238

134#: qml/Components/Lockscreen.qml:238

156msgid "Return to Call"

135msgid "Return to Call"

157msgstr ""

136msgstr ""

@@ -164,32 +143,39 @@ msgstr "Tísňové volání"

164msgid "OK"

143msgid "OK"

165msgstr ""

144msgstr ""

166

145

167−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

168msgid "See less"

147msgid "See less"

169msgstr ""

148msgstr ""

170

149

171−#: qml/Dash/GenericScopeView.qml:431

150+#: qml/Dash/GenericScopeView.qml:533

172msgid "See all"

151msgid "See all"

173msgstr ""

152msgstr ""

174

153

175−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

154+#: qml/Dash/GenericScopeView.qml:595

176−#: qml/Panel/SearchIndicator.qml:27

155+msgctxt "Label: Hint for dash search line edit"

177msgid "Search"

156msgid "Search"

178−msgstr "Hledat"

157+msgstr ""

179

158

180−#: qml/Dash/PageHeader.qml:260

159+#: qml/Dash/PageHeader.qml:269

160+msgctxt "Button: Open the Ubuntu Store"

181msgid "Store"

161msgid "Store"

182msgstr ""

162msgstr ""

183

163

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"

185msgid "Settings"

171msgid "Settings"

186msgstr ""

172msgstr ""

187

173

188−#: qml/Dash/PageHeader.qml:284

174+#: qml/Dash/PageHeader.qml:293

189msgid "Remove from Favorites"

175msgid "Remove from Favorites"

190msgstr ""

176msgstr ""

191

177

192−#: qml/Dash/PageHeader.qml:284

178+#: qml/Dash/PageHeader.qml:293

193msgid "Add to Favorites"

179msgid "Add to Favorites"

194msgstr ""

180msgstr ""

195

181

@@ -221,22 +207,88 @@ msgstr ""

221msgid "Release to refresh…"

207msgid "Release to refresh…"

222msgstr ""

208msgstr ""

223

209

210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

211+msgid "Enable location data"

212+msgstr ""

213+

224−#: qml/Dash/ScopesList.qml:63

214+#: qml/Dash/ScopesList.qml:66

225msgid "Manage"

215msgid "Manage"

226msgstr ""

216msgstr ""

227

217

228−#: qml/Dash/ScopesList.qml:107

218+#: qml/Dash/ScopesList.qml:112

229msgid "Home"

219msgid "Home"

230msgstr ""

220msgstr ""

231

221

232−#: qml/Dash/ScopesList.qml:108

222+#: qml/Dash/ScopesList.qml:113

233msgid "Also installed"

223msgid "Also installed"

234msgstr ""

224msgstr ""

235

225

236−#: qml/Greeter/Greeter.qml:174

226+#: qml/Greeter/CoverPage.qml:107

237msgid "Unlock"

227msgid "Unlock"

238msgstr ""

228msgstr ""

239

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+

240#: qml/Notifications/NotificationMenuItemFactory.qml:128

292#: qml/Notifications/NotificationMenuItemFactory.qml:128

241msgid "Show password"

293msgid "Show password"

242msgstr "Zobrazit heslo"

294msgstr "Zobrazit heslo"

@@ -277,6 +329,11 @@ msgstr ""

277msgid "Failed, tap to retry"

329msgid "Failed, tap to retry"

278msgstr ""

330msgstr ""

279

331

332+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

333+msgctxt "Label: Hint in message indicator line edit"

334+msgid "Reply"

335+msgstr ""

336+

280#: qml/Panel/Indicators/ModemInfoItem.qml:105

337#: qml/Panel/Indicators/ModemInfoItem.qml:105

281msgid "Unlock SIM"

338msgid "Unlock SIM"

282msgstr ""

339msgstr ""

@@ -285,61 +342,60 @@ msgstr ""

285msgid "Roaming"

342msgid "Roaming"

286msgstr ""

343msgstr ""

287

344

288−#: qml/Shell.qml:367

345+#: qml/Tutorial/TutorialBottomFinish.qml:24

289−#, qt-format

346+msgid "This action does different things for different apps"

290−msgid "Enter %1"

291msgstr ""

347msgstr ""

292

348

293−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

349+#: qml/Tutorial/TutorialBottomFinish.qml:25

294−msgid "Enter passphrase"

350+msgid "Tap here to finish."

295msgstr ""

351msgstr ""

296

352

297−#: qml/Shell.qml:369

353+#: qml/Tutorial/TutorialBottom.qml:28

298−msgid "Enter passcode"

354+msgid "Open special menus"

299msgstr ""

355msgstr ""

300

356

301−#: qml/Shell.qml:370

357+#: qml/Tutorial/TutorialBottom.qml:29

302−#, qt-format

358+msgid "Swipe up from the bottom edge."

303−msgid "Sorry, incorrect %1"

304msgstr ""

359msgstr ""

305

360

306−#: qml/Shell.qml:371

361+#: qml/Tutorial/TutorialLeftFinish.qml:24

307−msgid "Sorry, incorrect passphrase"

362+msgid "These are the shortcuts to favorite apps"

308msgstr ""

363msgstr ""

309

364

310−#: qml/Shell.qml:372

365+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

311−msgid "Please re-enter"

366+msgid "Tap here to continue."

312msgstr ""

367msgstr ""

313

368

314−#: qml/Shell.qml:373

369+#: qml/Tutorial/TutorialLeft.qml:26

315−msgid "Sorry, incorrect passcode"

370+msgid "Open the launcher"

316msgstr ""

371msgstr ""

317

372

318−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

373+#: qml/Tutorial/TutorialLeft.qml:27

319−msgid "Sorry, incorrect passphrase."

374+msgid "Short swipe from the left edge."

320msgstr ""

375msgstr ""

321

376

322−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

377+#: qml/Tutorial/TutorialPage.qml:178

323−msgid "Sorry, incorrect passcode."

378+msgid "You almost got it!"

324msgstr ""

379msgstr ""

325

380

326−#: qml/Shell.qml:469

381+#: qml/Tutorial/TutorialPage.qml:195

327−msgid "This will be your last attempt."

382+msgid "Try again."

328msgstr ""

383msgstr ""

329

384

330−#: qml/Shell.qml:471

385+#: qml/Tutorial/TutorialRight.qml:31

331−msgid ""

386+msgid "To view open apps"

332−"If passphrase is entered incorrectly, your phone will conduct a factory "

333−"reset and all personal data will be deleted."

334msgstr ""

387msgstr ""

335

388

336−#: qml/Shell.qml:472

389+#: qml/Tutorial/TutorialRight.qml:32

337−msgid ""

390+msgid "Long swipe from the right edge."

338−"If passcode is entered incorrectly, your phone will conduct a factory reset "

391+msgstr ""

339−"and all personal data will be deleted."

392+

393+#: qml/Tutorial/TutorialRight.qml:122

394+msgid "View all your running tasks."

340msgstr ""

395msgstr ""

341

396

342#: qml/Wizard/Page.qml:89

397#: qml/Wizard/Page.qml:89

398+msgctxt "Button: Go back one page in the Wizard"

343msgid "Back"

399msgid "Back"

344msgstr ""

400msgstr ""

345

401

@@ -356,7 +412,7 @@ msgid "Let’s get started."

356msgstr ""

412msgstr ""

357

413

358#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

414#: 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

360#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

416#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

361#: qml/Wizard/Pages/passwd-set.qml:90

417#: qml/Wizard/Pages/passwd-set.qml:90

362msgid "Continue"

418msgid "Continue"

@@ -366,11 +422,11 @@ msgstr ""

366msgid "Add a SIM card and restart your device"

422msgid "Add a SIM card and restart your device"

367msgstr ""

423msgstr ""

368

424

369−#: qml/Wizard/Pages/20-sim.qml:55

425+#: qml/Wizard/Pages/20-sim.qml:59

370msgid "Without it, you won’t be able to make calls or use text messaging."

426msgid "Without it, you won’t be able to make calls or use text messaging."

371msgstr ""

427msgstr ""

372

428

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

374msgid "Skip"

430msgid "Skip"

375msgstr ""

431msgstr ""

376

432

@@ -383,38 +439,44 @@ msgid "Please select how you’d like to unlock your phone."

383msgstr ""

439msgstr ""

384

440

385#: qml/Wizard/Pages/30-passwd-type.qml:97

441#: qml/Wizard/Pages/30-passwd-type.qml:97

442+msgctxt "Label: Type of security method"

386msgid "Swipe"

443msgid "Swipe"

387msgstr ""

444msgstr ""

388

445

389#: qml/Wizard/Pages/30-passwd-type.qml:98

446#: qml/Wizard/Pages/30-passwd-type.qml:98

447+msgctxt "Label: Description of security method"

390msgid "No security"

448msgid "No security"

391msgstr ""

449msgstr ""

392

450

393#: qml/Wizard/Pages/30-passwd-type.qml:100

451#: qml/Wizard/Pages/30-passwd-type.qml:100

452+msgctxt "Label: Type of security method"

394msgid "Passcode"

453msgid "Passcode"

395msgstr ""

454msgstr ""

396

455

397#: qml/Wizard/Pages/30-passwd-type.qml:101

456#: qml/Wizard/Pages/30-passwd-type.qml:101

457+msgctxt "Label: Description of security method"

398msgid "4 digits only"

458msgid "4 digits only"

399msgstr ""

459msgstr ""

400

460

401#: qml/Wizard/Pages/30-passwd-type.qml:103

461#: qml/Wizard/Pages/30-passwd-type.qml:103

462+msgctxt "Label: Type of security method"

402msgid "Passphrase"

463msgid "Passphrase"

403msgstr ""

464msgstr ""

404

465

405#: qml/Wizard/Pages/30-passwd-type.qml:104

466#: qml/Wizard/Pages/30-passwd-type.qml:104

467+msgctxt "Label: Description of security method"

406msgid "Numbers and letters"

468msgid "Numbers and letters"

407msgstr ""

469msgstr ""

408

470

409−#: qml/Wizard/Pages/40-wifi.qml:28

471+#: qml/Wizard/Pages/40-wifi.qml:29

410msgid "Connect to Wi‑Fi"

472msgid "Connect to Wi‑Fi"

411msgstr ""

473msgstr ""

412

474

413−#: qml/Wizard/Pages/40-wifi.qml:147

475+#: qml/Wizard/Pages/40-wifi.qml:168

414msgid "Available networks…"

476msgid "Available networks…"

415msgstr ""

477msgstr ""

416

478

417−#: qml/Wizard/Pages/40-wifi.qml:148

479+#: qml/Wizard/Pages/40-wifi.qml:169

418msgid "No available networks."

480msgid "No available networks."

419msgstr ""

481msgstr ""

420

482

@@ -516,6 +578,27 @@ msgstr ""

516msgid "%1 〉"

578msgid "%1 〉"

517msgstr ""

579msgstr ""

518

580

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+

519#~ msgid "Loading. Please Wait..."

602#~ msgid "Loading. Please Wait..."

520#~ msgstr "Načítám. Čekejte prosím..."

603#~ msgstr "Načítám. Čekejte prosím..."

521

604

@@ -525,8 +608,20 @@ msgstr ""

525#~ msgid "Confirm"

608#~ msgid "Confirm"

526#~ msgstr "Potvrdit"

609#~ msgstr "Potvrdit"

527

610

611+#~ msgid "Search"

612+#~ msgstr "Hledat"

613+

528#~ msgid "Speaking..."

614#~ msgid "Speaking..."

529#~ msgstr "Mluvte..."

615#~ msgstr "Mluvte..."

530

616

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+

531#~ msgid "Type or say a command"

623#~ msgid "Type or say a command"

532#~ msgstr "Napište nebo řekněte příkaz"

624#~ 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 ""

8msgstr ""

8msgstr ""

9"Project-Id-Version: unity8\n"

9"Project-Id-Version: unity8\n"

10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"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"

12"PO-Revision-Date: 2014-07-30 12:37+0000\n"

12"PO-Revision-Date: 2014-07-30 12:37+0000\n"

13"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"

13"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"

14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"

14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"

@@ -16,10 +16,10 @@ msgstr ""

16"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

17"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

20−"X-Generator: Launchpad (build 17286)\n"

20+"X-Generator: Launchpad (build 17413)\n"

21

21

22−#: plugins/LightDM/Greeter.cpp:130

22+#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

23msgid "Password: "

24msgstr ""

24msgstr ""

25

25

@@ -32,129 +32,106 @@ msgstr "Fastgør genvej"

32msgid "Unpin shortcut"

32msgid "Unpin shortcut"

33msgstr "Gør genvej flytbar"

33msgstr "Gør genvej flytbar"

34

34

35−#: qml/Components/DelayedLockscreen.qml:47

35+#: qml/Components/DelayedLockscreen.qml:49

36msgid "Device Locked"

36msgid "Device Locked"

37msgstr ""

37msgstr ""

38

38

39−#: qml/Components/DelayedLockscreen.qml:62

39+#: qml/Components/DelayedLockscreen.qml:64

40msgid "You have been locked out due to too many failed passphrase attempts."

40msgid "You have been locked out due to too many failed passphrase attempts."

41msgstr ""

41msgstr ""

42

42

43−#: qml/Components/DelayedLockscreen.qml:63

43+#: qml/Components/DelayedLockscreen.qml:65

44msgid "You have been locked out due to too many failed passcode attempts."

44msgid "You have been locked out due to too many failed passcode attempts."

45msgstr ""

45msgstr ""

46

46

47−#: qml/Components/DelayedLockscreen.qml:72

47+#: qml/Components/DelayedLockscreen.qml:74

48#, qt-format

48#, qt-format

49msgid "Please wait %1 minute and then try again…"

49msgid "Please wait %1 minute and then try again…"

50msgid_plural "Please wait %1 minutes and then try again…"

50msgid_plural "Please wait %1 minutes and then try again…"

51msgstr[0] ""

51msgstr[0] ""

52msgstr[1] ""

52msgstr[1] ""

53

53

54−#: qml/Components/Dialogs.qml:70

54+#: qml/Components/Dialogs.qml:67

55+msgctxt "Title: Lock/Log out dialog"

55msgid "Log out"

56msgid "Log out"

56msgstr ""

57msgstr ""

57

58

58−#: qml/Components/Dialogs.qml:71

59+#: qml/Components/Dialogs.qml:68

59msgid "Are you sure you want to log out?"

60msgid "Are you sure you want to log out?"

60msgstr ""

61msgstr ""

61

62

62−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63+#: qml/Components/Dialogs.qml:70

63−#: qml/Components/Dialogs.qml:122

64+msgctxt "Button: Lock the system"

64−msgid "No"

65+msgid "Lock"

65msgstr ""

66msgstr ""

66

67

67−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68+#: qml/Components/Dialogs.qml:77

68−#: qml/Components/Dialogs.qml:129

69+msgctxt "Button: Log out from the system"

69−msgid "Yes"

70+msgid "Log Out"

70msgstr ""

71msgstr ""

71

72

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"

73msgid "Shut down"

80msgid "Shut down"

74msgstr ""

81msgstr ""

75

82

76−#: qml/Components/Dialogs.qml:95

83+#: qml/Components/Dialogs.qml:97

77msgid "Are you sure you want to shut down?"

84msgid "Are you sure you want to shut down?"

78msgstr ""

85msgstr ""

79

86

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"

81msgid "Reboot"

99msgid "Reboot"

82msgstr ""

100msgstr ""

83

101

84−#: qml/Components/Dialogs.qml:120

102+#: qml/Components/Dialogs.qml:128

85msgid "Are you sure you want to reboot?"

103msgid "Are you sure you want to reboot?"

86msgstr ""

104msgstr ""

87

105

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"

89msgid "Power"

116msgid "Power"

90msgstr ""

117msgstr ""

91

118

92−#: qml/Components/Dialogs.qml:145

119+#: qml/Components/Dialogs.qml:151

93msgid ""

120msgid ""

94"Are you sure you would like\n"

121"Are you sure you would like\n"

95"to power off?"

122"to power off?"

96msgstr ""

123msgstr ""

97

124

98−#: qml/Components/Dialogs.qml:147

125+#: qml/Components/Dialogs.qml:153

126+msgctxt "Button: Power off the system"

99msgid "Power off"

127msgid "Power off"

100msgstr ""

128msgstr ""

101

129

102−#: qml/Components/Dialogs.qml:157

130+#: qml/Components/Dialogs.qml:162

131+msgctxt "Button: Restart the system"

103msgid "Restart"

132msgid "Restart"

104msgstr ""

133msgstr ""

105

134

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<br><br>Tap on the screen to start"

154−msgstr ""

155−"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "

156−"på skærmen for at starte"

157−

158#: qml/Components/Lockscreen.qml:238

135#: qml/Components/Lockscreen.qml:238

159msgid "Return to Call"

136msgid "Return to Call"

160msgstr ""

137msgstr ""

@@ -167,32 +144,39 @@ msgstr "Nødopkald"

167msgid "OK"

144msgid "OK"

168msgstr "O.k."

145msgstr "O.k."

169

146

170−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

147+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

171msgid "See less"

148msgid "See less"

172msgstr "Vis mindre"

149msgstr "Vis mindre"

173

150

174−#: qml/Dash/GenericScopeView.qml:431

151+#: qml/Dash/GenericScopeView.qml:533

175msgid "See all"

152msgid "See all"

176msgstr "Se alle"

153msgstr "Se alle"

177

154

178−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

155+#: qml/Dash/GenericScopeView.qml:595

179−#: qml/Panel/SearchIndicator.qml:27

156+msgctxt "Label: Hint for dash search line edit"

180msgid "Search"

157msgid "Search"

181−msgstr "Søg"

158+msgstr ""

182

159

183−#: qml/Dash/PageHeader.qml:260

160+#: qml/Dash/PageHeader.qml:269

161+msgctxt "Button: Open the Ubuntu Store"

184msgid "Store"

162msgid "Store"

185msgstr ""

163msgstr ""

186

164

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"

188msgid "Settings"

172msgid "Settings"

189msgstr ""

173msgstr ""

190

174

191−#: qml/Dash/PageHeader.qml:284

175+#: qml/Dash/PageHeader.qml:293

192msgid "Remove from Favorites"

176msgid "Remove from Favorites"

193msgstr ""

177msgstr ""

194

178

195−#: qml/Dash/PageHeader.qml:284

179+#: qml/Dash/PageHeader.qml:293

196msgid "Add to Favorites"

180msgid "Add to Favorites"

197msgstr ""

181msgstr ""

198

182

@@ -224,22 +208,88 @@ msgstr ""

224msgid "Release to refresh…"

208msgid "Release to refresh…"

225msgstr ""

209msgstr ""

226

210

211+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

212+msgid "Enable location data"

213+msgstr ""

214+

227−#: qml/Dash/ScopesList.qml:63

215+#: qml/Dash/ScopesList.qml:66

228msgid "Manage"

216msgid "Manage"

229msgstr ""

217msgstr ""

230

218

231−#: qml/Dash/ScopesList.qml:107

219+#: qml/Dash/ScopesList.qml:112

232msgid "Home"

220msgid "Home"

233msgstr ""

221msgstr ""

234

222

235−#: qml/Dash/ScopesList.qml:108

223+#: qml/Dash/ScopesList.qml:113

236msgid "Also installed"

224msgid "Also installed"

237msgstr ""

225msgstr ""

238

226

239−#: qml/Greeter/Greeter.qml:174

227+#: qml/Greeter/CoverPage.qml:107

240msgid "Unlock"

228msgid "Unlock"

241msgstr ""

229msgstr ""

242

230

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+

243#: qml/Notifications/NotificationMenuItemFactory.qml:128

293#: qml/Notifications/NotificationMenuItemFactory.qml:128

244msgid "Show password"

294msgid "Show password"

245msgstr "Vis adgangskode"

295msgstr "Vis adgangskode"

@@ -280,6 +330,11 @@ msgstr "Færdig"

280msgid "Failed, tap to retry"

330msgid "Failed, tap to retry"

281msgstr "Mislykkedes; tryk for at prøve igen"

331msgstr "Mislykkedes; tryk for at prøve igen"

282

332

333+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

334+msgctxt "Label: Hint in message indicator line edit"

335+msgid "Reply"

336+msgstr ""

337+

283#: qml/Panel/Indicators/ModemInfoItem.qml:105

338#: qml/Panel/Indicators/ModemInfoItem.qml:105

284msgid "Unlock SIM"

339msgid "Unlock SIM"

285msgstr ""

340msgstr ""

@@ -288,61 +343,60 @@ msgstr ""

288msgid "Roaming"

343msgid "Roaming"

289msgstr ""

344msgstr ""

290

345

291−#: qml/Shell.qml:367

346+#: qml/Tutorial/TutorialBottomFinish.qml:24

292−#, qt-format

347+msgid "This action does different things for different apps"

293−msgid "Enter %1"

294msgstr ""

348msgstr ""

295

349

296−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

350+#: qml/Tutorial/TutorialBottomFinish.qml:25

297−msgid "Enter passphrase"

351+msgid "Tap here to finish."

298msgstr ""

352msgstr ""

299

353

300−#: qml/Shell.qml:369

354+#: qml/Tutorial/TutorialBottom.qml:28

301−msgid "Enter passcode"

355+msgid "Open special menus"

302msgstr ""

356msgstr ""

303

357

304−#: qml/Shell.qml:370

358+#: qml/Tutorial/TutorialBottom.qml:29

305−#, qt-format

359+msgid "Swipe up from the bottom edge."

306−msgid "Sorry, incorrect %1"

307msgstr ""

360msgstr ""

308

361

309−#: qml/Shell.qml:371

362+#: qml/Tutorial/TutorialLeftFinish.qml:24

310−msgid "Sorry, incorrect passphrase"

363+msgid "These are the shortcuts to favorite apps"

311msgstr ""

364msgstr ""

312

365

313−#: qml/Shell.qml:372

366+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

314−msgid "Please re-enter"

367+msgid "Tap here to continue."

315msgstr ""

368msgstr ""

316

369

317−#: qml/Shell.qml:373

370+#: qml/Tutorial/TutorialLeft.qml:26

318−msgid "Sorry, incorrect passcode"

371+msgid "Open the launcher"

319msgstr ""

372msgstr ""

320

373

321−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

374+#: qml/Tutorial/TutorialLeft.qml:27

322−msgid "Sorry, incorrect passphrase."

375+msgid "Short swipe from the left edge."

323msgstr ""

376msgstr ""

324

377

325−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

378+#: qml/Tutorial/TutorialPage.qml:178

326−msgid "Sorry, incorrect passcode."

379+msgid "You almost got it!"

327msgstr ""

380msgstr ""

328

381

329−#: qml/Shell.qml:469

382+#: qml/Tutorial/TutorialPage.qml:195

330−msgid "This will be your last attempt."

383+msgid "Try again."

331msgstr ""

384msgstr ""

332

385

333−#: qml/Shell.qml:471

386+#: qml/Tutorial/TutorialRight.qml:31

334−msgid ""

387+msgid "To view open apps"

335−"If passphrase is entered incorrectly, your phone will conduct a factory "

336−"reset and all personal data will be deleted."

337msgstr ""

388msgstr ""

338

389

339−#: qml/Shell.qml:472

390+#: qml/Tutorial/TutorialRight.qml:32

340−msgid ""

391+msgid "Long swipe from the right edge."

341−"If passcode is entered incorrectly, your phone will conduct a factory reset "

392+msgstr ""

342−"and all personal data will be deleted."

393+

394+#: qml/Tutorial/TutorialRight.qml:122

395+msgid "View all your running tasks."

343msgstr ""

396msgstr ""

344

397

345#: qml/Wizard/Page.qml:89

398#: qml/Wizard/Page.qml:89

399+msgctxt "Button: Go back one page in the Wizard"

346msgid "Back"

400msgid "Back"

347msgstr ""

401msgstr ""

348

402

@@ -359,7 +413,7 @@ msgid "Let’s get started."

359msgstr ""

413msgstr ""

360

414

361#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

415#: 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

363#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

417#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

364#: qml/Wizard/Pages/passwd-set.qml:90

418#: qml/Wizard/Pages/passwd-set.qml:90

365msgid "Continue"

419msgid "Continue"

@@ -369,11 +423,11 @@ msgstr ""

369msgid "Add a SIM card and restart your device"

423msgid "Add a SIM card and restart your device"

370msgstr ""

424msgstr ""

371

425

372−#: qml/Wizard/Pages/20-sim.qml:55

426+#: qml/Wizard/Pages/20-sim.qml:59

373msgid "Without it, you won’t be able to make calls or use text messaging."

427msgid "Without it, you won’t be able to make calls or use text messaging."

374msgstr ""

428msgstr ""

375

429

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

377msgid "Skip"

431msgid "Skip"

378msgstr ""

432msgstr ""

379

433

@@ -386,38 +440,44 @@ msgid "Please select how you’d like to unlock your phone."

386msgstr ""

440msgstr ""

387

441

388#: qml/Wizard/Pages/30-passwd-type.qml:97

442#: qml/Wizard/Pages/30-passwd-type.qml:97

443+msgctxt "Label: Type of security method"

389msgid "Swipe"

444msgid "Swipe"

390msgstr ""

445msgstr ""

391

446

392#: qml/Wizard/Pages/30-passwd-type.qml:98

447#: qml/Wizard/Pages/30-passwd-type.qml:98

448+msgctxt "Label: Description of security method"

393msgid "No security"

449msgid "No security"

394msgstr ""

450msgstr ""

395

451

396#: qml/Wizard/Pages/30-passwd-type.qml:100

452#: qml/Wizard/Pages/30-passwd-type.qml:100

453+msgctxt "Label: Type of security method"

397msgid "Passcode"

454msgid "Passcode"

398msgstr ""

455msgstr ""

399

456

400#: qml/Wizard/Pages/30-passwd-type.qml:101

457#: qml/Wizard/Pages/30-passwd-type.qml:101

458+msgctxt "Label: Description of security method"

401msgid "4 digits only"

459msgid "4 digits only"

402msgstr ""

460msgstr ""

403

461

404#: qml/Wizard/Pages/30-passwd-type.qml:103

462#: qml/Wizard/Pages/30-passwd-type.qml:103

463+msgctxt "Label: Type of security method"

405msgid "Passphrase"

464msgid "Passphrase"

406msgstr ""

465msgstr ""

407

466

408#: qml/Wizard/Pages/30-passwd-type.qml:104

467#: qml/Wizard/Pages/30-passwd-type.qml:104

468+msgctxt "Label: Description of security method"

409msgid "Numbers and letters"

469msgid "Numbers and letters"

410msgstr ""

470msgstr ""

411

471

412−#: qml/Wizard/Pages/40-wifi.qml:28

472+#: qml/Wizard/Pages/40-wifi.qml:29

413msgid "Connect to Wi‑Fi"

473msgid "Connect to Wi‑Fi"

414msgstr ""

474msgstr ""

415

475

416−#: qml/Wizard/Pages/40-wifi.qml:147

476+#: qml/Wizard/Pages/40-wifi.qml:168

417msgid "Available networks…"

477msgid "Available networks…"

418msgstr ""

478msgstr ""

419

479

420−#: qml/Wizard/Pages/40-wifi.qml:148

480+#: qml/Wizard/Pages/40-wifi.qml:169

421msgid "No available networks."

481msgid "No available networks."

422msgstr ""

482msgstr ""

423

483

@@ -519,12 +579,45 @@ msgstr ""

519msgid "%1 〉"

579msgid "%1 〉"

520msgstr ""

580msgstr ""

521

581

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+

522#~ msgid "Speaking..."

594#~ msgid "Speaking..."

523#~ msgstr "Taler..."

595#~ msgstr "Taler..."

524

596

525#~ msgid "Confirm"

597#~ msgid "Confirm"

526#~ msgstr "Bekræft"

598#~ msgstr "Bekræft"

527

599

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+

528#~ msgid "Type or say a command"

621#~ msgid "Type or say a command"

529#~ msgstr "Skriv eller indtal en kommando"

622#~ msgstr "Skriv eller indtal en kommando"

530

623

@@ -533,3 +626,10 @@ msgstr ""

533

626

534#~ msgid "Speak Now..."

627#~ msgid "Speak Now..."

535#~ msgstr "Tal nu..."

628#~ msgstr "Tal nu..."

629+

630+#~ msgid ""

631+#~ "You have now mastered the edge gestures and can start using the "

632+#~ "phone<br><br>Tap on the screen to start"

633+#~ msgstr ""

634+#~ "Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "

635+#~ "på skærmen for at starte"

po/de.po+318−185

@@ -7,18 +7,18 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11−"PO-Revision-Date: 2014-12-12 01:42+0000\n"

11+"PO-Revision-Date: 2015-03-06 14:24+0000\n"

12"Last-Translator: Niklas Wenzel <nikwen.developer@gmail.com>\n"

12"Last-Translator: Niklas Wenzel <nikwen.developer@gmail.com>\n"

13"Language-Team: German <de@li.org>\n"

13"Language-Team: German <de@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr "Passwort: "

23msgstr "Passwort: "

24

24

@@ -31,68 +31,95 @@ msgstr "Verknüpfung anheften"

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Verknüpfung entfernen"

32msgstr "Verknüpfung entfernen"

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr "Gerät gesperrt"

36msgstr "Gerät gesperrt"

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

40msgstr ""

41"Das Gerät wurde aufgrund zu vieler falscher Passworteingaben für längere "

41"Das Gerät wurde aufgrund zu vieler falscher Passworteingaben für längere "

42"Zeit gesperrt."

42"Zeit gesperrt."

43

43

44−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

45msgid "You have been locked out due to too many failed passcode attempts."

45msgid "You have been locked out due to too many failed passcode attempts."

46msgstr ""

46msgstr ""

47"Das Gerät wurde aufgrund zu vieler falscher PIN-Eingaben für längere Zeit "

47"Das Gerät wurde aufgrund zu vieler falscher PIN-Eingaben für längere Zeit "

48"gesperrt."

48"gesperrt."

49

49

50−#: qml/Components/DelayedLockscreen.qml:72

50+#: qml/Components/DelayedLockscreen.qml:74

51#, qt-format

51#, qt-format

52msgid "Please wait %1 minute and then try again…"

52msgid "Please wait %1 minute and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

54msgstr[0] "Bitte warten Sie %1 Minute und versuchen Sie es dann erneut..."

54msgstr[0] "Bitte warten Sie %1 Minute und versuchen Sie es dann erneut..."

55msgstr[1] "Bitte warten Sie %1 Minuten und versuchen Sie es dann erneut..."

55msgstr[1] "Bitte warten Sie %1 Minuten und versuchen Sie es dann erneut..."

56

56

57−#: qml/Components/Dialogs.qml:70

57+#: qml/Components/Dialogs.qml:67

58+msgctxt "Title: Lock/Log out dialog"

58msgid "Log out"

59msgid "Log out"

59−msgstr "Abmelden"

60+msgstr ""

60

61

61−#: qml/Components/Dialogs.qml:71

62+#: qml/Components/Dialogs.qml:68

62msgid "Are you sure you want to log out?"

63msgid "Are you sure you want to log out?"

63msgstr "Sind Sie sicher, dass Sie sich abmelden wollen?"

64msgstr "Sind Sie sicher, dass Sie sich abmelden wollen?"

64

65

65−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66+#: qml/Components/Dialogs.qml:70

66−#: qml/Components/Dialogs.qml:122

67+msgctxt "Button: Lock the system"

67−msgid "No"

68+msgid "Lock"

68−msgstr "Nein"

69+msgstr ""

69

70

70−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

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

71−#: qml/Components/Dialogs.qml:129

77+#: qml/Components/Dialogs.qml:171

72−msgid "Yes"

78+msgid "Cancel"

73−msgstr "Ja"

79+msgstr "Abbrechen"

74

80

75−#: qml/Components/Dialogs.qml:94

81+#: qml/Components/Dialogs.qml:96

82+msgctxt "Title: Reboot/Shut down dialog"

76msgid "Shut down"

83msgid "Shut down"

77−msgstr "Herunterfahren"

84+msgstr ""

78

85

79−#: qml/Components/Dialogs.qml:95

86+#: qml/Components/Dialogs.qml:97

80msgid "Are you sure you want to shut down?"

87msgid "Are you sure you want to shut down?"

81msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"

88msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"

82

89

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"

84msgid "Reboot"

102msgid "Reboot"

85−msgstr "Neustart"

103+msgstr ""

86

104

87−#: qml/Components/Dialogs.qml:120

105+#: qml/Components/Dialogs.qml:128

88msgid "Are you sure you want to reboot?"

106msgid "Are you sure you want to reboot?"

89msgstr "Sind Sie sicher, dass Sie neu starten wollen?"

107msgstr "Sind Sie sicher, dass Sie neu starten wollen?"

90

108

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"

92msgid "Power"

119msgid "Power"

93−msgstr "Energie"

120+msgstr ""

94

121

95−#: qml/Components/Dialogs.qml:145

122+#: qml/Components/Dialogs.qml:151

96msgid ""

123msgid ""

97"Are you sure you would like\n"

124"Are you sure you would like\n"

98"to power off?"

125"to power off?"

@@ -100,68 +127,15 @@ msgstr ""

100"Sind Sie sicher, dass Sie das\n"

127"Sind Sie sicher, dass Sie das\n"

101"Gerät ausschalten wollen?"

128"Gerät ausschalten wollen?"

102

129

103−#: qml/Components/Dialogs.qml:147

130+#: qml/Components/Dialogs.qml:153

131+msgctxt "Button: Power off the system"

104msgid "Power off"

132msgid "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"

150msgstr ""

133msgstr ""

151−"Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"

152−"Schnellzugriff aufzurufen"

153

134

154−#: qml/Components/EdgeDemo.qml:242

135+#: qml/Components/Dialogs.qml:162

155−msgid "Well done"

136+msgctxt "Button: Restart the system"

156−msgstr "Gut gemacht"

137+msgid "Restart"

157−

158−#: qml/Components/EdgeDemo.qml:243

159−msgid ""

160−"You have now mastered the edge gestures and can start using the "

161−"phone<br><br>Tap on the screen to start"

162msgstr ""

138msgstr ""

163−"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "

164−"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"

165

139

166#: qml/Components/Lockscreen.qml:238

140#: qml/Components/Lockscreen.qml:238

167msgid "Return to Call"

141msgid "Return to Call"

@@ -175,32 +149,39 @@ msgstr "Notruf"

175msgid "OK"

149msgid "OK"

176msgstr "OK"

150msgstr "OK"

177

151

178−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

179msgid "See less"

153msgid "See less"

180msgstr "Weniger ansehen"

154msgstr "Weniger ansehen"

181

155

182−#: qml/Dash/GenericScopeView.qml:431

156+#: qml/Dash/GenericScopeView.qml:533

183msgid "See all"

157msgid "See all"

184msgstr "Alle anzeigen"

158msgstr "Alle anzeigen"

185

159

186−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

160+#: qml/Dash/GenericScopeView.qml:595

187−#: qml/Panel/SearchIndicator.qml:27

161+msgctxt "Label: Hint for dash search line edit"

188msgid "Search"

162msgid "Search"

189−msgstr "Suchen"

163+msgstr ""

190

164

191−#: qml/Dash/PageHeader.qml:260

165+#: qml/Dash/PageHeader.qml:269

166+msgctxt "Button: Open the Ubuntu Store"

192msgid "Store"

167msgid "Store"

193−msgstr "Store"

168+msgstr ""

194

169

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"

196msgid "Settings"

177msgid "Settings"

197−msgstr "Einstellungen"

178+msgstr ""

198

179

199−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

200msgid "Remove from Favorites"

181msgid "Remove from Favorites"

201msgstr "Aus den Favoriten entfernen"

182msgstr "Aus den Favoriten entfernen"

202

183

203−#: qml/Dash/PageHeader.qml:284

184+#: qml/Dash/PageHeader.qml:293

204msgid "Add to Favorites"

185msgid "Add to Favorites"

205msgstr "Zu Favoriten hinzufügen"

186msgstr "Zu Favoriten hinzufügen"

206

187

@@ -232,22 +213,92 @@ msgstr "Zum Aktualisieren ziehen …"

232msgid "Release to refresh…"

213msgid "Release to refresh…"

233msgstr "Zum Aktualisieren loslassen …"

214msgstr "Zum Aktualisieren loslassen …"

234

215

216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

217+msgid "Enable location data"

218+msgstr "Standortdaten aktivieren"

219+

235−#: qml/Dash/ScopesList.qml:63

220+#: qml/Dash/ScopesList.qml:66

236msgid "Manage"

221msgid "Manage"

237msgstr "Verwalten"

222msgstr "Verwalten"

238

223

239−#: qml/Dash/ScopesList.qml:107

224+#: qml/Dash/ScopesList.qml:112

240msgid "Home"

225msgid "Home"

241−msgstr ""

226+msgstr "Startseite"

242

227

243−#: qml/Dash/ScopesList.qml:108

228+#: qml/Dash/ScopesList.qml:113

244msgid "Also installed"

229msgid "Also installed"

245−msgstr ""

230+msgstr "Ebenfalls installiert"

246

231

247−#: qml/Greeter/Greeter.qml:174

232+#: qml/Greeter/CoverPage.qml:107

248msgid "Unlock"

233msgid "Unlock"

249msgstr "Entsperren"

234msgstr "Entsperren"

250

235

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+

251#: qml/Notifications/NotificationMenuItemFactory.qml:128

302#: qml/Notifications/NotificationMenuItemFactory.qml:128

252msgid "Show password"

303msgid "Show password"

253msgstr "Passwort anzeigen"

304msgstr "Passwort anzeigen"

@@ -288,6 +339,11 @@ msgstr "Erledigt"

288msgid "Failed, tap to retry"

339msgid "Failed, tap to retry"

289msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"

340msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"

290

341

342+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

343+msgctxt "Label: Hint in message indicator line edit"

344+msgid "Reply"

345+msgstr ""

346+

291#: qml/Panel/Indicators/ModemInfoItem.qml:105

347#: qml/Panel/Indicators/ModemInfoItem.qml:105

292msgid "Unlock SIM"

348msgid "Unlock SIM"

293msgstr "SIM-Karte entsperren"

349msgstr "SIM-Karte entsperren"

@@ -296,158 +352,161 @@ msgstr "SIM-Karte entsperren"

296msgid "Roaming"

352msgid "Roaming"

297msgstr "Roaming"

353msgstr "Roaming"

298

354

299−#: qml/Shell.qml:367

355+#: qml/Tutorial/TutorialBottomFinish.qml:24

300−#, qt-format

356+msgid "This action does different things for different apps"

301−msgid "Enter %1"

302−msgstr "%1 eingeben"

357+msgstr ""

358+"Diese Aktion bewirkt verschiedene Dinge in verschiedenen Anwendungen."

303

359

304−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

360+#: qml/Tutorial/TutorialBottomFinish.qml:25

305−msgid "Enter passphrase"

361+msgid "Tap here to finish."

306−msgstr "Passwort eingeben"

362+msgstr "Zum Beenden hier tippen."

307

363

308−#: qml/Shell.qml:369

364+#: qml/Tutorial/TutorialBottom.qml:28

309−msgid "Enter passcode"

365+msgid "Open special menus"

310−msgstr "PIN eingeben"

366+msgstr "Spezielle Menüs öffnen"

311

367

312−#: qml/Shell.qml:370

368+#: qml/Tutorial/TutorialBottom.qml:29

313−#, qt-format

369+msgid "Swipe up from the bottom edge."

314−msgid "Sorry, incorrect %1"

370+msgstr "Wischen Sie von der unteren Bildschirmkante nach oben."

315−msgstr "%1 falsch"

316

371

317−#: qml/Shell.qml:371

372+#: qml/Tutorial/TutorialLeftFinish.qml:24

318−msgid "Sorry, incorrect passphrase"

373+msgid "These are the shortcuts to favorite apps"

319−msgstr "Das Passwort ist nicht korrekt"

374+msgstr "Dies sind die Verknüpfungen zu Ihren favorisierten Anwendungen."

320

375

321−#: qml/Shell.qml:372

376+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

322−msgid "Please re-enter"

377+msgid "Tap here to continue."

323−msgstr "Bitte erneut eingeben"

378+msgstr "Zum Fortfahren hier tippen."

324

379

325−#: qml/Shell.qml:373

380+#: qml/Tutorial/TutorialLeft.qml:26

326−msgid "Sorry, incorrect passcode"

381+msgid "Open the launcher"

327−msgstr "Falsches Passwort"

382+msgstr "Öffnen Sie den Starter."

328

383

329−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

384+#: qml/Tutorial/TutorialLeft.qml:27

330−msgid "Sorry, incorrect passphrase."

385+msgid "Short swipe from the left edge."

331−msgstr "Entschuldigung, falsches Passwort."

386+msgstr "Kurzer Wisch von der linken Bildschirmkante."

332

387

333−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

388+#: qml/Tutorial/TutorialPage.qml:178

334−msgid "Sorry, incorrect passcode."

389+msgid "You almost got it!"

335−msgstr "Falsche PIN"

390+msgstr "Fast geschafft!"

336

391

337−#: qml/Shell.qml:469

392+#: qml/Tutorial/TutorialPage.qml:195

338−msgid "This will be your last attempt."

393+msgid "Try again."

339−msgstr "Dies ist Ihr letzter Versuch."

394+msgstr "Versuchen Sie es noch einmal."

340

395

341−#: qml/Shell.qml:471

396+#: qml/Tutorial/TutorialRight.qml:31

342−msgid ""

397+msgid "To view open apps"

343−"If passphrase is entered incorrectly, your phone will conduct a factory "

398+msgstr "Zum Ansehen offener Anwendungen"

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."

348

399

349−#: qml/Shell.qml:472

400+#: qml/Tutorial/TutorialRight.qml:32

350−msgid ""

401+msgid "Long swipe from the right edge."

351−"If passcode is entered incorrectly, your phone will conduct a factory reset "

402+msgstr "Langer Wisch von der rechten Bildschirmkante."

352−"and all personal data will be deleted."

403+

353−msgstr ""

404+#: qml/Tutorial/TutorialRight.qml:122

354−"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "

405+msgid "View all your running tasks."

355−"zurückgesetzt und alle Daten werden gelöscht."

406+msgstr "Sehen Sie alle Ihre laufenden Anwendungen."

356

407

357#: qml/Wizard/Page.qml:89

408#: qml/Wizard/Page.qml:89

409+msgctxt "Button: Go back one page in the Wizard"

358msgid "Back"

410msgid "Back"

359msgstr ""

411msgstr ""

360

412

361#: qml/Wizard/Pages/10-welcome.qml:27

413#: qml/Wizard/Pages/10-welcome.qml:27

362msgid "Hi!"

414msgid "Hi!"

363−msgstr ""

415+msgstr "Hallo!"

364

416

365#: qml/Wizard/Pages/10-welcome.qml:44

417#: qml/Wizard/Pages/10-welcome.qml:44

366msgid "Welcome to your Ubuntu phone."

418msgid "Welcome to your Ubuntu phone."

367−msgstr ""

419+msgstr "Willkommen zu Ihrem Ubuntu-Telefon."

368

420

369#: qml/Wizard/Pages/10-welcome.qml:52

421#: qml/Wizard/Pages/10-welcome.qml:52

370msgid "Let’s get started."

422msgid "Let’s get started."

371−msgstr ""

423+msgstr "Fangen wir an!"

372

424

373#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

425#: 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

375#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

427#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

376#: qml/Wizard/Pages/passwd-set.qml:90

428#: qml/Wizard/Pages/passwd-set.qml:90

377msgid "Continue"

429msgid "Continue"

378−msgstr ""

430+msgstr "Weiter"

379

431

380#: qml/Wizard/Pages/20-sim.qml:25

432#: qml/Wizard/Pages/20-sim.qml:25

381msgid "Add a SIM card and restart your device"

433msgid "Add a SIM card and restart your device"

382−msgstr ""

434+msgstr "SIM-Karte einlegen und Gerät neustarten"

383

435

384−#: qml/Wizard/Pages/20-sim.qml:55

436+#: qml/Wizard/Pages/20-sim.qml:59

385msgid "Without it, you won’t be able to make calls or use text messaging."

437msgid "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."

387

439

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

389msgid "Skip"

441msgid "Skip"

390−msgstr ""

442+msgstr "Überspringen"

391

443

392#: qml/Wizard/Pages/30-passwd-type.qml:39

444#: qml/Wizard/Pages/30-passwd-type.qml:39

393msgid "Lock security"

445msgid "Lock security"

394−msgstr ""

446+msgstr "Sicherheit nach dem Sperren"

395

447

396#: qml/Wizard/Pages/30-passwd-type.qml:74

448#: qml/Wizard/Pages/30-passwd-type.qml:74

397msgid "Please select how you’d like to unlock your phone."

449msgid "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."

399

451

400#: qml/Wizard/Pages/30-passwd-type.qml:97

452#: qml/Wizard/Pages/30-passwd-type.qml:97

453+msgctxt "Label: Type of security method"

401msgid "Swipe"

454msgid "Swipe"

402msgstr ""

455msgstr ""

403

456

404#: qml/Wizard/Pages/30-passwd-type.qml:98

457#: qml/Wizard/Pages/30-passwd-type.qml:98

458+msgctxt "Label: Description of security method"

405msgid "No security"

459msgid "No security"

406msgstr ""

460msgstr ""

407

461

408#: qml/Wizard/Pages/30-passwd-type.qml:100

462#: qml/Wizard/Pages/30-passwd-type.qml:100

463+msgctxt "Label: Type of security method"

409msgid "Passcode"

464msgid "Passcode"

410msgstr ""

465msgstr ""

411

466

412#: qml/Wizard/Pages/30-passwd-type.qml:101

467#: qml/Wizard/Pages/30-passwd-type.qml:101

468+msgctxt "Label: Description of security method"

413msgid "4 digits only"

469msgid "4 digits only"

414msgstr ""

470msgstr ""

415

471

416#: qml/Wizard/Pages/30-passwd-type.qml:103

472#: qml/Wizard/Pages/30-passwd-type.qml:103

473+msgctxt "Label: Type of security method"

417msgid "Passphrase"

474msgid "Passphrase"

418msgstr ""

475msgstr ""

419

476

420#: qml/Wizard/Pages/30-passwd-type.qml:104

477#: qml/Wizard/Pages/30-passwd-type.qml:104

478+msgctxt "Label: Description of security method"

421msgid "Numbers and letters"

479msgid "Numbers and letters"

422msgstr ""

480msgstr ""

423

481

424−#: qml/Wizard/Pages/40-wifi.qml:28

482+#: qml/Wizard/Pages/40-wifi.qml:29

425msgid "Connect to Wi‑Fi"

483msgid "Connect to Wi‑Fi"

426−msgstr ""

484+msgstr "Mit WLAN verbinden"

427

485

428−#: qml/Wizard/Pages/40-wifi.qml:147

486+#: qml/Wizard/Pages/40-wifi.qml:168

429msgid "Available networks…"

487msgid "Available networks…"

430−msgstr ""

488+msgstr "Verfügbare Netzwerke …"

431

489

432−#: qml/Wizard/Pages/40-wifi.qml:148

490+#: qml/Wizard/Pages/40-wifi.qml:169

433msgid "No available networks."

491msgid "No available networks."

434−msgstr ""

492+msgstr "Keine verfügbaren Netzwerke."

435

493

436#: qml/Wizard/Pages/50-location.qml:27

494#: qml/Wizard/Pages/50-location.qml:27

437msgid "Location"

495msgid "Location"

438−msgstr ""

496+msgstr "Position"

439

497

440#: qml/Wizard/Pages/50-location.qml:62

498#: qml/Wizard/Pages/50-location.qml:62

441msgid "Let the phone detect your location:"

499msgid "Let the phone detect your location:"

442−msgstr ""

500+msgstr "Dem Telefon erlauben, Ihre Position zu bestimmen:"

443

501

444#: qml/Wizard/Pages/50-location.qml:69

502#: qml/Wizard/Pages/50-location.qml:69

445msgid "Using GPS only (less accurate)"

503msgid "Using GPS only (less accurate)"

446−msgstr ""

504+msgstr "Nur durch GPS (ungenauer)"

447

505

448#: qml/Wizard/Pages/50-location.qml:86

506#: qml/Wizard/Pages/50-location.qml:86

449msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

507msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

450msgstr ""

508msgstr ""

509+"Durch GPS sowie anonymisierte WLAN- und Mobilfunknetz-Daten (empfohlen)"

451

510

452#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

511#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

453#: qml/Wizard/Pages/50-location.qml:103

512#: qml/Wizard/Pages/50-location.qml:103

@@ -455,81 +514,88 @@ msgid ""

455"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

514"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

456"conditions</a>."

515"conditions</a>."

457msgstr ""

516msgstr ""

517+"Mit dem Auswählen dieser Option stimmen Sie den Nokia HERE <a "

518+"href='#'>allgemeinen Geschäftsbedingungen</a> zu."

458

519

459#: qml/Wizard/Pages/50-location.qml:112

520#: qml/Wizard/Pages/50-location.qml:112

460msgid "Not at all"

521msgid "Not at all"

461−msgstr ""

522+msgstr "Gar nicht"

462

523

463#: qml/Wizard/Pages/50-location.qml:124

524#: qml/Wizard/Pages/50-location.qml:124

464msgid "You can change your mind later in <b>System Settings</b>."

525msgid "You can change your mind later in <b>System Settings</b>."

465msgstr ""

526msgstr ""

527+"Sie können Ihre Meinung später in den <b>Systemeinstellungen</b> ändern."

466

528

467#: qml/Wizard/Pages/60-reporting.qml:24

529#: qml/Wizard/Pages/60-reporting.qml:24

468msgid "Improving your experience"

530msgid "Improving your experience"

469−msgstr ""

531+msgstr "Verbessert Ihre Erfahrung mit diesem Produkt"

470

532

471#: qml/Wizard/Pages/60-reporting.qml:36

533#: qml/Wizard/Pages/60-reporting.qml:36

472msgid ""

534msgid ""

473"Your phone is set up to automatically report errors to Canonical and its "

535"Your phone is set up to automatically report errors to Canonical and its "

474"partners, the makers of the operating system."

536"partners, the makers of the operating system."

475msgstr ""

537msgstr ""

538+"Ihr Telefon ist so eingestellt, dass es automatisch Fehlerberichte an "

539+"Canonical und seine Partner, die Hersteller des Betriebssystems, sendet."

476

540

477#: qml/Wizard/Pages/60-reporting.qml:43

541#: qml/Wizard/Pages/60-reporting.qml:43

478msgid ""

542msgid ""

479"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

543"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

480"Privacy</b>"

544"Privacy</b>"

481msgstr ""

545msgstr ""

546+"Dies kann in den <b>Systemeinstellungen</b> unter <b>Sicherheit &amp; "

547+"Datenschutz</b> deaktiviert werden"

482

548

483#: qml/Wizard/Pages/80-finished.qml:24

549#: qml/Wizard/Pages/80-finished.qml:24

484msgid "All done"

550msgid "All done"

485−msgstr ""

551+msgstr "Alles erledigt"

486

552

487#: qml/Wizard/Pages/80-finished.qml:39

553#: qml/Wizard/Pages/80-finished.qml:39

488msgid "Nice work!"

554msgid "Nice work!"

489−msgstr ""

555+msgstr "Gute Arbeit!"

490

556

491#: qml/Wizard/Pages/80-finished.qml:46

557#: qml/Wizard/Pages/80-finished.qml:46

492msgid "Your phone is now ready to use."

558msgid "Your phone is now ready to use."

493−msgstr ""

559+msgstr "Ihr Telefon ist nun einsatzbereit."

494

560

495#: qml/Wizard/Pages/80-finished.qml:53

561#: qml/Wizard/Pages/80-finished.qml:53

496msgid "Finish"

562msgid "Finish"

497−msgstr ""

563+msgstr "Beenden"

498

564

499#: qml/Wizard/Pages/here-terms.qml:27

565#: qml/Wizard/Pages/here-terms.qml:27

500msgid "Terms & Conditions"

566msgid "Terms & Conditions"

501−msgstr ""

567+msgstr "Nutzungsbedingungen"

502

568

503#: qml/Wizard/Pages/passwd-confirm.qml:49

569#: qml/Wizard/Pages/passwd-confirm.qml:49

504msgid "Confirm passphrase"

570msgid "Confirm passphrase"

505−msgstr ""

571+msgstr "Passwort bestätigen"

506

572

507#: qml/Wizard/Pages/passwd-confirm.qml:50

573#: qml/Wizard/Pages/passwd-confirm.qml:50

508msgid "Confirm passcode"

574msgid "Confirm passcode"

509−msgstr ""

575+msgstr "PIN bestätigen"

510

576

511#: qml/Wizard/Pages/passwd-confirm.qml:53

577#: qml/Wizard/Pages/passwd-confirm.qml:53

512#: qml/Wizard/Pages/passwd-confirm.qml:54

578#: qml/Wizard/Pages/passwd-confirm.qml:54

513msgid "Please try again."

579msgid "Please try again."

514−msgstr ""

580+msgstr "Bitte versuchen Sie es erneut."

515

581

516#: qml/Wizard/Pages/passwd-set.qml:61

582#: qml/Wizard/Pages/passwd-set.qml:61

517msgid "Choose your passcode"

583msgid "Choose your passcode"

518−msgstr ""

584+msgstr "Wählen Sie Ihre PIN"

519

585

520#: qml/Wizard/Pages/passwd-set.qml:68

586#: qml/Wizard/Pages/passwd-set.qml:68

521msgid "Passphrase must be 4 characters long"

587msgid "Passphrase must be 4 characters long"

522−msgstr ""

588+msgstr "Passwörter müssen 4 Buchstaben lang sein"

523

589

524#: qml/Wizard/StackButton.qml:39

590#: qml/Wizard/StackButton.qml:39

525#, qt-format

591#, qt-format

526msgid "〈 %1"

592msgid "〈 %1"

527−msgstr ""

593+msgstr "〈 %1"

528

594

529#: qml/Wizard/StackButton.qml:42

595#: qml/Wizard/StackButton.qml:42

530#, qt-format

596#, qt-format

531msgid "%1 〉"

597msgid "%1 〉"

532−msgstr ""

598+msgstr "%1 〉"

533

599

534#~ msgid "Confirm"

600#~ msgid "Confirm"

535#~ msgstr "Bestätigen"

601#~ msgstr "Bestätigen"

@@ -540,12 +606,58 @@ msgstr ""

540#~ msgid "Speak Now..."

606#~ msgid "Speak Now..."

541#~ msgstr "Sprechen Sie jetzt …"

607#~ msgstr "Sprechen Sie jetzt …"

542

608

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+

543#~ msgid "Type or say a command"

627#~ msgid "Type or say a command"

544#~ msgstr "Befehl eingeben oder sprechen"

628#~ msgstr "Befehl eingeben oder sprechen"

545

629

546#~ msgid "Speaking..."

630#~ msgid "Speaking..."

547#~ msgstr "Sprechen Sie …"

631#~ msgstr "Sprechen Sie …"

548

632

633+#~ msgid ""

634+#~ "You have now mastered the edge gestures and can start using the "

635+#~ "phone<br><br>Tap on the screen to start"

636+#~ msgstr ""

637+#~ "Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "

638+#~ "nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"

639+

640+#~ msgid "Top edge"

641+#~ msgstr "Oberer Bildschirmrand"

642+

643+#~ msgid "Try swiping from the top edge to access the indicators"

644+#~ msgstr ""

645+#~ "Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"

646+

647+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

648+#~ msgstr ""

649+#~ "Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"

650+#~ "Schnellzugriff aufzurufen"

651+

652+#~ msgid "Try swiping from the right edge to unlock the phone"

653+#~ msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"

654+

655+#~ msgid "Right edge"

656+#~ msgstr "Rechter Bildschirmrand"

657+

658+#~ msgid "Power off"

659+#~ msgstr "Ausschalten"

660+

549#~ msgid "All"

661#~ msgid "All"

550#~ msgstr "Alle"

662#~ msgstr "Alle"

551

663

@@ -555,5 +667,26 @@ msgstr ""

555#~ msgid "Favorites"

667#~ msgid "Favorites"

556#~ msgstr "Favoriten"

668#~ msgstr "Favoriten"

557

669

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+

558#~ msgid "Manage Scopes"

691#~ msgid "Manage Scopes"

559#~ msgstr "Filter verwalten"

692#~ msgstr "Filter verwalten"

po/el.po+327−184

@@ -7,18 +7,18 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11−"PO-Revision-Date: 2014-11-08 18:38+0000\n"

11+"PO-Revision-Date: 2015-03-30 19:52+0000\n"

12−"Last-Translator: Efstathios Iosifidis <Unknown>\n"

12+"Last-Translator: Simos Xenitellis <Unknown>\n"

13"Language-Team: Greek <el@li.org>\n"

13"Language-Team: Greek <el@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-31 05:58+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr "Κωδικός πρόσβασης: "

23msgstr "Κωδικός πρόσβασης: "

24

24

@@ -31,68 +31,95 @@ msgstr "Καρφίτσωμα συντόμευσης"

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Ξεκαρφίτσωμα συντόμευσης"

32msgstr "Ξεκαρφίτσωμα συντόμευσης"

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr "Κλειδωμένη συσκευή"

36msgstr "Κλειδωμένη συσκευή"

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

40msgstr ""

41"Δεν σας επιτρέπεται η πρόσβαση καθώς προσπαθήσατε επανηλλημένως να "

41"Δεν σας επιτρέπεται η πρόσβαση καθώς προσπαθήσατε επανηλλημένως να "

42"συνδεθείτε με λάθος κωδικό."

42"συνδεθείτε με λάθος κωδικό."

43

43

44−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

45msgid "You have been locked out due to too many failed passcode attempts."

45msgid "You have been locked out due to too many failed passcode attempts."

46msgstr ""

46msgstr ""

47"Δεν σας επιτρέπεται η πρόσβαση καθώς προσπαθήσατε επανηλλημένως να "

47"Δεν σας επιτρέπεται η πρόσβαση καθώς προσπαθήσατε επανηλλημένως να "

48"συνδεθείτε με λάθος κωδικό."

48"συνδεθείτε με λάθος κωδικό."

49

49

50−#: qml/Components/DelayedLockscreen.qml:72

50+#: qml/Components/DelayedLockscreen.qml:74

51#, qt-format

51#, qt-format

52msgid "Please wait %1 minute and then try again…"

52msgid "Please wait %1 minute and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

54msgstr[0] "Παρακαλώ περιμένετε %1 λεπτό και δοκιμάστε ξανά..."

54msgstr[0] "Παρακαλώ περιμένετε %1 λεπτό και δοκιμάστε ξανά..."

55msgstr[1] "Παρακαλώ περιμένετε %1 λεπτά και δοκιμάστε ξανά..."

55msgstr[1] "Παρακαλώ περιμένετε %1 λεπτά και δοκιμάστε ξανά..."

56

56

57−#: qml/Components/Dialogs.qml:70

57+#: qml/Components/Dialogs.qml:67

58+msgctxt "Title: Lock/Log out dialog"

58msgid "Log out"

59msgid "Log out"

59msgstr "Αποσύνδεση"

60msgstr "Αποσύνδεση"

60

61

61−#: qml/Components/Dialogs.qml:71

62+#: qml/Components/Dialogs.qml:68

62msgid "Are you sure you want to log out?"

63msgid "Are you sure you want to log out?"

63msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε;"

64msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε;"

64

65

65−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66+#: qml/Components/Dialogs.qml:70

66−#: qml/Components/Dialogs.qml:122

67+msgctxt "Button: Lock the system"

67−msgid "No"

68+msgid "Lock"

68−msgstr "Όχι"

69+msgstr "Κλείδωμα"

69

70

70−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

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

71−#: qml/Components/Dialogs.qml:129

77+#: qml/Components/Dialogs.qml:171

72−msgid "Yes"

78+msgid "Cancel"

73−msgstr "Ναι"

79+msgstr "Ακύρωση"

74

80

75−#: qml/Components/Dialogs.qml:94

81+#: qml/Components/Dialogs.qml:96

82+msgctxt "Title: Reboot/Shut down dialog"

76msgid "Shut down"

83msgid "Shut down"

77msgstr "Τερματισμός λειτουργίας"

84msgstr "Τερματισμός λειτουργίας"

78

85

79−#: qml/Components/Dialogs.qml:95

86+#: qml/Components/Dialogs.qml:97

80msgid "Are you sure you want to shut down?"

87msgid "Are you sure you want to shut down?"

81msgstr "Επιθυμείτε σίγουρα τερματισμό;"

88msgstr "Επιθυμείτε σίγουρα τερματισμό;"

82

89

83−#: qml/Components/Dialogs.qml:119

90+#: qml/Components/Dialogs.qml:99

91+msgctxt "Button: Reboot the system"

84msgid "Reboot"

92msgid "Reboot"

85msgstr "Επανεκκίνηση"

93msgstr "Επανεκκίνηση"

86

94

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

88msgid "Are you sure you want to reboot?"

106msgid "Are you sure you want to reboot?"

89msgstr "Επιθυμείτε σίγουρα επανεκκίνηση;"

107msgstr "Επιθυμείτε σίγουρα επανεκκίνηση;"

90

108

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"

92msgid "Power"

119msgid "Power"

93msgstr ""

120msgstr ""

94

121

95−#: qml/Components/Dialogs.qml:145

122+#: qml/Components/Dialogs.qml:151

96msgid ""

123msgid ""

97"Are you sure you would like\n"

124"Are you sure you would like\n"

98"to power off?"

125"to power off?"

@@ -100,68 +127,16 @@ msgstr ""

100"Επιθυμείτε σίγουρα τον\n"

127"Επιθυμείτε σίγουρα τον\n"

101"τερματισμό λειτουργίας;"

128"τερματισμό λειτουργίας;"

102

129

103−#: qml/Components/Dialogs.qml:147

130+#: qml/Components/Dialogs.qml:153

131+msgctxt "Button: Power off the system"

104msgid "Power off"

132msgid "Power off"

105−msgstr "Τερματισμός"

133+msgstr "Κλείσιμο τροφοδοσίας"

106

134

107−#: qml/Components/Dialogs.qml:157

135+#: qml/Components/Dialogs.qml:162

136+msgctxt "Button: Restart the system"

108msgid "Restart"

137msgid "Restart"

109msgstr "Επανεκκίνηση"

138msgstr "Επανεκκίνηση"

110

139

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<br><br>Tap on the screen to start"

161−msgstr ""

162−"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "

163−"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"

164−

165#: qml/Components/Lockscreen.qml:238

140#: qml/Components/Lockscreen.qml:238

166msgid "Return to Call"

141msgid "Return to Call"

167msgstr "Επιστροφή στην κλήση"

142msgstr "Επιστροφή στην κλήση"

@@ -174,32 +149,39 @@ msgstr "Κλήση έκτακτης ανάγκης"

174msgid "OK"

149msgid "OK"

175msgstr "OK"

150msgstr "OK"

176

151

177−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

178msgid "See less"

153msgid "See less"

179msgstr "Λιγότερα"

154msgstr "Λιγότερα"

180

155

181−#: qml/Dash/GenericScopeView.qml:431

156+#: qml/Dash/GenericScopeView.qml:533

182msgid "See all"

157msgid "See all"

183msgstr "Εμφάνιση όλων"

158msgstr "Εμφάνιση όλων"

184

159

185−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

160+#: qml/Dash/GenericScopeView.qml:595

186−#: qml/Panel/SearchIndicator.qml:27

161+msgctxt "Label: Hint for dash search line edit"

187msgid "Search"

162msgid "Search"

188msgstr "Αναζήτηση"

163msgstr "Αναζήτηση"

189

164

190−#: qml/Dash/PageHeader.qml:260

165+#: qml/Dash/PageHeader.qml:269

166+msgctxt "Button: Open the Ubuntu Store"

191msgid "Store"

167msgid "Store"

192−msgstr "Κατάστημα"

168+msgstr ""

193

169

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"

195msgid "Settings"

177msgid "Settings"

196−msgstr "Ρυθμίσεις"

178+msgstr ""

197

179

198−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

199msgid "Remove from Favorites"

181msgid "Remove from Favorites"

200msgstr "Αφαίρεση από τα αγαπημένα"

182msgstr "Αφαίρεση από τα αγαπημένα"

201

183

202−#: qml/Dash/PageHeader.qml:284

184+#: qml/Dash/PageHeader.qml:293

203msgid "Add to Favorites"

185msgid "Add to Favorites"

204msgstr "Προσθήκη στα αγαπημένα"

186msgstr "Προσθήκη στα αγαπημένα"

205

187

@@ -225,28 +207,100 @@ msgstr "Αποστολή"

225

207

226#: qml/Dash/PullToRefreshScopeStyle.qml:55

208#: qml/Dash/PullToRefreshScopeStyle.qml:55

227msgid "Pull to refresh…"

209msgid "Pull to refresh…"

228−msgstr ""

210+msgstr "Σύρτε για ανανέωση…"

229

211

230#: qml/Dash/PullToRefreshScopeStyle.qml:60

212#: qml/Dash/PullToRefreshScopeStyle.qml:60

231msgid "Release to refresh…"

213msgid "Release to refresh…"

232−msgstr ""

214+msgstr "Αφήστε για ανανέωση…"

215+

216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

217+msgid "Enable location data"

218+msgstr "Ενεργοποίηση δεδομένων τοποθεσίας"

233

219

234−#: qml/Dash/ScopesList.qml:63

220+#: qml/Dash/ScopesList.qml:66

235msgid "Manage"

221msgid "Manage"

236−msgstr ""

222+msgstr "Διαχείριση"

237

223

238−#: qml/Dash/ScopesList.qml:107

224+#: qml/Dash/ScopesList.qml:112

239msgid "Home"

225msgid "Home"

240−msgstr ""

226+msgstr "Αρχή"

241

227

242−#: qml/Dash/ScopesList.qml:108

228+#: qml/Dash/ScopesList.qml:113

243msgid "Also installed"

229msgid "Also installed"

244−msgstr ""

230+msgstr "Επίσης εγκατεστημένα"

245

231

246−#: qml/Greeter/Greeter.qml:174

232+#: qml/Greeter/CoverPage.qml:107

247msgid "Unlock"

233msgid "Unlock"

248msgstr "Ξεκλείδωμα"

234msgstr "Ξεκλείδωμα"

249

235

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+

250#: qml/Notifications/NotificationMenuItemFactory.qml:128

304#: qml/Notifications/NotificationMenuItemFactory.qml:128

251msgid "Show password"

305msgid "Show password"

252msgstr "Εμφάνιση κωδικού"

306msgstr "Εμφάνιση κωδικού"

@@ -287,6 +341,11 @@ msgstr "Ολοκληρώθηκε"

287msgid "Failed, tap to retry"

341msgid "Failed, tap to retry"

288msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσετε"

342msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσετε"

289

343

344+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

345+msgctxt "Label: Hint in message indicator line edit"

346+msgid "Reply"

347+msgstr "Απάντηση"

348+

290#: qml/Panel/Indicators/ModemInfoItem.qml:105

349#: qml/Panel/Indicators/ModemInfoItem.qml:105

291msgid "Unlock SIM"

350msgid "Unlock SIM"

292msgstr "Ξεκλείδωμα SIM"

351msgstr "Ξεκλείδωμα SIM"

@@ -295,154 +354,164 @@ msgstr "Ξεκλείδωμα SIM"

295msgid "Roaming"

354msgid "Roaming"

296msgstr "Περιαγωγή"

355msgstr "Περιαγωγή"

297

356

298−#: qml/Shell.qml:367

357+#: qml/Tutorial/TutorialBottomFinish.qml:24

299−#, qt-format

358+msgid "This action does different things for different apps"

300−msgid "Enter %1"

301−msgstr "Εισάγετε %1"

359+msgstr ""

360+"Αυτή η ενέργεια κάνει διαφορετικά πράγματα για διαφορετικές εφαρμογές"

302

361

303−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

362+#: qml/Tutorial/TutorialBottomFinish.qml:25

304−msgid "Enter passphrase"

363+msgid "Tap here to finish."

305−msgstr "Εισαγωγή συνθηματικού"

364+msgstr "Πατήστε εδώ για τέλος."

306

365

307−#: qml/Shell.qml:369

366+#: qml/Tutorial/TutorialBottom.qml:28

308−msgid "Enter passcode"

367+msgid "Open special menus"

309−msgstr "Εισαγωγή κωδικού"

368+msgstr "Άνοιγμα ειδικών μενού"

310

369

311−#: qml/Shell.qml:370

370+#: qml/Tutorial/TutorialBottom.qml:29

312−#, qt-format

371+msgid "Swipe up from the bottom edge."

313−msgid "Sorry, incorrect %1"

372+msgstr "Σύρετε από την κάτω άκρη προς τα πάνω."

314−msgstr "Συγνώμη, μη έγκυρο %1"

315

373

316−#: qml/Shell.qml:371

374+#: qml/Tutorial/TutorialLeftFinish.qml:24

317−msgid "Sorry, incorrect passphrase"

375+msgid "These are the shortcuts to favorite apps"

318−msgstr "Συγνώμη, μη έγκυρο συνθηματικό"

376+msgstr "Είναι συντομεύσεις για αγαπημένες εφαρμογές"

319

377

320−#: qml/Shell.qml:372

378+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

321−msgid "Please re-enter"

379+msgid "Tap here to continue."

322−msgstr "Παρακαλώ πληκτρολογήστε ξανά"

380+msgstr "Πατήστε εδώ για συνέχεια."

323

381

324−#: qml/Shell.qml:373

382+#: qml/Tutorial/TutorialLeft.qml:26

325−msgid "Sorry, incorrect passcode"

383+msgid "Open the launcher"

326−msgstr ""

384+msgstr "Άνοιγμα του εκκινητή"

327

385

328−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

386+#: qml/Tutorial/TutorialLeft.qml:27

329−msgid "Sorry, incorrect passphrase."

387+msgid "Short swipe from the left edge."

330−msgstr ""

388+msgstr "Σύρετε ελάχιστα από την αριστερή άκρη."

331

389

332−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

390+#: qml/Tutorial/TutorialPage.qml:178

333−msgid "Sorry, incorrect passcode."

391+msgid "You almost got it!"

334−msgstr ""

392+msgstr "Σχεδόν το είχατε!"

335

393

336−#: qml/Shell.qml:469

394+#: qml/Tutorial/TutorialPage.qml:195

337−msgid "This will be your last attempt."

395+msgid "Try again."

338−msgstr ""

396+msgstr "Δοκιμάστε πάλι."

339

397

340−#: qml/Shell.qml:471

398+#: qml/Tutorial/TutorialRight.qml:31

341−msgid ""

399+msgid "To view open apps"

342−"If passphrase is entered incorrectly, your phone will conduct a factory "

400+msgstr "Για να δείτε τις ανοιχτές εφαρμογές"

343−"reset and all personal data will be deleted."

344−msgstr ""

345

401

346−#: qml/Shell.qml:472

402+#: qml/Tutorial/TutorialRight.qml:32

347−msgid ""

403+msgid "Long swipe from the right edge."

348−"If passcode is entered incorrectly, your phone will conduct a factory reset "

404+msgstr "Σύρετε παρατεταμένα από την δεξιά άκρη."

349−"and all personal data will be deleted."

405+

350−msgstr ""

406+#: qml/Tutorial/TutorialRight.qml:122

407+msgid "View all your running tasks."

408+msgstr "Δείτε όλες τις εργασίες που εκτελούνται."

351

409

352#: qml/Wizard/Page.qml:89

410#: qml/Wizard/Page.qml:89

411+msgctxt "Button: Go back one page in the Wizard"

353msgid "Back"

412msgid "Back"

354−msgstr ""

413+msgstr "Πίσω"

355

414

356#: qml/Wizard/Pages/10-welcome.qml:27

415#: qml/Wizard/Pages/10-welcome.qml:27

357msgid "Hi!"

416msgid "Hi!"

358−msgstr ""

417+msgstr "Γεια!"

359

418

360#: qml/Wizard/Pages/10-welcome.qml:44

419#: qml/Wizard/Pages/10-welcome.qml:44

361msgid "Welcome to your Ubuntu phone."

420msgid "Welcome to your Ubuntu phone."

362−msgstr ""

421+msgstr "Καλώς ήρθατε στο Ubuntu phone σας."

363

422

364#: qml/Wizard/Pages/10-welcome.qml:52

423#: qml/Wizard/Pages/10-welcome.qml:52

365msgid "Let’s get started."

424msgid "Let’s get started."

366−msgstr ""

425+msgstr "Ας ξεκινήσουμε."

367

426

368#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

427#: 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

370#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

429#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

371#: qml/Wizard/Pages/passwd-set.qml:90

430#: qml/Wizard/Pages/passwd-set.qml:90

372msgid "Continue"

431msgid "Continue"

373−msgstr ""

432+msgstr "Συνέχιση"

374

433

375#: qml/Wizard/Pages/20-sim.qml:25

434#: qml/Wizard/Pages/20-sim.qml:25

376msgid "Add a SIM card and restart your device"

435msgid "Add a SIM card and restart your device"

377−msgstr ""

436+msgstr "Εισάγετε μια κάρτα SIM και επανεκκινήστε τη συσκευή σας"

378

437

379−#: qml/Wizard/Pages/20-sim.qml:55

438+#: qml/Wizard/Pages/20-sim.qml:59

380msgid "Without it, you won’t be able to make calls or use text messaging."

439msgid "Without it, you won’t be able to make calls or use text messaging."

381msgstr ""

440msgstr ""

441+"Χωρίς αυτήν, δεν θα μπορείτε να κάνετε κλήσεις ή να χρησιμοποιήσετε μηνύματα "

442+"κειμένου."

382

443

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

384msgid "Skip"

445msgid "Skip"

385−msgstr ""

446+msgstr "Παράβλεψη"

386

447

387#: qml/Wizard/Pages/30-passwd-type.qml:39

448#: qml/Wizard/Pages/30-passwd-type.qml:39

388msgid "Lock security"

449msgid "Lock security"

389−msgstr ""

450+msgstr "Κλείδωμα ασφαλείας"

390

451

391#: qml/Wizard/Pages/30-passwd-type.qml:74

452#: qml/Wizard/Pages/30-passwd-type.qml:74

392msgid "Please select how you’d like to unlock your phone."

453msgid "Please select how you’d like to unlock your phone."

393−msgstr ""

454+msgstr "Παρακαλούμε επιλέξτε πως θα θέλατε να ξεκλειδώνετε το τηλέφωνό σας."

394

455

395#: qml/Wizard/Pages/30-passwd-type.qml:97

456#: qml/Wizard/Pages/30-passwd-type.qml:97

457+msgctxt "Label: Type of security method"

396msgid "Swipe"

458msgid "Swipe"

397msgstr ""

459msgstr ""

398

460

399#: qml/Wizard/Pages/30-passwd-type.qml:98

461#: qml/Wizard/Pages/30-passwd-type.qml:98

462+msgctxt "Label: Description of security method"

400msgid "No security"

463msgid "No security"

401−msgstr ""

464+msgstr "Χωρίς ασφάλεια"

402

465

403#: qml/Wizard/Pages/30-passwd-type.qml:100

466#: qml/Wizard/Pages/30-passwd-type.qml:100

467+msgctxt "Label: Type of security method"

404msgid "Passcode"

468msgid "Passcode"

405−msgstr ""

469+msgstr "Κωδικός αριθμός"

406

470

407#: qml/Wizard/Pages/30-passwd-type.qml:101

471#: qml/Wizard/Pages/30-passwd-type.qml:101

472+msgctxt "Label: Description of security method"

408msgid "4 digits only"

473msgid "4 digits only"

409−msgstr ""

474+msgstr "Μόνο με 4 ψηφία"

410

475

411#: qml/Wizard/Pages/30-passwd-type.qml:103

476#: qml/Wizard/Pages/30-passwd-type.qml:103

477+msgctxt "Label: Type of security method"

412msgid "Passphrase"

478msgid "Passphrase"

413−msgstr ""

479+msgstr "Κωδική φράση"

414

480

415#: qml/Wizard/Pages/30-passwd-type.qml:104

481#: qml/Wizard/Pages/30-passwd-type.qml:104

482+msgctxt "Label: Description of security method"

416msgid "Numbers and letters"

483msgid "Numbers and letters"

417−msgstr ""

484+msgstr "Αριθμοί και γράμματα"

418

485

419−#: qml/Wizard/Pages/40-wifi.qml:28

486+#: qml/Wizard/Pages/40-wifi.qml:29

420msgid "Connect to Wi‑Fi"

487msgid "Connect to Wi‑Fi"

421−msgstr ""

488+msgstr "Σύνδεση σε δίκτυο Wi-Fi"

422

489

423−#: qml/Wizard/Pages/40-wifi.qml:147

490+#: qml/Wizard/Pages/40-wifi.qml:168

424msgid "Available networks…"

491msgid "Available networks…"

425−msgstr ""

492+msgstr "Διαθέσιμα δίκτυα..."

426

493

427−#: qml/Wizard/Pages/40-wifi.qml:148

494+#: qml/Wizard/Pages/40-wifi.qml:169

428msgid "No available networks."

495msgid "No available networks."

429−msgstr ""

496+msgstr "Δεν υπάρχουν διαθέσιμα δίκτυα."

430

497

431#: qml/Wizard/Pages/50-location.qml:27

498#: qml/Wizard/Pages/50-location.qml:27

432msgid "Location"

499msgid "Location"

433−msgstr ""

500+msgstr "Τοποθεσία"

434

501

435#: qml/Wizard/Pages/50-location.qml:62

502#: qml/Wizard/Pages/50-location.qml:62

436msgid "Let the phone detect your location:"

503msgid "Let the phone detect your location:"

437−msgstr ""

504+msgstr "Επιτρέψετε το τηλέφωνο να εντοπίσει την τοποθεσία σας:"

438

505

439#: qml/Wizard/Pages/50-location.qml:69

506#: qml/Wizard/Pages/50-location.qml:69

440msgid "Using GPS only (less accurate)"

507msgid "Using GPS only (less accurate)"

441−msgstr ""

508+msgstr "Χρήση μόνο GPS (λιγότερο ακριβή)"

442

509

443#: qml/Wizard/Pages/50-location.qml:86

510#: qml/Wizard/Pages/50-location.qml:86

444msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

511msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

445msgstr ""

512msgstr ""

513+"Χρήση GPS, ανωνυνοποιημένα δίκτυα Wi-Fi και πληροφορίες δικτύων κινητής "

514+"τηλεφωνίας (συνιστάται)"

446

515

447#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

516#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

448#: qml/Wizard/Pages/50-location.qml:103

517#: qml/Wizard/Pages/50-location.qml:103

@@ -450,81 +519,89 @@ msgid ""

450"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

519"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

451"conditions</a>."

520"conditions</a>."

452msgstr ""

521msgstr ""

522+"Ενεργοποιώντας αυτή την επιλογή, αποδέχεστε τους <a href='#'>όρους και "

523+"προϋποθέσεις</a> της Nokia HERE."

453

524

454#: qml/Wizard/Pages/50-location.qml:112

525#: qml/Wizard/Pages/50-location.qml:112

455msgid "Not at all"

526msgid "Not at all"

456−msgstr ""

527+msgstr "Καθόλου"

457

528

458#: qml/Wizard/Pages/50-location.qml:124

529#: qml/Wizard/Pages/50-location.qml:124

459msgid "You can change your mind later in <b>System Settings</b>."

530msgid "You can change your mind later in <b>System Settings</b>."

460msgstr ""

531msgstr ""

532+"Μπορείτε να αλλάξετε τη γνώμη σας αργότερα στις <b>Ρυθμίσεις Συστήματος</b>."

461

533

462#: qml/Wizard/Pages/60-reporting.qml:24

534#: qml/Wizard/Pages/60-reporting.qml:24

463msgid "Improving your experience"

535msgid "Improving your experience"

464−msgstr ""

536+msgstr "Βελτιώστε την εμπειρία σας"

465

537

466#: qml/Wizard/Pages/60-reporting.qml:36

538#: qml/Wizard/Pages/60-reporting.qml:36

467msgid ""

539msgid ""

468"Your phone is set up to automatically report errors to Canonical and its "

540"Your phone is set up to automatically report errors to Canonical and its "

469"partners, the makers of the operating system."

541"partners, the makers of the operating system."

470msgstr ""

542msgstr ""

543+"Το τηλέφωνό σας είναι ρυθμισμένο να στέλνει αυτόματα αναφορές σφαλμάτων στην "

544+"Canonical και τους συνεργάτες της, τους δημιουργούς τους λειτουργικού "

545+"συστήματος."

471

546

472#: qml/Wizard/Pages/60-reporting.qml:43

547#: qml/Wizard/Pages/60-reporting.qml:43

473msgid ""

548msgid ""

474"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

549"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

475"Privacy</b>"

550"Privacy</b>"

476msgstr ""

551msgstr ""

552+"Αυτό μπορεί να απενεργοποιηθεί στις <b>Ρυθμίσεις Συστήματος</b> στο πεδίο "

553+"<b>Ασφάλεια &amp; Ιδιωτικότητα</b>"

477

554

478#: qml/Wizard/Pages/80-finished.qml:24

555#: qml/Wizard/Pages/80-finished.qml:24

479msgid "All done"

556msgid "All done"

480−msgstr ""

557+msgstr "Όλα έτοιμα"

481

558

482#: qml/Wizard/Pages/80-finished.qml:39

559#: qml/Wizard/Pages/80-finished.qml:39

483msgid "Nice work!"

560msgid "Nice work!"

484−msgstr ""

561+msgstr "Ωραία δουλειά!"

485

562

486#: qml/Wizard/Pages/80-finished.qml:46

563#: qml/Wizard/Pages/80-finished.qml:46

487msgid "Your phone is now ready to use."

564msgid "Your phone is now ready to use."

488−msgstr ""

565+msgstr "Το τηλέφωνό σας είναι πλέον έτοιμο για χρήση."

489

566

490#: qml/Wizard/Pages/80-finished.qml:53

567#: qml/Wizard/Pages/80-finished.qml:53

491msgid "Finish"

568msgid "Finish"

492−msgstr ""

569+msgstr "Ολοκλήρωση"

493

570

494#: qml/Wizard/Pages/here-terms.qml:27

571#: qml/Wizard/Pages/here-terms.qml:27

495msgid "Terms & Conditions"

572msgid "Terms & Conditions"

496−msgstr ""

573+msgstr "Όροι και προϋποθέσεις"

497

574

498#: qml/Wizard/Pages/passwd-confirm.qml:49

575#: qml/Wizard/Pages/passwd-confirm.qml:49

499msgid "Confirm passphrase"

576msgid "Confirm passphrase"

500−msgstr ""

577+msgstr "Επιβεβαίωση φράσης πρόσβασης"

501

578

502#: qml/Wizard/Pages/passwd-confirm.qml:50

579#: qml/Wizard/Pages/passwd-confirm.qml:50

503msgid "Confirm passcode"

580msgid "Confirm passcode"

504−msgstr ""

581+msgstr "Επιβεβαιώστε τον κωδικό πρόσβασης"

505

582

506#: qml/Wizard/Pages/passwd-confirm.qml:53

583#: qml/Wizard/Pages/passwd-confirm.qml:53

507#: qml/Wizard/Pages/passwd-confirm.qml:54

584#: qml/Wizard/Pages/passwd-confirm.qml:54

508msgid "Please try again."

585msgid "Please try again."

509−msgstr ""

586+msgstr "Παρακαλώ προσπαθήστε ξανά."

510

587

511#: qml/Wizard/Pages/passwd-set.qml:61

588#: qml/Wizard/Pages/passwd-set.qml:61

512msgid "Choose your passcode"

589msgid "Choose your passcode"

513−msgstr ""

590+msgstr "Επιλογή κωδικού πρόσβασης"

514

591

515#: qml/Wizard/Pages/passwd-set.qml:68

592#: qml/Wizard/Pages/passwd-set.qml:68

516msgid "Passphrase must be 4 characters long"

593msgid "Passphrase must be 4 characters long"

517−msgstr ""

594+msgstr "Η φράση πρόσβασης πρέπει να έχει 4 χαρακτήρες"

518

595

519#: qml/Wizard/StackButton.qml:39

596#: qml/Wizard/StackButton.qml:39

520#, qt-format

597#, qt-format

521msgid "〈 %1"

598msgid "〈 %1"

522−msgstr ""

599+msgstr "〈 %1"

523

600

524#: qml/Wizard/StackButton.qml:42

601#: qml/Wizard/StackButton.qml:42

525#, qt-format

602#, qt-format

526msgid "%1 〉"

603msgid "%1 〉"

527−msgstr ""

604+msgstr "%1 〉"

528

605

529#~ msgid "Confirm"

606#~ msgid "Confirm"

530#~ msgstr "Επιβεβαίωση"

607#~ msgstr "Επιβεβαίωση"

@@ -538,9 +615,57 @@ msgstr ""

538#~ msgid "Speaking..."

615#~ msgid "Speaking..."

539#~ msgstr "Ομιλία..."

616#~ msgstr "Ομιλία..."

540

617

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+

541#~ msgid "Loading. Please Wait..."

647#~ msgid "Loading. Please Wait..."

542#~ msgstr "Γίνεται φόρτωση. Παρακαλώ περιμένετε..."

648#~ msgstr "Γίνεται φόρτωση. Παρακαλώ περιμένετε..."

543

649

650+#~ msgid "Try swiping from the right edge to unlock the phone"

651+#~ msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"

652+

653+#~ msgid "Skip intro"

654+#~ msgstr "Παράλειψη εισαγωγής"

655+

656+#~ msgid ""

657+#~ "You have now mastered the edge gestures and can start using the "

658+#~ "phone<br><br>Tap on the screen to start"

659+#~ msgstr ""

660+#~ "Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "

661+#~ "χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"

662+

663+#~ msgid "Store"

664+#~ msgstr "Κατάστημα"

665+

666+#~ msgid "Power off"

667+#~ msgstr "Τερματισμός"

668+

544#~ msgid "All"

669#~ msgid "All"

545#~ msgstr "Όλα"

670#~ msgstr "Όλα"

546

671

@@ -549,3 +674,21 @@ msgstr ""

549

674

550#~ msgid "Done"

675#~ msgid "Done"

551#~ msgstr "Ολοκληρώθηκε"

676#~ 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 ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11−"PO-Revision-Date: 2014-10-12 09:41+0000\n"

11+"PO-Revision-Date: 2015-04-11 02:20+0000\n"

12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"

12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"

13"Language-Team: English (Australia) <en_AU@li.org>\n"

13"Language-Team: English (Australia) <en_AU@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-04-14 05:33+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17423)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr "Password: "

23msgstr "Password: "

24

24

@@ -31,64 +31,91 @@ msgstr "Pin shortcut"

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Unpin shortcut"

32msgstr "Unpin shortcut"

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr "Device Locked"

36msgstr "Device Locked"

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr "You have been locked out due to too many failed passphrase attempts."

40msgstr "You have been locked out due to too many failed passphrase attempts."

41

41

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

43msgid "You have been locked out due to too many failed passcode attempts."

43msgid "You have been locked out due to too many failed passcode attempts."

44msgstr "You have been locked out due to too many failed passcode attempts."

44msgstr "You have been locked out due to too many failed passcode attempts."

45

45

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

47#, qt-format

47#, qt-format

48msgid "Please wait %1 minute and then try again…"

48msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] "Please wait %1 minute and then try again…"

50msgstr[0] "Please wait %1 minute and then try again…"

51msgstr[1] "Please wait %1 minutes and then try again…"

51msgstr[1] "Please wait %1 minutes and then try again…"

52

52

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

54msgid "Log out"

55msgid "Log out"

55msgstr "Log out"

56msgstr "Log out"

56

57

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

58msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

59msgstr "Are you sure you want to log out?"

60msgstr "Are you sure you want to log out?"

60

61

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:70

62−#: qml/Components/Dialogs.qml:122

63+msgctxt "Button: Lock the system"

63−msgid "No"

64+msgid "Lock"

64−msgstr "No"

65+msgstr "Lock"

65

66

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:77

67−#: qml/Components/Dialogs.qml:129

68+msgctxt "Button: Log out from the system"

68−msgid "Yes"

69+msgid "Log Out"

69−msgstr "Yes"

70+msgstr "Log Out"

70

71

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"

72msgid "Shut down"

79msgid "Shut down"

73msgstr "Shut down"

80msgstr "Shut down"

74

81

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

76msgid "Are you sure you want to shut down?"

83msgid "Are you sure you want to shut down?"

77msgstr "Are you sure you want to shut down?"

84msgstr "Are you sure you want to shut down?"

78

85

79−#: qml/Components/Dialogs.qml:119

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

80msgid "Reboot"

88msgid "Reboot"

81msgstr "Reboot"

89msgstr "Reboot"

82

90

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

84msgid "Are you sure you want to reboot?"

102msgid "Are you sure you want to reboot?"

85msgstr "Are you sure you want to reboot?"

103msgstr "Are you sure you want to reboot?"

86

104

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"

88msgid "Power"

115msgid "Power"

89msgstr "Power"

116msgstr "Power"

90

117

91−#: qml/Components/Dialogs.qml:145

118+#: qml/Components/Dialogs.qml:151

92msgid ""

119msgid ""

93"Are you sure you would like\n"

120"Are you sure you would like\n"

94"to power off?"

121"to power off?"

@@ -96,69 +123,19 @@ msgstr ""

96"Are you sure you would like\n"

123"Are you sure you would like\n"

97"to power off?"

124"to power off?"

98

125

99−#: qml/Components/Dialogs.qml:147

126+#: qml/Components/Dialogs.qml:153

127+msgctxt "Button: Power off the system"

100msgid "Power off"

128msgid "Power off"

101msgstr "Power off"

129msgstr "Power off"

102

130

103−#: qml/Components/Dialogs.qml:157

131+#: qml/Components/Dialogs.qml:162

132+msgctxt "Button: Restart the system"

104msgid "Restart"

133msgid "Restart"

105msgstr "Restart"

134msgstr "Restart"

106

135

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<br><br>Tap on the screen to start"

155−msgstr ""

156−"You have now mastered the edge gestures and can start using the "

157−"phone<br><br>Tap on the screen to start"

158−

159#: qml/Components/Lockscreen.qml:238

136#: qml/Components/Lockscreen.qml:238

160msgid "Return to Call"

137msgid "Return to Call"

161−msgstr ""

138+msgstr "Return to Call"

162

139

163#: qml/Components/Lockscreen.qml:238

140#: qml/Components/Lockscreen.qml:238

164msgid "Emergency Call"

141msgid "Emergency Call"

@@ -168,32 +145,39 @@ msgstr "Emergency Call"

168msgid "OK"

145msgid "OK"

169msgstr "OK"

146msgstr "OK"

170

147

171−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

148+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

172msgid "See less"

149msgid "See less"

173msgstr "See less"

150msgstr "See less"

174

151

175−#: qml/Dash/GenericScopeView.qml:431

152+#: qml/Dash/GenericScopeView.qml:533

176msgid "See all"

153msgid "See all"

177msgstr "See all"

154msgstr "See all"

178

155

179−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

156+#: qml/Dash/GenericScopeView.qml:595

180−#: qml/Panel/SearchIndicator.qml:27

157+msgctxt "Label: Hint for dash search line edit"

181msgid "Search"

158msgid "Search"

182msgstr "Search"

159msgstr "Search"

183

160

184−#: qml/Dash/PageHeader.qml:260

161+#: qml/Dash/PageHeader.qml:269

162+msgctxt "Button: Open the Ubuntu Store"

185msgid "Store"

163msgid "Store"

186msgstr "Store"

164msgstr "Store"

187

165

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"

189msgid "Settings"

173msgid "Settings"

190msgstr "Settings"

174msgstr "Settings"

191

175

192−#: qml/Dash/PageHeader.qml:284

176+#: qml/Dash/PageHeader.qml:293

193msgid "Remove from Favorites"

177msgid "Remove from Favorites"

194msgstr "Remove from Favourites"

178msgstr "Remove from Favourites"

195

179

196−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

197msgid "Add to Favorites"

181msgid "Add to Favorites"

198msgstr "Add to Favourites"

182msgstr "Add to Favourites"

199

183

@@ -225,22 +209,92 @@ msgstr "Pull to refresh…"

225msgid "Release to refresh…"

209msgid "Release to refresh…"

226msgstr "Release to refresh…"

210msgstr "Release to refresh…"

227

211

212+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

213+msgid "Enable location data"

214+msgstr "Enable location data"

215+

228−#: qml/Dash/ScopesList.qml:63

216+#: qml/Dash/ScopesList.qml:66

229msgid "Manage"

217msgid "Manage"

230−msgstr ""

218+msgstr "Manage"

231

219

232−#: qml/Dash/ScopesList.qml:107

220+#: qml/Dash/ScopesList.qml:112

233msgid "Home"

221msgid "Home"

234−msgstr ""

222+msgstr "Home"

235

223

236−#: qml/Dash/ScopesList.qml:108

224+#: qml/Dash/ScopesList.qml:113

237msgid "Also installed"

225msgid "Also installed"

238−msgstr ""

226+msgstr "Also installed"

239

227

240−#: qml/Greeter/Greeter.qml:174

228+#: qml/Greeter/CoverPage.qml:107

241msgid "Unlock"

229msgid "Unlock"

242msgstr "Unlock"

230msgstr "Unlock"

243

231

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+

244#: qml/Notifications/NotificationMenuItemFactory.qml:128

298#: qml/Notifications/NotificationMenuItemFactory.qml:128

245msgid "Show password"

299msgid "Show password"

246msgstr "Show password"

300msgstr "Show password"

@@ -281,6 +335,11 @@ msgstr "Finished"

281msgid "Failed, tap to retry"

335msgid "Failed, tap to retry"

282msgstr "Failed, tap to retry"

336msgstr "Failed, tap to retry"

283

337

338+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

339+msgctxt "Label: Hint in message indicator line edit"

340+msgid "Reply"

341+msgstr "Reply"

342+

284#: qml/Panel/Indicators/ModemInfoItem.qml:105

343#: qml/Panel/Indicators/ModemInfoItem.qml:105

285msgid "Unlock SIM"

344msgid "Unlock SIM"

286msgstr "Unlock SIM"

345msgstr "Unlock SIM"

@@ -289,158 +348,159 @@ msgstr "Unlock SIM"

289msgid "Roaming"

348msgid "Roaming"

290msgstr "Roaming"

349msgstr "Roaming"

291

350

292−#: qml/Shell.qml:367

351+#: qml/Tutorial/TutorialBottomFinish.qml:24

293−#, qt-format

352+msgid "This action does different things for different apps"

294−msgid "Enter %1"

353+msgstr "This action does different things for different apps"

295−msgstr "Enter %1"

296

354

297−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

355+#: qml/Tutorial/TutorialBottomFinish.qml:25

298−msgid "Enter passphrase"

356+msgid "Tap here to finish."

299−msgstr "Enter passphrase"

357+msgstr "Tap here to finish."

300

358

301−#: qml/Shell.qml:369

359+#: qml/Tutorial/TutorialBottom.qml:28

302−msgid "Enter passcode"

360+msgid "Open special menus"

303−msgstr "Enter passcode"

361+msgstr "Open special menus"

304

362

305−#: qml/Shell.qml:370

363+#: qml/Tutorial/TutorialBottom.qml:29

306−#, qt-format

364+msgid "Swipe up from the bottom edge."

307−msgid "Sorry, incorrect %1"

365+msgstr "Swipe up from the bottom edge."

308−msgstr "Sorry, incorrect %1"

309

366

310−#: qml/Shell.qml:371

367+#: qml/Tutorial/TutorialLeftFinish.qml:24

311−msgid "Sorry, incorrect passphrase"

368+msgid "These are the shortcuts to favorite apps"

312−msgstr "Sorry, incorrect passphrase"

369+msgstr "These are the shortcuts to favourite apps"

313

370

314−#: qml/Shell.qml:372

371+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

315−msgid "Please re-enter"

372+msgid "Tap here to continue."

316−msgstr "Please re-enter"

373+msgstr "Tap here to continue."

317

374

318−#: qml/Shell.qml:373

375+#: qml/Tutorial/TutorialLeft.qml:26

319−msgid "Sorry, incorrect passcode"

376+msgid "Open the launcher"

320−msgstr "Sorry, incorrect passcode"

377+msgstr "Open the launcher"

321

378

322−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

379+#: qml/Tutorial/TutorialLeft.qml:27

323−msgid "Sorry, incorrect passphrase."

380+msgid "Short swipe from the left edge."

324−msgstr "Sorry, incorrect passphrase."

381+msgstr "Short swipe from the left edge."

325

382

326−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

383+#: qml/Tutorial/TutorialPage.qml:178

327−msgid "Sorry, incorrect passcode."

384+msgid "You almost got it!"

328−msgstr "Sorry, incorrect passcode."

385+msgstr "You almost got it!"

329

386

330−#: qml/Shell.qml:469

387+#: qml/Tutorial/TutorialPage.qml:195

331−msgid "This will be your last attempt."

388+msgid "Try again."

332−msgstr "This will be your last attempt."

389+msgstr "Try again."

333

390

334−#: qml/Shell.qml:471

391+#: qml/Tutorial/TutorialRight.qml:31

335−msgid ""

392+msgid "To view open apps"

336−"If passphrase is entered incorrectly, your phone will conduct a factory "

337−"reset and all personal data will be deleted."

338−msgstr ""

393+msgstr "To view open apps"

339−"If passphrase is entered incorrectly, your phone will conduct a factory "

340−"reset and all personal data will be deleted."

341

394

342−#: qml/Shell.qml:472

395+#: qml/Tutorial/TutorialRight.qml:32

343−msgid ""

396+msgid "Long swipe from the right edge."

344−"If passcode is entered incorrectly, your phone will conduct a factory reset "

397+msgstr "Long swipe from the right edge."

345−"and all personal data will be deleted."

398+

346−msgstr ""

399+#: qml/Tutorial/TutorialRight.qml:122

347−"If passcode is entered incorrectly, your phone will conduct a factory reset "

400+msgid "View all your running tasks."

348−"and all personal data will be deleted."

401+msgstr "View all your running tasks."

349

402

350#: qml/Wizard/Page.qml:89

403#: qml/Wizard/Page.qml:89

404+msgctxt "Button: Go back one page in the Wizard"

351msgid "Back"

405msgid "Back"

352−msgstr ""

406+msgstr "Back"

353

407

354#: qml/Wizard/Pages/10-welcome.qml:27

408#: qml/Wizard/Pages/10-welcome.qml:27

355msgid "Hi!"

409msgid "Hi!"

356−msgstr ""

410+msgstr "Hi!"

357

411

358#: qml/Wizard/Pages/10-welcome.qml:44

412#: qml/Wizard/Pages/10-welcome.qml:44

359msgid "Welcome to your Ubuntu phone."

413msgid "Welcome to your Ubuntu phone."

360−msgstr ""

414+msgstr "Welcome to your Ubuntu phone."

361

415

362#: qml/Wizard/Pages/10-welcome.qml:52

416#: qml/Wizard/Pages/10-welcome.qml:52

363msgid "Let’s get started."

417msgid "Let’s get started."

364−msgstr ""

418+msgstr "Let’s get started."

365

419

366#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

420#: 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

368#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

422#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

369#: qml/Wizard/Pages/passwd-set.qml:90

423#: qml/Wizard/Pages/passwd-set.qml:90

370msgid "Continue"

424msgid "Continue"

371−msgstr ""

425+msgstr "Continue"

372

426

373#: qml/Wizard/Pages/20-sim.qml:25

427#: qml/Wizard/Pages/20-sim.qml:25

374msgid "Add a SIM card and restart your device"

428msgid "Add a SIM card and restart your device"

375−msgstr ""

429+msgstr "Add a SIM card and restart your device"

376

430

377−#: qml/Wizard/Pages/20-sim.qml:55

431+#: qml/Wizard/Pages/20-sim.qml:59

378msgid "Without it, you won’t be able to make calls or use text messaging."

432msgid "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."

380

434

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

382msgid "Skip"

436msgid "Skip"

383−msgstr ""

437+msgstr "Skip"

384

438

385#: qml/Wizard/Pages/30-passwd-type.qml:39

439#: qml/Wizard/Pages/30-passwd-type.qml:39

386msgid "Lock security"

440msgid "Lock security"

387−msgstr ""

441+msgstr "Lock security"

388

442

389#: qml/Wizard/Pages/30-passwd-type.qml:74

443#: qml/Wizard/Pages/30-passwd-type.qml:74

390msgid "Please select how you’d like to unlock your phone."

444msgid "Please select how you’d like to unlock your phone."

391−msgstr ""

445+msgstr "Please select how you’d like to unlock your phone."

392

446

393#: qml/Wizard/Pages/30-passwd-type.qml:97

447#: qml/Wizard/Pages/30-passwd-type.qml:97

448+msgctxt "Label: Type of security method"

394msgid "Swipe"

449msgid "Swipe"

395−msgstr ""

450+msgstr "Swipe"

396

451

397#: qml/Wizard/Pages/30-passwd-type.qml:98

452#: qml/Wizard/Pages/30-passwd-type.qml:98

453+msgctxt "Label: Description of security method"

398msgid "No security"

454msgid "No security"

399−msgstr ""

455+msgstr "No security"

400

456

401#: qml/Wizard/Pages/30-passwd-type.qml:100

457#: qml/Wizard/Pages/30-passwd-type.qml:100

458+msgctxt "Label: Type of security method"

402msgid "Passcode"

459msgid "Passcode"

403−msgstr ""

460+msgstr "Passcode"

404

461

405#: qml/Wizard/Pages/30-passwd-type.qml:101

462#: qml/Wizard/Pages/30-passwd-type.qml:101

463+msgctxt "Label: Description of security method"

406msgid "4 digits only"

464msgid "4 digits only"

407−msgstr ""

465+msgstr "4 digits only"

408

466

409#: qml/Wizard/Pages/30-passwd-type.qml:103

467#: qml/Wizard/Pages/30-passwd-type.qml:103

468+msgctxt "Label: Type of security method"

410msgid "Passphrase"

469msgid "Passphrase"

411−msgstr ""

470+msgstr "Passphrase"

412

471

413#: qml/Wizard/Pages/30-passwd-type.qml:104

472#: qml/Wizard/Pages/30-passwd-type.qml:104

473+msgctxt "Label: Description of security method"

414msgid "Numbers and letters"

474msgid "Numbers and letters"

415−msgstr ""

475+msgstr "Numbers and letters"

416

476

417−#: qml/Wizard/Pages/40-wifi.qml:28

477+#: qml/Wizard/Pages/40-wifi.qml:29

418msgid "Connect to Wi‑Fi"

478msgid "Connect to Wi‑Fi"

419−msgstr ""

479+msgstr "Connect to Wi‑Fi"

420

480

421−#: qml/Wizard/Pages/40-wifi.qml:147

481+#: qml/Wizard/Pages/40-wifi.qml:168

422msgid "Available networks…"

482msgid "Available networks…"

423−msgstr ""

483+msgstr "Available networks…"

424

484

425−#: qml/Wizard/Pages/40-wifi.qml:148

485+#: qml/Wizard/Pages/40-wifi.qml:169

426msgid "No available networks."

486msgid "No available networks."

427−msgstr ""

487+msgstr "No available networks."

428

488

429#: qml/Wizard/Pages/50-location.qml:27

489#: qml/Wizard/Pages/50-location.qml:27

430msgid "Location"

490msgid "Location"

431−msgstr ""

491+msgstr "Location"

432

492

433#: qml/Wizard/Pages/50-location.qml:62

493#: qml/Wizard/Pages/50-location.qml:62

434msgid "Let the phone detect your location:"

494msgid "Let the phone detect your location:"

435−msgstr ""

495+msgstr "Let the phone detect your location:"

436

496

437#: qml/Wizard/Pages/50-location.qml:69

497#: qml/Wizard/Pages/50-location.qml:69

438msgid "Using GPS only (less accurate)"

498msgid "Using GPS only (less accurate)"

439−msgstr ""

499+msgstr "Using GPS only (less accurate)"

440

500

441#: qml/Wizard/Pages/50-location.qml:86

501#: qml/Wizard/Pages/50-location.qml:86

442msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

502msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

443−msgstr ""

503+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"

444

504

445#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

505#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

446#: qml/Wizard/Pages/50-location.qml:103

506#: qml/Wizard/Pages/50-location.qml:103

@@ -448,81 +508,87 @@ msgid ""

448"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

508"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

449"conditions</a>."

509"conditions</a>."

450msgstr ""

510msgstr ""

511+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

512+"conditions</a>."

451

513

452#: qml/Wizard/Pages/50-location.qml:112

514#: qml/Wizard/Pages/50-location.qml:112

453msgid "Not at all"

515msgid "Not at all"

454−msgstr ""

516+msgstr "Not at all"

455

517

456#: qml/Wizard/Pages/50-location.qml:124

518#: qml/Wizard/Pages/50-location.qml:124

457msgid "You can change your mind later in <b>System Settings</b>."

519msgid "You can change your mind later in <b>System Settings</b>."

458−msgstr ""

520+msgstr "You can change your mind later in <b>System Settings</b>."

459

521

460#: qml/Wizard/Pages/60-reporting.qml:24

522#: qml/Wizard/Pages/60-reporting.qml:24

461msgid "Improving your experience"

523msgid "Improving your experience"

462−msgstr ""

524+msgstr "Improving your experience"

463

525

464#: qml/Wizard/Pages/60-reporting.qml:36

526#: qml/Wizard/Pages/60-reporting.qml:36

465msgid ""

527msgid ""

466"Your phone is set up to automatically report errors to Canonical and its "

528"Your phone is set up to automatically report errors to Canonical and its "

467"partners, the makers of the operating system."

529"partners, the makers of the operating system."

468msgstr ""

530msgstr ""

531+"Your phone is set up to automatically report errors to Canonical and its "

532+"partners, the makers of the operating system."

469

533

470#: qml/Wizard/Pages/60-reporting.qml:43

534#: qml/Wizard/Pages/60-reporting.qml:43

471msgid ""

535msgid ""

472"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

536"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

473"Privacy</b>"

537"Privacy</b>"

474msgstr ""

538msgstr ""

539+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

540+"Privacy</b>"

475

541

476#: qml/Wizard/Pages/80-finished.qml:24

542#: qml/Wizard/Pages/80-finished.qml:24

477msgid "All done"

543msgid "All done"

478−msgstr ""

544+msgstr "All done"

479

545

480#: qml/Wizard/Pages/80-finished.qml:39

546#: qml/Wizard/Pages/80-finished.qml:39

481msgid "Nice work!"

547msgid "Nice work!"

482−msgstr ""

548+msgstr "Nice work!"

483

549

484#: qml/Wizard/Pages/80-finished.qml:46

550#: qml/Wizard/Pages/80-finished.qml:46

485msgid "Your phone is now ready to use."

551msgid "Your phone is now ready to use."

486−msgstr ""

552+msgstr "Your phone is now ready to use."

487

553

488#: qml/Wizard/Pages/80-finished.qml:53

554#: qml/Wizard/Pages/80-finished.qml:53

489msgid "Finish"

555msgid "Finish"

490−msgstr ""

556+msgstr "Finish"

491

557

492#: qml/Wizard/Pages/here-terms.qml:27

558#: qml/Wizard/Pages/here-terms.qml:27

493msgid "Terms & Conditions"

559msgid "Terms & Conditions"

494−msgstr ""

560+msgstr "Terms & Conditions"

495

561

496#: qml/Wizard/Pages/passwd-confirm.qml:49

562#: qml/Wizard/Pages/passwd-confirm.qml:49

497msgid "Confirm passphrase"

563msgid "Confirm passphrase"

498−msgstr ""

564+msgstr "Confirm passphrase"

499

565

500#: qml/Wizard/Pages/passwd-confirm.qml:50

566#: qml/Wizard/Pages/passwd-confirm.qml:50

501msgid "Confirm passcode"

567msgid "Confirm passcode"

502−msgstr ""

568+msgstr "Confirm passcode"

503

569

504#: qml/Wizard/Pages/passwd-confirm.qml:53

570#: qml/Wizard/Pages/passwd-confirm.qml:53

505#: qml/Wizard/Pages/passwd-confirm.qml:54

571#: qml/Wizard/Pages/passwd-confirm.qml:54

506msgid "Please try again."

572msgid "Please try again."

507−msgstr ""

573+msgstr "Please try again."

508

574

509#: qml/Wizard/Pages/passwd-set.qml:61

575#: qml/Wizard/Pages/passwd-set.qml:61

510msgid "Choose your passcode"

576msgid "Choose your passcode"

511−msgstr ""

577+msgstr "Choose your passcode"

512

578

513#: qml/Wizard/Pages/passwd-set.qml:68

579#: qml/Wizard/Pages/passwd-set.qml:68

514msgid "Passphrase must be 4 characters long"

580msgid "Passphrase must be 4 characters long"

515−msgstr ""

581+msgstr "Passphrase must be 4 characters long"

516

582

517#: qml/Wizard/StackButton.qml:39

583#: qml/Wizard/StackButton.qml:39

518#, qt-format

584#, qt-format

519msgid "〈 %1"

585msgid "〈 %1"

520−msgstr ""

586+msgstr "〈 %1"

521

587

522#: qml/Wizard/StackButton.qml:42

588#: qml/Wizard/StackButton.qml:42

523#, qt-format

589#, qt-format

524msgid "%1 〉"

590msgid "%1 〉"

525−msgstr ""

591+msgstr "%1 〉"

526

592

527#~ msgid "Confirm"

593#~ msgid "Confirm"

528#~ msgstr "Confirm"

594#~ msgstr "Confirm"

@@ -539,14 +605,78 @@ msgstr ""

539#~ msgid "Speaking..."

605#~ msgid "Speaking..."

540#~ msgstr "Speaking..."

606#~ msgstr "Speaking..."

541

607

608+#~ msgid "Search"

609+#~ msgstr "Search"

610+

611+#~ msgid "Top edge"

612+#~ msgstr "Top edge"

613+

614+#~ msgid "Try swiping from the top edge to access the indicators"

615+#~ msgstr "Try swiping from the top edge to access the indicators"

616+

617+#~ msgid "Close"

618+#~ msgstr "Close"

619+

620+#~ msgid "Swipe up again to close the settings screen"

621+#~ msgstr "Swipe up again to close the settings screen"

622+

623+#~ msgid "Left edge"

624+#~ msgstr "Left edge"

625+

626+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

627+#~ msgstr "Swipe from the left to reveal the launcher for quick access to apps"

628+

629+#~ msgid "Well done"

630+#~ msgstr "Well done"

631+

632+#~ msgid "Skip intro"

633+#~ msgstr "Skip intro"

634+

635+#~ msgid "Try swiping from the right edge to unlock the phone"

636+#~ msgstr "Try swiping from the right edge to unlock the phone"

637+

638+#~ msgid "Right edge"

639+#~ msgstr "Right edge"

640+

641+#~ msgid ""

642+#~ "You have now mastered the edge gestures and can start using the "

643+#~ "phone<br><br>Tap on the screen to start"

644+#~ msgstr ""

645+#~ "You have now mastered the edge gestures and can start using the "

646+#~ "phone<br><br>Tap on the screen to start"

647+

542#~ msgid "All"

648#~ msgid "All"

543#~ msgstr "All"

649#~ msgstr "All"

544

650

545#~ msgid "Favorites"

651#~ msgid "Favorites"

546#~ msgstr "Favourites"

652#~ msgstr "Favourites"

547

653

654+#~ msgid "Store"

655+#~ msgstr "Store"

656+

657+#~ msgid "Power off"

658+#~ msgstr "Power off"

659+

548#~ msgid "Done"

660#~ msgid "Done"

549#~ msgstr "Done"

661#~ msgstr "Done"

550

662

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+

551#~ msgid "Manage Scopes"

681#~ msgid "Manage Scopes"

552#~ msgstr "Manage Scopes"

682#~ msgstr "Manage Scopes"

po/en_GB.po+321−183

@@ -7,18 +7,18 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11−"PO-Revision-Date: 2014-11-05 18:59+0000\n"

11+"PO-Revision-Date: 2015-01-22 12:14+0000\n"

12"Last-Translator: Andi Chandler <Unknown>\n"

12"Last-Translator: Andi Chandler <Unknown>\n"

13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"

13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr "Password: "

23msgstr "Password: "

24

24

@@ -31,64 +31,91 @@ msgstr "Pin shortcut"

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Unpin shortcut"

32msgstr "Unpin shortcut"

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr "Device Locked"

36msgstr "Device Locked"

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr "You have been locked out due to too many failed passphrase attempts."

40msgstr "You have been locked out due to too many failed passphrase attempts."

41

41

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

43msgid "You have been locked out due to too many failed passcode attempts."

43msgid "You have been locked out due to too many failed passcode attempts."

44msgstr "You have been locked out due to too many failed passcode attempts."

44msgstr "You have been locked out due to too many failed passcode attempts."

45

45

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

47#, qt-format

47#, qt-format

48msgid "Please wait %1 minute and then try again…"

48msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] "Please wait %1 minute and then try again…"

50msgstr[0] "Please wait %1 minute and then try again…"

51msgstr[1] "Please wait %1 minutes and then try again…"

51msgstr[1] "Please wait %1 minutes and then try again…"

52

52

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

54msgid "Log out"

55msgid "Log out"

55msgstr "Log out"

56msgstr "Log out"

56

57

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

58msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

59msgstr "Are you sure you want to log out?"

60msgstr "Are you sure you want to log out?"

60

61

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:70

62−#: qml/Components/Dialogs.qml:122

63+msgctxt "Button: Lock the system"

63−msgid "No"

64+msgid "Lock"

64−msgstr "No"

65+msgstr "Lock"

65

66

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:77

67−#: qml/Components/Dialogs.qml:129

68+msgctxt "Button: Log out from the system"

68−msgid "Yes"

69+msgid "Log Out"

69−msgstr "Yes"

70+msgstr "Log Out"

70

71

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"

72msgid "Shut down"

79msgid "Shut down"

73msgstr "Shut down"

80msgstr "Shut down"

74

81

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

76msgid "Are you sure you want to shut down?"

83msgid "Are you sure you want to shut down?"

77msgstr "Are you sure you want to shut down?"

84msgstr "Are you sure you want to shut down?"

78

85

79−#: qml/Components/Dialogs.qml:119

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

80msgid "Reboot"

88msgid "Reboot"

81msgstr "Reboot"

89msgstr "Reboot"

82

90

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

84msgid "Are you sure you want to reboot?"

102msgid "Are you sure you want to reboot?"

85msgstr "Are you sure you want to reboot?"

103msgstr "Are you sure you want to reboot?"

86

104

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"

88msgid "Power"

115msgid "Power"

89msgstr "Power"

116msgstr "Power"

90

117

91−#: qml/Components/Dialogs.qml:145

118+#: qml/Components/Dialogs.qml:151

92msgid ""

119msgid ""

93"Are you sure you would like\n"

120"Are you sure you would like\n"

94"to power off?"

121"to power off?"

@@ -96,66 +123,16 @@ msgstr ""

96"Are you sure you would like\n"

123"Are you sure you would like\n"

97"to power off?"

124"to power off?"

98

125

99−#: qml/Components/Dialogs.qml:147

126+#: qml/Components/Dialogs.qml:153

127+msgctxt "Button: Power off the system"

100msgid "Power off"

128msgid "Power off"

101msgstr "Power off"

129msgstr "Power off"

102

130

103−#: qml/Components/Dialogs.qml:157

131+#: qml/Components/Dialogs.qml:162

132+msgctxt "Button: Restart the system"

104msgid "Restart"

133msgid "Restart"

105msgstr "Restart"

134msgstr "Restart"

106

135

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<br><br>Tap on the screen to start"

155−msgstr ""

156−"You have now mastered the edge gestures and can start using the "

157−"phone<br><br>Tap on the screen to start"

158−

159#: qml/Components/Lockscreen.qml:238

136#: qml/Components/Lockscreen.qml:238

160msgid "Return to Call"

137msgid "Return to Call"

161msgstr "Return to Call"

138msgstr "Return to Call"

@@ -168,32 +145,39 @@ msgstr "Emergency Call"

168msgid "OK"

145msgid "OK"

169msgstr "OK"

146msgstr "OK"

170

147

171−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

148+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

172msgid "See less"

149msgid "See less"

173msgstr "See less"

150msgstr "See less"

174

151

175−#: qml/Dash/GenericScopeView.qml:431

152+#: qml/Dash/GenericScopeView.qml:533

176msgid "See all"

153msgid "See all"

177msgstr "See all"

154msgstr "See all"

178

155

179−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

156+#: qml/Dash/GenericScopeView.qml:595

180−#: qml/Panel/SearchIndicator.qml:27

157+msgctxt "Label: Hint for dash search line edit"

181msgid "Search"

158msgid "Search"

182msgstr "Search"

159msgstr "Search"

183

160

184−#: qml/Dash/PageHeader.qml:260

161+#: qml/Dash/PageHeader.qml:269

162+msgctxt "Button: Open the Ubuntu Store"

185msgid "Store"

163msgid "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 ""

187

170

188−#: qml/Dash/PageHeader.qml:277

171+#: qml/Dash/PageHeader.qml:286

172+msgctxt "Button: Show the current dash scope settings"

189msgid "Settings"

173msgid "Settings"

190−msgstr "Settings"

174+msgstr ""

191

175

192−#: qml/Dash/PageHeader.qml:284

176+#: qml/Dash/PageHeader.qml:293

193msgid "Remove from Favorites"

177msgid "Remove from Favorites"

194msgstr "Remove from Favourites"

178msgstr "Remove from Favourites"

195

179

196−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

197msgid "Add to Favorites"

181msgid "Add to Favorites"

198msgstr "Add to Favourites"

182msgstr "Add to Favourites"

199

183

@@ -225,22 +209,92 @@ msgstr "Pull to refresh…"

225msgid "Release to refresh…"

209msgid "Release to refresh…"

226msgstr "Release to refresh…"

210msgstr "Release to refresh…"

227

211

212+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

213+msgid "Enable location data"

214+msgstr "Enable location data"

215+

228−#: qml/Dash/ScopesList.qml:63

216+#: qml/Dash/ScopesList.qml:66

229msgid "Manage"

217msgid "Manage"

230msgstr "Manage"

218msgstr "Manage"

231

219

232−#: qml/Dash/ScopesList.qml:107

220+#: qml/Dash/ScopesList.qml:112

233msgid "Home"

221msgid "Home"

234msgstr "Home"

222msgstr "Home"

235

223

236−#: qml/Dash/ScopesList.qml:108

224+#: qml/Dash/ScopesList.qml:113

237msgid "Also installed"

225msgid "Also installed"

238msgstr "Also installed"

226msgstr "Also installed"

239

227

240−#: qml/Greeter/Greeter.qml:174

228+#: qml/Greeter/CoverPage.qml:107

241msgid "Unlock"

229msgid "Unlock"

242msgstr "Unlock"

230msgstr "Unlock"

243

231

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+

244#: qml/Notifications/NotificationMenuItemFactory.qml:128

298#: qml/Notifications/NotificationMenuItemFactory.qml:128

245msgid "Show password"

299msgid "Show password"

246msgstr "Show password"

300msgstr "Show password"

@@ -281,6 +335,11 @@ msgstr "Finished"

281msgid "Failed, tap to retry"

335msgid "Failed, tap to retry"

282msgstr "Failed, tap to retry"

336msgstr "Failed, tap to retry"

283

337

338+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

339+msgctxt "Label: Hint in message indicator line edit"

340+msgid "Reply"

341+msgstr "Reply"

342+

284#: qml/Panel/Indicators/ModemInfoItem.qml:105

343#: qml/Panel/Indicators/ModemInfoItem.qml:105

285msgid "Unlock SIM"

344msgid "Unlock SIM"

286msgstr "Unlock SIM"

345msgstr "Unlock SIM"

@@ -289,158 +348,159 @@ msgstr "Unlock SIM"

289msgid "Roaming"

348msgid "Roaming"

290msgstr "Roaming"

349msgstr "Roaming"

291

350

292−#: qml/Shell.qml:367

351+#: qml/Tutorial/TutorialBottomFinish.qml:24

293−#, qt-format

352+msgid "This action does different things for different apps"

294−msgid "Enter %1"

353+msgstr "This action does different things for different apps"

295−msgstr "Enter %1"

296

354

297−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

355+#: qml/Tutorial/TutorialBottomFinish.qml:25

298−msgid "Enter passphrase"

356+msgid "Tap here to finish."

299−msgstr "Enter passphrase"

357+msgstr "Tap here to finish."

300

358

301−#: qml/Shell.qml:369

359+#: qml/Tutorial/TutorialBottom.qml:28

302−msgid "Enter passcode"

360+msgid "Open special menus"

303−msgstr "Enter passcode"

361+msgstr "Open special menus"

304

362

305−#: qml/Shell.qml:370

363+#: qml/Tutorial/TutorialBottom.qml:29

306−#, qt-format

364+msgid "Swipe up from the bottom edge."

307−msgid "Sorry, incorrect %1"

365+msgstr "Swipe up from the bottom edge."

308−msgstr "Sorry, incorrect %1"

309

366

310−#: qml/Shell.qml:371

367+#: qml/Tutorial/TutorialLeftFinish.qml:24

311−msgid "Sorry, incorrect passphrase"

368+msgid "These are the shortcuts to favorite apps"

312−msgstr "Sorry, incorrect passphrase"

369+msgstr "These are the shortcuts to favourite apps"

313

370

314−#: qml/Shell.qml:372

371+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

315−msgid "Please re-enter"

372+msgid "Tap here to continue."

316−msgstr "Please re-enter"

373+msgstr "Tap here to continue."

317

374

318−#: qml/Shell.qml:373

375+#: qml/Tutorial/TutorialLeft.qml:26

319−msgid "Sorry, incorrect passcode"

376+msgid "Open the launcher"

320−msgstr "Sorry, incorrect passcode"

377+msgstr "Open the launcher"

321

378

322−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

379+#: qml/Tutorial/TutorialLeft.qml:27

323−msgid "Sorry, incorrect passphrase."

380+msgid "Short swipe from the left edge."

324−msgstr "Sorry, incorrect passphrase."

381+msgstr "Short swipe from the left edge."

325

382

326−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

383+#: qml/Tutorial/TutorialPage.qml:178

327−msgid "Sorry, incorrect passcode."

384+msgid "You almost got it!"

328−msgstr "Sorry, incorrect passcode."

385+msgstr "You almost got it!"

329

386

330−#: qml/Shell.qml:469

387+#: qml/Tutorial/TutorialPage.qml:195

331−msgid "This will be your last attempt."

388+msgid "Try again."

332−msgstr "This will be your last attempt."

389+msgstr "Try again."

333

390

334−#: qml/Shell.qml:471

391+#: qml/Tutorial/TutorialRight.qml:31

335−msgid ""

392+msgid "To view open apps"

336−"If passphrase is entered incorrectly, your phone will conduct a factory "

337−"reset and all personal data will be deleted."

338−msgstr ""

393+msgstr "To view open apps"

339−"If passphrase is entered incorrectly, your phone will conduct a factory "

340−"reset and all personal data will be deleted."

341

394

342−#: qml/Shell.qml:472

395+#: qml/Tutorial/TutorialRight.qml:32

343−msgid ""

396+msgid "Long swipe from the right edge."

344−"If passcode is entered incorrectly, your phone will conduct a factory reset "

397+msgstr "Long swipe from the right edge."

345−"and all personal data will be deleted."

398+

346−msgstr ""

399+#: qml/Tutorial/TutorialRight.qml:122

347−"If passcode is entered incorrectly, your phone will conduct a factory reset "

400+msgid "View all your running tasks."

348−"and all personal data will be deleted."

401+msgstr "View all your running tasks."

349

402

350#: qml/Wizard/Page.qml:89

403#: qml/Wizard/Page.qml:89

404+msgctxt "Button: Go back one page in the Wizard"

351msgid "Back"

405msgid "Back"

352−msgstr ""

406+msgstr "Back"

353

407

354#: qml/Wizard/Pages/10-welcome.qml:27

408#: qml/Wizard/Pages/10-welcome.qml:27

355msgid "Hi!"

409msgid "Hi!"

356−msgstr ""

410+msgstr "Hi!"

357

411

358#: qml/Wizard/Pages/10-welcome.qml:44

412#: qml/Wizard/Pages/10-welcome.qml:44

359msgid "Welcome to your Ubuntu phone."

413msgid "Welcome to your Ubuntu phone."

360−msgstr ""

414+msgstr "Welcome to your Ubuntu phone."

361

415

362#: qml/Wizard/Pages/10-welcome.qml:52

416#: qml/Wizard/Pages/10-welcome.qml:52

363msgid "Let’s get started."

417msgid "Let’s get started."

364−msgstr ""

418+msgstr "Let’s get started."

365

419

366#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

420#: 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

368#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

422#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

369#: qml/Wizard/Pages/passwd-set.qml:90

423#: qml/Wizard/Pages/passwd-set.qml:90

370msgid "Continue"

424msgid "Continue"

371−msgstr ""

425+msgstr "Continue"

372

426

373#: qml/Wizard/Pages/20-sim.qml:25

427#: qml/Wizard/Pages/20-sim.qml:25

374msgid "Add a SIM card and restart your device"

428msgid "Add a SIM card and restart your device"

375−msgstr ""

429+msgstr "Add a SIM card and restart your device"

376

430

377−#: qml/Wizard/Pages/20-sim.qml:55

431+#: qml/Wizard/Pages/20-sim.qml:59

378msgid "Without it, you won’t be able to make calls or use text messaging."

432msgid "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."

380

434

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

382msgid "Skip"

436msgid "Skip"

383−msgstr ""

437+msgstr "Skip"

384

438

385#: qml/Wizard/Pages/30-passwd-type.qml:39

439#: qml/Wizard/Pages/30-passwd-type.qml:39

386msgid "Lock security"

440msgid "Lock security"

387−msgstr ""

441+msgstr "Lock security"

388

442

389#: qml/Wizard/Pages/30-passwd-type.qml:74

443#: qml/Wizard/Pages/30-passwd-type.qml:74

390msgid "Please select how you’d like to unlock your phone."

444msgid "Please select how you’d like to unlock your phone."

391−msgstr ""

445+msgstr "Please select how you’d like to unlock your phone."

392

446

393#: qml/Wizard/Pages/30-passwd-type.qml:97

447#: qml/Wizard/Pages/30-passwd-type.qml:97

448+msgctxt "Label: Type of security method"

394msgid "Swipe"

449msgid "Swipe"

395−msgstr ""

450+msgstr "Swipe"

396

451

397#: qml/Wizard/Pages/30-passwd-type.qml:98

452#: qml/Wizard/Pages/30-passwd-type.qml:98

453+msgctxt "Label: Description of security method"

398msgid "No security"

454msgid "No security"

399−msgstr ""

455+msgstr "No security"

400

456

401#: qml/Wizard/Pages/30-passwd-type.qml:100

457#: qml/Wizard/Pages/30-passwd-type.qml:100

458+msgctxt "Label: Type of security method"

402msgid "Passcode"

459msgid "Passcode"

403−msgstr ""

460+msgstr "Passcode"

404

461

405#: qml/Wizard/Pages/30-passwd-type.qml:101

462#: qml/Wizard/Pages/30-passwd-type.qml:101

463+msgctxt "Label: Description of security method"

406msgid "4 digits only"

464msgid "4 digits only"

407−msgstr ""

465+msgstr "4 digits only"

408

466

409#: qml/Wizard/Pages/30-passwd-type.qml:103

467#: qml/Wizard/Pages/30-passwd-type.qml:103

468+msgctxt "Label: Type of security method"

410msgid "Passphrase"

469msgid "Passphrase"

411−msgstr ""

470+msgstr "Passphrase"

412

471

413#: qml/Wizard/Pages/30-passwd-type.qml:104

472#: qml/Wizard/Pages/30-passwd-type.qml:104

473+msgctxt "Label: Description of security method"

414msgid "Numbers and letters"

474msgid "Numbers and letters"

415−msgstr ""

475+msgstr "Numbers and letters"

416

476

417−#: qml/Wizard/Pages/40-wifi.qml:28

477+#: qml/Wizard/Pages/40-wifi.qml:29

418msgid "Connect to Wi‑Fi"

478msgid "Connect to Wi‑Fi"

419−msgstr ""

479+msgstr "Connect to Wi‑Fi"

420

480

421−#: qml/Wizard/Pages/40-wifi.qml:147

481+#: qml/Wizard/Pages/40-wifi.qml:168

422msgid "Available networks…"

482msgid "Available networks…"

423−msgstr ""

483+msgstr "Available networks…"

424

484

425−#: qml/Wizard/Pages/40-wifi.qml:148

485+#: qml/Wizard/Pages/40-wifi.qml:169

426msgid "No available networks."

486msgid "No available networks."

427−msgstr ""

487+msgstr "No available networks."

428

488

429#: qml/Wizard/Pages/50-location.qml:27

489#: qml/Wizard/Pages/50-location.qml:27

430msgid "Location"

490msgid "Location"

431−msgstr ""

491+msgstr "Location"

432

492

433#: qml/Wizard/Pages/50-location.qml:62

493#: qml/Wizard/Pages/50-location.qml:62

434msgid "Let the phone detect your location:"

494msgid "Let the phone detect your location:"

435−msgstr ""

495+msgstr "Let the phone detect your location:"

436

496

437#: qml/Wizard/Pages/50-location.qml:69

497#: qml/Wizard/Pages/50-location.qml:69

438msgid "Using GPS only (less accurate)"

498msgid "Using GPS only (less accurate)"

439−msgstr ""

499+msgstr "Using GPS only (less accurate)"

440

500

441#: qml/Wizard/Pages/50-location.qml:86

501#: qml/Wizard/Pages/50-location.qml:86

442msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

502msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

443−msgstr ""

503+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"

444

504

445#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

505#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

446#: qml/Wizard/Pages/50-location.qml:103

506#: qml/Wizard/Pages/50-location.qml:103

@@ -448,81 +508,87 @@ msgid ""

448"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

508"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

449"conditions</a>."

509"conditions</a>."

450msgstr ""

510msgstr ""

511+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

512+"conditions</a>."

451

513

452#: qml/Wizard/Pages/50-location.qml:112

514#: qml/Wizard/Pages/50-location.qml:112

453msgid "Not at all"

515msgid "Not at all"

454−msgstr ""

516+msgstr "Not at all"

455

517

456#: qml/Wizard/Pages/50-location.qml:124

518#: qml/Wizard/Pages/50-location.qml:124

457msgid "You can change your mind later in <b>System Settings</b>."

519msgid "You can change your mind later in <b>System Settings</b>."

458−msgstr ""

520+msgstr "You can change your mind later in <b>System Settings</b>."

459

521

460#: qml/Wizard/Pages/60-reporting.qml:24

522#: qml/Wizard/Pages/60-reporting.qml:24

461msgid "Improving your experience"

523msgid "Improving your experience"

462−msgstr ""

524+msgstr "Improving your experience"

463

525

464#: qml/Wizard/Pages/60-reporting.qml:36

526#: qml/Wizard/Pages/60-reporting.qml:36

465msgid ""

527msgid ""

466"Your phone is set up to automatically report errors to Canonical and its "

528"Your phone is set up to automatically report errors to Canonical and its "

467"partners, the makers of the operating system."

529"partners, the makers of the operating system."

468msgstr ""

530msgstr ""

531+"Your phone is set up to automatically report errors to Canonical and its "

532+"partners, the makers of the operating system."

469

533

470#: qml/Wizard/Pages/60-reporting.qml:43

534#: qml/Wizard/Pages/60-reporting.qml:43

471msgid ""

535msgid ""

472"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

536"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

473"Privacy</b>"

537"Privacy</b>"

474msgstr ""

538msgstr ""

539+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

540+"Privacy</b>"

475

541

476#: qml/Wizard/Pages/80-finished.qml:24

542#: qml/Wizard/Pages/80-finished.qml:24

477msgid "All done"

543msgid "All done"

478−msgstr ""

544+msgstr "All done"

479

545

480#: qml/Wizard/Pages/80-finished.qml:39

546#: qml/Wizard/Pages/80-finished.qml:39

481msgid "Nice work!"

547msgid "Nice work!"

482−msgstr ""

548+msgstr "Nice work!"

483

549

484#: qml/Wizard/Pages/80-finished.qml:46

550#: qml/Wizard/Pages/80-finished.qml:46

485msgid "Your phone is now ready to use."

551msgid "Your phone is now ready to use."

486−msgstr ""

552+msgstr "Your phone is now ready to use."

487

553

488#: qml/Wizard/Pages/80-finished.qml:53

554#: qml/Wizard/Pages/80-finished.qml:53

489msgid "Finish"

555msgid "Finish"

490−msgstr ""

556+msgstr "Finish"

491

557

492#: qml/Wizard/Pages/here-terms.qml:27

558#: qml/Wizard/Pages/here-terms.qml:27

493msgid "Terms & Conditions"

559msgid "Terms & Conditions"

494−msgstr ""

560+msgstr "Terms & Conditions"

495

561

496#: qml/Wizard/Pages/passwd-confirm.qml:49

562#: qml/Wizard/Pages/passwd-confirm.qml:49

497msgid "Confirm passphrase"

563msgid "Confirm passphrase"

498−msgstr ""

564+msgstr "Confirm passphrase"

499

565

500#: qml/Wizard/Pages/passwd-confirm.qml:50

566#: qml/Wizard/Pages/passwd-confirm.qml:50

501msgid "Confirm passcode"

567msgid "Confirm passcode"

502−msgstr ""

568+msgstr "Confirm passcode"

503

569

504#: qml/Wizard/Pages/passwd-confirm.qml:53

570#: qml/Wizard/Pages/passwd-confirm.qml:53

505#: qml/Wizard/Pages/passwd-confirm.qml:54

571#: qml/Wizard/Pages/passwd-confirm.qml:54

506msgid "Please try again."

572msgid "Please try again."

507−msgstr ""

573+msgstr "Please try again."

508

574

509#: qml/Wizard/Pages/passwd-set.qml:61

575#: qml/Wizard/Pages/passwd-set.qml:61

510msgid "Choose your passcode"

576msgid "Choose your passcode"

511−msgstr ""

577+msgstr "Choose your passcode"

512

578

513#: qml/Wizard/Pages/passwd-set.qml:68

579#: qml/Wizard/Pages/passwd-set.qml:68

514msgid "Passphrase must be 4 characters long"

580msgid "Passphrase must be 4 characters long"

515−msgstr ""

581+msgstr "Passphrase must be 4 characters long"

516

582

517#: qml/Wizard/StackButton.qml:39

583#: qml/Wizard/StackButton.qml:39

518#, qt-format

584#, qt-format

519msgid "〈 %1"

585msgid "〈 %1"

520−msgstr ""

586+msgstr "〈 %1"

521

587

522#: qml/Wizard/StackButton.qml:42

588#: qml/Wizard/StackButton.qml:42

523#, qt-format

589#, qt-format

524msgid "%1 〉"

590msgid "%1 〉"

525−msgstr ""

591+msgstr "%1 〉"

526

592

527#~ msgid "Confirm"

593#~ msgid "Confirm"

528#~ msgstr "Confirm"

594#~ msgstr "Confirm"

@@ -539,14 +605,86 @@ msgstr ""

539#~ msgid "Speaking..."

605#~ msgid "Speaking..."

540#~ msgstr "Speaking..."

606#~ msgstr "Speaking..."

541

607

608+#~ msgid "Search"

609+#~ msgstr "Search"

610+

611+#~ msgid "Try swiping from the right edge to unlock the phone"

612+#~ msgstr "Try swiping from the right edge to unlock the phone"

613+

614+#~ msgid "Top edge"

615+#~ msgstr "Top edge"

616+

617+#~ msgid "Try swiping from the top edge to access the indicators"

618+#~ msgstr "Try swiping from the top edge to access the indicators"

619+

620+#~ msgid "Close"

621+#~ msgstr "Close"

622+

623+#~ msgid "Swipe up again to close the settings screen"

624+#~ msgstr "Swipe up again to close the settings screen"

625+

626+#~ msgid "Left edge"

627+#~ msgstr "Left edge"

628+

629+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

630+#~ msgstr "Swipe from the left to reveal the launcher for quick access to apps"

631+

632+#~ msgid "Well done"

633+#~ msgstr "Well done"

634+

635+#~ msgid "Skip intro"

636+#~ msgstr "Skip intro"

637+

638+#~ msgid "Right edge"

639+#~ msgstr "Right edge"

640+

641+#~ msgid ""

642+#~ "You have now mastered the edge gestures and can start using the "

643+#~ "phone<br><br>Tap on the screen to start"

644+#~ msgstr ""

645+#~ "You have now mastered the edge gestures and can start using the "

646+#~ "phone<br><br>Tap on the screen to start"

647+

648+#~ msgid "Store"

649+#~ msgstr "Store"

650+

542#~ msgid "All"

651#~ msgid "All"

543#~ msgstr "All"

652#~ msgstr "All"

544

653

545#~ msgid "Favorites"

654#~ msgid "Favorites"

546#~ msgstr "Favourites"

655#~ msgstr "Favourites"

547

656

657+#~ msgid "Power off"

658+#~ msgstr "Power off"

659+

548#~ msgid "Done"

660#~ msgid "Done"

549#~ msgstr "Done"

661#~ msgstr "Done"

550

662

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+

551#~ msgid "Manage Scopes"

681#~ msgid "Manage Scopes"

552#~ msgstr "Manage Scopes"

682#~ 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 ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11"PO-Revision-Date: 2013-06-26 22:35+0000\n"

11"PO-Revision-Date: 2013-06-26 22:35+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Esperanto <eo@li.org>\n"

13"Language-Team: Esperanto <eo@li.org>\n"

@@ -15,10 +15,10 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr ""

23msgstr ""

24

24

@@ -31,125 +31,104 @@ msgstr ""

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr ""

32msgstr ""

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr ""

36msgstr ""

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

40msgstr ""

41

41

42−#: qml/Components/DelayedLockscreen.qml:63

42+#: qml/Components/DelayedLockscreen.qml:65

43msgid "You have been locked out due to too many failed passcode attempts."

43msgid "You have been locked out due to too many failed passcode attempts."

44msgstr ""

44msgstr ""

45

45

46−#: qml/Components/DelayedLockscreen.qml:72

46+#: qml/Components/DelayedLockscreen.qml:74

47#, qt-format

47#, qt-format

48msgid "Please wait %1 minute and then try again…"

48msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] ""

50msgstr[0] ""

51msgstr[1] ""

51msgstr[1] ""

52

52

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:67

54+msgctxt "Title: Lock/Log out dialog"

54msgid "Log out"

55msgid "Log out"

55msgstr ""

56msgstr ""

56

57

57−#: qml/Components/Dialogs.qml:71

58+#: qml/Components/Dialogs.qml:68

58msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

59msgstr ""

60msgstr ""

60

61

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:70

62−#: qml/Components/Dialogs.qml:122

63+msgctxt "Button: Lock the system"

63−msgid "No"

64+msgid "Lock"

64msgstr ""

65msgstr ""

65

66

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:77

67−#: qml/Components/Dialogs.qml:129

68+msgctxt "Button: Log out from the system"

68−msgid "Yes"

69+msgid "Log Out"

69msgstr ""

70msgstr ""

70

71

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"

72msgid "Shut down"

79msgid "Shut down"

73msgstr ""

80msgstr ""

74

81

75−#: qml/Components/Dialogs.qml:95

82+#: qml/Components/Dialogs.qml:97

76msgid "Are you sure you want to shut down?"

83msgid "Are you sure you want to shut down?"

77msgstr ""

84msgstr ""

78

85

79−#: qml/Components/Dialogs.qml:119

86+#: qml/Components/Dialogs.qml:99

87+msgctxt "Button: Reboot the system"

80msgid "Reboot"

88msgid "Reboot"

81msgstr ""

89msgstr ""

82

90

83−#: qml/Components/Dialogs.qml:120

91+#: qml/Components/Dialogs.qml:107

84−msgid "Are you sure you want to reboot?"

92+msgctxt "Button: Shut down the system"

85−msgstr ""

93+msgid "Shut down"

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"

119msgstr ""

94msgstr ""

120

95

121−#: qml/Components/EdgeDemo.qml:157

96+#: qml/Components/Dialogs.qml:127

97+msgctxt "Title: Reboot dialog"

122−msgid "Top edge"

98+msgid "Reboot"

123msgstr ""

99msgstr ""

124

100

125−#: qml/Components/EdgeDemo.qml:158

101+#: qml/Components/Dialogs.qml:128

126−msgid "Try swiping from the top edge to access the indicators"

102+msgid "Are you sure you want to reboot?"

127msgstr ""

103msgstr ""

128

104

129−#: qml/Components/EdgeDemo.qml:183

105+#: qml/Components/Dialogs.qml:130

130−msgid "Close"

106+msgid "No"

131msgstr ""

107msgstr ""

132

108

133−#: qml/Components/EdgeDemo.qml:184

109+#: qml/Components/Dialogs.qml:136

134−msgid "Swipe up again to close the settings screen"

110+msgid "Yes"

135msgstr ""

111msgstr ""

136

112

137−#: qml/Components/EdgeDemo.qml:214

113+#: qml/Components/Dialogs.qml:150

114+msgctxt "Title: Power off/Restart dialog"

138−msgid "Left edge"

115+msgid "Power"

139msgstr ""

116msgstr ""

140

117

141−#: qml/Components/EdgeDemo.qml:215

118+#: qml/Components/Dialogs.qml:151

142−msgid "Swipe from the left to reveal the launcher for quick access to apps"

119+msgid ""

120+"Are you sure you would like\n"

121+"to power off?"

143msgstr ""

122msgstr ""

144

123

145−#: qml/Components/EdgeDemo.qml:242

124+#: qml/Components/Dialogs.qml:153

146−msgid "Well done"

125+msgctxt "Button: Power off the system"

126+msgid "Power off"

147msgstr ""

127msgstr ""

148

128

149−#: qml/Components/EdgeDemo.qml:243

129+#: qml/Components/Dialogs.qml:162

130+msgctxt "Button: Restart the system"

150−msgid ""

131+msgid "Restart"

151−"You have now mastered the edge gestures and can start using the "

152−"phone<br><br>Tap on the screen to start"

153msgstr ""

132msgstr ""

154

133

155#: qml/Components/Lockscreen.qml:238

134#: qml/Components/Lockscreen.qml:238

@@ -164,32 +143,39 @@ msgstr ""

164msgid "OK"

143msgid "OK"

165msgstr ""

144msgstr ""

166

145

167−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

168msgid "See less"

147msgid "See less"

169msgstr ""

148msgstr ""

170

149

171−#: qml/Dash/GenericScopeView.qml:431

150+#: qml/Dash/GenericScopeView.qml:533

172msgid "See all"

151msgid "See all"

173msgstr ""

152msgstr ""

174

153

175−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

154+#: qml/Dash/GenericScopeView.qml:595

176−#: qml/Panel/SearchIndicator.qml:27

155+msgctxt "Label: Hint for dash search line edit"

177msgid "Search"

156msgid "Search"

178msgstr ""

157msgstr ""

179

158

180−#: qml/Dash/PageHeader.qml:260

159+#: qml/Dash/PageHeader.qml:269

160+msgctxt "Button: Open the Ubuntu Store"

181msgid "Store"

161msgid "Store"

182msgstr ""

162msgstr ""

183

163

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"

185msgid "Settings"

171msgid "Settings"

186msgstr ""

172msgstr ""

187

173

188−#: qml/Dash/PageHeader.qml:284

174+#: qml/Dash/PageHeader.qml:293

189msgid "Remove from Favorites"

175msgid "Remove from Favorites"

190msgstr ""

176msgstr ""

191

177

192−#: qml/Dash/PageHeader.qml:284

178+#: qml/Dash/PageHeader.qml:293

193msgid "Add to Favorites"

179msgid "Add to Favorites"

194msgstr ""

180msgstr ""

195

181

@@ -221,22 +207,88 @@ msgstr ""

221msgid "Release to refresh…"

207msgid "Release to refresh…"

222msgstr ""

208msgstr ""

223

209

210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

211+msgid "Enable location data"

212+msgstr ""

213+

224−#: qml/Dash/ScopesList.qml:63

214+#: qml/Dash/ScopesList.qml:66

225msgid "Manage"

215msgid "Manage"

226msgstr ""

216msgstr ""

227

217

228−#: qml/Dash/ScopesList.qml:107

218+#: qml/Dash/ScopesList.qml:112

229msgid "Home"

219msgid "Home"

230msgstr ""

220msgstr ""

231

221

232−#: qml/Dash/ScopesList.qml:108

222+#: qml/Dash/ScopesList.qml:113

233msgid "Also installed"

223msgid "Also installed"

234msgstr ""

224msgstr ""

235

225

236−#: qml/Greeter/Greeter.qml:174

226+#: qml/Greeter/CoverPage.qml:107

237msgid "Unlock"

227msgid "Unlock"

238msgstr ""

228msgstr ""

239

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+

240#: qml/Notifications/NotificationMenuItemFactory.qml:128

292#: qml/Notifications/NotificationMenuItemFactory.qml:128

241msgid "Show password"

293msgid "Show password"

242msgstr ""

294msgstr ""

@@ -277,6 +329,11 @@ msgstr ""

277msgid "Failed, tap to retry"

329msgid "Failed, tap to retry"

278msgstr ""

330msgstr ""

279

331

332+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

333+msgctxt "Label: Hint in message indicator line edit"

334+msgid "Reply"

335+msgstr ""

336+

280#: qml/Panel/Indicators/ModemInfoItem.qml:105

337#: qml/Panel/Indicators/ModemInfoItem.qml:105

281msgid "Unlock SIM"

338msgid "Unlock SIM"

282msgstr ""

339msgstr ""

@@ -285,61 +342,60 @@ msgstr ""

285msgid "Roaming"

342msgid "Roaming"

286msgstr ""

343msgstr ""

287

344

288−#: qml/Shell.qml:367

345+#: qml/Tutorial/TutorialBottomFinish.qml:24

289−#, qt-format

346+msgid "This action does different things for different apps"

290−msgid "Enter %1"

291msgstr ""

347msgstr ""

292

348

293−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

349+#: qml/Tutorial/TutorialBottomFinish.qml:25

294−msgid "Enter passphrase"

350+msgid "Tap here to finish."

295msgstr ""

351msgstr ""

296

352

297−#: qml/Shell.qml:369

353+#: qml/Tutorial/TutorialBottom.qml:28

298−msgid "Enter passcode"

354+msgid "Open special menus"

299msgstr ""

355msgstr ""

300

356

301−#: qml/Shell.qml:370

357+#: qml/Tutorial/TutorialBottom.qml:29

302−#, qt-format

358+msgid "Swipe up from the bottom edge."

303−msgid "Sorry, incorrect %1"

304msgstr ""

359msgstr ""

305

360

306−#: qml/Shell.qml:371

361+#: qml/Tutorial/TutorialLeftFinish.qml:24

307−msgid "Sorry, incorrect passphrase"

362+msgid "These are the shortcuts to favorite apps"

308msgstr ""

363msgstr ""

309

364

310−#: qml/Shell.qml:372

365+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

311−msgid "Please re-enter"

366+msgid "Tap here to continue."

312msgstr ""

367msgstr ""

313

368

314−#: qml/Shell.qml:373

369+#: qml/Tutorial/TutorialLeft.qml:26

315−msgid "Sorry, incorrect passcode"

370+msgid "Open the launcher"

316msgstr ""

371msgstr ""

317

372

318−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

373+#: qml/Tutorial/TutorialLeft.qml:27

319−msgid "Sorry, incorrect passphrase."

374+msgid "Short swipe from the left edge."

320msgstr ""

375msgstr ""

321

376

322−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

377+#: qml/Tutorial/TutorialPage.qml:178

323−msgid "Sorry, incorrect passcode."

378+msgid "You almost got it!"

324msgstr ""

379msgstr ""

325

380

326−#: qml/Shell.qml:469

381+#: qml/Tutorial/TutorialPage.qml:195

327−msgid "This will be your last attempt."

382+msgid "Try again."

328msgstr ""

383msgstr ""

329

384

330−#: qml/Shell.qml:471

385+#: qml/Tutorial/TutorialRight.qml:31

331−msgid ""

386+msgid "To view open apps"

332−"If passphrase is entered incorrectly, your phone will conduct a factory "

333−"reset and all personal data will be deleted."

334msgstr ""

387msgstr ""

335

388

336−#: qml/Shell.qml:472

389+#: qml/Tutorial/TutorialRight.qml:32

337−msgid ""

390+msgid "Long swipe from the right edge."

338−"If passcode is entered incorrectly, your phone will conduct a factory reset "

391+msgstr ""

339−"and all personal data will be deleted."

392+

393+#: qml/Tutorial/TutorialRight.qml:122

394+msgid "View all your running tasks."

340msgstr ""

395msgstr ""

341

396

342#: qml/Wizard/Page.qml:89

397#: qml/Wizard/Page.qml:89

398+msgctxt "Button: Go back one page in the Wizard"

343msgid "Back"

399msgid "Back"

344msgstr ""

400msgstr ""

345

401

@@ -356,7 +412,7 @@ msgid "Let’s get started."

356msgstr ""

412msgstr ""

357

413

358#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

414#: 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

360#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

416#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

361#: qml/Wizard/Pages/passwd-set.qml:90

417#: qml/Wizard/Pages/passwd-set.qml:90

362msgid "Continue"

418msgid "Continue"

@@ -366,11 +422,11 @@ msgstr ""

366msgid "Add a SIM card and restart your device"

422msgid "Add a SIM card and restart your device"

367msgstr ""

423msgstr ""

368

424

369−#: qml/Wizard/Pages/20-sim.qml:55

425+#: qml/Wizard/Pages/20-sim.qml:59

370msgid "Without it, you won’t be able to make calls or use text messaging."

426msgid "Without it, you won’t be able to make calls or use text messaging."

371msgstr ""

427msgstr ""

372

428

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

374msgid "Skip"

430msgid "Skip"

375msgstr ""

431msgstr ""

376

432

@@ -383,38 +439,44 @@ msgid "Please select how you’d like to unlock your phone."

383msgstr ""

439msgstr ""

384

440

385#: qml/Wizard/Pages/30-passwd-type.qml:97

441#: qml/Wizard/Pages/30-passwd-type.qml:97

442+msgctxt "Label: Type of security method"

386msgid "Swipe"

443msgid "Swipe"

387msgstr ""

444msgstr ""

388

445

389#: qml/Wizard/Pages/30-passwd-type.qml:98

446#: qml/Wizard/Pages/30-passwd-type.qml:98

447+msgctxt "Label: Description of security method"

390msgid "No security"

448msgid "No security"

391msgstr ""

449msgstr ""

392

450

393#: qml/Wizard/Pages/30-passwd-type.qml:100

451#: qml/Wizard/Pages/30-passwd-type.qml:100

452+msgctxt "Label: Type of security method"

394msgid "Passcode"

453msgid "Passcode"

395msgstr ""

454msgstr ""

396

455

397#: qml/Wizard/Pages/30-passwd-type.qml:101

456#: qml/Wizard/Pages/30-passwd-type.qml:101

457+msgctxt "Label: Description of security method"

398msgid "4 digits only"

458msgid "4 digits only"

399msgstr ""

459msgstr ""

400

460

401#: qml/Wizard/Pages/30-passwd-type.qml:103

461#: qml/Wizard/Pages/30-passwd-type.qml:103

462+msgctxt "Label: Type of security method"

402msgid "Passphrase"

463msgid "Passphrase"

403msgstr ""

464msgstr ""

404

465

405#: qml/Wizard/Pages/30-passwd-type.qml:104

466#: qml/Wizard/Pages/30-passwd-type.qml:104

467+msgctxt "Label: Description of security method"

406msgid "Numbers and letters"

468msgid "Numbers and letters"

407msgstr ""

469msgstr ""

408

470

409−#: qml/Wizard/Pages/40-wifi.qml:28

471+#: qml/Wizard/Pages/40-wifi.qml:29

410msgid "Connect to Wi‑Fi"

472msgid "Connect to Wi‑Fi"

411msgstr ""

473msgstr ""

412

474

413−#: qml/Wizard/Pages/40-wifi.qml:147

475+#: qml/Wizard/Pages/40-wifi.qml:168

414msgid "Available networks…"

476msgid "Available networks…"

415msgstr ""

477msgstr ""

416

478

417−#: qml/Wizard/Pages/40-wifi.qml:148

479+#: qml/Wizard/Pages/40-wifi.qml:169

418msgid "No available networks."

480msgid "No available networks."

419msgstr ""

481msgstr ""

420

482

po/es.po+324−194

@@ -7,18 +7,18 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11−"PO-Revision-Date: 2014-11-08 08:01+0000\n"

11+"PO-Revision-Date: 2015-03-27 21:24+0000\n"

12−"Last-Translator: Paco Molinero <paco@byasl.com>\n"

12+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"

13"Language-Team: Spanish <es@li.org>\n"

13"Language-Team: Spanish <es@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-28 05:32+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr "Contraseña: "

23msgstr "Contraseña: "

24

24

@@ -31,138 +31,112 @@ msgstr "Anclar"

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Desanclar"

32msgstr "Desanclar"

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr "Dispositivo bloqueado"

36msgstr "Dispositivo bloqueado"

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

40msgstr ""

41"Se ha proporcionado una contraseña errónea demasiadas veces. Se ha bloqueado "

41"Se ha proporcionado una contraseña errónea demasiadas veces. Se ha bloqueado "

42"el dispositivo."

42"el dispositivo."

43

43

44−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

45msgid "You have been locked out due to too many failed passcode attempts."

45msgid "You have been locked out due to too many failed passcode attempts."

46msgstr ""

46msgstr ""

47"Se ha bloqueado el dispositivo debido al gran número de intentos fallidos de "

47"Se ha bloqueado el dispositivo debido al gran número de intentos fallidos de "

48"desbloqueo."

48"desbloqueo."

49

49

50−#: qml/Components/DelayedLockscreen.qml:72

50+#: qml/Components/DelayedLockscreen.qml:74

51#, qt-format

51#, qt-format

52msgid "Please wait %1 minute and then try again…"

52msgid "Please wait %1 minute and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

54msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."

54msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."

55msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."

55msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."

56

56

57−#: qml/Components/Dialogs.qml:70

57+#: qml/Components/Dialogs.qml:67

58+msgctxt "Title: Lock/Log out dialog"

58msgid "Log out"

59msgid "Log out"

59msgstr "Cerrar la sesión"

60msgstr "Cerrar la sesión"

60

61

61−#: qml/Components/Dialogs.qml:71

62+#: qml/Components/Dialogs.qml:68

62msgid "Are you sure you want to log out?"

63msgid "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?"

64

65

65−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66+#: qml/Components/Dialogs.qml:70

66−#: qml/Components/Dialogs.qml:122

67+msgctxt "Button: Lock the system"

67−msgid "No"

68+msgid "Lock"

68−msgstr "No"

69+msgstr "Bloquear"

69

70

70−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

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

71−#: qml/Components/Dialogs.qml:129

77+#: qml/Components/Dialogs.qml:171

72−msgid "Yes"

78+msgid "Cancel"

73−msgstr "Sí"

79+msgstr "Cancelar"

74

80

75−#: qml/Components/Dialogs.qml:94

81+#: qml/Components/Dialogs.qml:96

82+msgctxt "Title: Reboot/Shut down dialog"

76msgid "Shut down"

83msgid "Shut down"

77msgstr "Apagar"

84msgstr "Apagar"

78

85

79−#: qml/Components/Dialogs.qml:95

86+#: qml/Components/Dialogs.qml:97

80msgid "Are you sure you want to shut down?"

87msgid "Are you sure you want to shut down?"

81msgstr "¿Está seguro de que quiere apagar?"

88msgstr "¿Está seguro de que quiere apagar?"

82

89

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"

84msgid "Reboot"

102msgid "Reboot"

85msgstr "Reiniciar"

103msgstr "Reiniciar"

86

104

87−#: qml/Components/Dialogs.qml:120

105+#: qml/Components/Dialogs.qml:128

88msgid "Are you sure you want to reboot?"

106msgid "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í"

90

116

91−#: qml/Components/Dialogs.qml:144

117+#: qml/Components/Dialogs.qml:150

118+msgctxt "Title: Power off/Restart dialog"

92msgid "Power"

119msgid "Power"

93msgstr "Apagar"

120msgstr "Apagar"

94

121

95−#: qml/Components/Dialogs.qml:145

122+#: qml/Components/Dialogs.qml:151

96msgid ""

123msgid ""

97"Are you sure you would like\n"

124"Are you sure you would like\n"

98"to power off?"

125"to power off?"

99msgstr ""

126msgstr ""

100−"¿Está seguro de que quiere\n"

127+"¿Seguro que quiere\n"

101"apagar?"

128"apagar?"

102

129

103−#: qml/Components/Dialogs.qml:147

130+#: qml/Components/Dialogs.qml:153

131+msgctxt "Button: Power off the system"

104msgid "Power off"

132msgid "Power off"

105msgstr "Apagar"

133msgstr "Apagar"

106

134

107−#: qml/Components/Dialogs.qml:157

135+#: qml/Components/Dialogs.qml:162

136+msgctxt "Button: Restart the system"

108msgid "Restart"

137msgid "Restart"

109msgstr "Reiniciar"

138msgstr "Reiniciar"

110

139

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<br><br>Tap on the screen to start"

162−msgstr ""

163−"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "

164−"la pantalla para comenzar"

165−

166#: qml/Components/Lockscreen.qml:238

140#: qml/Components/Lockscreen.qml:238

167msgid "Return to Call"

141msgid "Return to Call"

168msgstr "Volver a la llamada"

142msgstr "Volver a la llamada"

@@ -175,32 +149,39 @@ msgstr "Llamada de emergencia"

175msgid "OK"

149msgid "OK"

176msgstr "Aceptar"

150msgstr "Aceptar"

177

151

178−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

179msgid "See less"

153msgid "See less"

180msgstr "Ver menos"

154msgstr "Ver menos"

181

155

182−#: qml/Dash/GenericScopeView.qml:431

156+#: qml/Dash/GenericScopeView.qml:533

183msgid "See all"

157msgid "See all"

184msgstr "Ver todo"

158msgstr "Ver todo"

185

159

186−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

160+#: qml/Dash/GenericScopeView.qml:595

187−#: qml/Panel/SearchIndicator.qml:27

161+msgctxt "Label: Hint for dash search line edit"

188msgid "Search"

162msgid "Search"

189−msgstr "Buscar"

163+msgstr "Búsqueda"

190

164

191−#: qml/Dash/PageHeader.qml:260

165+#: qml/Dash/PageHeader.qml:269

166+msgctxt "Button: Open the Ubuntu Store"

192msgid "Store"

167msgid "Store"

193msgstr "Tienda"

168msgstr "Tienda"

194

169

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"

196msgid "Settings"

177msgid "Settings"

197−msgstr "Configuración"

178+msgstr "Ajustes"

198

179

199−#: qml/Dash/PageHeader.qml:284

180+#: qml/Dash/PageHeader.qml:293

200msgid "Remove from Favorites"

181msgid "Remove from Favorites"

201msgstr "Quitar de favoritos"

182msgstr "Quitar de favoritos"

202

183

203−#: qml/Dash/PageHeader.qml:284

184+#: qml/Dash/PageHeader.qml:293

204msgid "Add to Favorites"

185msgid "Add to Favorites"

205msgstr "Añadir a favoritos"

186msgstr "Añadir a favoritos"

206

187

@@ -232,29 +213,99 @@ msgstr "Deslice para actualizar…"

232msgid "Release to refresh…"

213msgid "Release to refresh…"

233msgstr "Suelte para actualizar…"

214msgstr "Suelte para actualizar…"

234

215

216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

217+msgid "Enable location data"

218+msgstr "Activar datos de ubicación"

219+

235−#: qml/Dash/ScopesList.qml:63

220+#: qml/Dash/ScopesList.qml:66

236msgid "Manage"

221msgid "Manage"

237−msgstr ""

222+msgstr "Administrar"

238

223

239−#: qml/Dash/ScopesList.qml:107

224+#: qml/Dash/ScopesList.qml:112

240msgid "Home"

225msgid "Home"

241−msgstr ""

226+msgstr "Inicio"

242

227

243−#: qml/Dash/ScopesList.qml:108

228+#: qml/Dash/ScopesList.qml:113

244msgid "Also installed"

229msgid "Also installed"

245−msgstr ""

230+msgstr "También instalados"

246

231

247−#: qml/Greeter/Greeter.qml:174

232+#: qml/Greeter/CoverPage.qml:107

248msgid "Unlock"

233msgid "Unlock"

249msgstr "Desbloquear"

234msgstr "Desbloquear"

250

235

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+

251#: qml/Notifications/NotificationMenuItemFactory.qml:128

302#: qml/Notifications/NotificationMenuItemFactory.qml:128

252msgid "Show password"

303msgid "Show password"

253msgstr "Mostrar contraseña"

304msgstr "Mostrar contraseña"

254

305

255#: qml/Panel/ActiveCallHint.qml:79

306#: qml/Panel/ActiveCallHint.qml:79

256msgid "Tap to return to call..."

307msgid "Tap to return to call..."

257−msgstr "Toque para volver a llamar..."

308+msgstr "Toque para volver a la llamada…"

258

309

259#: qml/Panel/ActiveCallHint.qml:92

310#: qml/Panel/ActiveCallHint.qml:92

260msgid "Conference"

311msgid "Conference"

@@ -288,6 +339,11 @@ msgstr "Finalizado"

288msgid "Failed, tap to retry"

339msgid "Failed, tap to retry"

289msgstr "Falló, toque para reintentar"

340msgstr "Falló, toque para reintentar"

290

341

342+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

343+msgctxt "Label: Hint in message indicator line edit"

344+msgid "Reply"

345+msgstr "Responder"

346+

291#: qml/Panel/Indicators/ModemInfoItem.qml:105

347#: qml/Panel/Indicators/ModemInfoItem.qml:105

292msgid "Unlock SIM"

348msgid "Unlock SIM"

293msgstr "Desbloquear SIM"

349msgstr "Desbloquear SIM"

@@ -296,158 +352,159 @@ msgstr "Desbloquear SIM"

296msgid "Roaming"

352msgid "Roaming"

297msgstr "Itinerancia"

353msgstr "Itinerancia"

298

354

299−#: qml/Shell.qml:367

355+#: qml/Tutorial/TutorialBottomFinish.qml:24

300−#, qt-format

356+msgid "This action does different things for different apps"

301−msgid "Enter %1"

357+msgstr "Esta acción tiene efectos diferentes en cada aplicación"

302−msgstr "Introduzca %1"

303

358

304−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

359+#: qml/Tutorial/TutorialBottomFinish.qml:25

305−msgid "Enter passphrase"

360+msgid "Tap here to finish."

306−msgstr "Introduzca la contraseña"

361+msgstr "Toque aquí para finalizar."

307

362

308−#: qml/Shell.qml:369

363+#: qml/Tutorial/TutorialBottom.qml:28

309−msgid "Enter passcode"

364+msgid "Open special menus"

310−msgstr "Introduzca el código"

365+msgstr "Abrir menús especiales"

311

366

312−#: qml/Shell.qml:370

367+#: qml/Tutorial/TutorialBottom.qml:29

313−#, qt-format

368+msgid "Swipe up from the bottom edge."

314−msgid "Sorry, incorrect %1"

369+msgstr "Deslizar hacia arriba desde el borde inferior."

315−msgstr "Incorrecto (%1)"

316

370

317−#: qml/Shell.qml:371

371+#: qml/Tutorial/TutorialLeftFinish.qml:24

318−msgid "Sorry, incorrect passphrase"

372+msgid "These are the shortcuts to favorite apps"

319−msgstr "La contraseña es incorrecta"

373+msgstr "Esto son atajos a las aplicaciones favoritas"

320

374

321−#: qml/Shell.qml:372

375+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

322−msgid "Please re-enter"

376+msgid "Tap here to continue."

323−msgstr "Reintroduzca"

377+msgstr "Toque aquí para continuar."

324

378

325−#: qml/Shell.qml:373

379+#: qml/Tutorial/TutorialLeft.qml:26

326−msgid "Sorry, incorrect passcode"

380+msgid "Open the launcher"

327−msgstr "El código es incorrecto"

381+msgstr "Abrir el lanzador"

328

382

329−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

383+#: qml/Tutorial/TutorialLeft.qml:27

330−msgid "Sorry, incorrect passphrase."

384+msgid "Short swipe from the left edge."

331−msgstr "La contraseña es incorrecta."

385+msgstr "Deslizamiento corto desde el borde izquierdo."

332

386

333−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

387+#: qml/Tutorial/TutorialPage.qml:178

334−msgid "Sorry, incorrect passcode."

388+msgid "You almost got it!"

335−msgstr "Código de acceso incorrecto."

389+msgstr "¡Casi lo tiene!"

336

390

337−#: qml/Shell.qml:469

391+#: qml/Tutorial/TutorialPage.qml:195

338−msgid "This will be your last attempt."

392+msgid "Try again."

339−msgstr "Este será su último intento."

393+msgstr "Inténtelo de nuevo."

340

394

341−#: qml/Shell.qml:471

395+#: qml/Tutorial/TutorialRight.qml:31

342−msgid ""

396+msgid "To view open apps"

343−"If passphrase is entered incorrectly, your phone will conduct a factory "

397+msgstr "Para ver las aplicaciones abiertas"

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."

348

398

349−#: qml/Shell.qml:472

399+#: qml/Tutorial/TutorialRight.qml:32

350−msgid ""

400+msgid "Long swipe from the right edge."

351−"If passcode is entered incorrectly, your phone will conduct a factory reset "

401+msgstr "Deslizamiento largo desde el borde derecho."

352−"and all personal data will be deleted."

402+

353−msgstr ""

403+#: qml/Tutorial/TutorialRight.qml:122

354−"Si se introduce el código incorrectamente, el teléfono volverá a la "

404+msgid "View all your running tasks."

355−"configuración de fábrica y se perderán todos los datos personales."

405+msgstr "Ver todas las tareas en ejecución."

356

406

357#: qml/Wizard/Page.qml:89

407#: qml/Wizard/Page.qml:89

408+msgctxt "Button: Go back one page in the Wizard"

358msgid "Back"

409msgid "Back"

359−msgstr ""

410+msgstr "Atrás"

360

411

361#: qml/Wizard/Pages/10-welcome.qml:27

412#: qml/Wizard/Pages/10-welcome.qml:27

362msgid "Hi!"

413msgid "Hi!"

363−msgstr ""

414+msgstr "¡Hola!"

364

415

365#: qml/Wizard/Pages/10-welcome.qml:44

416#: qml/Wizard/Pages/10-welcome.qml:44

366msgid "Welcome to your Ubuntu phone."

417msgid "Welcome to your Ubuntu phone."

367−msgstr ""

418+msgstr "Bienvenido a su teléfono Ubuntu."

368

419

369#: qml/Wizard/Pages/10-welcome.qml:52

420#: qml/Wizard/Pages/10-welcome.qml:52

370msgid "Let’s get started."

421msgid "Let’s get started."

371−msgstr ""

422+msgstr "Comencemos."

372

423

373#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

424#: 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

375#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

426#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

376#: qml/Wizard/Pages/passwd-set.qml:90

427#: qml/Wizard/Pages/passwd-set.qml:90

377msgid "Continue"

428msgid "Continue"

378−msgstr ""

429+msgstr "Continuar"

379

430

380#: qml/Wizard/Pages/20-sim.qml:25

431#: qml/Wizard/Pages/20-sim.qml:25

381msgid "Add a SIM card and restart your device"

432msgid "Add a SIM card and restart your device"

382−msgstr ""

433+msgstr "Inserte una tarjeta SIM y reinicie el dispositivo"

383

434

384−#: qml/Wizard/Pages/20-sim.qml:55

435+#: qml/Wizard/Pages/20-sim.qml:59

385msgid "Without it, you won’t be able to make calls or use text messaging."

436msgid "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."

387

438

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

389msgid "Skip"

440msgid "Skip"

390−msgstr ""

441+msgstr "Omitir"

391

442

392#: qml/Wizard/Pages/30-passwd-type.qml:39

443#: qml/Wizard/Pages/30-passwd-type.qml:39

393msgid "Lock security"

444msgid "Lock security"

394−msgstr ""

445+msgstr "Seguridad de bloqueo"

395

446

396#: qml/Wizard/Pages/30-passwd-type.qml:74

447#: qml/Wizard/Pages/30-passwd-type.qml:74

397msgid "Please select how you’d like to unlock your phone."

448msgid "Please select how you’d like to unlock your phone."

398−msgstr ""

449+msgstr "Seleccione el método de desbloqueo del teléfono."

399

450

400#: qml/Wizard/Pages/30-passwd-type.qml:97

451#: qml/Wizard/Pages/30-passwd-type.qml:97

452+msgctxt "Label: Type of security method"

401msgid "Swipe"

453msgid "Swipe"

402−msgstr ""

454+msgstr "Deslizar"

403

455

404#: qml/Wizard/Pages/30-passwd-type.qml:98

456#: qml/Wizard/Pages/30-passwd-type.qml:98

457+msgctxt "Label: Description of security method"

405msgid "No security"

458msgid "No security"

406−msgstr ""

459+msgstr "Sin seguridad"

407

460

408#: qml/Wizard/Pages/30-passwd-type.qml:100

461#: qml/Wizard/Pages/30-passwd-type.qml:100

462+msgctxt "Label: Type of security method"

409msgid "Passcode"

463msgid "Passcode"

410−msgstr ""

464+msgstr "Código"

411

465

412#: qml/Wizard/Pages/30-passwd-type.qml:101

466#: qml/Wizard/Pages/30-passwd-type.qml:101

467+msgctxt "Label: Description of security method"

413msgid "4 digits only"

468msgid "4 digits only"

414−msgstr ""

469+msgstr "Solo 4 dígitos"

415

470

416#: qml/Wizard/Pages/30-passwd-type.qml:103

471#: qml/Wizard/Pages/30-passwd-type.qml:103

472+msgctxt "Label: Type of security method"

417msgid "Passphrase"

473msgid "Passphrase"

418−msgstr ""

474+msgstr "Contraseña"

419

475

420#: qml/Wizard/Pages/30-passwd-type.qml:104

476#: qml/Wizard/Pages/30-passwd-type.qml:104

477+msgctxt "Label: Description of security method"

421msgid "Numbers and letters"

478msgid "Numbers and letters"

422−msgstr ""

479+msgstr "Números y letras"

423

480

424−#: qml/Wizard/Pages/40-wifi.qml:28

481+#: qml/Wizard/Pages/40-wifi.qml:29

425msgid "Connect to Wi‑Fi"

482msgid "Connect to Wi‑Fi"

426−msgstr ""

483+msgstr "Conectar con wifi"

427

484

428−#: qml/Wizard/Pages/40-wifi.qml:147

485+#: qml/Wizard/Pages/40-wifi.qml:168

429msgid "Available networks…"

486msgid "Available networks…"

430−msgstr ""

487+msgstr "Redes disponibles…"

431

488

432−#: qml/Wizard/Pages/40-wifi.qml:148

489+#: qml/Wizard/Pages/40-wifi.qml:169

433msgid "No available networks."

490msgid "No available networks."

434−msgstr ""

491+msgstr "No hay redes disponibles."

435

492

436#: qml/Wizard/Pages/50-location.qml:27

493#: qml/Wizard/Pages/50-location.qml:27

437msgid "Location"

494msgid "Location"

438−msgstr ""

495+msgstr "Ubicación"

439

496

440#: qml/Wizard/Pages/50-location.qml:62

497#: qml/Wizard/Pages/50-location.qml:62

441msgid "Let the phone detect your location:"

498msgid "Let the phone detect your location:"

442−msgstr ""

499+msgstr "Permitir que el teléfono detecte su ubicación:"

443

500

444#: qml/Wizard/Pages/50-location.qml:69

501#: qml/Wizard/Pages/50-location.qml:69

445msgid "Using GPS only (less accurate)"

502msgid "Using GPS only (less accurate)"

446−msgstr ""

503+msgstr "Usando solo GPS (poco preciso)"

447

504

448#: qml/Wizard/Pages/50-location.qml:86

505#: qml/Wizard/Pages/50-location.qml:86

449msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

506msgid "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)"

451

508

452#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

509#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

453#: qml/Wizard/Pages/50-location.qml:103

510#: qml/Wizard/Pages/50-location.qml:103

@@ -455,81 +512,87 @@ msgid ""

455"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

512"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

456"conditions</a>."

513"conditions</a>."

457msgstr ""

514msgstr ""

515+"Al seleccionar esta opción acepta los <a href='#'>términos y condiciones</a> "

516+"de Nokia HERE."

458

517

459#: qml/Wizard/Pages/50-location.qml:112

518#: qml/Wizard/Pages/50-location.qml:112

460msgid "Not at all"

519msgid "Not at all"

461−msgstr ""

520+msgstr "De ningún modo"

462

521

463#: qml/Wizard/Pages/50-location.qml:124

522#: qml/Wizard/Pages/50-location.qml:124

464msgid "You can change your mind later in <b>System Settings</b>."

523msgid "You can change your mind later in <b>System Settings</b>."

465−msgstr ""

524+msgstr "Si cambia de opinión, vaya a <b>Configuración del sistema</b>."

466

525

467#: qml/Wizard/Pages/60-reporting.qml:24

526#: qml/Wizard/Pages/60-reporting.qml:24

468msgid "Improving your experience"

527msgid "Improving your experience"

469−msgstr ""

528+msgstr "Mejorar la experiencia"

470

529

471#: qml/Wizard/Pages/60-reporting.qml:36

530#: qml/Wizard/Pages/60-reporting.qml:36

472msgid ""

531msgid ""

473"Your phone is set up to automatically report errors to Canonical and its "

532"Your phone is set up to automatically report errors to Canonical and its "

474"partners, the makers of the operating system."

533"partners, the makers of the operating system."

475msgstr ""

534msgstr ""

535+"El teléfono está configurado para enviar automáticamente informes de error a "

536+"Canonical y sus socios, los creadores del sistema operativo."

476

537

477#: qml/Wizard/Pages/60-reporting.qml:43

538#: qml/Wizard/Pages/60-reporting.qml:43

478msgid ""

539msgid ""

479"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

540"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

480"Privacy</b>"

541"Privacy</b>"

481msgstr ""

542msgstr ""

543+"Esto se puede desactivar en <b>Configuración del sistema</b> &gt; "

544+"<b>Seguridad y privacidad</b>."

482

545

483#: qml/Wizard/Pages/80-finished.qml:24

546#: qml/Wizard/Pages/80-finished.qml:24

484msgid "All done"

547msgid "All done"

485−msgstr ""

548+msgstr "Hecho"

486

549

487#: qml/Wizard/Pages/80-finished.qml:39

550#: qml/Wizard/Pages/80-finished.qml:39

488msgid "Nice work!"

551msgid "Nice work!"

489−msgstr ""

552+msgstr "¡Buen trabajo!"

490

553

491#: qml/Wizard/Pages/80-finished.qml:46

554#: qml/Wizard/Pages/80-finished.qml:46

492msgid "Your phone is now ready to use."

555msgid "Your phone is now ready to use."

493−msgstr ""

556+msgstr "El teléfono ya está listo para usarse."

494

557

495#: qml/Wizard/Pages/80-finished.qml:53

558#: qml/Wizard/Pages/80-finished.qml:53

496msgid "Finish"

559msgid "Finish"

497−msgstr ""

560+msgstr "Finalizar"

498

561

499#: qml/Wizard/Pages/here-terms.qml:27

562#: qml/Wizard/Pages/here-terms.qml:27

500msgid "Terms & Conditions"

563msgid "Terms & Conditions"

501−msgstr ""

564+msgstr "Términos y condiciones"

502

565

503#: qml/Wizard/Pages/passwd-confirm.qml:49

566#: qml/Wizard/Pages/passwd-confirm.qml:49

504msgid "Confirm passphrase"

567msgid "Confirm passphrase"

505−msgstr ""

568+msgstr "Confirme la contraseña"

506

569

507#: qml/Wizard/Pages/passwd-confirm.qml:50

570#: qml/Wizard/Pages/passwd-confirm.qml:50

508msgid "Confirm passcode"

571msgid "Confirm passcode"

509−msgstr ""

572+msgstr "Confirme el código"

510

573

511#: qml/Wizard/Pages/passwd-confirm.qml:53

574#: qml/Wizard/Pages/passwd-confirm.qml:53

512#: qml/Wizard/Pages/passwd-confirm.qml:54

575#: qml/Wizard/Pages/passwd-confirm.qml:54

513msgid "Please try again."

576msgid "Please try again."

514−msgstr ""

577+msgstr "Inténtelo de nuevo."

515

578

516#: qml/Wizard/Pages/passwd-set.qml:61

579#: qml/Wizard/Pages/passwd-set.qml:61

517msgid "Choose your passcode"

580msgid "Choose your passcode"

518−msgstr ""

581+msgstr "Elija su código"

519

582

520#: qml/Wizard/Pages/passwd-set.qml:68

583#: qml/Wizard/Pages/passwd-set.qml:68

521msgid "Passphrase must be 4 characters long"

584msgid "Passphrase must be 4 characters long"

522−msgstr ""

585+msgstr "El código debe tener 4 caracteres"

523

586

524#: qml/Wizard/StackButton.qml:39

587#: qml/Wizard/StackButton.qml:39

525#, qt-format

588#, qt-format

526msgid "〈 %1"

589msgid "〈 %1"

527−msgstr ""

590+msgstr "〈 %1"

528

591

529#: qml/Wizard/StackButton.qml:42

592#: qml/Wizard/StackButton.qml:42

530#, qt-format

593#, qt-format

531msgid "%1 〉"

594msgid "%1 〉"

532−msgstr ""

595+msgstr "%1 〉"

533

596

534#~ msgid "Confirm"

597#~ msgid "Confirm"

535#~ msgstr "Confirmar"

598#~ msgstr "Confirmar"

@@ -546,14 +609,81 @@ msgstr ""

546#~ msgid "Speaking..."

609#~ msgid "Speaking..."

547#~ msgstr "Hablando…"

610#~ msgstr "Hablando…"

548

611

612+#~ msgid "Search"

613+#~ msgstr "Buscar"

614+

615+#~ msgid "Top edge"

616+#~ msgstr "Borde superior"

617+

618+#~ msgid "Close"

619+#~ msgstr "Cerrar"

620+

621+#~ msgid "Left edge"

622+#~ msgstr "Borde izquierdo"

623+

624+#~ msgid "Skip intro"

625+#~ msgstr "Omitir la introducción"

626+

627+#~ msgid "Right edge"

628+#~ msgstr "Borde derecho"

629+

630+#~ msgid "Well done"

631+#~ msgstr "Bien hecho"

632+

633+#~ msgid "Swipe up again to close the settings screen"

634+#~ msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"

635+

636+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

637+#~ msgstr ""

638+#~ "Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "

639+#~ "rápidamente a las aplicaciones"

640+

641+#~ msgid "Try swiping from the right edge to unlock the phone"

642+#~ msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"

643+

644+#~ msgid "Try swiping from the top edge to access the indicators"

645+#~ msgstr ""

646+#~ "Deslice el dedo desde el borde superior para acceder a los indicadores"

647+

648+#~ msgid ""

649+#~ "You have now mastered the edge gestures and can start using the "

650+#~ "phone<br><br>Tap on the screen to start"

651+#~ msgstr ""

652+#~ "Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "

653+#~ "la pantalla para comenzar"

654+

655+#~ msgid "Power off"

656+#~ msgstr "Apagar"

657+

549#~ msgid "All"

658#~ msgid "All"

550#~ msgstr "Todo"

659#~ msgstr "Todo"

551

660

552#~ msgid "Favorites"

661#~ msgid "Favorites"

553#~ msgstr "Favoritos"

662#~ msgstr "Favoritos"

554

663

664+#~ msgid "Store"

665+#~ msgstr "Tienda"

666+

555#~ msgid "Done"

667#~ msgid "Done"

556#~ msgstr "Hecho"

668#~ msgstr "Hecho"

557

669

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+

558#~ msgid "Manage Scopes"

688#~ msgid "Manage Scopes"

559#~ msgstr "Administrar Scopes"

689#~ msgstr "Administrar Scopes"

po/eu.po+317−185

@@ -7,18 +7,18 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"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"

11−"PO-Revision-Date: 2014-11-08 14:44+0000\n"

11+"PO-Revision-Date: 2015-01-22 21:40+0000\n"

12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

13"Language-Team: Basque <eu@li.org>\n"

13"Language-Team: Basque <eu@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17413)\n"

20

20

21−#: plugins/LightDM/Greeter.cpp:130

21+#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

22msgid "Password: "

23msgstr "Pasahitza: "

23msgstr "Pasahitza: "

24

24

@@ -31,134 +31,108 @@ msgstr "Ainguratu lasterbidea"

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Askatu lasterbidea"

32msgstr "Askatu lasterbidea"

33

33

34−#: qml/Components/DelayedLockscreen.qml:47

34+#: qml/Components/DelayedLockscreen.qml:49

35msgid "Device Locked"

35msgid "Device Locked"

36msgstr "Gailua blokeatuta"

36msgstr "Gailua blokeatuta"

37

37

38−#: qml/Components/DelayedLockscreen.qml:62

38+#: qml/Components/DelayedLockscreen.qml:64

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

40msgstr ""

41"Gailua blokeatu da, pasaesaldia sartzeko saiakera gehiegi hutsegin "

41"Gailua blokeatu da, pasaesaldia sartzeko saiakera gehiegi hutsegin "

42"dituzulako."

42"dituzulako."

43

43

44−#: qml/Components/DelayedLockscreen.qml:63

44+#: qml/Components/DelayedLockscreen.qml:65

45msgid "You have been locked out due to too many failed passcode attempts."

45msgid "You have been locked out due to too many failed passcode attempts."

46msgstr ""

46msgstr ""

47"Gailua blokeatu da, pasakodea sartzeko saiakera gehiegi hutsegin dituzulako."

47"Gailua blokeatu da, pasakodea sartzeko saiakera gehiegi hutsegin dituzulako."

48

48

49−#: qml/Components/DelayedLockscreen.qml:72

49+#: qml/Components/DelayedLockscreen.qml:74

50#, qt-format

50#, qt-format

51msgid "Please wait %1 minute and then try again…"

51msgid "Please wait %1 minute and then try again…"

52msgid_plural "Please wait %1 minutes and then try again…"

52msgid_plural "Please wait %1 minutes and then try again…"

53msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"

53msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"

54msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"

54msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"

55

55

56−#: qml/Components/Dialogs.qml:70

56+#: qml/Components/Dialogs.qml:67

57+msgctxt "Title: Lock/Log out dialog"

57msgid "Log out"

58msgid "Log out"

58−msgstr "Amaitu saioa"

59+msgstr ""

59

60

60−#: qml/Components/Dialogs.qml:71

61+#: qml/Components/Dialogs.qml:68

61msgid "Are you sure you want to log out?"

62msgid "Are you sure you want to log out?"

62msgstr "Ziur saioa amaitu nahi duzula?"

63msgstr "Ziur saioa amaitu nahi duzula?"

63

64

64−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

65+#: qml/Components/Dialogs.qml:70

65−#: qml/Components/Dialogs.qml:122

66+msgctxt "Button: Lock the system"

66−msgid "No"

67+msgid "Lock"

67−msgstr "Ez"

68+msgstr ""

68

69

69−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

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

70−#: qml/Components/Dialogs.qml:129

76+#: qml/Components/Dialogs.qml:171

71−msgid "Yes"

77+msgid "Cancel"

72−msgstr "Bai"

78+msgstr "Utzi"

73

79

74−#: qml/Components/Dialogs.qml:94

80+#: qml/Components/Dialogs.qml:96

81+msgctxt "Title: Reboot/Shut down dialog"

75msgid "Shut down"

82msgid "Shut down"

76−msgstr "Itzali"

83+msgstr ""

77

84

78−#: qml/Components/Dialogs.qml:95

85+#: qml/Components/Dialogs.qml:97

79msgid "Are you sure you want to shut down?"

86msgid "Are you sure you want to shut down?"

80msgstr "Ziur itzali nahi duzula?"

87msgstr "Ziur itzali nahi duzula?"

81

88

82−#: qml/Components/Dialogs.qml:119

89+#: qml/Components/Dialogs.qml:99

90+msgctxt "Button: Reboot the system"

83msgid "Reboot"

91msgid "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 ""

85

103

86−#: qml/Components/Dialogs.qml:120

104+#: qml/Components/Dialogs.qml:128

87msgid "Are you sure you want to reboot?"

105msgid "Are you sure you want to reboot?"

88msgstr "Ziur berrabiarazi nahi duzula?"

106msgstr "Ziur berrabiarazi nahi duzula?"

89

107

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"

91msgid "Power"

118msgid "Power"

92−msgstr "Piztu/itzali"

119+msgstr ""

93

120

94−#: qml/Components/Dialogs.qml:145

121+#: qml/Components/Dialogs.qml:151

95msgid ""

122msgid ""

96"Are you sure you would like\n"

123"Are you sure you would like\n"

97"to power off?"

124"to power off?"

98msgstr "Ziur itzali nahi duzula?"

125msgstr "Ziur itzali nahi duzula?"

99

126

100−#: qml/Components/Dialogs.qml:147

127+#: qml/Components/Dialogs.qml:153

128+msgctxt "Button: Power off the system"

101msgid "Power off"

129msgid "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"

122msgstr ""

130msgstr ""

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"

140

131

141−#: qml/Components/EdgeDemo.qml:214

132+#: qml/Components/Dialogs.qml:162

142−msgid "Left edge"

133+msgctxt "Button: Restart the system"

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 ""

134+msgid "Restart"

157−"You have now mastered the edge gestures and can start using the "

158−"phone<br><br>Tap on the screen to start"

159msgstr ""

135msgstr ""

160−"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "

161−"zaitezke<br><br>Sakatu pantailan hasteko"

162

136

163#: qml/Components/Lockscreen.qml:238

137#: qml/Components/Lockscreen.qml:238

164msgid "Return to Call"

138msgid "Return to Call"

@@ -172,32 +146,39 @@ msgstr "Larrialdi-deia"

172msgid "OK"

146msgid "OK"

173msgstr "Ados"

147msgstr "Ados"

174

148

175−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

149+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691

176msgid "See less"

150msgid "See less"

177msgstr "Ikusi gutxiago"

151msgstr "Ikusi gutxiago"

178

152

179−#: qml/Dash/GenericScopeView.qml:431

153+#: qml/Dash/GenericScopeView.qml:533

180msgid "See all"

154msgid "See all"

181msgstr "Ikusi guztiak"

155msgstr "Ikusi guztiak"

182

156

183−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

157+#: qml/Dash/GenericScopeView.qml:595

184−#: qml/Panel/SearchIndicator.qml:27

158+msgctxt "Label: Hint for dash search line edit"

185msgid "Search"

159msgid "Search"

186−msgstr "Bilatu"

160+msgstr ""

187

161

188−#: qml/Dash/PageHeader.qml:260

162+#: qml/Dash/PageHeader.qml:269

163+msgctxt "Button: Open the Ubuntu Store"

189msgid "Store"

164msgid "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 ""

191

171

192−#: qml/Dash/PageHeader.qml:277

172+#: qml/Dash/PageHeader.qml:286

173+msgctxt "Button: Show the current dash scope settings"

193msgid "Settings"

174msgid "Settings"

194−msgstr "Ezarpenak"

175+msgstr ""

195

176

196−#: qml/Dash/PageHeader.qml:284

177+#: qml/Dash/PageHeader.qml:293

197msgid "Remove from Favorites"

178msgid "Remove from Favorites"

198msgstr "Kendu gogokoetatik"

179msgstr "Kendu gogokoetatik"

199

180

200−#: qml/Dash/PageHeader.qml:284

181+#: qml/Dash/PageHeader.qml:293

201msgid "Add to Favorites"

182msgid "Add to Favorites"

202msgstr "Gehitu gogokoetara"

183msgstr "Gehitu gogokoetara"

203

184

@@ -229,22 +210,92 @@ msgstr "Tiratu freskatzeko…"

229msgid "Release to refresh…"

210msgid "Release to refresh…"

230msgstr "Askatu freskatzeko…"

211msgstr "Askatu freskatzeko…"

231

212

232−#: qml/Dash/ScopesList.qml:63

213+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

233−msgid "Manage"

214+msgid "Enable location data"

234msgstr ""

215msgstr ""

235

216

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

237msgid "Home"

222msgid "Home"

238−msgstr ""

223+msgstr "Hasiera"

239

224

240−#: qml/Dash/ScopesList.qml:108

225+#: qml/Dash/ScopesList.qml:113

241msgid "Also installed"

226msgid "Also installed"

242−msgstr ""

227+msgstr "Hau ere instalatuta"

243

228

244−#: qml/Greeter/Greeter.qml:174

229+#: qml/Greeter/CoverPage.qml:107

245msgid "Unlock"

230msgid "Unlock"

246msgstr "Desblokeatu"

231msgstr "Desblokeatu"

247

232

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+

248#: qml/Notifications/NotificationMenuItemFactory.qml:128

299#: qml/Notifications/NotificationMenuItemFactory.qml:128

249msgid "Show password"

300msgid "Show password"

250msgstr "Erakutsi pasahitza"

301msgstr "Erakutsi pasahitza"

@@ -285,6 +336,11 @@ msgstr "Amaituta"

285msgid "Failed, tap to retry"

336msgid "Failed, tap to retry"

286msgstr "Huts egin du, sakatu berriro saiatzeko"

337msgstr "Huts egin du, sakatu berriro saiatzeko"

287

338

339+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149

340+msgctxt "Label: Hint in message indicator line edit"

341+msgid "Reply"

342+msgstr ""

343+

288#: qml/Panel/Indicators/ModemInfoItem.qml:105

344#: qml/Panel/Indicators/ModemInfoItem.qml:105

289msgid "Unlock SIM"

345msgid "Unlock SIM"

290msgstr "Desblokeatu SIMa"

346msgstr "Desblokeatu SIMa"

@@ -293,158 +349,161 @@ msgstr "Desblokeatu SIMa"

293msgid "Roaming"

349msgid "Roaming"

294msgstr "Ibiltaritza"

350msgstr "Ibiltaritza"

295

351

296−#: qml/Shell.qml:367

352+#: qml/Tutorial/TutorialBottomFinish.qml:24

297−#, qt-format

353+msgid "This action does different things for different apps"

298−msgid "Enter %1"

299−msgstr "Sartu %1"

354+msgstr ""

300

355

301−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

356+#: qml/Tutorial/TutorialBottomFinish.qml:25

302−msgid "Enter passphrase"

357+msgid "Tap here to finish."

303−msgstr "Sartu pasaesaldia"

358+msgstr ""

304

359

305−#: qml/Shell.qml:369

360+#: qml/Tutorial/TutorialBottom.qml:28

306−msgid "Enter passcode"

361+msgid "Open special menus"

307−msgstr "Sartu pasakodea"

362+msgstr ""

308

363

309−#: qml/Shell.qml:370

364+#: qml/Tutorial/TutorialBottom.qml:29

310−#, qt-format

365+msgid "Swipe up from the bottom edge."

311−msgid "Sorry, incorrect %1"

366+msgstr ""

312−msgstr "Sentitzen dugu, %1 okerra da"

313

367

314−#: qml/Shell.qml:371

368+#: qml/Tutorial/TutorialLeftFinish.qml:24

315−msgid "Sorry, incorrect passphrase"

369+msgid "These are the shortcuts to favorite apps"

316−msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"

370+msgstr ""

317

371

318−#: qml/Shell.qml:372

372+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144

319−msgid "Please re-enter"

373+msgid "Tap here to continue."

320−msgstr "Errepikatu"

374+msgstr ""

321

375

322−#: qml/Shell.qml:373

376+#: qml/Tutorial/TutorialLeft.qml:26

323−msgid "Sorry, incorrect passcode"

377+msgid "Open the launcher"

324−msgstr "Sentitzen dugu, pasakodea okerra da"

378+msgstr ""

325

379

326−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

380+#: qml/Tutorial/TutorialLeft.qml:27

327−msgid "Sorry, incorrect passphrase."

381+msgid "Short swipe from the left edge."

328−msgstr "Sentitzen dugu, pasaesaldia okerra da."

382+msgstr ""

329

383

330−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

384+#: qml/Tutorial/TutorialPage.qml:178

331−msgid "Sorry, incorrect passcode."

385+msgid "You almost got it!"

332−msgstr "Sentitzen dugu, pasakodea okerra da."

386+msgstr ""

333

387

334−#: qml/Shell.qml:469

388+#: qml/Tutorial/TutorialPage.qml:195

335−msgid "This will be your last attempt."

389+msgid "Try again."

336−msgstr "Hau duzu azken saiakera."

390+msgstr ""

337

391

338−#: qml/Shell.qml:471

392+#: qml/Tutorial/TutorialRight.qml:31

339−msgid ""

393+msgid "To view open apps"

340−"If passphrase is entered incorrectly, your phone will conduct a factory "

341−"reset and all personal data will be deleted."

342msgstr ""

394msgstr ""

343−"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "

344−"berrezarri eta datu pertsonal guztiak ezabatuko dira."

345

395

346−#: qml/Shell.qml:472

396+#: qml/Tutorial/TutorialRight.qml:32

347−msgid ""

397+msgid "Long swipe from the right edge."

348−"If passcode is entered incorrectly, your phone will conduct a factory reset "

398+msgstr ""

349−"and all personal data will be deleted."

399+

400+#: qml/Tutorial/TutorialRight.qml:122

401+msgid "View all your running tasks."

350msgstr ""

402msgstr ""

351−"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "

352−"berrezarri eta datu pertsonal guztiak ezabatuko dira."

353

403

354#: qml/Wizard/Page.qml:89

404#: qml/Wizard/Page.qml:89

405+msgctxt "Button: Go back one page in the Wizard"

355msgid "Back"

406msgid "Back"

356msgstr ""

407msgstr ""

357

408

358#: qml/Wizard/Pages/10-welcome.qml:27

409#: qml/Wizard/Pages/10-welcome.qml:27

359msgid "Hi!"

410msgid "Hi!"

360−msgstr ""

411+msgstr "Epa!"

361

412

362#: qml/Wizard/Pages/10-welcome.qml:44

413#: qml/Wizard/Pages/10-welcome.qml:44

363msgid "Welcome to your Ubuntu phone."

414msgid "Welcome to your Ubuntu phone."

364−msgstr ""

415+msgstr "Ongi etorri zure Ubuntu telefonora."

365

416

366#: qml/Wizard/Pages/10-welcome.qml:52

417#: qml/Wizard/Pages/10-welcome.qml:52

367msgid "Let’s get started."

418msgid "Let’s get started."

368−msgstr ""

419+msgstr "Has gaitezen."

369

420

370#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

421#: 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

372#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

423#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

373#: qml/Wizard/Pages/passwd-set.qml:90

424#: qml/Wizard/Pages/passwd-set.qml:90

374msgid "Continue"

425msgid "Continue"

375−msgstr ""

426+msgstr "Jarraitu"

376

427

377#: qml/Wizard/Pages/20-sim.qml:25

428#: qml/Wizard/Pages/20-sim.qml:25

378msgid "Add a SIM card and restart your device"

429msgid "Add a SIM card and restart your device"

379−msgstr ""

430+msgstr "Gehitu SIM txartel bat eta berrabiarazi zure gailua"

380

431

381−#: qml/Wizard/Pages/20-sim.qml:55

432+#: qml/Wizard/Pages/20-sim.qml:59

382msgid "Without it, you won’t be able to make calls or use text messaging."

433msgid "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."

384

435

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

386msgid "Skip"

437msgid "Skip"

387−msgstr ""

438+msgstr "Saltatu"

388

439

389#: qml/Wizard/Pages/30-passwd-type.qml:39

440#: qml/Wizard/Pages/30-passwd-type.qml:39

390msgid "Lock security"

441msgid "Lock security"

391−msgstr ""

442+msgstr "Blokeo-segurtasuna"

392

443

393#: qml/Wizard/Pages/30-passwd-type.qml:74

444#: qml/Wizard/Pages/30-passwd-type.qml:74

394msgid "Please select how you’d like to unlock your phone."

445msgid "Please select how you’d like to unlock your phone."

395−msgstr ""

446+msgstr "Aukeratu telefonoa nola desblokeatu nahi duzun."

396

447

397#: qml/Wizard/Pages/30-passwd-type.qml:97

448#: qml/Wizard/Pages/30-passwd-type.qml:97

449+msgctxt "Label: Type of security method"

398msgid "Swipe"

450msgid "Swipe"

399msgstr ""

451msgstr ""

400

452

401#: qml/Wizard/Pages/30-passwd-type.qml:98

453#: qml/Wizard/Pages/30-passwd-type.qml:98

454+msgctxt "Label: Description of security method"

402msgid "No security"

455msgid "No security"

403msgstr ""

456msgstr ""

404

457

405#: qml/Wizard/Pages/30-passwd-type.qml:100

458#: qml/Wizard/Pages/30-passwd-type.qml:100

459+msgctxt "Label: Type of security method"

406msgid "Passcode"

460msgid "Passcode"

407msgstr ""

461msgstr ""

408

462

409#: qml/Wizard/Pages/30-passwd-type.qml:101

463#: qml/Wizard/Pages/30-passwd-type.qml:101

464+msgctxt "Label: Description of security method"

410msgid "4 digits only"

465msgid "4 digits only"

411msgstr ""

466msgstr ""

412

467

413#: qml/Wizard/Pages/30-passwd-type.qml:103

468#: qml/Wizard/Pages/30-passwd-type.qml:103

469+msgctxt "Label: Type of security method"

414msgid "Passphrase"

470msgid "Passphrase"

415msgstr ""

471msgstr ""

416

472

417#: qml/Wizard/Pages/30-passwd-type.qml:104

473#: qml/Wizard/Pages/30-passwd-type.qml:104

474+msgctxt "Label: Description of security method"

418msgid "Numbers and letters"

475msgid "Numbers and letters"

419msgstr ""

476msgstr ""

420

477

421−#: qml/Wizard/Pages/40-wifi.qml:28

478+#: qml/Wizard/Pages/40-wifi.qml:29

422msgid "Connect to Wi‑Fi"

479msgid "Connect to Wi‑Fi"

423−msgstr ""

480+msgstr "Konektatu wifira"

424

481

425−#: qml/Wizard/Pages/40-wifi.qml:147

482+#: qml/Wizard/Pages/40-wifi.qml:168

426msgid "Available networks…"

483msgid "Available networks…"

427−msgstr ""

484+msgstr "Sare erabilgarriak…"

428

485

429−#: qml/Wizard/Pages/40-wifi.qml:148

486+#: qml/Wizard/Pages/40-wifi.qml:169

430msgid "No available networks."

487msgid "No available networks."

431−msgstr ""

488+msgstr "Ez dago sare erabilgarririk."

432

489

433#: qml/Wizard/Pages/50-location.qml:27

490#: qml/Wizard/Pages/50-location.qml:27

434msgid "Location"

491msgid "Location"

435−msgstr ""

492+msgstr "Kokalekua"

436

493

437#: qml/Wizard/Pages/50-location.qml:62

494#: qml/Wizard/Pages/50-location.qml:62

438msgid "Let the phone detect your location:"

495msgid "Let the phone detect your location:"

439−msgstr ""

496+msgstr "Utzi telefonoari zure kokalekua detektatzen:"

440

497

441#: qml/Wizard/Pages/50-location.qml:69

498#: qml/Wizard/Pages/50-location.qml:69

442msgid "Using GPS only (less accurate)"

499msgid "Using GPS only (less accurate)"

443−msgstr ""

500+msgstr "GPSa soilik erabiltzen (zehaztasun gutxiago)"

444

501

445#: qml/Wizard/Pages/50-location.qml:86

502#: qml/Wizard/Pages/50-location.qml:86

446msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

503msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

447msgstr ""

504msgstr ""

505+"GPSa, wifi anonimotua eta sare mugikorraren informazioa erabiltzen "

506+"(gomendatua)"

448

507

449#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

508#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

450#: qml/Wizard/Pages/50-location.qml:103

509#: qml/Wizard/Pages/50-location.qml:103

@@ -452,81 +511,105 @@ msgid ""

452"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

511"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

453"conditions</a>."

512"conditions</a>."

454msgstr ""

513msgstr ""

514+"Aukera hau hautatuz, Nokia HERE(r)en <a href='#'>baldintzak</a> onartzeko "

515+"dituzu."

455

516

456#: qml/Wizard/Pages/50-location.qml:112

517#: qml/Wizard/Pages/50-location.qml:112

457msgid "Not at all"

518msgid "Not at all"

458−msgstr ""

519+msgstr "Bat ere ez"

459

520

460#: qml/Wizard/Pages/50-location.qml:124

521#: qml/Wizard/Pages/50-location.qml:124

461msgid "You can change your mind later in <b>System Settings</b>."

522msgid "You can change your mind later in <b>System Settings</b>."

462−msgstr ""

523+msgstr "Geroago ere alda dezakezu <b>Sistemaren ezarpenetan</b>."

463

524

464#: qml/Wizard/Pages/60-reporting.qml:24

525#: qml/Wizard/Pages/60-reporting.qml:24

465msgid "Improving your experience"

526msgid "Improving your experience"

466−msgstr ""

527+msgstr "Zure esperientzia hobetuz"

467

528

468#: qml/Wizard/Pages/60-reporting.qml:36

529#: qml/Wizard/Pages/60-reporting.qml:36

469msgid ""

530msgid ""

470"Your phone is set up to automatically report errors to Canonical and its "

531"Your phone is set up to automatically report errors to Canonical and its "

471"partners, the makers of the operating system."

532"partners, the makers of the operating system."

472msgstr ""

533msgstr ""

534+"Telefonoa erroreen berria automatikoki Canonical-i eta honen bazkideei "

535+"emateko konfiguratuta dago, sistema eragilearen egileei."

473

536

474#: qml/Wizard/Pages/60-reporting.qml:43

537#: qml/Wizard/Pages/60-reporting.qml:43

475msgid ""

538msgid ""

476"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

539"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

477"Privacy</b>"

540"Privacy</b>"

478msgstr ""

541msgstr ""

542+"Hau <b>Sistemaren ezarpenetatik</b> desgaitu daiteke, <b>Segurtasuna eta "

543+"pribatutasuna</b> atalean"

479

544

480#: qml/Wizard/Pages/80-finished.qml:24

545#: qml/Wizard/Pages/80-finished.qml:24

481msgid "All done"

546msgid "All done"

482−msgstr ""

547+msgstr "Eginda"

483

548

484#: qml/Wizard/Pages/80-finished.qml:39

549#: qml/Wizard/Pages/80-finished.qml:39

485msgid "Nice work!"

550msgid "Nice work!"

486−msgstr ""

551+msgstr "Bikain!"

487

552

488#: qml/Wizard/Pages/80-finished.qml:46

553#: qml/Wizard/Pages/80-finished.qml:46

489msgid "Your phone is now ready to use."

554msgid "Your phone is now ready to use."

490−msgstr ""

555+msgstr "Zure telefonoa erabiltzeko prest dago."

491

556

492#: qml/Wizard/Pages/80-finished.qml:53

557#: qml/Wizard/Pages/80-finished.qml:53

493msgid "Finish"

558msgid "Finish"

494−msgstr ""

559+msgstr "Amaitu"

495

560

496#: qml/Wizard/Pages/here-terms.qml:27

561#: qml/Wizard/Pages/here-terms.qml:27

497msgid "Terms & Conditions"

562msgid "Terms & Conditions"

498−msgstr ""

563+msgstr "Baldintzak"

499

564

500#: qml/Wizard/Pages/passwd-confirm.qml:49

565#: qml/Wizard/Pages/passwd-confirm.qml:49

501msgid "Confirm passphrase"

566msgid "Confirm passphrase"

502−msgstr ""

567+msgstr "Berretsi pasaesaldia"

503

568

504#: qml/Wizard/Pages/passwd-confirm.qml:50

569#: qml/Wizard/Pages/passwd-confirm.qml:50

505msgid "Confirm passcode"

570msgid "Confirm passcode"

506−msgstr ""

571+msgstr "Berretsi pasakodea"

507

572

508#: qml/Wizard/Pages/passwd-confirm.qml:53

573#: qml/Wizard/Pages/passwd-confirm.qml:53

509#: qml/Wizard/Pages/passwd-confirm.qml:54

574#: qml/Wizard/Pages/passwd-confirm.qml:54

510msgid "Please try again."

575msgid "Please try again."

511−msgstr ""

576+msgstr "Saiatu berriro."

512

577

513#: qml/Wizard/Pages/passwd-set.qml:61

578#: qml/Wizard/Pages/passwd-set.qml:61

514msgid "Choose your passcode"

579msgid "Choose your passcode"

515−msgstr ""

580+msgstr "Aukeratu zure pasakodea"

516

581

517#: qml/Wizard/Pages/passwd-set.qml:68

582#: qml/Wizard/Pages/passwd-set.qml:68

518msgid "Passphrase must be 4 characters long"

583msgid "Passphrase must be 4 characters long"

519−msgstr ""

584+msgstr "Pasaesaldiak 4 karaktereko luzera izan behar du"

520

585

521#: qml/Wizard/StackButton.qml:39

586#: qml/Wizard/StackButton.qml:39

522#, qt-format

587#, qt-format

523msgid "〈 %1"

588msgid "〈 %1"

524−msgstr ""

589+msgstr "〈 %1"

525

590

526#: qml/Wizard/StackButton.qml:42

591#: qml/Wizard/StackButton.qml:42

527#, qt-format

592#, qt-format

528msgid "%1 〉"

593msgid "%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"

530

613

531#~ msgid "Type or say a command"

614#~ msgid "Type or say a command"

532#~ msgstr "Idatzi edo esan agindu bat"

615#~ msgstr "Idatzi edo esan agindu bat"

@@ -540,6 +623,41 @@ msgstr ""

540#~ msgid "Speaking..."

623#~ msgid "Speaking..."

541#~ msgstr "Hitz egiten..."

624#~ msgstr "Hitz egiten..."

542

625

626+#~ msgid "Search"

627+#~ msgstr "Bilatu"

628+

629+#~ msgid ""

630+#~ "You have now mastered the edge gestures and can start using the "

631+#~ "phone<br><br>Tap on the screen to start"

632+#~ msgstr ""

633+#~ "Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "

634+#~ "zaitezke<br><br>Sakatu pantailan hasteko"

635+

636+#~ msgid "Try swiping from the top edge to access the indicators"

637+#~ msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"

638+

639+#~ msgid "Swipe up again to close the settings screen"

640+#~ msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"

641+

642+#~ msgid "Try swiping from the right edge to unlock the phone"

643+#~ msgstr ""

644+#~ "Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"

645+

646+#~ msgid "Log out"

647+#~ msgstr "Amaitu saioa"

648+

649+#~ msgid "Reboot"

650+#~ msgstr "Berrabiarazi"

651+

652+#~ msgid "Shut down"

653+#~ msgstr "Itzali"

654+

655+#~ msgid "Settings"

656+#~ msgstr "Ezarpenak"

657+

658+#~ msgid "Power off"

659+#~ msgstr "Itzali"

660+

543#~ msgid "Done"

661#~ msgid "Done"

544#~ msgstr "Eginda"

662#~ msgstr "Eginda"

545

663

@@ -549,6 +667,20 @@ msgstr ""

549#~ msgid "Favorites"

667#~ msgid "Favorites"

550#~ msgstr "Gogokoak"

668#~ msgstr "Gogokoak"

551

669

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+

552#~ msgid "Confirm"

684#~ msgid "Confirm"

553#~ msgstr "Berretsi"

685#~ msgstr "Berretsi"

554

686

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.