Unity 8

Merge lp:~cimi/unity8/use-PageHeader into lp:unity8

  1. use-PageHeader
  2. Merge into trunk
Proposed by Andrea Cimitan on 2016-02-03
Status: Rejected
Rejected by: Andrea Cimitan on 2016-05-03
Proposed branch: lp:~cimi/unity8/use-PageHeader
Merge into: lp:unity8
Prerequisite: lp:~tpeeters/unity8/fixBlackHeader
Diff against target: 29726 lines (+34/-20179)
156 files modified
CMakeLists.txt (+0/-7)
debian/changelog (+0/-146)
debian/control (+0/-29)
plugins/AccountsService/AccountsService.cpp (+0/-367)
plugins/AccountsService/AccountsService.h (+0/-15)
plugins/Dash/CardCreator.js (+0/-73)
plugins/Dash/CardCreatorCache.qml (+0/-4)
plugins/IntegratedLightDM/liblightdm/CMakeLists.txt (+0/-4)
plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp (+0/-32)
plugins/Utils/CMakeLists.txt (+0/-4)
plugins/Utils/plugin.cpp (+0/-8)
po/aa.po (+0/-670)
po/am.po (+0/-182)
po/ar.po (+0/-196)
po/ast.po (+0/-264)
po/az.po (+0/-175)
po/be.po (+0/-197)
po/bg.po (+0/-175)
po/bn.po (+0/-185)
po/br.po (+0/-269)
po/bs.po (+0/-196)
po/ca.po (+0/-265)
po/ca@valencia.po (+0/-196)
po/ce.po (+0/-175)
po/ckb.po (+0/-175)
po/cs.po (+0/-194)
po/cy.po (+0/-194)
po/da.po (+0/-196)
po/de.po (+0/-189)
po/el.po (+0/-201)
po/en_AU.po (+0/-203)
po/en_GB.po (+0/-198)
po/eo.po (+0/-205)
po/es.po (+0/-198)
po/eu.po (+0/-195)
po/fa.po (+0/-197)
po/fi.po (+0/-197)
po/fo.po (+0/-175)
po/fr.po (+0/-206)
po/ga.po (+0/-333)
po/gd.po (+0/-207)
po/gl.po (+0/-194)
po/gv.po (+0/-175)
po/he.po (+0/-184)
po/hi.po (+0/-175)
po/hr.po (+0/-201)
po/hu.po (+0/-198)
po/hy.po (+0/-175)
po/ia.po (+0/-198)
po/id.po (+0/-175)
po/is.po (+0/-175)
po/it.po (+0/-200)
po/ja.po (+0/-175)
po/km.po (+0/-186)
po/kn.po (+0/-175)
po/ko.po (+0/-259)
po/ku.po (+0/-175)
po/ky.po (+0/-175)
po/lo.po (+0/-175)
po/lt.po (+0/-175)
po/lv.po (+0/-194)
po/ml.po (+0/-175)
po/mr.po (+0/-175)
po/ms.po (+0/-196)
po/my.po (+0/-175)
po/nb.po (+0/-196)
po/ne.po (+0/-175)
po/nl.po (+0/-194)
po/nn.po (+0/-175)
po/oc.po (+0/-184)
po/or.po (+0/-175)
po/pa.po (+0/-194)
po/pl.po (+0/-200)
po/pt.po (+0/-196)
po/pt_BR.po (+0/-196)
po/ro.po (+0/-198)
po/ru.po (+0/-197)
po/shn.po (+0/-175)
po/si.po (+0/-175)
po/sk.po (+0/-186)
po/sl.po (+0/-238)
po/sq.po (+0/-189)
po/sr.po (+0/-203)
po/sv.po (+0/-272)
po/sw.po (+0/-184)
po/ta.po (+0/-175)
po/te.po (+0/-175)
po/th.po (+0/-175)
po/tr.po (+0/-197)
po/ug.po (+0/-193)
po/uk.po (+0/-200)
po/unity8.pot (+0/-170)
po/ur.po (+0/-175)
po/uz.po (+0/-175)
po/vi.po (+0/-175)
po/wo.po (+0/-194)
po/xh.po (+0/-175)
po/zh_CN.po (+0/-179)
po/zh_HK.po (+0/-175)
po/zh_TW.po (+0/-189)
qml/Components/Header.qml (+0/-28)
qml/Components/InputMethod.qml (+0/-4)
qml/Components/PhysicalKeysMapper.qml (+0/-12)
qml/Dash/CardGrid.qml (+0/-4)
qml/Dash/CardHorizontalList.qml (+0/-4)
qml/Dash/CardTool.qml (+0/-4)
qml/Dash/CardVerticalJournal.qml (+0/-4)
qml/Dash/DashPageHeader.qml (+26/-32)
qml/Dash/GenericScopeView.qml (+0/-20)
qml/DisabledScreenNotice.qml (+0/-84)
qml/Launcher/Launcher.qml (+0/-23)
qml/OrientedShell.qml (+0/-37)
qml/Panel/Handle.qml (+0/-8)
qml/Panel/IndicatorsMenu.qml (+0/-5)
qml/Shell.qml (+1/-28)
qml/Stages/AbstractStage.qml (+0/-7)
qml/Stages/ApplicationWindow.qml (+0/-10)
qml/Stages/DesktopStage.qml (+0/-47)
qml/Stages/PhoneStage.qml (+0/-9)
qml/Stages/Splash.qml (+7/-19)
qml/Stages/SurfaceContainer.qml (+0/-65)
qml/Stages/TabletStage.qml (+0/-7)
qml/Stages/WindowResizeArea.qml (+0/-18)
qml/Wizard/Pages/10-welcome.qml (+0/-50)
qml/Wizard/Pages/70-passwd-type.qml (+0/-13)
qml/Wizard/Pages/80-finished.qml (+0/-20)
tests/mocks/Unity/Application/ApplicationInfo.cpp (+0/-16)
tests/mocks/Unity/Application/ApplicationInfo.h (+0/-24)
tests/mocks/Unity/Application/ApplicationTestInterface.cpp.OTHER (+0/-117)
tests/mocks/Unity/Application/ApplicationTestInterface.h.OTHER (+0/-45)
tests/mocks/Unity/Application/MirSurface.cpp (+0/-51)
tests/mocks/Unity/Application/MirSurface.h (+0/-30)
tests/mocks/Unity/Application/MirSurfaceItem.h (+0/-5)
tests/mocks/Unity/Application/SurfaceManager.h (+0/-29)
tests/mocks/Unity/Indicators/ModelActionRootState.qml (+0/-16)
tests/mocks/Utils/CMakeLists.txt (+0/-4)
tests/mocks/Utils/plugin.cpp (+0/-8)
tests/plugins/Dash/cardcreator/1.res (+0/-11)
tests/plugins/Dash/cardcreator/10.res (+0/-144)
tests/plugins/Dash/cardcreator/11.res (+0/-219)
tests/plugins/Dash/cardcreator/3.res (+0/-11)
tests/plugins/Dash/cardcreator/5.res (+0/-11)
tests/plugins/Dash/cardcreator/9.res (+0/-5)
tests/plugins/Dash/cardcreatortest.cpp (+0/-31)
tests/plugins/Unity/Launcher/launchermodeltest.cpp (+0/-5)
tests/plugins/Utils/CMakeLists.txt (+0/-4)
tests/qmltests/Components/tst_PhysicalKeysMapper.qml (+0/-8)
tests/qmltests/Dash/tst_GenericScopeView.qml (+0/-34)
tests/qmltests/Panel/tst_Panel.qml (+0/-2)
tests/qmltests/Stages/RecursingChildSessionControl.qml (+0/-41)
tests/qmltests/Stages/tst_DesktopStage.qml (+0/-39)
tests/qmltests/Stages/tst_SurfaceContainer.qml (+0/-107)
tests/qmltests/Wizard/tst_Wizard.qml (+0/-4)
tests/qmltests/tst_DisabledScreenNotice.qml (+0/-20)
tests/qmltests/tst_OrientedShell.qml (+0/-119)
tests/qmltests/tst_Shell.qml (+0/-76)
To merge this branch: bzr merge lp:~cimi/unity8/use-PageHeader
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Disapprove on 2016-05-03
Unity8 CI Bot continuous-integration Needs Fixing on 2016-04-28
Albert Astals Cid (community) 2016-02-03 Needs Fixing on 2016-03-14
Tim Peeters (community) Approve on 2016-02-29
PS Jenkins bot continuous-integration Needs Fixing on 2016-02-03
Review via email: mp+284942@code.launchpad.net

Commit Message

Use PageHeader instead Ambiance's PageHeadStyle

Description of the Change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * Did you make sure that your branch does not contain spurious tags?
y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
n/a

To post a comment you must log in.
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2148
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/269/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/269/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2148
http://jenkins.qa.ubuntu.com/job/unity8-ci/7210/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6319/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/625/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1915/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/618/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1810/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1810/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/617/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/616/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6330/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/623/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7210/rebuild

review: Needs Fixing (continuous-integration)
Albert Astals Cid (aacid) wrote :

Not sure if it's because your branch or because of Tim's but the splash header is blue for some reason, can you investigate why?

review: Needs Fixing
Tim Peeters (tpeeters) wrote :

Nice! Thanks for switching to PageHeader.

The blue text in the header looks like a separate issue to me, independent from header changes, but related to the new palette that we are using in the UITK now.

lp:~cimi/unity8/use-PageHeader updated on 2016-02-29
2149. By Andrea Cimitan on 2016-02-29

merged trunk

Andrea Cimitan (cimi) wrote :

> Not sure if it's because your branch or because of Tim's but the splash header
> is blue for some reason, can you investigate why?
https://code.launchpad.net/~cimi/unity8/selected-to-normal-backgroundText/+merge/287452

Tim Peeters (tpeeters) wrote :

Looks good to me, nice clean up :)

review: Approve
Tim Peeters (tpeeters) wrote :

Probably headerContainer.height can also be set to header.height instead of header.implicitHeight.

Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2149
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/522/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/687/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/710
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/728
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/728
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/724/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/724/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/724/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/724/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/724/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/724/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/522/rebuild

review: Needs Fixing (continuous-integration)
Albert Astals Cid (aacid) wrote :

Code looks good, waiting on silo to be available to do testing.

Albert Astals Cid (aacid) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass?
No because it needs new SDK, running them locally, will approve if all is good

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve
Albert Astals Cid (aacid) wrote :

The tests fail, at least Dash and DashContent have failing tests, please fix.

review: Needs Fixing
lp:~cimi/unity8/use-PageHeader updated on 2016-03-02
2150. By Andrea Cimitan on 2016-03-02

merged tpeeters branch

Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2150
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/554/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/743
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/761
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/761
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/756/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/756/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/756/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/756/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/756/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/756/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/554/rebuild

review: Needs Fixing (continuous-integration)
Albert Astals Cid (aacid) wrote :

Seems there's some weird cris-cross, can you merge master?

review: Needs Fixing
Albert Astals Cid (aacid) wrote :

Text conflict in debian/control
Text conflict in qml/Stages/Splash.qml
2 conflicts encountered.

review: Needs Fixing
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Michał Sawicz (saviq) wrote :

Text conflict in debian/control
Text conflict in qml/Dash/DashPageHeader.qml
Text conflict in qml/Stages/Splash.qml
3 conflicts encountered.

lp:~cimi/unity8/use-PageHeader updated on 2016-04-28
2151. By Andrea Cimitan on 2016-04-28

merged trunk

Andrea Cimitan (cimi) wrote :

oooh the merge went so bad!

Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2151
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1082/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/631
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/631
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/631/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1453
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1419
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1419
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1419
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1419/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1419
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1419/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1419
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1419/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1419
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1419/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1419
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1419/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1419
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1419/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1082/rebuild

review: Needs Fixing (continuous-integration)
Andrea Cimitan (cimi) wrote :
review: Disapprove

Unmerged revisions

2151. By Andrea Cimitan on 2016-04-28

merged trunk

2150. By Andrea Cimitan on 2016-03-02

merged tpeeters branch

2149. By Andrea Cimitan on 2016-02-29

merged trunk

2148. By Andrea Cimitan on 2016-02-03

Use new PageHeader

2147. By Andrea Cimitan on 2016-02-03

merged and removed Header.qml from Components, unused

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-04-28 10:49:18 +0000
3+++ CMakeLists.txt 2016-04-04 13:28:29 +0000
4@@ -57,18 +57,11 @@
5 find_package(Qt5Concurrent 5.4 REQUIRED)
6 find_package(Qt5Sql 5.4 REQUIRED)
7
8-<<<<<<< TREE
9 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=15)
10 pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
11 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
12 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
13 pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
14-=======
15-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=13)
16-pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
17-pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
18-pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
19->>>>>>> MERGE-SOURCE
20
21 # Standard install paths
22 include(GNUInstallDirs)
23
24=== modified file 'debian/changelog'
25--- debian/changelog 2016-04-28 10:49:18 +0000
26+++ debian/changelog 2016-04-21 13:48:02 +0000
27@@ -1,4 +1,3 @@
28-<<<<<<< TREE
29 unity8 (8.12+16.04.20160421.1-0ubuntu1) xenial; urgency=medium
30
31 [ Daniel d'Andrada ]
32@@ -405,151 +404,6 @@
33
34 -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 29 Jan 2016 11:53:27 +0000
35
36-=======
37-unity8 (8.11+16.04.20160216.1-0ubuntu1) xenial; urgency=medium
38-
39- [ Albert Astals Cid ]
40- * Make the audio previews create a playlist (LP: #1540477)
41-
42- [ CI Train Bot ]
43- * Resync trunk. added: po/aa.po
44- * Update translation template
45-
46- -- Pawel Stolowski <ci-train-bot@canonical.com> Tue, 16 Feb 2016 03:24:46 +0000
47-
48-unity8 (8.11+16.04.20160212-0ubuntu1) xenial; urgency=medium
49-
50- [ Albert Astals Cid ]
51- * Do not use components in card creator generated code
52- * Forward the makesurevisible signal from the inner preview widget
53- * Make fallback also be fallback when the image is empty and not only
54- on error (LP: #1531913)
55- * Make the artShapeSize assignment be updated when using dynamic grid
56- units
57- * Visual improvements to the dash audio play cards
58- * We don't use the unity-scope-scopes anymore (LP: #1439172)
59-
60- [ Andrea Cimitan ]
61- * only request a bigger image if zoomable widget data property is
62- true, otherwise just leave the screen size (LP: #1536814)
63-
64- [ CI Train Bot ]
65- * Update translation template
66-
67- [ Daniel d'Andrada ]
68- * Set initial surface size (LP: #1532974)
69-
70- [ Daniel d'Andrada, Michał Sawicz ]
71- * Window Size Hints
72-
73- [ Florian Boucault ]
74- * Splash screen: delay showing the ActivityIndicator by 2 seconds.
75-
76- [ Lukáš Tinkl ]
77- * Replace the word "phone" with a more generic term "device" in the
78- welcome wizard (LP: #1294732, #1543527)
79-
80- [ Michael Terry ]
81- * Have the tablet greeter set appropriate OSK hints if the user has a
82- passcode instead of a passphrase. (LP: #1544173)
83-
84- [ Michael Zanetti ]
85- * Don't eat mouse events in the edgebarrer
86-
87- [ Michał Sawicz ]
88- * Bump unity-api dependencies
89-
90- [ Nick Dedekind ]
91- * Added support for secondary indicator actions (LP: #1398888)
92- * Remove zombie if they're not animated. (LP: #1534541)
93- * Removed unused panel resources
94-
95- [ Ted Gould ]
96- * Start the indicators after Unity8 starts instead of before
97-
98- -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 12 Feb 2016 00:12:41 +0000
99-
100-unity8 (8.11+16.04.20160208-0ubuntu1) xenial; urgency=medium
101-
102- [ Albert Astals Cid ]
103- * LVWPH: Reset to initial values when list is empty (LP: #1540490)
104- * Make LazyImage qmltest less flaky on CI
105-
106- [ Andrea Cimitan ]
107- * Make LazyImage qmltest less flaky on CI
108-
109- [ CI Train Bot ]
110- * Resync trunk.
111- * Update translation template
112-
113- [ Michael Terry ]
114- * Display the current user's real name on the tablet lockscreen. (LP:
115- #1536714)
116-
117- -- Michał Sawicz <michal.sawicz@canonical.com> Mon, 08 Feb 2016 09:38:00 +0000
118-
119-unity8 (8.11+16.04.20160129-0ubuntu1) xenial; urgency=medium
120-
121- [ Albert Astals Cid ]
122- * Audio Preview Button: Don't gain focus on press (LP: #1517830)
123- * Better attempt at sanitization
124- * Better looking application scopes for wide screens
125- * Call printSettings correctly
126- * Card test: Limit the precision we ask for doubles to be equal
127- * Convert while into tryCompareFunction
128- * Do not use the same filepath parameter for all the card creator
129- createQmlObject calls (LP: #1536379)
130- * Fix some test shells being unstable in the armhf builders
131- * Make revealByEdgePush more stable
132- * More reliable compares
133- * Move the mouse over the bfb before waiting for rendering
134- * Remove the DDAs constrains for every test
135- * Set the background source size to the max we'll need + new
136- background (LP: #1539011)
137-
138- [ Andrea Cimitan ]
139- * Dynamically change click scope card size according to size (LP:
140- #1536745)
141- * Should fix lazyimage test failures on fast machines
142-
143- [ CI Train Bot ]
144- * Fix card tests on the phone
145- * Update translation template
146-
147- [ Daniel d'Andrada ]
148- * Desktop stage rotates only to follow screen orientation (LP:
149- #1515977)
150-
151- [ Lukáš Tinkl ]
152- * Hide/reveal the mouse pointer on touch/mouse events renamed:
153- plugins/Utils/HomeKeyWatcher.cpp =>
154- plugins/Utils/WindowInputMonitor.cpp plugins/Utils/HomeKeyWatcher.h
155- => plugins/Utils/WindowInputMonitor.h
156- tests/mocks/Utils/HomeKeyWatcher.qml =>
157- tests/mocks/Utils/WindowInputMonitor.qml
158- tests/plugins/Utils/HomeKeyWatcherTest.cpp =>
159- tests/plugins/Utils/WindowInputMonitorTest.cpp
160-
161- [ Michael Terry ]
162- * Synchronize the mouse-cursor-speed and touchpad-cursor-speed
163- properties with USC. (LP: #1536383)
164-
165- [ Michael Zanetti ]
166- * Add InputMethod to secondary screen
167- * Add a virtual Touchpad while external screen is connected
168- * Make big tablets switch to windowed mode by plugging a kbd only (LP:
169- #1535399)
170- * Prevent alt key presses from being dispatched to the app on alt+tab
171- (LP: #1532862)
172-
173- [ Michał Sawicz ]
174- * Make qmluitests.sh more robust and allow parallel test execution
175- * Skip SessionBackendTest::testLogin1Capabilities until we talk to a
176- mock instead (LP: #1532112, #1532113)
177-
178- -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 29 Jan 2016 11:53:27 +0000
179-
180->>>>>>> MERGE-SOURCE
181 unity8 (8.11+16.04.20160122-0ubuntu1) xenial; urgency=medium
182
183 [ Albert Astals Cid ]
184
185=== modified file 'debian/control'
186--- debian/control 2016-04-28 10:49:18 +0000
187+++ debian/control 2016-04-13 16:50:51 +0000
188@@ -30,11 +30,7 @@
189 libqt5xmlpatterns5-dev,
190 libsystemsettings-dev,
191 libudev-dev,
192-<<<<<<< TREE
193 libunity-api-dev (>= 7.110),
194-=======
195- libunity-api-dev (>= 7.106),
196->>>>>>> MERGE-SOURCE
197 libusermetricsoutput1-dev,
198 # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
199 libx11-dev[!armhf],
200@@ -59,13 +55,8 @@
201 qtdeclarative5-private-dev (>= 5.4),
202 qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
203 qtdeclarative5-ubuntu-content1,
204-<<<<<<< TREE
205 qtdeclarative5-ubuntu-settings-components (>= 0.7),
206 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
207-=======
208- qtdeclarative5-ubuntu-settings-components (>= 0.7),
209- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
210->>>>>>> MERGE-SOURCE
211 qtdeclarative5-ubuntu-web-plugin,
212 ttf-ubuntu-font-family,
213 Standards-Version: 3.9.4
214@@ -81,11 +72,7 @@
215 Package: indicators-client
216 Architecture: amd64 armhf i386
217 Depends: qmenumodel-qml (>= 0.2.9),
218-<<<<<<< TREE
219 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
220-=======
221- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
222->>>>>>> MERGE-SOURCE
223 unity8 (= ${binary:Version}),
224 ${misc:Depends},
225 ${shlibs:Depends},
226@@ -143,18 +130,10 @@
227 Depends: qml-module-qtquick-layouts,
228 qtdeclarative5-ubuntu-settings-components (>= 0.7),
229 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
230-<<<<<<< TREE
231 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
232-=======
233- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
234->>>>>>> MERGE-SOURCE
235 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
236 ubuntu-thumbnailer-impl-0,
237-<<<<<<< TREE
238 unity-application-impl-15,
239-=======
240- unity-application-impl-13,
241->>>>>>> MERGE-SOURCE
242 unity-notifications-impl-3,
243 unity-plugin-scopes | unity-scopes-impl,
244 unity-scopes-impl-11,
245@@ -181,11 +160,7 @@
246 python3-fixtures,
247 python3-gi,
248 qttestability-autopilot (>= 1.4),
249-<<<<<<< TREE
250 ubuntu-ui-toolkit-autopilot (>= 1.3.1845),
251-=======
252- ubuntu-ui-toolkit-autopilot (>= 1.3.1796),
253->>>>>>> MERGE-SOURCE
254 unity-scope-click,
255 unity8 (= ${source:Version}),
256 unity8-fake-env (= ${source:Version}),
257@@ -204,11 +179,7 @@
258 Depends: ${misc:Depends},
259 ${shlibs:Depends},
260 Provides: unity-application-impl,
261-<<<<<<< TREE
262 unity-application-impl-15,
263-=======
264- unity-application-impl-13,
265->>>>>>> MERGE-SOURCE
266 Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
267 Description: Fake environment for running Unity 8 shell
268 Provides fake implementations of some QML modules used by Unity 8 shell
269
270=== modified file 'plugins/AccountsService/AccountsService.cpp'
271--- plugins/AccountsService/AccountsService.cpp 2016-04-28 10:49:18 +0000
272+++ plugins/AccountsService/AccountsService.cpp 2016-03-23 09:50:10 +0000
273@@ -144,23 +144,9 @@
274 m_user = user;
275 Q_EMIT userChanged();
276
277-<<<<<<< TREE
278 // Do the first update synchronously, as a cheap way to block rendering
279 // until we have the right values on bootup.
280 refresh(!wasEmpty);
281-=======
282- updateDemoEdges(false);
283- updateEnableLauncherWhileLocked(false);
284- updateEnableIndicatorsWhileLocked(false);
285- updateBackgroundFile(false);
286- updateMouseCursorSpeed();
287- updateTouchpadCursorSpeed();
288- updateStatsWelcomeScreen(false);
289- updatePasswordDisplayHint(false);
290- updateFailedLogins(false);
291- updateHereEnabled(false);
292- updateHereLicensePath(false);
293->>>>>>> MERGE-SOURCE
294 }
295
296 bool AccountsService::demoEdges() const
297@@ -240,7 +226,6 @@
298
299 bool AccountsService::hereLicensePathValid() const
300 {
301-<<<<<<< TREE
302 auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH);
303 return !value.toString().isNull();
304 }
305@@ -285,319 +270,6 @@
306 }
307
308 return {QStringLiteral("us")};
309-=======
310- return !m_hereLicensePath.isNull();
311-}
312-
313-void AccountsService::updateDemoEdges(bool async)
314-{
315- QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
316- QStringLiteral("com.canonical.unity.AccountsService"),
317- QStringLiteral("demo-edges"));
318- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
319-
320- connect(watcher, &QDBusPendingCallWatcher::finished,
321- this, [this](QDBusPendingCallWatcher* watcher) {
322-
323- QDBusPendingReply<QDBusVariant> reply = *watcher;
324- watcher->deleteLater();
325- if (reply.isError()) {
326- qWarning() << "Failed to get 'demo-edges' property - " << reply.error().message();
327- return;
328- }
329-
330- auto demoEdges = reply.value().variant().toBool();
331- if (m_demoEdges != demoEdges) {
332- m_demoEdges = demoEdges;
333- Q_EMIT demoEdgesChanged();
334- }
335- });
336- if (!async) {
337- watcher->waitForFinished();
338- delete watcher;
339- }
340-}
341-
342-void AccountsService::updateEnableLauncherWhileLocked(bool async)
343-{
344- QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
345- QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy"),
346- QStringLiteral("EnableLauncherWhileLocked"));
347- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
348-
349- connect(watcher, &QDBusPendingCallWatcher::finished,
350- this, [this](QDBusPendingCallWatcher* watcher) {
351-
352- QDBusPendingReply<QVariant> reply = *watcher;
353- watcher->deleteLater();
354- if (reply.isError()) {
355- qWarning() << "Failed to get 'EnableLauncherWhileLocked' property - " << reply.error().message();
356- return;
357- }
358-
359- const bool enableLauncherWhileLocked = reply.value().toBool();
360- if (m_enableLauncherWhileLocked != enableLauncherWhileLocked) {
361- m_enableLauncherWhileLocked = enableLauncherWhileLocked;
362- Q_EMIT enableLauncherWhileLockedChanged();
363- }
364- });
365- if (!async) {
366- watcher->waitForFinished();
367- delete watcher;
368- }
369-}
370-
371-void AccountsService::updateEnableIndicatorsWhileLocked(bool async)
372-{
373- QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
374- QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy"),
375- QStringLiteral("EnableIndicatorsWhileLocked"));
376- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
377-
378- connect(watcher, &QDBusPendingCallWatcher::finished,
379- this, [this](QDBusPendingCallWatcher* watcher) {
380-
381- QDBusPendingReply<QVariant> reply = *watcher;
382- watcher->deleteLater();
383- if (reply.isError()) {
384- qWarning() << "Failed to get 'EnableIndicatorsWhileLocked' property - " << reply.error().message();
385- return;
386- }
387-
388- const bool enableIndicatorsWhileLocked = reply.value().toBool();
389- if (m_enableIndicatorsWhileLocked != enableIndicatorsWhileLocked) {
390- m_enableIndicatorsWhileLocked = enableIndicatorsWhileLocked;
391- Q_EMIT enableIndicatorsWhileLockedChanged();
392- }
393- });
394- if (!async) {
395- watcher->waitForFinished();
396- delete watcher;
397- }
398-}
399-
400-void AccountsService::updateBackgroundFile(bool async)
401-{
402- QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
403- QStringLiteral("org.freedesktop.Accounts.User"),
404- QStringLiteral("BackgroundFile"));
405- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
406-
407- connect(watcher, &QDBusPendingCallWatcher::finished,
408- this, [this](QDBusPendingCallWatcher* watcher) {
409-
410- QDBusPendingReply<QVariant> reply = *watcher;
411- watcher->deleteLater();
412- if (reply.isError()) {
413- qWarning() << "Failed to get 'BackgroundFile' property - " << reply.error().message();
414- return;
415- }
416-
417- const QString backgroundFile = reply.value().toString();
418- if (m_backgroundFile != backgroundFile) {
419- m_backgroundFile = backgroundFile;
420- Q_EMIT backgroundFileChanged();
421- }
422- });
423- if (!async) {
424- watcher->waitForFinished();
425- delete watcher;
426- }
427-}
428-
429-void AccountsService::updateMouseCursorSpeed()
430-{
431- QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
432- QStringLiteral("com.ubuntu.AccountsService.Input"),
433- QStringLiteral("MouseCursorSpeed"));
434- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
435-
436- connect(watcher, &QDBusPendingCallWatcher::finished,
437- this, [this](QDBusPendingCallWatcher* watcher) {
438-
439- QDBusPendingReply<QVariant> reply = *watcher;
440- watcher->deleteLater();
441- if (reply.isError()) {
442- qWarning() << "Failed to get 'MouseCursorSpeed' property - " << reply.error().message();
443- return;
444- }
445-
446- // Merely proxy this along to USC. We don't care about keeping a copy
447- // or exporting it internally.
448- m_unityInput->asyncCall(QStringLiteral("setMouseCursorSpeed"), reply.value());
449- });
450-}
451-
452-void AccountsService::updateTouchpadCursorSpeed()
453-{
454- QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
455- QStringLiteral("com.ubuntu.AccountsService.Input"),
456- QStringLiteral("TouchpadCursorSpeed"));
457- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
458-
459- connect(watcher, &QDBusPendingCallWatcher::finished,
460- this, [this](QDBusPendingCallWatcher* watcher) {
461-
462- QDBusPendingReply<QVariant> reply = *watcher;
463- watcher->deleteLater();
464- if (reply.isError()) {
465- qWarning() << "Failed to get 'TouchpadCursorSpeed' property - " << reply.error().message();
466- return;
467- }
468-
469- // Merely proxy this along to USC. We don't care about keeping a copy
470- // or exporting it internally.
471- m_unityInput->asyncCall(QStringLiteral("setTouchpadCursorSpeed"), reply.value());
472- });
473-}
474-
475-void AccountsService::updateStatsWelcomeScreen(bool async)
476-{
477- QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
478- QStringLiteral("com.ubuntu.touch.AccountsService.SecurityPrivacy"),
479- QStringLiteral("StatsWelcomeScreen"));
480- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
481-
482- connect(watcher, &QDBusPendingCallWatcher::finished,
483- this, [this](QDBusPendingCallWatcher* watcher) {
484-
485- QDBusPendingReply<QVariant> reply = *watcher;
486- watcher->deleteLater();
487- if (reply.isError()) {
488- qWarning() << "Failed to get 'StatsWelcomeScreen' property - " << reply.error().message();
489- return;
490- }
491-
492- const bool statsWelcomeScreen = reply.value().toBool();
493- if (m_statsWelcomeScreen != statsWelcomeScreen) {
494- m_statsWelcomeScreen = statsWelcomeScreen;
495- Q_EMIT statsWelcomeScreenChanged();
496- }
497- });
498- if (!async) {
499- watcher->waitForFinished();
500- delete watcher;
501- }
502-}
503-
504-void AccountsService::updatePasswordDisplayHint(bool async)
505-{
506- QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
507- QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy"),
508- QStringLiteral("PasswordDisplayHint"));
509- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
510-
511- connect(watcher, &QDBusPendingCallWatcher::finished,
512- this, [this](QDBusPendingCallWatcher* watcher) {
513-
514- QDBusPendingReply<QVariant> reply = *watcher;
515- watcher->deleteLater();
516- if (reply.isError()) {
517- qWarning() << "Failed to get 'PasswordDisplayHint' property - " << reply.error().message();
518- return;
519- }
520-
521- const PasswordDisplayHint passwordDisplayHint = (PasswordDisplayHint)reply.value().toInt();
522- if (m_passwordDisplayHint != passwordDisplayHint) {
523- m_passwordDisplayHint = passwordDisplayHint;
524- Q_EMIT passwordDisplayHintChanged();
525- }
526- });
527- if (!async) {
528- watcher->waitForFinished();
529- delete watcher;
530- }
531-}
532-
533-void AccountsService::updateFailedLogins(bool async)
534-{
535- QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
536- QStringLiteral("com.canonical.unity.AccountsService.Private"),
537- QStringLiteral("FailedLogins"));
538- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
539-
540- connect(watcher, &QDBusPendingCallWatcher::finished,
541- this, [this](QDBusPendingCallWatcher* watcher) {
542-
543- QDBusPendingReply<QVariant> reply = *watcher;
544- watcher->deleteLater();
545- if (reply.isError()) {
546- qWarning() << "Failed to get 'FailedLogins' property - " << reply.error().message();
547- return;
548- }
549-
550- const uint failedLogins = reply.value().toUInt();
551- if (m_failedLogins != failedLogins) {
552- m_failedLogins = failedLogins;
553- Q_EMIT failedLoginsChanged();
554- }
555- });
556- if (!async) {
557- watcher->waitForFinished();
558- delete watcher;
559- }
560-}
561-
562-void AccountsService::updateHereEnabled(bool async)
563-{
564- QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
565- QStringLiteral("com.ubuntu.location.providers.here.AccountsService"),
566- QStringLiteral("LicenseAccepted"));
567- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
568-
569- connect(watcher, &QDBusPendingCallWatcher::finished,
570- this, [this](QDBusPendingCallWatcher* watcher) {
571-
572- QDBusPendingReply<QVariant> reply = *watcher;
573- watcher->deleteLater();
574- if (reply.isError()) {
575- qWarning() << "Failed to get 'LicenseAccepted' property - " << reply.error().message();
576- return;
577- }
578-
579- const bool hereEnabled = reply.value().toBool();
580- if (m_hereEnabled != hereEnabled) {
581- m_hereEnabled = hereEnabled;
582- Q_EMIT hereEnabledChanged();
583- }
584- });
585- if (!async) {
586- watcher->waitForFinished();
587- delete watcher;
588- }
589-}
590-
591-void AccountsService::updateHereLicensePath(bool async)
592-{
593- QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
594- QStringLiteral("com.ubuntu.location.providers.here.AccountsService"),
595- QStringLiteral("LicenseBasePath"));
596- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
597-
598- connect(watcher, &QDBusPendingCallWatcher::finished,
599- this, [this](QDBusPendingCallWatcher* watcher) {
600-
601- QDBusPendingReply<QVariant> reply = *watcher;
602- watcher->deleteLater();
603- if (reply.isError()) {
604- qWarning() << "Failed to get 'LicenseBasePath' property - " << reply.error().message();
605- return;
606- }
607-
608- QString hereLicensePath = reply.value().toString();
609- if (hereLicensePath.isEmpty() || !QFile::exists(hereLicensePath))
610- hereLicensePath = QLatin1String("");
611-
612- if (m_hereLicensePath.isNull() || m_hereLicensePath != hereLicensePath) {
613- m_hereLicensePath = hereLicensePath;
614- Q_EMIT hereLicensePathChanged();
615- }
616- });
617- if (!async) {
618- watcher->waitForFinished();
619- delete watcher;
620- }
621->>>>>>> MERGE-SOURCE
622 }
623
624 uint AccountsService::failedLogins() const
625@@ -725,7 +397,6 @@
626 return;
627 }
628
629-<<<<<<< TREE
630 auto propHash = m_properties.value(interface);
631 auto i = propHash.constBegin();
632 while (i != propHash.constEnd()) {
633@@ -733,44 +404,6 @@
634 updateProperty(interface, i.key());
635 }
636 ++i;
637-=======
638- if (interface == QLatin1String("com.canonical.unity.AccountsService")) {
639- if (changed.contains(QStringLiteral("demo-edges"))) {
640- updateDemoEdges();
641- }
642- } else if (interface == QLatin1String("com.canonical.unity.AccountsService.Private")) {
643- if (changed.contains(QStringLiteral("FailedLogins"))) {
644- updateFailedLogins();
645- }
646- } else if (interface == QLatin1String("com.ubuntu.AccountsService.Input")) {
647- if (changed.contains(QStringLiteral("MouseCursorSpeed"))) {
648- updateMouseCursorSpeed();
649- }
650- if (changed.contains(QStringLiteral("TouchpadCursorSpeed"))) {
651- updateTouchpadCursorSpeed();
652- }
653- } else if (interface == QLatin1String("com.ubuntu.touch.AccountsService.SecurityPrivacy")) {
654- if (changed.contains(QStringLiteral("StatsWelcomeScreen"))) {
655- updateStatsWelcomeScreen();
656- }
657- } else if (interface == QLatin1String("com.ubuntu.AccountsService.SecurityPrivacy")) {
658- if (changed.contains(QStringLiteral("PasswordDisplayHint"))) {
659- updatePasswordDisplayHint();
660- }
661- if (changed.contains(QStringLiteral("EnableLauncherWhileLocked"))) {
662- updateEnableLauncherWhileLocked();
663- }
664- if (changed.contains(QStringLiteral("EnableIndicatorsWhileLocked"))) {
665- updateEnableIndicatorsWhileLocked();
666- }
667- } else if (interface == QLatin1String("com.ubuntu.location.providers.here.AccountsService")) {
668- if (changed.contains(QStringLiteral("LicenseAccepted"))) {
669- updateHereEnabled();
670- }
671- if (changed.contains(QStringLiteral("LicenseBasePath"))) {
672- updateHereLicensePath();
673- }
674->>>>>>> MERGE-SOURCE
675 }
676 }
677
678
679=== modified file 'plugins/AccountsService/AccountsService.h'
680--- plugins/AccountsService/AccountsService.h 2016-04-28 10:49:18 +0000
681+++ plugins/AccountsService/AccountsService.h 2016-03-23 09:50:10 +0000
682@@ -129,7 +129,6 @@
683 void onMaybeChanged(const QString &user);
684
685 private:
686-<<<<<<< TREE
687 typedef QVariant (*ProxyConverter)(const QVariant &);
688
689 void refresh(bool async);
690@@ -154,20 +153,6 @@
691 };
692 typedef QHash< QString, QHash<QString, PropertyInfo> > PropertyHash;
693 PropertyHash m_properties;
694-=======
695- void updateDemoEdges(bool async = true);
696- void updateEnableLauncherWhileLocked(bool async = true);
697- void updateEnableIndicatorsWhileLocked(bool async = true);
698- void updateBackgroundFile(bool async = true);
699- void updateMouseCursorSpeed();
700- void updateTouchpadCursorSpeed();
701- void updateStatsWelcomeScreen(bool async = true);
702- void updatePasswordDisplayHint(bool async = true);
703- void updateFailedLogins(bool async = true);
704- void updateHereEnabled(bool async = true);
705- void updateHereLicensePath(bool async = true);
706-
707->>>>>>> MERGE-SOURCE
708 AccountsServiceDBusAdaptor *m_service;
709 QDBusInterface *m_unityInput;
710 QString m_user;
711
712=== modified file 'plugins/Dash/CardCreator.js'
713--- plugins/Dash/CardCreator.js 2016-04-28 10:49:18 +0000
714+++ plugins/Dash/CardCreator.js 2016-03-10 16:53:04 +0000
715@@ -16,16 +16,10 @@
716
717 .pragma library
718
719-<<<<<<< TREE
720 // %1 is the template["card-background"]["elements"][0]
721 // %2 is the template["card-background"]["elements"][1]
722 // %3 is whether the loader should be asynchronous or not
723 // %4 is the template["card-background"] string
724-=======
725-// %1 is the template["card-background"]["elements"][0]
726-// %2 is the template["card-background"]["elements"][1]
727-// %3 is the template["card-background"] string
728->>>>>>> MERGE-SOURCE
729 var kBackgroundLoaderCode = 'Loader {\n\
730 id: backgroundLoader; \n\
731 objectName: "backgroundLoader"; \n\
732@@ -53,11 +47,7 @@
733 objectName: "backgroundImage"; \n\
734 source: { \n\
735 if (cardData && typeof cardData["background"] === "string") return cardData["background"]; \n\
736-<<<<<<< TREE
737 else return %4; \n\
738-=======
739- else return %3; \n\
740->>>>>>> MERGE-SOURCE
741 } \n\
742 } \n\
743 function getColor(index) { \n\
744@@ -72,18 +62,11 @@
745 // %1 is used as anchors of artShapeHolder
746 // %2 is used as image width
747 // %3 is used as image height
748-<<<<<<< TREE
749 // %4 is used for artShapeSource.hideSource and inner Loader visible
750 // %5 is used as aspect ratio fallback
751 // %6 is whether the loader should be asynchronous or not
752 // %7 is injected as code to artImage
753 // %8 is used as image fallback
754-=======
755-// %4 is used for artShapeSource.hideSource and inner Loader visible
756-// %5 is used as aspect ratio fallback
757-// %6 is injected as code to artImage
758-// %7 is used as image fallback
759->>>>>>> MERGE-SOURCE
760 var kArtShapeHolderCode = 'Item { \n\
761 id: artShapeHolder; \n\
762 height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height; \n\
763@@ -92,15 +75,9 @@
764 Loader { \n\
765 id: artShapeLoader; \n\
766 objectName: "artShapeLoader"; \n\
767-<<<<<<< TREE
768 readonly property string cardArt: cardData && cardData["art"] || %8; \n\
769 active: cardArt != ""; \n\
770 asynchronous: %6; \n\
771-=======
772- readonly property string cardArt: cardData && cardData["art"] || %7; \n\
773- active: cardArt != ""; \n\
774- asynchronous: root.asynchronous; \n\
775->>>>>>> MERGE-SOURCE
776 visible: status == Loader.Ready; \n\
777 sourceComponent: Item { \n\
778 id: artShape; \n\
779@@ -156,20 +133,11 @@
780 CroppedImageMinimumSourceSize { \n\
781 id: artImage; \n\
782 objectName: "artImage"; \n\
783-<<<<<<< TREE
784 source: artShapeLoader.cardArt; \n\
785 asynchronous: %6; \n\
786-=======
787- source: artShapeLoader.cardArt; \n\
788- asynchronous: root.asynchronous; \n\
789->>>>>>> MERGE-SOURCE
790 width: %2; \n\
791 height: %3; \n\
792-<<<<<<< TREE
793 %7 \n\
794-=======
795- %6 \n\
796->>>>>>> MERGE-SOURCE
797 } \n\
798 } \n\
799 } \n\
800@@ -203,12 +171,8 @@
801 height: width; \n\
802 opacity: 0.9; \n\
803 name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; \n\
804-<<<<<<< TREE
805 color: "white"; \n\
806 asynchronous: %4; \n\
807-=======
808- color: "white"; \n\
809->>>>>>> MERGE-SOURCE
810 } \n\
811 onClicked: { \n\
812 if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { \n\
813@@ -515,11 +479,7 @@
814 backgroundElements1 = '"%1"'.arg(element1);
815 }
816 }
817-<<<<<<< TREE
818 code += kBackgroundLoaderCode.arg(backgroundElements0).arg(backgroundElements1).arg(asynchronous).arg(templateCardBackground);
819-=======
820- code += kBackgroundLoaderCode.arg(backgroundElements0).arg(backgroundElements1).arg(templateCardBackground);
821->>>>>>> MERGE-SOURCE
822 }
823
824 if (hasArt) {
825@@ -544,7 +504,6 @@
826 heightCode = 'width / artShape.aspect';
827 }
828
829-<<<<<<< TREE
830 var aspectRatio = components["art"] && components["art"]["aspect-ratio"] || 1;
831 if (isNaN(aspectRatio)) {
832 aspectRatio = 1;
833@@ -553,30 +512,12 @@
834 fallback = encodeURI(fallback);
835 var fallbackStatusCode = "";
836 var fallbackURICode = '""';
837-=======
838- var aspectRatio = components["art"] && components["art"]["aspect-ratio"] || 1;
839- if (isNaN(aspectRatio)) {
840- aspectRatio = 1;
841- }
842- var fallback = components["art"] && components["art"]["fallback"] || "";
843- fallback = encodeURI(fallback);
844- var fallbackStatusCode = "";
845- var fallbackURICode = '""';
846->>>>>>> MERGE-SOURCE
847 if (fallback !== "") {
848-<<<<<<< TREE
849 // fallbackStatusCode has %6 in it because we want to substitute it for fallbackURICode
850 // which in kArtShapeHolderCode is %8
851 fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %8;';
852 fallbackURICode = 'decodeURI("%1")'.arg(fallback);
853-=======
854- // fallbackStatusCode has %6 in it because we want to substitute it for fallbackURICode
855- // which in kArtShapeHolderCode is %7
856- fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %7;';
857- fallbackURICode = 'decodeURI("%1")'.arg(fallback);
858->>>>>>> MERGE-SOURCE
859 }
860-<<<<<<< TREE
861 code += kArtShapeHolderCode.arg(artAnchors)
862 .arg(widthCode)
863 .arg(heightCode)
864@@ -585,9 +526,6 @@
865 .arg(asynchronous)
866 .arg(fallbackStatusCode)
867 .arg(fallbackURICode);
868-=======
869- code += kArtShapeHolderCode.arg(artAnchors).arg(widthCode).arg(heightCode).arg(isConciergeMode ? "false" : "true").arg(aspectRatio).arg(fallbackStatusCode).arg(fallbackURICode);
870->>>>>>> MERGE-SOURCE
871 } else {
872 code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'
873 }
874@@ -680,17 +618,10 @@
875 }
876
877 var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
878-<<<<<<< TREE
879 var fallback = !isCardTool && components["mascot"] && components["mascot"]["fallback"] || "";
880 fallback = encodeURI(fallback);
881 var fallbackStatusCode = "";
882 var fallbackURICode = '""';
883-=======
884- var fallback = components["mascot"] && components["mascot"]["fallback"] || "";
885- fallback = encodeURI(fallback);
886- var fallbackStatusCode = "";
887- var fallbackURICode = '""';
888->>>>>>> MERGE-SOURCE
889 if (fallback !== "") {
890 // fallbackStatusCode has %4 in it because we want to substitute it for fallbackURICode
891 // which in kMascotImageCode is %4
892@@ -958,11 +889,7 @@
893 return code;
894 }
895
896-<<<<<<< TREE
897 function createCardComponent(parent, template, components, isCardTool, identifier) {
898-=======
899-function createCardComponent(parent, template, components, identifier) {
900->>>>>>> MERGE-SOURCE
901 var imports = 'import QtQuick 2.4; \n\
902 import Ubuntu.Components 1.3; \n\
903 import Ubuntu.Settings.Components 0.1; \n\
904
905=== modified file 'plugins/Dash/CardCreatorCache.qml'
906--- plugins/Dash/CardCreatorCache.qml 2016-04-28 10:49:18 +0000
907+++ plugins/Dash/CardCreatorCache.qml 2016-02-16 14:26:58 +0000
908@@ -32,11 +32,7 @@
909 var allString = tString + cString + isCardTool;
910 var component = cache[allString];
911 if (component === undefined) {
912-<<<<<<< TREE
913 component = CardCreator.createCardComponent(root, template, components, isCardTool, allString);
914-=======
915- component = CardCreator.createCardComponent(root, template, components, allString);
916->>>>>>> MERGE-SOURCE
917 cache[allString] = component;
918 }
919 return component;
920
921=== modified file 'plugins/IntegratedLightDM/liblightdm/CMakeLists.txt'
922--- plugins/IntegratedLightDM/liblightdm/CMakeLists.txt 2016-04-28 10:49:18 +0000
923+++ plugins/IntegratedLightDM/liblightdm/CMakeLists.txt 2016-03-08 18:07:38 +0000
924@@ -21,16 +21,12 @@
925 )
926
927 target_link_libraries(integratedLightDM
928-<<<<<<< TREE
929 ${GLIB_LIBRARIES}
930 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
931 -lpam
932 )
933 target_link_libraries(integratedLightDMSession
934 ${GLIB_LIBRARIES}
935-=======
936- ${GLIB_LIBRARIES}
937->>>>>>> MERGE-SOURCE
938 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
939 -lpam
940 )
941
942=== modified file 'plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
943--- plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp 2016-04-28 10:49:18 +0000
944+++ plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp 2016-03-08 18:07:38 +0000
945@@ -18,15 +18,11 @@
946
947 #include "UsersModelPrivate.h"
948
949-<<<<<<< TREE
950 #include "AccountsServiceDBusAdaptor.h"
951 #include "UsersModel.h"
952
953 #include <glib.h>
954 #include <QDebug>
955-=======
956-#include <glib.h>
957->>>>>>> MERGE-SOURCE
958 #include <QDir>
959 #include <QSettings>
960 #include <QStringList>
961@@ -35,7 +31,6 @@
962 {
963
964 UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
965-<<<<<<< TREE
966 : QObject(parent),
967 q_ptr(parent),
968 m_service(new AccountsServiceDBusAdaptor(this))
969@@ -91,33 +86,6 @@
970 });
971 if (!async) {
972 watcher->waitForFinished();
973-=======
974- : q_ptr(parent)
975-{
976- QFileInfo demoFile(QDir::homePath() + "/.unity8-greeter-demo");
977- QString currentUser = g_get_user_name();
978-
979- if (demoFile.exists()) {
980- QSettings settings(demoFile.filePath(), QSettings::NativeFormat);
981- QStringList users = settings.value(QStringLiteral("users"), QStringList() << currentUser).toStringList();
982-
983- entries.reserve(users.count());
984- Q_FOREACH(const QString &user, users)
985- {
986- QString name = settings.value(user + "/name", user).toString();
987- entries.append({user, name, 0, 0, false, false, 0, 0});
988- }
989- } else {
990- // If we were using the actual liblightdm, we could just ask it
991- // for the user's real name. But we aren't. We *should* ask
992- // AccountsService for the real name, like liblightdm does internally,
993- // but this is close enough since AS and passwd are always in sync.
994- QString realName = QString::fromUtf8(g_get_real_name()); // gets name from passwd entry
995- if (realName == QStringLiteral("Unknown")) { // glib doesn't translate this string
996- realName.clear();
997- }
998- entries.append({currentUser, realName, 0, 0, false, false, 0, 0});
999->>>>>>> MERGE-SOURCE
1000 }
1001 }
1002
1003
1004=== modified file 'plugins/Utils/CMakeLists.txt'
1005--- plugins/Utils/CMakeLists.txt 2016-04-28 10:49:18 +0000
1006+++ plugins/Utils/CMakeLists.txt 2016-03-11 21:16:44 +0000
1007@@ -22,13 +22,9 @@
1008 easingcurve.cpp
1009 windowstatestorage.cpp
1010 timezoneFormatter.cpp
1011-<<<<<<< TREE
1012 inputeventgenerator.cpp
1013 deviceconfigparser.cpp
1014 globalfunctions.cpp
1015-=======
1016- inputeventgenerator.cpp
1017->>>>>>> MERGE-SOURCE
1018 plugin.cpp
1019 )
1020
1021
1022=== modified file 'plugins/Utils/plugin.cpp'
1023--- plugins/Utils/plugin.cpp 2016-04-28 10:49:18 +0000
1024+++ plugins/Utils/plugin.cpp 2016-03-11 21:16:44 +0000
1025@@ -36,13 +36,9 @@
1026 #include "constants.h"
1027 #include "timezoneFormatter.h"
1028 #include "applicationsfiltermodel.h"
1029-<<<<<<< TREE
1030 #include "inputeventgenerator.h"
1031 #include "deviceconfigparser.h"
1032 #include "globalfunctions.h"
1033-=======
1034-#include "inputeventgenerator.h"
1035->>>>>>> MERGE-SOURCE
1036
1037 static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
1038 {
1039@@ -82,13 +78,9 @@
1040 [](QQmlEngine*, QJSEngine*) -> QObject* { return new TimezoneFormatter; });
1041 qmlRegisterType<ActiveFocusLogger>(uri, 0, 1, "ActiveFocusLogger");
1042 qmlRegisterType<ApplicationsFilterModel>(uri, 0, 1, "ApplicationsFilterModel");
1043-<<<<<<< TREE
1044 qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
1045 qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
1046 qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
1047-=======
1048- qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
1049->>>>>>> MERGE-SOURCE
1050 }
1051
1052 void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
1053
1054=== modified file 'po/aa.po'
1055--- po/aa.po 2016-04-28 10:49:18 +0000
1056+++ po/aa.po 2016-04-27 06:03:19 +0000
1057@@ -1,4 +1,3 @@
1058-<<<<<<< TREE
1059 # Afar translation for unity8
1060 # Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016
1061 # This file is distributed under the same license as the unity8 package.
1062@@ -766,672 +765,3 @@
1063
1064 #~ msgid "Continue"
1065 #~ msgstr "Tatur"
1066-=======
1067-# Afar translation for unity8
1068-# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016
1069-# This file is distributed under the same license as the unity8 package.
1070-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
1071-#
1072-msgid ""
1073-msgstr ""
1074-"Project-Id-Version: unity8\n"
1075-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1076-"POT-Creation-Date: 2016-02-16 03:29+0000\n"
1077-"PO-Revision-Date: 2016-02-12 10:18+0000\n"
1078-"Last-Translator: Charif AYFARAH <ayfarah@ymail.com>\n"
1079-"Language-Team: Afar <aa@li.org>\n"
1080-"MIME-Version: 1.0\n"
1081-"Content-Type: text/plain; charset=UTF-8\n"
1082-"Content-Transfer-Encoding: 8bit\n"
1083-"Plural-Forms: nplurals=2; plural=n != 1;\n"
1084-"X-Launchpad-Export-Date: 2016-02-23 06:03+0000\n"
1085-"X-Generator: Launchpad (build 17925)\n"
1086-
1087-#: plugins/IntegratedLightDM/Greeter.cpp:112
1088-msgid "Password: "
1089-msgstr "Cuumita "
1090-
1091-#: plugins/Unity/Launcher/launcheritem.cpp:47
1092-#: plugins/Unity/Launcher/launcheritem.cpp:106
1093-msgid "Pin shortcut"
1094-msgstr ""
1095-
1096-#: plugins/Unity/Launcher/launcheritem.cpp:52
1097-msgid "Quit"
1098-msgstr "Kat"
1099-
1100-#: plugins/Unity/Launcher/launcheritem.cpp:106
1101-msgid "Unpin shortcut"
1102-msgstr ""
1103-
1104-#: qml/Components/DelayedLockscreen.qml:49
1105-msgid "Device Locked"
1106-msgstr ""
1107-
1108-#: qml/Components/DelayedLockscreen.qml:64
1109-msgid "You have been locked out due to too many failed passphrase attempts."
1110-msgstr ""
1111-
1112-#: qml/Components/DelayedLockscreen.qml:65
1113-msgid "You have been locked out due to too many failed passcode attempts."
1114-msgstr ""
1115-
1116-#: qml/Components/DelayedLockscreen.qml:74
1117-#, qt-format
1118-msgid "Please wait %1 minute and then try again…"
1119-msgid_plural "Please wait %1 minutes and then try again…"
1120-msgstr[0] "Maganak %1 minit qambaalaay, kaadu gabbat"
1121-msgstr[1] "Maganak %1 minit qambaalaay, kaadu gabbat"
1122-
1123-#: qml/Components/Dialogs.qml:144
1124-msgctxt "Title: Lock/Log out dialog"
1125-msgid "Log out"
1126-msgstr "Eweq"
1127-
1128-#: qml/Components/Dialogs.qml:145
1129-msgid "Are you sure you want to log out?"
1130-msgstr ""
1131-
1132-#: qml/Components/Dialogs.qml:147
1133-msgctxt "Button: Lock the system"
1134-msgid "Lock"
1135-msgstr "Koflis"
1136-
1137-#: qml/Components/Dialogs.qml:154
1138-msgctxt "Button: Log out from the system"
1139-msgid "Log Out"
1140-msgstr "Eweq"
1141-
1142-#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
1143-#: qml/Components/Dialogs.qml:253
1144-msgid "Cancel"
1145-msgstr "Bayis"
1146-
1147-#: qml/Components/Dialogs.qml:173
1148-msgctxt "Title: Reboot/Shut down dialog"
1149-msgid "Shut down"
1150-msgstr "Bargus"
1151-
1152-#: qml/Components/Dialogs.qml:174
1153-msgid "Are you sure you want to shut down?"
1154-msgstr "Bargussuh digga maay litoo?"
1155-
1156-#: qml/Components/Dialogs.qml:176
1157-msgctxt "Button: Reboot the system"
1158-msgid "Reboot"
1159-msgstr "Wadir-ugus"
1160-
1161-#: qml/Components/Dialogs.qml:185
1162-msgctxt "Button: Shut down the system"
1163-msgid "Shut down"
1164-msgstr "Bargus"
1165-
1166-#: qml/Components/Dialogs.qml:207
1167-msgctxt "Title: Reboot dialog"
1168-msgid "Reboot"
1169-msgstr "Wadir-ugus"
1170-
1171-#: qml/Components/Dialogs.qml:208
1172-msgid "Are you sure you want to reboot?"
1173-msgstr "Wadir-ugussuh digga maay litoo?"
1174-
1175-#: qml/Components/Dialogs.qml:210
1176-msgid "No"
1177-msgstr "Maleey"
1178-
1179-#: qml/Components/Dialogs.qml:217
1180-msgid "Yes"
1181-msgstr "Yeey"
1182-
1183-#: qml/Components/Dialogs.qml:232
1184-msgctxt "Title: Power off/Restart dialog"
1185-msgid "Power"
1186-msgstr "Cayla"
1187-
1188-#: qml/Components/Dialogs.qml:233
1189-msgid ""
1190-"Are you sure you would like\n"
1191-"to power off?"
1192-msgstr "Timmi haytuh digga maay litoo?"
1193-
1194-#: qml/Components/Dialogs.qml:235
1195-msgctxt "Button: Power off the system"
1196-msgid "Power off"
1197-msgstr "Timmi hayis"
1198-
1199-#: qml/Components/Dialogs.qml:244
1200-msgctxt "Button: Restart the system"
1201-msgid "Restart"
1202-msgstr "Wadir-qimbis"
1203-
1204-#: qml/Components/Lockscreen.qml:245
1205-msgid "Return to Call"
1206-msgstr "Seecol gacis"
1207-
1208-#: qml/Components/Lockscreen.qml:245
1209-msgid "Emergency Call"
1210-msgstr ""
1211-
1212-#: qml/Components/Lockscreen.qml:277
1213-msgid "OK"
1214-msgstr "Hayya"
1215-
1216-#: qml/Components/ModeSwitchWarningDialog.qml:32
1217-msgid "Apps may have unsaved data:"
1218-msgstr ""
1219-
1220-#: qml/Components/ModeSwitchWarningDialog.qml:57
1221-msgid "Re-dock, save your work and close these apps to continue."
1222-msgstr ""
1223-
1224-#: qml/Components/ModeSwitchWarningDialog.qml:63
1225-msgid "Or force close now (unsaved data will be lost)."
1226-msgstr ""
1227-
1228-#: qml/Components/ModeSwitchWarningDialog.qml:75
1229-msgid "OK, I will reconnect"
1230-msgstr ""
1231-
1232-#: qml/Components/ModeSwitchWarningDialog.qml:76
1233-msgid "Reconnect now!"
1234-msgstr ""
1235-
1236-#: qml/Components/ModeSwitchWarningDialog.qml:88
1237-msgid "Close all"
1238-msgstr "Inkih alif"
1239-
1240-#: qml/Dash/DashPageHeader.qml:266
1241-msgctxt "Button: Open the Ubuntu Store"
1242-msgid "Store"
1243-msgstr ""
1244-
1245-#: qml/Dash/DashPageHeader.qml:273
1246-msgctxt "Button: Start a search in the current dash scope"
1247-msgid "Search"
1248-msgstr "Goranto"
1249-
1250-#: qml/Dash/DashPageHeader.qml:283
1251-msgctxt "Button: Show the current dash scope settings"
1252-msgid "Settings"
1253-msgstr "Massosu"
1254-
1255-#: qml/Dash/DashPageHeader.qml:290
1256-msgid "Remove from Favorites"
1257-msgstr ""
1258-
1259-#: qml/Dash/DashPageHeader.qml:290
1260-msgid "Add to Favorites"
1261-msgstr ""
1262-
1263-#: qml/Dash/GenericScopeView.qml:587 qml/Dash/GenericScopeView.qml:745
1264-msgid "See less"
1265-msgstr ""
1266-
1267-#: qml/Dash/GenericScopeView.qml:587
1268-msgid "See all"
1269-msgstr ""
1270-
1271-#: qml/Dash/GenericScopeView.qml:649
1272-msgctxt "Label: Hint for dash search line edit"
1273-msgid "Search"
1274-msgstr "Goranto"
1275-
1276-#: qml/Dash/Previews/PreviewActionCombo.qml:35
1277-msgid "More..."
1278-msgstr ""
1279-
1280-#: qml/Dash/Previews/PreviewActionCombo.qml:35
1281-msgid "Less..."
1282-msgstr ""
1283-
1284-#: qml/Dash/Previews/PreviewCommentInput.qml:68
1285-#: qml/Dash/Previews/PreviewRatingInput.qml:174
1286-msgid "Send"
1287-msgstr "Rub"
1288-
1289-#: qml/Dash/Previews/PreviewRatingInput.qml:84
1290-msgid "Rate this"
1291-msgstr ""
1292-
1293-#: qml/Dash/Previews/PreviewRatingInput.qml:129
1294-msgid "Add a review"
1295-msgstr ""
1296-
1297-#: qml/Dash/Previews/PreviewSharing.qml:50
1298-msgid "Preview Share Item"
1299-msgstr ""
1300-
1301-#: qml/Dash/PullToRefreshScopeStyle.qml:55
1302-msgid "Pull to refresh…"
1303-msgstr ""
1304-
1305-#: qml/Dash/PullToRefreshScopeStyle.qml:60
1306-msgid "Release to refresh…"
1307-msgstr ""
1308-
1309-#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
1310-msgid "Enable location data"
1311-msgstr ""
1312-
1313-#: qml/Dash/ScopesList.qml:67
1314-msgid "Manage"
1315-msgstr ""
1316-
1317-#: qml/Dash/ScopesList.qml:113
1318-msgid "Home"
1319-msgstr "Dabqi"
1320-
1321-#: qml/Dash/ScopesList.qml:114
1322-msgid "Also installed"
1323-msgstr ""
1324-
1325-#: qml/DisabledScreenNotice.qml:87
1326-msgid ""
1327-"Your device is now connected to an external display. Use this screen as a "
1328-"touch pad to interact with the mouse."
1329-msgstr ""
1330-
1331-#: qml/Greeter/CoverPage.qml:107
1332-msgid "Unlock"
1333-msgstr ""
1334-
1335-#: qml/Greeter/LoginList.qml:239
1336-msgid "Retry"
1337-msgstr "Qagis"
1338-
1339-#: qml/Greeter/LoginList.qml:240
1340-msgid "Tap to unlock"
1341-msgstr ""
1342-
1343-#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
1344-msgid "Sorry, incorrect passphrase."
1345-msgstr ""
1346-
1347-#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
1348-msgid "Sorry, incorrect passcode."
1349-msgstr ""
1350-
1351-#: qml/Greeter/NarrowView.qml:56
1352-msgid "This will be your last attempt."
1353-msgstr ""
1354-
1355-#: qml/Greeter/NarrowView.qml:58
1356-msgid ""
1357-"If passphrase is entered incorrectly, your phone will conduct a factory "
1358-"reset and all personal data will be deleted."
1359-msgstr ""
1360-
1361-#: qml/Greeter/NarrowView.qml:59
1362-msgid ""
1363-"If passcode is entered incorrectly, your phone will conduct a factory reset "
1364-"and all personal data will be deleted."
1365-msgstr ""
1366-
1367-#: qml/Greeter/NarrowView.qml:116
1368-#, qt-format
1369-msgid "Enter %1"
1370-msgstr "%1 culus"
1371-
1372-#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
1373-msgid "Enter passphrase"
1374-msgstr "Tatur-maxco culus"
1375-
1376-#: qml/Greeter/NarrowView.qml:118
1377-msgid "Enter passcode"
1378-msgstr "Tatur-mudenta culus"
1379-
1380-#: qml/Greeter/NarrowView.qml:119
1381-#, qt-format
1382-msgid "Sorry, incorrect %1"
1383-msgstr ""
1384-
1385-#: qml/Greeter/NarrowView.qml:120
1386-msgid "Sorry, incorrect passphrase"
1387-msgstr ""
1388-
1389-#: qml/Greeter/NarrowView.qml:121
1390-msgctxt "passphrase"
1391-msgid "Please re-enter"
1392-msgstr ""
1393-
1394-#: qml/Greeter/NarrowView.qml:122
1395-msgid "Sorry, incorrect passcode"
1396-msgstr ""
1397-
1398-#: qml/Notifications/NotificationMenuItemFactory.qml:129
1399-msgid "Show password"
1400-msgstr "Cuumita uybulluy"
1401-
1402-#: qml/Panel/ActiveCallHint.qml:79
1403-msgid "Tap to return to call..."
1404-msgstr ""
1405-
1406-#: qml/Panel/ActiveCallHint.qml:92
1407-msgid "Conference"
1408-msgstr "Koboxu"
1409-
1410-#: qml/Panel/Indicators/MenuItemFactory.qml:753
1411-msgid "Nothing is playing"
1412-msgstr ""
1413-
1414-#: qml/Panel/Indicators/MenuItemFactory.qml:882
1415-#, qt-format
1416-msgid "%1 hour"
1417-msgid_plural "%1 hours"
1418-msgstr[0] "%1 saaqata"
1419-msgstr[1] "%1 saaqata"
1420-
1421-#: qml/Panel/Indicators/MenuItemFactory.qml:886
1422-#, qt-format
1423-msgid "%1 minute"
1424-msgid_plural "%1 minutes"
1425-msgstr[0] "%1 miniti"
1426-msgstr[1] "%1 miniti"
1427-
1428-#: qml/Panel/Indicators/MenuItemFactory.qml:891
1429-#, qt-format
1430-msgid "%1 second"
1431-msgid_plural "%1 seconds"
1432-msgstr[0] "%1 nammayye"
1433-msgstr[1] "%1 nammayye"
1434-
1435-#: qml/Panel/Indicators/MenuItemFactory.qml:894
1436-msgid "0 seconds"
1437-msgstr "0 nammayye"
1438-
1439-#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
1440-#: qml/Panel/Indicators/MenuItemFactory.qml:896
1441-#, qt-format
1442-msgid "%1 remaining"
1443-msgstr "%1 raaqe"
1444-
1445-#: qml/Panel/Indicators/MenuItemFactory.qml:902
1446-msgid "In queue…"
1447-msgstr ""
1448-
1449-#: qml/Panel/Indicators/MenuItemFactory.qml:906
1450-msgid "Downloading"
1451-msgstr "Qulluumah"
1452-
1453-#: qml/Panel/Indicators/MenuItemFactory.qml:908
1454-msgid "Paused, tap to resume"
1455-msgstr ""
1456-
1457-#: qml/Panel/Indicators/MenuItemFactory.qml:910
1458-msgid "Canceled"
1459-msgstr "Bayteh"
1460-
1461-#: qml/Panel/Indicators/MenuItemFactory.qml:912
1462-msgid "Finished"
1463-msgstr "Duudumteh"
1464-
1465-#: qml/Panel/Indicators/MenuItemFactory.qml:914
1466-msgid "Failed, tap to retry"
1467-msgstr ""
1468-
1469-#: qml/Panel/Indicators/MessageMenuItemFactory.qml:155
1470-#: qml/Panel/Indicators/MessageMenuItemFactory.qml:214
1471-msgctxt "Button: Send a reply message"
1472-msgid "Send"
1473-msgstr "Rub"
1474-
1475-#: qml/Panel/Indicators/MessageMenuItemFactory.qml:156
1476-msgctxt "Label: Hint in message indicator line edit"
1477-msgid "Reply"
1478-msgstr ""
1479-
1480-#: qml/Panel/Indicators/MessageMenuItemFactory.qml:213
1481-msgctxt "Button: Call back on phone"
1482-msgid "Call back"
1483-msgstr ""
1484-
1485-#: qml/Panel/Indicators/ModemInfoItem.qml:105
1486-msgid "Unlock SIM"
1487-msgstr ""
1488-
1489-#: qml/Panel/Indicators/RoamingIndication.qml:27
1490-msgid "Roaming"
1491-msgstr ""
1492-
1493-#: qml/Tutorial/TutorialBottom.qml:28
1494-msgid "Open special menus"
1495-msgstr ""
1496-
1497-#: qml/Tutorial/TutorialBottom.qml:29
1498-msgid "Swipe up from the bottom edge."
1499-msgstr ""
1500-
1501-#: qml/Tutorial/TutorialBottomFinish.qml:24
1502-msgid "This action does different things for different apps"
1503-msgstr ""
1504-
1505-#: qml/Tutorial/TutorialBottomFinish.qml:25
1506-msgid "Tap here to finish."
1507-msgstr ""
1508-
1509-#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
1510-#: qml/Tutorial/TutorialRight.qml:144
1511-msgid "Tap here to continue."
1512-msgstr ""
1513-
1514-#: qml/Tutorial/TutorialLeft.qml:26
1515-msgid "Open the launcher"
1516-msgstr ""
1517-
1518-#: qml/Tutorial/TutorialLeft.qml:27
1519-msgid "Short swipe from the left edge."
1520-msgstr ""
1521-
1522-#: qml/Tutorial/TutorialLeftFinish.qml:24
1523-msgid "These are the shortcuts to favorite apps"
1524-msgstr ""
1525-
1526-#: qml/Tutorial/TutorialPage.qml:178
1527-msgid "You almost got it!"
1528-msgstr ""
1529-
1530-#: qml/Tutorial/TutorialPage.qml:195
1531-msgid "Try again."
1532-msgstr ""
1533-
1534-#: qml/Tutorial/TutorialRight.qml:31
1535-msgid "To view open apps"
1536-msgstr ""
1537-
1538-#: qml/Tutorial/TutorialRight.qml:32
1539-msgid "Long swipe from the right edge."
1540-msgstr ""
1541-
1542-#: qml/Tutorial/TutorialRight.qml:122
1543-msgid "View all your running tasks."
1544-msgstr ""
1545-
1546-#: qml/Wizard/Page.qml:89
1547-msgctxt "Button: Go back one page in the Wizard"
1548-msgid "Back"
1549-msgstr "Derre"
1550-
1551-#: qml/Wizard/Pages/10-welcome.qml:27
1552-msgid "Hi!"
1553-msgstr "Nagaale!"
1554-
1555-#: qml/Wizard/Pages/10-welcome.qml:44
1556-msgid "Welcome to your Ubuntu device."
1557-msgstr ""
1558-
1559-#: qml/Wizard/Pages/10-welcome.qml:52
1560-msgid "Let’s get started."
1561-msgstr "Hayya qimbisnay."
1562-
1563-#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
1564-#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
1565-#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
1566-#: qml/Wizard/Pages/passwd-set.qml:90
1567-msgid "Continue"
1568-msgstr "Tatur"
1569-
1570-#: qml/Wizard/Pages/20-sim.qml:25
1571-msgid "Add a SIM card and restart your device"
1572-msgstr ""
1573-
1574-#: qml/Wizard/Pages/20-sim.qml:59
1575-msgid "Without it, you won’t be able to make calls or use text messaging."
1576-msgstr ""
1577-
1578-#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
1579-msgid "Skip"
1580-msgstr "Kaqit"
1581-
1582-#: qml/Wizard/Pages/30-passwd-type.qml:39
1583-msgid "Lock security"
1584-msgstr ""
1585-
1586-#: qml/Wizard/Pages/30-passwd-type.qml:79
1587-msgid "Please select how you’d like to unlock your device."
1588-msgstr ""
1589-
1590-#: qml/Wizard/Pages/30-passwd-type.qml:102
1591-msgctxt "Label: Type of security method"
1592-msgid "Swipe"
1593-msgstr "Uysuttuc"
1594-
1595-#: qml/Wizard/Pages/30-passwd-type.qml:103
1596-msgctxt "Label: Description of security method"
1597-msgid "No security"
1598-msgstr ""
1599-
1600-#: qml/Wizard/Pages/30-passwd-type.qml:105
1601-msgctxt "Label: Type of security method"
1602-msgid "Passcode"
1603-msgstr ""
1604-
1605-#: qml/Wizard/Pages/30-passwd-type.qml:106
1606-msgctxt "Label: Description of security method"
1607-msgid "4 digits only"
1608-msgstr ""
1609-
1610-#: qml/Wizard/Pages/30-passwd-type.qml:108
1611-msgctxt "Label: Type of security method"
1612-msgid "Passphrase"
1613-msgstr ""
1614-
1615-#: qml/Wizard/Pages/30-passwd-type.qml:109
1616-msgctxt "Label: Description of security method"
1617-msgid "Numbers and letters"
1618-msgstr ""
1619-
1620-#: qml/Wizard/Pages/40-wifi.qml:29
1621-msgid "Connect to Wi‑Fi"
1622-msgstr ""
1623-
1624-#: qml/Wizard/Pages/40-wifi.qml:168
1625-msgid "Available networks…"
1626-msgstr ""
1627-
1628-#: qml/Wizard/Pages/40-wifi.qml:169
1629-msgid "No available networks."
1630-msgstr ""
1631-
1632-#: qml/Wizard/Pages/50-location.qml:27
1633-msgid "Location"
1634-msgstr ""
1635-
1636-#: qml/Wizard/Pages/50-location.qml:62
1637-msgid "Let the phone detect your location:"
1638-msgstr ""
1639-
1640-#: qml/Wizard/Pages/50-location.qml:69
1641-msgid "Using GPS only (less accurate)"
1642-msgstr ""
1643-
1644-#: qml/Wizard/Pages/50-location.qml:86
1645-msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
1646-msgstr ""
1647-
1648-#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
1649-#: qml/Wizard/Pages/50-location.qml:103
1650-msgid ""
1651-"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
1652-"conditions</a>."
1653-msgstr ""
1654-
1655-#: qml/Wizard/Pages/50-location.qml:112
1656-msgid "Not at all"
1657-msgstr ""
1658-
1659-#: qml/Wizard/Pages/50-location.qml:124
1660-msgid "You can change your mind later in <b>System Settings</b>."
1661-msgstr ""
1662-
1663-#: qml/Wizard/Pages/60-reporting.qml:26
1664-msgid "Improving your experience"
1665-msgstr ""
1666-
1667-#: qml/Wizard/Pages/60-reporting.qml:46
1668-msgid ""
1669-"Your phone is set up to automatically report errors to Canonical and its "
1670-"partners, the makers of the operating system."
1671-msgstr ""
1672-
1673-#: qml/Wizard/Pages/60-reporting.qml:53
1674-msgid ""
1675-"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
1676-"Privacy</b>"
1677-msgstr ""
1678-
1679-#: qml/Wizard/Pages/80-finished.qml:24
1680-msgid "All done"
1681-msgstr ""
1682-
1683-#: qml/Wizard/Pages/80-finished.qml:39
1684-msgid "Nice work!"
1685-msgstr ""
1686-
1687-#: qml/Wizard/Pages/80-finished.qml:46
1688-msgid "Your device is now ready to use."
1689-msgstr ""
1690-
1691-#: qml/Wizard/Pages/80-finished.qml:53
1692-msgid "Finish"
1693-msgstr ""
1694-
1695-#: qml/Wizard/Pages/here-terms.qml:27
1696-msgid "Terms & Conditions"
1697-msgstr ""
1698-
1699-#: qml/Wizard/Pages/passwd-confirm.qml:49
1700-msgid "Confirm passphrase"
1701-msgstr ""
1702-
1703-#: qml/Wizard/Pages/passwd-confirm.qml:50
1704-msgid "Confirm passcode"
1705-msgstr ""
1706-
1707-#: qml/Wizard/Pages/passwd-confirm.qml:53
1708-#: qml/Wizard/Pages/passwd-confirm.qml:54
1709-msgid "Please try again."
1710-msgstr ""
1711-
1712-#: qml/Wizard/Pages/passwd-set.qml:61
1713-msgid "Choose your passcode"
1714-msgstr ""
1715-
1716-#: qml/Wizard/Pages/passwd-set.qml:68
1717-msgid "Passphrase must be 4 characters long"
1718-msgstr ""
1719-
1720-#. Translators: This is the arrow for "Back" buttons
1721-#: qml/Wizard/StackButton.qml:39
1722-#, qt-format
1723-msgid "〈 %1"
1724-msgstr ""
1725-
1726-#. Translators: This is the arrow for "Forward" buttons
1727-#: qml/Wizard/StackButton.qml:42
1728-#, qt-format
1729-msgid "%1 〉"
1730-msgstr ""
1731-
1732-#~ msgid "Welcome to your Ubuntu phone."
1733-#~ msgstr "Ubuntu Telefoonul arcib"
1734->>>>>>> MERGE-SOURCE
1735
1736=== modified file 'po/am.po'
1737--- po/am.po 2016-04-28 10:49:18 +0000
1738+++ po/am.po 2016-04-27 06:03:19 +0000
1739@@ -7,26 +7,16 @@
1740 msgstr ""
1741 "Project-Id-Version: unity8\n"
1742 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1743-<<<<<<< TREE
1744 "POT-Creation-Date: 2016-04-21 13:47+0000\n"
1745 "PO-Revision-Date: 2016-03-24 19:07+0000\n"
1746-=======
1747-"POT-Creation-Date: 2016-02-16 03:29+0000\n"
1748-"PO-Revision-Date: 2015-11-19 19:27+0000\n"
1749->>>>>>> MERGE-SOURCE
1750 "Last-Translator: samson <Unknown>\n"
1751 "Language-Team: Amharic <am@li.org>\n"
1752 "MIME-Version: 1.0\n"
1753 "Content-Type: text/plain; charset=UTF-8\n"
1754 "Content-Transfer-Encoding: 8bit\n"
1755 "Plural-Forms: nplurals=2; plural=n > 1;\n"
1756-<<<<<<< TREE
1757 "X-Launchpad-Export-Date: 2016-04-27 06:01+0000\n"
1758 "X-Generator: Launchpad (build 17995)\n"
1759-=======
1760-"X-Launchpad-Export-Date: 2016-02-23 06:03+0000\n"
1761-"X-Generator: Launchpad (build 17925)\n"
1762->>>>>>> MERGE-SOURCE
1763
1764 #: plugins/IntegratedLightDM/Greeter.cpp:112
1765 msgid "Password: "
1766@@ -190,7 +180,6 @@
1767 msgid "Add to Favorites"
1768 msgstr "ወደምወዳቸው መጨመሪያ"
1769
1770-<<<<<<< TREE
1771 #: qml/Dash/FiltersPopover.qml:60
1772 msgid "Refine your results"
1773 msgstr "የ እርስዎን ውጤቶች እንደገና ማጣሪያ"
1774@@ -200,25 +189,14 @@
1775 msgstr "እንደ ነበረ መመለሻ"
1776
1777 #: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
1778-=======
1779-#: qml/Dash/GenericScopeView.qml:587 qml/Dash/GenericScopeView.qml:745
1780->>>>>>> MERGE-SOURCE
1781 msgid "See less"
1782 msgstr "አነስተኛ መመልከቻ"
1783
1784-<<<<<<< TREE
1785 #: qml/Dash/GenericScopeView.qml:570
1786-=======
1787-#: qml/Dash/GenericScopeView.qml:587
1788->>>>>>> MERGE-SOURCE
1789 msgid "See all"
1790 msgstr "ሁሉንም መመልከቻ"
1791
1792-<<<<<<< TREE
1793 #: qml/Dash/GenericScopeView.qml:627
1794-=======
1795-#: qml/Dash/GenericScopeView.qml:649
1796->>>>>>> MERGE-SOURCE
1797 msgctxt "Label: Hint for dash search line edit"
1798 msgid "Search"
1799 msgstr "መፈለጊያ"
1800@@ -280,20 +258,11 @@
1801 msgid "Also installed"
1802 msgstr "እንዲሁም የተገጠሙ"
1803
1804-<<<<<<< TREE
1805 #: qml/DisabledScreenNotice.qml:104
1806 msgid ""
1807 "Your device is now connected to an external display. Use this screen as a "
1808 "touch pad to interact with the pointer."
1809 msgstr "የ እርስዎ አካል አሁን ከ ውጪ ማሳያ ጋር ተገናኝቷል: ይህን መመልከቻ እንደ ተችፓድ መጠቀሚያ"
1810-=======
1811-#: qml/DisabledScreenNotice.qml:87
1812-msgid ""
1813-"Your device is now connected to an external display. Use this screen as a "
1814-"touch pad to interact with the mouse."
1815-msgstr ""
1816-"የ እርስዎ አካል አሁን ከ ውጪ ማሳያ ጋር ተገናኝቷል: ይህን መመልከቻ እንደ ተችፓድ ከ አይጥ ጋር ተባብሮ ይሰራል"
1817->>>>>>> MERGE-SOURCE
1818
1819 #: qml/Greeter/CoverPage.qml:118
1820 msgid "Unlock"
1821@@ -507,7 +476,6 @@
1822 msgstr "ወደ ኋላ"
1823
1824 #: qml/Wizard/Pages/10-welcome.qml:27
1825-<<<<<<< TREE
1826 msgid "Language"
1827 msgstr "ቋንቋ"
1828
1829@@ -518,24 +486,6 @@
1830 #: qml/Wizard/Pages/passcode-desktop.qml:124
1831 #: qml/Wizard/Pages/password-set.qml:141
1832 msgid "Next"
1833-=======
1834-msgid "Hi!"
1835-msgstr "ሰላም"
1836-
1837-#: qml/Wizard/Pages/10-welcome.qml:44
1838-msgid "Welcome to your Ubuntu device."
1839-msgstr "እንኳን ድህና መጡ ወደ ኡቡንቱ"
1840-
1841-#: qml/Wizard/Pages/10-welcome.qml:52
1842-msgid "Let’s get started."
1843-msgstr "ስራ እንጀምር"
1844-
1845-#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
1846-#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
1847-#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
1848-#: qml/Wizard/Pages/passwd-set.qml:90
1849-msgid "Continue"
1850->>>>>>> MERGE-SOURCE
1851 msgstr "ይቀጥሉ"
1852
1853 #: qml/Wizard/Pages/30-wifi.qml:29
1854@@ -559,7 +509,6 @@
1855 msgid "Skip"
1856 msgstr "መዝለያ"
1857
1858-<<<<<<< TREE
1859 #: qml/Wizard/Pages/40-location.qml:27
1860 msgid "Location Services"
1861 msgstr "የ አካባቢ ግልጋሎት"
1862@@ -656,125 +605,6 @@
1863 msgstr "እንጀምር"
1864
1865 #: qml/Wizard/Pages/here-terms.qml:25
1866-=======
1867-#: qml/Wizard/Pages/30-passwd-type.qml:39
1868-msgid "Lock security"
1869-msgstr "ደህንነት መቆለፊያ"
1870-
1871-#: qml/Wizard/Pages/30-passwd-type.qml:79
1872-msgid "Please select how you’d like to unlock your device."
1873-msgstr "እባክዎን የ እርስዎን አካል እንዴት እንደሚከፈት ይምረጡ"
1874-
1875-#: qml/Wizard/Pages/30-passwd-type.qml:102
1876-msgctxt "Label: Type of security method"
1877-msgid "Swipe"
1878-msgstr "መጥረጊያ"
1879-
1880-#: qml/Wizard/Pages/30-passwd-type.qml:103
1881-msgctxt "Label: Description of security method"
1882-msgid "No security"
1883-msgstr "ደህንነት አልተገኘም"
1884-
1885-#: qml/Wizard/Pages/30-passwd-type.qml:105
1886-msgctxt "Label: Type of security method"
1887-msgid "Passcode"
1888-msgstr "ማለፊያ ኮድ"
1889-
1890-#: qml/Wizard/Pages/30-passwd-type.qml:106
1891-msgctxt "Label: Description of security method"
1892-msgid "4 digits only"
1893-msgstr "4 ዲጂት ብቻ"
1894-
1895-#: qml/Wizard/Pages/30-passwd-type.qml:108
1896-msgctxt "Label: Type of security method"
1897-msgid "Passphrase"
1898-msgstr "የማለፊያ ሐረግ"
1899-
1900-#: qml/Wizard/Pages/30-passwd-type.qml:109
1901-msgctxt "Label: Description of security method"
1902-msgid "Numbers and letters"
1903-msgstr "ቁጥሮች እና ፊደሎች"
1904-
1905-#: qml/Wizard/Pages/40-wifi.qml:29
1906-msgid "Connect to Wi‑Fi"
1907-msgstr "ወደ ዋይ‑ፋይ መገናኛ"
1908-
1909-#: qml/Wizard/Pages/40-wifi.qml:168
1910-msgid "Available networks…"
1911-msgstr "ዝግጁ ኔትዎርኮች…"
1912-
1913-#: qml/Wizard/Pages/40-wifi.qml:169
1914-msgid "No available networks."
1915-msgstr "ዝግጁ ኔትዎርኮች አልተገኙም"
1916-
1917-#: qml/Wizard/Pages/50-location.qml:27
1918-msgid "Location"
1919-msgstr "አካባቢ"
1920-
1921-#: qml/Wizard/Pages/50-location.qml:62
1922-msgid "Let the phone detect your location:"
1923-msgstr "እባክዎን እርስዎ ያሉበትን አካባቢ ስልኩ እራሱ ይፈልግ:"
1924-
1925-#: qml/Wizard/Pages/50-location.qml:69
1926-msgid "Using GPS only (less accurate)"
1927-msgstr "ጂፒኤስን ብቻ መጠቀሚያ(በጣም ቅርብ)"
1928-
1929-#: qml/Wizard/Pages/50-location.qml:86
1930-msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
1931-msgstr "ይጠቀሙ ጂፒኤስ ግልጽ ያልሆነ ዋይ-ፋይ እና ተንቀሳቃሽ ኔትዎርክ መረጃ (ይመከራሉ)"
1932-
1933-#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
1934-#: qml/Wizard/Pages/50-location.qml:103
1935-msgid ""
1936-"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
1937-"conditions</a>."
1938-msgstr "ይህን ምርጫ በመምረጥ ተስማምቻለሁ ከ Nokia HERE <a href='#'>ውሎች እና ሁኔታዎች ጋር</a>."
1939-
1940-#: qml/Wizard/Pages/50-location.qml:112
1941-msgid "Not at all"
1942-msgstr "አይደለም"
1943-
1944-#: qml/Wizard/Pages/50-location.qml:124
1945-msgid "You can change your mind later in <b>System Settings</b>."
1946-msgstr "እርስዎ በኋላ መቀየር ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b>."
1947-
1948-#: qml/Wizard/Pages/60-reporting.qml:26
1949-msgid "Improving your experience"
1950-msgstr "የ እርስዎን ልምምድ ማሻሻያ"
1951-
1952-#: qml/Wizard/Pages/60-reporting.qml:46
1953-msgid ""
1954-"Your phone is set up to automatically report errors to Canonical and its "
1955-"partners, the makers of the operating system."
1956-msgstr ""
1957-"የ እርስዎ ስልክ ራሱ በራሱ የ ስህተት መግለጫዎች ወደ Canonical and its partners, የ መስሪያ ስርአት "
1958-"አምራቾች"
1959-
1960-#: qml/Wizard/Pages/60-reporting.qml:53
1961-msgid ""
1962-"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
1963-"Privacy</b>"
1964-msgstr ""
1965-"ይህን ግልጋሎት ማሰናከል ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b> under <b>Security &amp; Privacy</b>"
1966-
1967-#: qml/Wizard/Pages/80-finished.qml:24
1968-msgid "All done"
1969-msgstr "ሁሉም ተፈጽሟል"
1970-
1971-#: qml/Wizard/Pages/80-finished.qml:39
1972-msgid "Nice work!"
1973-msgstr "ጥሩ ሰርተዋል!"
1974-
1975-#: qml/Wizard/Pages/80-finished.qml:46
1976-msgid "Your device is now ready to use."
1977-msgstr "የ እርስዎ አካል አሁን ዝግጁ ነው"
1978-
1979-#: qml/Wizard/Pages/80-finished.qml:53
1980-msgid "Finish"
1981-msgstr "መጨረሻ"
1982-
1983-#: qml/Wizard/Pages/here-terms.qml:27
1984->>>>>>> MERGE-SOURCE
1985 msgid "Terms & Conditions"
1986 msgstr "ውሎች & ሁኔታዎች"
1987
1988@@ -1012,7 +842,6 @@
1989 #~ msgid "Please re-enter"
1990 #~ msgstr "እባክዎን እንደገና-ያስገቡ"
1991
1992-<<<<<<< TREE
1993 #~ msgid "Lock security"
1994 #~ msgstr "ደህንነት መቆለፊያ"
1995
1996@@ -1189,17 +1018,6 @@
1997 #~ msgid "Numbers and letters"
1998 #~ msgstr "ቁጥሮች እና ፊደሎች"
1999
2000-=======
2001-#~ msgid "Please select how you’d like to unlock your phone."
2002-#~ msgstr "እባክዎን የ እርስዎን ስልክ እንዴት እንደሚከፍቱ ይምረጡ"
2003-
2004-#~ msgid "Your phone is now ready to use."
2005-#~ msgstr "ስልኩ አሁን ለመጠቀም ዝግጁ ነው"
2006-
2007-#~ msgid "Welcome to your Ubuntu phone."
2008-#~ msgstr "እንኳን ደህና መጡ ወደ እርስዎ ኡቡንቱ ስልክ"
2009-
2010->>>>>>> MERGE-SOURCE
2011 #~ msgid "%a %d %b %H:%M"
2012 #~ msgstr "%a %d %b %ሰ:%ደ"
2013
2014
2015=== modified file 'po/ar.po'
2016--- po/ar.po 2016-04-28 10:49:18 +0000
2017+++ po/ar.po 2016-04-27 06:03:19 +0000
2018@@ -7,11 +7,7 @@
2019 msgstr ""
2020 "Project-Id-Version: unity\n"
2021 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2022-<<<<<<< TREE
2023 "POT-Creation-Date: 2016-04-21 13:47+0000\n"
2024-=======
2025-"POT-Creation-Date: 2016-02-16 03:29+0000\n"
2026->>>>>>> MERGE-SOURCE
2027 "PO-Revision-Date: 2015-07-29 09:41+0000\n"
2028 "Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
2029 "Language-Team: Arabic <ar@li.org>\n"
2030@@ -20,13 +16,8 @@
2031 "Content-Transfer-Encoding: 8bit\n"
2032 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
2033 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
2034-<<<<<<< TREE
2035 "X-Launchpad-Export-Date: 2016-04-27 06:01+0000\n"
2036 "X-Generator: Launchpad (build 17995)\n"
2037-=======
2038-"X-Launchpad-Export-Date: 2016-02-23 06:03+0000\n"
2039-"X-Generator: Launchpad (build 17925)\n"
2040->>>>>>> MERGE-SOURCE
2041
2042 #: plugins/IntegratedLightDM/Greeter.cpp:112
2043 msgid "Password: "
2044@@ -196,7 +187,6 @@
2045 msgid "Add to Favorites"
2046 msgstr "إضافة إلى المفضلات"
2047
2048-<<<<<<< TREE
2049 #: qml/Dash/FiltersPopover.qml:60
2050 msgid "Refine your results"
2051 msgstr ""
2052@@ -206,25 +196,14 @@
2053 msgstr ""
2054
2055 #: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
2056-=======
2057-#: qml/Dash/GenericScopeView.qml:587 qml/Dash/GenericScopeView.qml:745
2058->>>>>>> MERGE-SOURCE
2059 msgid "See less"
2060 msgstr "شاهد أقل"
2061
2062-<<<<<<< TREE
2063 #: qml/Dash/GenericScopeView.qml:570
2064-=======
2065-#: qml/Dash/GenericScopeView.qml:587
2066->>>>>>> MERGE-SOURCE
2067 msgid "See all"
2068 msgstr "عرض الكل"
2069
2070-<<<<<<< TREE
2071 #: qml/Dash/GenericScopeView.qml:627
2072-=======
2073-#: qml/Dash/GenericScopeView.qml:649
2074->>>>>>> MERGE-SOURCE
2075 msgctxt "Label: Hint for dash search line edit"
2076 msgid "Search"
2077 msgstr "بحث"
2078@@ -286,17 +265,10 @@
2079 msgid "Also installed"
2080 msgstr "أيضا تم تثبيت"
2081
2082-<<<<<<< TREE
2083 #: qml/DisabledScreenNotice.qml:104
2084 msgid ""
2085 "Your device is now connected to an external display. Use this screen as a "
2086 "touch pad to interact with the pointer."
2087-=======
2088-#: qml/DisabledScreenNotice.qml:87
2089-msgid ""
2090-"Your device is now connected to an external display. Use this screen as a "
2091-"touch pad to interact with the mouse."
2092->>>>>>> MERGE-SOURCE
2093 msgstr ""
2094
2095 #: qml/Greeter/CoverPage.qml:118
2096@@ -523,7 +495,6 @@
2097 msgstr "عودة"
2098
2099 #: qml/Wizard/Pages/10-welcome.qml:27
2100-<<<<<<< TREE
2101 msgid "Language"
2102 msgstr ""
2103
2104@@ -554,40 +525,9 @@
2105
2106 #: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
2107 #: qml/Wizard/Pages/sim.qml:101
2108-=======
2109-msgid "Hi!"
2110-msgstr "أهلا!"
2111-
2112-#: qml/Wizard/Pages/10-welcome.qml:44
2113-msgid "Welcome to your Ubuntu device."
2114-msgstr ""
2115-
2116-#: qml/Wizard/Pages/10-welcome.qml:52
2117-msgid "Let’s get started."
2118-msgstr "هيا بنا نبدأ."
2119-
2120-#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
2121-#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
2122-#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
2123-#: qml/Wizard/Pages/passwd-set.qml:90
2124-msgid "Continue"
2125-msgstr "متابعة"
2126-
2127-#: qml/Wizard/Pages/20-sim.qml:25
2128-msgid "Add a SIM card and restart your device"
2129-msgstr "أدخِل شريحة SIM ثم أعِد تشغيل الجهاز"
2130-
2131-#: qml/Wizard/Pages/20-sim.qml:59
2132-msgid "Without it, you won’t be able to make calls or use text messaging."
2133-msgstr ""
2134-"بدونها لن تتمكن من إجراء أي مكالمات هاتفية أو استخدام الرسائل النصية."
2135-
2136-#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
2137->>>>>>> MERGE-SOURCE
2138 msgid "Skip"
2139 msgstr "تخطي"
2140
2141-<<<<<<< TREE
2142 #: qml/Wizard/Pages/40-location.qml:27
2143 msgid "Location Services"
2144 msgstr ""
2145@@ -684,130 +624,6 @@
2146 msgstr ""
2147
2148 #: qml/Wizard/Pages/here-terms.qml:25
2149-=======
2150-#: qml/Wizard/Pages/30-passwd-type.qml:39
2151-msgid "Lock security"
2152-msgstr "قِفل الأمان"
2153-
2154-#: qml/Wizard/Pages/30-passwd-type.qml:79
2155-msgid "Please select how you’d like to unlock your device."
2156-msgstr ""
2157-
2158-#: qml/Wizard/Pages/30-passwd-type.qml:102
2159-msgctxt "Label: Type of security method"
2160-msgid "Swipe"
2161-msgstr "سحبة"
2162-
2163-#: qml/Wizard/Pages/30-passwd-type.qml:103
2164-msgctxt "Label: Description of security method"
2165-msgid "No security"
2166-msgstr "بدون أمان"
2167-
2168-#: qml/Wizard/Pages/30-passwd-type.qml:105
2169-msgctxt "Label: Type of security method"
2170-msgid "Passcode"
2171-msgstr "رمز سري"
2172-
2173-#: qml/Wizard/Pages/30-passwd-type.qml:106
2174-msgctxt "Label: Description of security method"
2175-msgid "4 digits only"
2176-msgstr "4 أرقام فقط"
2177-
2178-#: qml/Wizard/Pages/30-passwd-type.qml:108
2179-msgctxt "Label: Type of security method"
2180-msgid "Passphrase"
2181-msgstr "عبارة سرية"
2182-
2183-#: qml/Wizard/Pages/30-passwd-type.qml:109
2184-msgctxt "Label: Description of security method"
2185-msgid "Numbers and letters"
2186-msgstr "أرقام وحروف"
2187-
2188-#: qml/Wizard/Pages/40-wifi.qml:29
2189-msgid "Connect to Wi‑Fi"
2190-msgstr "اتصل بالواي فاي"
2191-
2192-#: qml/Wizard/Pages/40-wifi.qml:168
2193-msgid "Available networks…"
2194-msgstr "الشبكات المتاحة..."
2195-
2196-#: qml/Wizard/Pages/40-wifi.qml:169
2197-msgid "No available networks."
2198-msgstr "لا توجد شبكات متاحة."
2199-
2200-#: qml/Wizard/Pages/50-location.qml:27
2201-msgid "Location"
2202-msgstr "الموقع"
2203-
2204-#: qml/Wizard/Pages/50-location.qml:62
2205-msgid "Let the phone detect your location:"
2206-msgstr "دع هاتفك يحدد موقعك:"
2207-
2208-#: qml/Wizard/Pages/50-location.qml:69
2209-msgid "Using GPS only (less accurate)"
2210-msgstr "باستخدام نظام تحديد المواقع (GPS) فقط (أقل دقّة)"
2211-
2212-#: qml/Wizard/Pages/50-location.qml:86
2213-msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
2214-msgstr ""
2215-"باستخدام نظام تحديد المواقع (GPS)، والواي فاي، وبيانات الشبكة الخلوية "
2216-"(مستحسن)"
2217-
2218-#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
2219-#: qml/Wizard/Pages/50-location.qml:103
2220-msgid ""
2221-"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
2222-"conditions</a>."
2223-msgstr ""
2224-"باختيارك لهذا الخيار فإنك توافق على <a href='#'>الشروط والأحكام</a> الخاصة "
2225-"بـ Nokia HERE."
2226-
2227-#: qml/Wizard/Pages/50-location.qml:112
2228-msgid "Not at all"
2229-msgstr ""
2230-
2231-#: qml/Wizard/Pages/50-location.qml:124
2232-msgid "You can change your mind later in <b>System Settings</b>."
2233-msgstr "يمكنك تغيير رأيك في وقت لاحق عن طريق <b>إعدادات النظام</b>."
2234-
2235-#: qml/Wizard/Pages/60-reporting.qml:26
2236-msgid "Improving your experience"
2237-msgstr "تحسين تجربتك"
2238-
2239-#: qml/Wizard/Pages/60-reporting.qml:46
2240-msgid ""
2241-"Your phone is set up to automatically report errors to Canonical and its "
2242-"partners, the makers of the operating system."
2243-msgstr ""
2244-"هاتفك مُعدّ لإرسال تقارير آلية بالأخطاء إلى كانونيكال وشركائها (صانعي نظام "
2245-"التشغيل)."
2246-
2247-#: qml/Wizard/Pages/60-reporting.qml:53
2248-msgid ""
2249-"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
2250-"Privacy</b>"
2251-msgstr ""
2252-"يمكن تعطيل ذلك بالذهاب إلى <b>إعدادات النظام</b> من خلال <b>الأمان "
2253-"والخصوصية</b>"
2254-
2255-#: qml/Wizard/Pages/80-finished.qml:24
2256-msgid "All done"
2257-msgstr "تم ذلك"
2258-
2259-#: qml/Wizard/Pages/80-finished.qml:39
2260-msgid "Nice work!"
2261-msgstr "عمل جيد!"
2262-
2263-#: qml/Wizard/Pages/80-finished.qml:46
2264-msgid "Your device is now ready to use."
2265-msgstr ""
2266-
2267-#: qml/Wizard/Pages/80-finished.qml:53
2268-msgid "Finish"
2269-msgstr "إنهاء"
2270-
2271-#: qml/Wizard/Pages/here-terms.qml:27
2272->>>>>>> MERGE-SOURCE
2273 msgid "Terms & Conditions"
2274 msgstr "الشروط والأحكام"
2275
2276@@ -1047,7 +863,6 @@
2277
2278 #~ msgid "Please re-enter"
2279 #~ msgstr "برجاء إعادة إدخالها"
2280-<<<<<<< TREE
2281
2282 #~ msgid "This action does different things for different apps"
2283 #~ msgstr "هذا الإجراء يقوم بأشياء مختلفة على التطبيقات المختلفة"
2284@@ -1207,14 +1022,3 @@
2285 #~ msgstr ""
2286 #~ "باختيارك لهذا الخيار فإنك توافق على <a href='#'>الشروط والأحكام</a> الخاصة "
2287 #~ "بـ Nokia HERE."
2288-=======
2289-
2290-#~ msgid "Welcome to your Ubuntu phone."
2291-#~ msgstr "مرحبا بك في أوبونتو للهواتف."
2292-
2293-#~ msgid "Please select how you’d like to unlock your phone."
2294-#~ msgstr "رجاءً اختر الطريقة التي ترغب بأن توصد هاتفك بها."
2295-
2296-#~ msgid "Your phone is now ready to use."
2297-#~ msgstr "هاتفك جاهز الآن للاستخدام."
2298->>>>>>> MERGE-SOURCE
2299
2300=== modified file 'po/ast.po'
2301--- po/ast.po 2016-04-28 10:49:18 +0000
2302+++ po/ast.po 2016-04-27 06:03:19 +0000
2303@@ -7,26 +7,16 @@
2304 msgstr ""
2305 "Project-Id-Version: unity8\n"
2306 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2307-<<<<<<< TREE
2308 "POT-Creation-Date: 2016-04-21 13:47+0000\n"
2309 "PO-Revision-Date: 2016-04-17 16:57+0000\n"
2310-=======
2311-"POT-Creation-Date: 2016-02-16 03:29+0000\n"
2312-"PO-Revision-Date: 2016-02-19 19:39+0000\n"
2313->>>>>>> MERGE-SOURCE
2314 "Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
2315 "Language-Team: Asturian <ast@li.org>\n"
2316 "MIME-Version: 1.0\n"
2317 "Content-Type: text/plain; charset=UTF-8\n"
2318 "Content-Transfer-Encoding: 8bit\n"
2319 "Plural-Forms: nplurals=2; plural=n != 1;\n"
2320-<<<<<<< TREE
2321 "X-Launchpad-Export-Date: 2016-04-27 06:01+0000\n"
2322 "X-Generator: Launchpad (build 17995)\n"
2323-=======
2324-"X-Launchpad-Export-Date: 2016-02-23 06:03+0000\n"
2325-"X-Generator: Launchpad (build 17925)\n"
2326->>>>>>> MERGE-SOURCE
2327
2328 #: plugins/IntegratedLightDM/Greeter.cpp:112
2329 msgid "Password: "
2330@@ -151,8 +141,6 @@
2331 "Re-dock means connect the device again to an external screen/mouse/keyboard"
2332 msgid "Re-dock, save your work and close these apps to continue."
2333 msgstr ""
2334-"Pa siguir coneuta nuevamente'l preséu, guarda'l trabayu y zarra estes "
2335-"aplicaciones."
2336
2337 #: qml/Components/ModeSwitchWarningDialog.qml:63
2338 msgid "Or force close now (unsaved data will be lost)."
2339@@ -193,7 +181,6 @@
2340 msgid "Add to Favorites"
2341 msgstr "Amestar a favoritos"
2342
2343-<<<<<<< TREE
2344 #: qml/Dash/FiltersPopover.qml:60
2345 msgid "Refine your results"
2346 msgstr ""
2347@@ -203,25 +190,14 @@
2348 msgstr "Reafitar"
2349
2350 #: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
2351-=======
2352-#: qml/Dash/GenericScopeView.qml:587 qml/Dash/GenericScopeView.qml:745
2353->>>>>>> MERGE-SOURCE
2354 msgid "See less"
2355 msgstr "Ver menos"
2356
2357-<<<<<<< TREE
2358 #: qml/Dash/GenericScopeView.qml:570
2359-=======
2360-#: qml/Dash/GenericScopeView.qml:587
2361->>>>>>> MERGE-SOURCE
2362 msgid "See all"
2363 msgstr "Ver too"
2364
2365-<<<<<<< TREE
2366 #: qml/Dash/GenericScopeView.qml:627
2367-=======
2368-#: qml/Dash/GenericScopeView.qml:649
2369->>>>>>> MERGE-SOURCE
2370 msgctxt "Label: Hint for dash search line edit"
2371 msgid "Search"
2372 msgstr "Guetar"
2373@@ -283,17 +259,10 @@
2374 msgid "Also installed"
2375 msgstr "Tamién instalaos"
2376
2377-<<<<<<< TREE
2378 #: qml/DisabledScreenNotice.qml:104
2379 msgid ""
2380 "Your device is now connected to an external display. Use this screen as a "
2381 "touch pad to interact with the pointer."
2382-=======
2383-#: qml/DisabledScreenNotice.qml:87
2384-msgid ""
2385-"Your device is now connected to an external display. Use this screen as a "
2386-"touch pad to interact with the mouse."
2387->>>>>>> MERGE-SOURCE
2388 msgstr ""
2389
2390 #: qml/Greeter/CoverPage.qml:118
2391@@ -452,7 +421,6 @@
2392 #: qml/Panel/Indicators/MessageMenuItemFactory.qml:213
2393 msgctxt "Button: Call back on phone"
2394 msgid "Call back"
2395-<<<<<<< TREE
2396 msgstr "Devolver llamada"
2397
2398 #: qml/Stages/SideStage.qml:76
2399@@ -504,78 +472,11 @@
2400 msgstr ""
2401
2402 #: qml/Wizard/Page.qml:54
2403-=======
2404-msgstr "Devolver llamada"
2405-
2406-#: qml/Panel/Indicators/ModemInfoItem.qml:105
2407-msgid "Unlock SIM"
2408-msgstr "Desbloquiar SIM"
2409-
2410-#: qml/Panel/Indicators/RoamingIndication.qml:27
2411-msgid "Roaming"
2412-msgstr "Roaming"
2413-
2414-#: qml/Tutorial/TutorialBottom.qml:28
2415-msgid "Open special menus"
2416-msgstr "Abrir menús especiales"
2417-
2418-#: qml/Tutorial/TutorialBottom.qml:29
2419-msgid "Swipe up from the bottom edge."
2420-msgstr "Esliza dende'l berbesu d'embaxo."
2421-
2422-#: qml/Tutorial/TutorialBottomFinish.qml:24
2423-msgid "This action does different things for different apps"
2424-msgstr "Esta aición fai coses distintes p'aplicaciones estremaes"
2425-
2426-#: qml/Tutorial/TutorialBottomFinish.qml:25
2427-msgid "Tap here to finish."
2428-msgstr "Toca equí pa finar."
2429-
2430-#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
2431-#: qml/Tutorial/TutorialRight.qml:144
2432-msgid "Tap here to continue."
2433-msgstr "Toca equí pa siguir."
2434-
2435-#: qml/Tutorial/TutorialLeft.qml:26
2436-msgid "Open the launcher"
2437-msgstr "Abrir el llanzador"
2438-
2439-#: qml/Tutorial/TutorialLeft.qml:27
2440-msgid "Short swipe from the left edge."
2441-msgstr "Esliza un poco dende'l berbesu esquierdu."
2442-
2443-#: qml/Tutorial/TutorialLeftFinish.qml:24
2444-msgid "These are the shortcuts to favorite apps"
2445-msgstr "Estos son los atayos a les aplicaciones favorites"
2446-
2447-#: qml/Tutorial/TutorialPage.qml:178
2448-msgid "You almost got it!"
2449-msgstr "¡Yá cuasi finamos!"
2450-
2451-#: qml/Tutorial/TutorialPage.qml:195
2452-msgid "Try again."
2453-msgstr "Intentar de nueves"
2454-
2455-#: qml/Tutorial/TutorialRight.qml:31
2456-msgid "To view open apps"
2457-msgstr "Pa ver aplicaciones abiertes"
2458-
2459-#: qml/Tutorial/TutorialRight.qml:32
2460-msgid "Long swipe from the right edge."
2461-msgstr "Eslizamientu llargu dende'l berbesu drechu."
2462-
2463-#: qml/Tutorial/TutorialRight.qml:122
2464-msgid "View all your running tasks."
2465-msgstr "Mira toles tos aplicaciones n'execución."
2466-
2467-#: qml/Wizard/Page.qml:89
2468->>>>>>> MERGE-SOURCE
2469 msgctxt "Button: Go back one page in the Wizard"
2470 msgid "Back"
2471 msgstr "Atrás"
2472
2473 #: qml/Wizard/Pages/10-welcome.qml:27
2474-<<<<<<< TREE
2475 msgid "Language"
2476 msgstr "Llingua"
2477
2478@@ -606,39 +507,9 @@
2479
2480 #: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
2481 #: qml/Wizard/Pages/sim.qml:101
2482-=======
2483-msgid "Hi!"
2484-msgstr "¡Hola!"
2485-
2486-#: qml/Wizard/Pages/10-welcome.qml:44
2487-msgid "Welcome to your Ubuntu device."
2488-msgstr ""
2489-
2490-#: qml/Wizard/Pages/10-welcome.qml:52
2491-msgid "Let’s get started."
2492-msgstr "Entamemos."
2493-
2494-#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
2495-#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
2496-#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
2497-#: qml/Wizard/Pages/passwd-set.qml:90
2498-msgid "Continue"
2499-msgstr "Siguir"
2500-
2501-#: qml/Wizard/Pages/20-sim.qml:25
2502-msgid "Add a SIM card and restart your device"
2503-msgstr "Amiesta una tarxeta SIM y reanicia'l to preséu"
2504-
2505-#: qml/Wizard/Pages/20-sim.qml:59
2506-msgid "Without it, you won’t be able to make calls or use text messaging."
2507-msgstr "Ensin ella, nun vas poder facer llamaes nin unviar mensaxes."
2508-
2509-#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
2510->>>>>>> MERGE-SOURCE
2511 msgid "Skip"
2512 msgstr "Saltar"
2513
2514-<<<<<<< TREE
2515 #: qml/Wizard/Pages/40-location.qml:27
2516 msgid "Location Services"
2517 msgstr ""
2518@@ -735,129 +606,6 @@
2519 msgstr "Primeros pasos"
2520
2521 #: qml/Wizard/Pages/here-terms.qml:25
2522-=======
2523-#: qml/Wizard/Pages/30-passwd-type.qml:39
2524-msgid "Lock security"
2525-msgstr "Seguranza del bloquéu"
2526-
2527-#: qml/Wizard/Pages/30-passwd-type.qml:79
2528-msgid "Please select how you’d like to unlock your device."
2529-msgstr ""
2530-
2531-#: qml/Wizard/Pages/30-passwd-type.qml:102
2532-msgctxt "Label: Type of security method"
2533-msgid "Swipe"
2534-msgstr "Eslizar"
2535-
2536-#: qml/Wizard/Pages/30-passwd-type.qml:103
2537-msgctxt "Label: Description of security method"
2538-msgid "No security"
2539-msgstr "Ensin seguranza"
2540-
2541-#: qml/Wizard/Pages/30-passwd-type.qml:105
2542-msgctxt "Label: Type of security method"
2543-msgid "Passcode"
2544-msgstr "Códigu de pasu"
2545-
2546-#: qml/Wizard/Pages/30-passwd-type.qml:106
2547-msgctxt "Label: Description of security method"
2548-msgid "4 digits only"
2549-msgstr "Namái 4 díxitos"
2550-
2551-#: qml/Wizard/Pages/30-passwd-type.qml:108
2552-msgctxt "Label: Type of security method"
2553-msgid "Passphrase"
2554-msgstr "Fras de pasu"
2555-
2556-#: qml/Wizard/Pages/30-passwd-type.qml:109
2557-msgctxt "Label: Description of security method"
2558-msgid "Numbers and letters"
2559-msgstr "Númberos y lletres"
2560-
2561-#: qml/Wizard/Pages/40-wifi.qml:29
2562-msgid "Connect to Wi‑Fi"
2563-msgstr "Coneutase al WiFi"
2564-
2565-#: qml/Wizard/Pages/40-wifi.qml:168
2566-msgid "Available networks…"
2567-msgstr "Redes disponibles..."
2568-
2569-#: qml/Wizard/Pages/40-wifi.qml:169
2570-msgid "No available networks."
2571-msgstr "Nun hai redes disponibles"
2572-
2573-#: qml/Wizard/Pages/50-location.qml:27
2574-msgid "Location"
2575-msgstr "Allugamientu"
2576-
2577-#: qml/Wizard/Pages/50-location.qml:62
2578-msgid "Let the phone detect your location:"
2579-msgstr "Dexar al teléfonu deteutar l'allugamientu:"
2580-
2581-#: qml/Wizard/Pages/50-location.qml:69
2582-msgid "Using GPS only (less accurate)"
2583-msgstr "Namái usando GPS (menos precisión)"
2584-
2585-#: qml/Wizard/Pages/50-location.qml:86
2586-msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
2587-msgstr ""
2588-"Usando GPS, Wi-fi anónimes ya información de redes móviles (aconseyao)"
2589-
2590-#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
2591-#: qml/Wizard/Pages/50-location.qml:103
2592-msgid ""
2593-"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
2594-"conditions</a>."
2595-msgstr ""
2596-"Esbillando esta opción aceutes los <a href='#'>términos y condiciones</a> de "
2597-"Nokia HERE."
2598-
2599-#: qml/Wizard/Pages/50-location.qml:112
2600-msgid "Not at all"
2601-msgstr "De nengún mou"
2602-
2603-#: qml/Wizard/Pages/50-location.qml:124
2604-msgid "You can change your mind later in <b>System Settings</b>."
2605-msgstr "Pues cambialo dempués n'<b>Axustes del sistema</b>."
2606-
2607-#: qml/Wizard/Pages/60-reporting.qml:26
2608-msgid "Improving your experience"
2609-msgstr "Ameyorando la to esperiencia"
2610-
2611-#: qml/Wizard/Pages/60-reporting.qml:46
2612-msgid ""
2613-"Your phone is set up to automatically report errors to Canonical and its "
2614-"partners, the makers of the operating system."
2615-msgstr ""
2616-"El teléfonu ta configuráu pa informar automáticamente de los fallos a "
2617-"Canonical y asociaos, los fabricantes del sistema operativu."
2618-
2619-#: qml/Wizard/Pages/60-reporting.qml:53
2620-msgid ""
2621-"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
2622-"Privacy</b>"
2623-msgstr ""
2624-"Esto pue deshabilitase nos <b>Axustes del sistema</b> en <b>Seguranza y "
2625-"privacidá</b>"
2626-
2627-#: qml/Wizard/Pages/80-finished.qml:24
2628-msgid "All done"
2629-msgstr "Too fecho"
2630-
2631-#: qml/Wizard/Pages/80-finished.qml:39
2632-msgid "Nice work!"
2633-msgstr "¡Bon trabayu!"
2634-
2635-#: qml/Wizard/Pages/80-finished.qml:46
2636-msgid "Your device is now ready to use."
2637-msgstr ""
2638-
2639-#: qml/Wizard/Pages/80-finished.qml:53
2640-msgid "Finish"
2641-msgstr "Finar"
2642-
2643-#: qml/Wizard/Pages/here-terms.qml:27
2644->>>>>>> MERGE-SOURCE
2645 msgid "Terms & Conditions"
2646 msgstr "Términos y condiciones"
2647
2648@@ -1172,7 +920,6 @@
2649 #~ msgid "Please re-enter"
2650 #~ msgstr "Por favor, reintroduzla"
2651
2652-<<<<<<< TREE
2653 #~ msgid "This action does different things for different apps"
2654 #~ msgstr "Esta aición fai coses distintes p'aplicaciones estremaes"
2655
2656@@ -1277,17 +1024,6 @@
2657 #~ msgid "Please try again."
2658 #~ msgstr "Por favor, vuelvi a intentalo."
2659
2660-=======
2661-#~ msgid "Please select how you’d like to unlock your phone."
2662-#~ msgstr "Por favor, esbilla como te prestaría desbloquiar el teléfonu."
2663-
2664-#~ msgid "Welcome to your Ubuntu phone."
2665-#~ msgstr "Bienllegáu/ada al to teléfonu d'Ubuntu"
2666-
2667-#~ msgid "Your phone is now ready to use."
2668-#~ msgstr "El teléfonu yá ta tresnáu pa usase."
2669-
2670->>>>>>> MERGE-SOURCE
2671 #~ msgid "%a %H:%M"
2672 #~ msgstr "%a %H:%M"
2673
2674
2675=== modified file 'po/az.po'
2676--- po/az.po 2016-04-28 10:49:18 +0000
2677+++ po/az.po 2016-04-27 06:03:19 +0000
2678@@ -7,11 +7,7 @@
2679 msgstr ""
2680 "Project-Id-Version: unity\n"
2681 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2682-<<<<<<< TREE
2683 "POT-Creation-Date: 2016-04-21 13:47+0000\n"
2684-=======
2685-"POT-Creation-Date: 2016-02-16 03:29+0000\n"
2686->>>>>>> MERGE-SOURCE
2687 "PO-Revision-Date: 2014-09-03 16:39+0000\n"
2688 "Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
2689 "Language-Team: Azerbaijani <az@li.org>\n"
2690@@ -19,13 +15,8 @@
2691 "Content-Type: text/plain; charset=UTF-8\n"
2692 "Content-Transfer-Encoding: 8bit\n"
2693 "Plural-Forms: nplurals=2; plural=n != 1;\n"
2694-<<<<<<< TREE
2695 "X-Launchpad-Export-Date: 2016-04-27 06:01+0000\n"
2696 "X-Generator: Launchpad (build 17995)\n"
2697-=======
2698-"X-Launchpad-Export-Date: 2016-02-23 06:03+0000\n"
2699-"X-Generator: Launchpad (build 17925)\n"
2700->>>>>>> MERGE-SOURCE
2701
2702 #: plugins/IntegratedLightDM/Greeter.cpp:112
2703 msgid "Password: "
2704@@ -187,7 +178,6 @@
2705 msgid "Add to Favorites"
2706 msgstr "Seçilmişlәrә әlavә et"
2707
2708-<<<<<<< TREE
2709 #: qml/Dash/FiltersPopover.qml:60
2710 msgid "Refine your results"
2711 msgstr ""
2712@@ -197,25 +187,14 @@
2713 msgstr ""
2714
2715 #: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
2716-=======
2717-#: qml/Dash/GenericScopeView.qml:587 qml/Dash/GenericScopeView.qml:745
2718->>>>>>> MERGE-SOURCE
2719 msgid "See less"
2720 msgstr "Daha azını gör"
2721
2722-<<<<<<< TREE
2723 #: qml/Dash/GenericScopeView.qml:570
2724-=======
2725-#: qml/Dash/GenericScopeView.qml:587
2726->>>>>>> MERGE-SOURCE
2727 msgid "See all"
2728 msgstr "Hamısını gör"
2729
2730-<<<<<<< TREE
2731 #: qml/Dash/GenericScopeView.qml:627
2732-=======
2733-#: qml/Dash/GenericScopeView.qml:649
2734->>>>>>> MERGE-SOURCE
2735 msgctxt "Label: Hint for dash search line edit"
2736 msgid "Search"
2737 msgstr ""
2738@@ -277,17 +256,10 @@
2739 msgid "Also installed"
2740 msgstr ""
2741
2742-<<<<<<< TREE
2743 #: qml/DisabledScreenNotice.qml:104
2744 msgid ""
2745 "Your device is now connected to an external display. Use this screen as a "
2746 "touch pad to interact with the pointer."
2747-=======
2748-#: qml/DisabledScreenNotice.qml:87
2749-msgid ""
2750-"Your device is now connected to an external display. Use this screen as a "
2751-"touch pad to interact with the mouse."
2752->>>>>>> MERGE-SOURCE
2753 msgstr ""
2754
2755 #: qml/Greeter/CoverPage.qml:118
2756@@ -502,7 +474,6 @@
2757 msgstr ""
2758
2759 #: qml/Wizard/Pages/10-welcome.qml:27
2760-<<<<<<< TREE
2761 msgid "Language"
2762 msgstr ""
2763
2764@@ -533,39 +504,9 @@
2765
2766 #: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
2767 #: qml/Wizard/Pages/sim.qml:101
2768-=======
2769-msgid "Hi!"
2770-msgstr ""
2771-
2772-#: qml/Wizard/Pages/10-welcome.qml:44
2773-msgid "Welcome to your Ubuntu device."
2774-msgstr ""
2775-
2776-#: qml/Wizard/Pages/10-welcome.qml:52
2777-msgid "Let’s get started."
2778-msgstr ""
2779-
2780-#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
2781-#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
2782-#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
2783-#: qml/Wizard/Pages/passwd-set.qml:90
2784-msgid "Continue"
2785-msgstr ""
2786-
2787-#: qml/Wizard/Pages/20-sim.qml:25
2788-msgid "Add a SIM card and restart your device"
2789-msgstr ""
2790-
2791-#: qml/Wizard/Pages/20-sim.qml:59
2792-msgid "Without it, you won’t be able to make calls or use text messaging."
2793-msgstr ""
2794-
2795-#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
2796->>>>>>> MERGE-SOURCE
2797 msgid "Skip"
2798 msgstr ""
2799
2800-<<<<<<< TREE
2801 #: qml/Wizard/Pages/40-location.qml:27
2802 msgid "Location Services"
2803 msgstr ""
2804@@ -662,122 +603,6 @@
2805 msgstr ""
2806
2807 #: qml/Wizard/Pages/here-terms.qml:25
2808-=======
2809-#: qml/Wizard/Pages/30-passwd-type.qml:39
2810-msgid "Lock security"
2811-msgstr ""
2812-
2813-#: qml/Wizard/Pages/30-passwd-type.qml:79
2814-msgid "Please select how you’d like to unlock your device."
2815-msgstr ""
2816-
2817-#: qml/Wizard/Pages/30-passwd-type.qml:102
2818-msgctxt "Label: Type of security method"
2819-msgid "Swipe"
2820-msgstr ""
2821-
2822-#: qml/Wizard/Pages/30-passwd-type.qml:103
2823-msgctxt "Label: Description of security method"
2824-msgid "No security"
2825-msgstr ""
2826-
2827-#: qml/Wizard/Pages/30-passwd-type.qml:105
2828-msgctxt "Label: Type of security method"
2829-msgid "Passcode"
2830-msgstr ""
2831-
2832-#: qml/Wizard/Pages/30-passwd-type.qml:106
2833-msgctxt "Label: Description of security method"
2834-msgid "4 digits only"
2835-msgstr ""
2836-
2837-#: qml/Wizard/Pages/30-passwd-type.qml:108
2838-msgctxt "Label: Type of security method"
2839-msgid "Passphrase"
2840-msgstr ""
2841-
2842-#: qml/Wizard/Pages/30-passwd-type.qml:109
2843-msgctxt "Label: Description of security method"
2844-msgid "Numbers and letters"
2845-msgstr ""
2846-
2847-#: qml/Wizard/Pages/40-wifi.qml:29
2848-msgid "Connect to Wi‑Fi"
2849-msgstr ""
2850-
2851-#: qml/Wizard/Pages/40-wifi.qml:168
2852-msgid "Available networks…"
2853-msgstr ""
2854-
2855-#: qml/Wizard/Pages/40-wifi.qml:169
2856-msgid "No available networks."
2857-msgstr ""
2858-
2859-#: qml/Wizard/Pages/50-location.qml:27
2860-msgid "Location"
2861-msgstr ""
2862-
2863-#: qml/Wizard/Pages/50-location.qml:62
2864-msgid "Let the phone detect your location:"
2865-msgstr ""
2866-
2867-#: qml/Wizard/Pages/50-location.qml:69
2868-msgid "Using GPS only (less accurate)"
2869-msgstr ""
2870-
2871-#: qml/Wizard/Pages/50-location.qml:86
2872-msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
2873-msgstr ""
2874-
2875-#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
2876-#: qml/Wizard/Pages/50-location.qml:103
2877-msgid ""
2878-"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
2879-"conditions</a>."
2880-msgstr ""
2881-
2882-#: qml/Wizard/Pages/50-location.qml:112
2883-msgid "Not at all"
2884-msgstr ""
2885-
2886-#: qml/Wizard/Pages/50-location.qml:124
2887-msgid "You can change your mind later in <b>System Settings</b>."
2888-msgstr ""
2889-
2890-#: qml/Wizard/Pages/60-reporting.qml:26
2891-msgid "Improving your experience"
2892-msgstr ""
2893-
2894-#: qml/Wizard/Pages/60-reporting.qml:46
2895-msgid ""
2896-"Your phone is set up to automatically report errors to Canonical and its "
2897-"partners, the makers of the operating system."
2898-msgstr ""
2899-
2900-#: qml/Wizard/Pages/60-reporting.qml:53
2901-msgid ""
2902-"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
2903-"Privacy</b>"
2904-msgstr ""
2905-
2906-#: qml/Wizard/Pages/80-finished.qml:24
2907-msgid "All done"
2908-msgstr ""
2909-
2910-#: qml/Wizard/Pages/80-finished.qml:39
2911-msgid "Nice work!"
2912-msgstr ""
2913-
2914-#: qml/Wizard/Pages/80-finished.qml:46
2915-msgid "Your device is now ready to use."
2916-msgstr ""
2917-
2918-#: qml/Wizard/Pages/80-finished.qml:53
2919-msgid "Finish"
2920-msgstr ""
2921-
2922-#: qml/Wizard/Pages/here-terms.qml:27
2923->>>>>>> MERGE-SOURCE
2924 msgid "Terms & Conditions"
2925 msgstr ""
2926
2927
2928=== modified file 'po/be.po'
2929--- po/be.po 2016-04-28 10:49:18 +0000
2930+++ po/be.po 2016-04-27 06:03:19 +0000
2931@@ -7,11 +7,7 @@
2932 msgstr ""
2933 "Project-Id-Version: unity8\n"
2934 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2935-<<<<<<< TREE
2936 "POT-Creation-Date: 2016-04-21 13:47+0000\n"
2937-=======
2938-"POT-Creation-Date: 2016-02-16 03:29+0000\n"
2939->>>>>>> MERGE-SOURCE
2940 "PO-Revision-Date: 2015-12-13 13:12+0000\n"
2941 "Last-Translator: Mikhail_SaTuRn <mikhail_saturn@tut.by>\n"
2942 "Language-Team: Belarusian <be@li.org>\n"
2943@@ -20,13 +16,8 @@
2944 "Content-Transfer-Encoding: 8bit\n"
2945 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
2946 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
2947-<<<<<<< TREE
2948 "X-Launchpad-Export-Date: 2016-04-27 06:01+0000\n"
2949 "X-Generator: Launchpad (build 17995)\n"
2950-=======
2951-"X-Launchpad-Export-Date: 2016-02-23 06:03+0000\n"
2952-"X-Generator: Launchpad (build 17925)\n"
2953->>>>>>> MERGE-SOURCE
2954
2955 #: plugins/IntegratedLightDM/Greeter.cpp:112
2956 msgid "Password: "
2957@@ -194,7 +185,6 @@
2958 msgid "Add to Favorites"
2959 msgstr "Дадаць да абранага"
2960
2961-<<<<<<< TREE
2962 #: qml/Dash/FiltersPopover.qml:60
2963 msgid "Refine your results"
2964 msgstr ""
2965@@ -204,25 +194,14 @@
2966 msgstr ""
2967
2968 #: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
2969-=======
2970-#: qml/Dash/GenericScopeView.qml:587 qml/Dash/GenericScopeView.qml:745
2971->>>>>>> MERGE-SOURCE
2972 msgid "See less"
2973 msgstr "Карацей"
2974
2975-<<<<<<< TREE
2976 #: qml/Dash/GenericScopeView.qml:570
2977-=======
2978-#: qml/Dash/GenericScopeView.qml:587
2979->>>>>>> MERGE-SOURCE
2980 msgid "See all"
2981 msgstr "Больш падрабязна"
2982
2983-<<<<<<< TREE
2984 #: qml/Dash/GenericScopeView.qml:627
2985-=======
2986-#: qml/Dash/GenericScopeView.qml:649
2987->>>>>>> MERGE-SOURCE
2988 msgctxt "Label: Hint for dash search line edit"
2989 msgid "Search"
2990 msgstr "Пошук"
2991@@ -284,19 +263,11 @@
2992 msgid "Also installed"
2993 msgstr "Таксама ўсталявана"
2994
2995-<<<<<<< TREE
2996 #: qml/DisabledScreenNotice.qml:104
2997 msgid ""
2998 "Your device is now connected to an external display. Use this screen as a "
2999 "touch pad to interact with the pointer."
3000 msgstr ""
3001-=======
3002-#: qml/DisabledScreenNotice.qml:87
3003-msgid ""
3004-"Your device is now connected to an external display. Use this screen as a "
3005-"touch pad to interact with the mouse."
3006-msgstr ""
3007->>>>>>> MERGE-SOURCE
3008
3009 #: qml/Greeter/CoverPage.qml:118
3010 msgid "Unlock"
3011@@ -513,7 +484,6 @@
3012 msgstr "Вярнуцца"
3013
3014 #: qml/Wizard/Pages/10-welcome.qml:27
3015-<<<<<<< TREE
3016 msgid "Language"
3017 msgstr ""
3018
3019@@ -544,39 +514,9 @@
3020
3021 #: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
3022 #: qml/Wizard/Pages/sim.qml:101
3023-=======
3024-msgid "Hi!"
3025-msgstr "Вітай!"
3026-
3027-#: qml/Wizard/Pages/10-welcome.qml:44
3028-msgid "Welcome to your Ubuntu device."
3029-msgstr ""
3030-
3031-#: qml/Wizard/Pages/10-welcome.qml:52
3032-msgid "Let’s get started."
3033-msgstr "Пачнем."
3034-
3035-#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
3036-#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
3037-#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
3038-#: qml/Wizard/Pages/passwd-set.qml:90
3039-msgid "Continue"
3040-msgstr "Працягнуць"
3041-
3042-#: qml/Wizard/Pages/20-sim.qml:25
3043-msgid "Add a SIM card and restart your device"
3044-msgstr "Дадайце SIM-карту і перазагрузіце Вашую прыладу"
3045-
3046-#: qml/Wizard/Pages/20-sim.qml:59
3047-msgid "Without it, you won’t be able to make calls or use text messaging."
3048-msgstr "Без яе Вы не зможаце тэлефанаваць ці адпраўляць паведамленні."
3049-
3050-#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
3051->>>>>>> MERGE-SOURCE
3052 msgid "Skip"
3053 msgstr "Прапусціць"
3054
3055-<<<<<<< TREE
3056 #: qml/Wizard/Pages/40-location.qml:27
3057 msgid "Location Services"
3058 msgstr ""
3059@@ -673,129 +613,6 @@
3060 msgstr ""
3061
3062 #: qml/Wizard/Pages/here-terms.qml:25
3063-=======
3064-#: qml/Wizard/Pages/30-passwd-type.qml:39
3065-msgid "Lock security"
3066-msgstr "Блакіроўка"
3067-
3068-#: qml/Wizard/Pages/30-passwd-type.qml:79
3069-msgid "Please select how you’d like to unlock your device."
3070-msgstr ""
3071-
3072-#: qml/Wizard/Pages/30-passwd-type.qml:102
3073-msgctxt "Label: Type of security method"
3074-msgid "Swipe"
3075-msgstr "Рух"
3076-
3077-#: qml/Wizard/Pages/30-passwd-type.qml:103
3078-msgctxt "Label: Description of security method"
3079-msgid "No security"
3080-msgstr "Без бяспекі"
3081-
3082-#: qml/Wizard/Pages/30-passwd-type.qml:105
3083-msgctxt "Label: Type of security method"
3084-msgid "Passcode"
3085-msgstr "Код-пароль"
3086-
3087-#: qml/Wizard/Pages/30-passwd-type.qml:106
3088-msgctxt "Label: Description of security method"
3089-msgid "4 digits only"
3090-msgstr "Толькі 4 лічбы"
3091-
3092-#: qml/Wizard/Pages/30-passwd-type.qml:108
3093-msgctxt "Label: Type of security method"
3094-msgid "Passphrase"
3095-msgstr "Пароль"
3096-
3097-#: qml/Wizard/Pages/30-passwd-type.qml:109
3098-msgctxt "Label: Description of security method"
3099-msgid "Numbers and letters"
3100-msgstr "Літары і лічбы"
3101-
3102-#: qml/Wizard/Pages/40-wifi.qml:29
3103-msgid "Connect to Wi‑Fi"
3104-msgstr "Злучыцца з Wi-Fi"
3105-
3106-#: qml/Wizard/Pages/40-wifi.qml:168
3107-msgid "Available networks…"
3108-msgstr "Даступныя сеткі..."
3109-
3110-#: qml/Wizard/Pages/40-wifi.qml:169
3111-msgid "No available networks."
3112-msgstr "Няма даступных сетак."
3113-
3114-#: qml/Wizard/Pages/50-location.qml:27
3115-msgid "Location"
3116-msgstr "Месца"
3117-
3118-#: qml/Wizard/Pages/50-location.qml:62
3119-msgid "Let the phone detect your location:"
3120-msgstr "Дазволіць тэлефону вызначаць месцазнаходжанне:"
3121-
3122-#: qml/Wizard/Pages/50-location.qml:69
3123-msgid "Using GPS only (less accurate)"
3124-msgstr "З дапамогай толькі GPS (найменш дакладна)"
3125-
3126-#: qml/Wizard/Pages/50-location.qml:86
3127-msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
3128-msgstr ""
3129-"На аснове GPS, ананімізаванага Wi-Fi і дадзеных сотавай сеткі (рэкамендуецца)"
3130-
3131-#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
3132-#: qml/Wizard/Pages/50-location.qml:103
3133-msgid ""
3134-"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
3135-"conditions</a>."
3136-msgstr ""
3137-"Выбарам гэтага варыянту дзеянняў вы згаджаецеся з <a href='#'> умовамі "
3138-"прадстаўлення паслуг Nokia HERE</a>."
3139-
3140-#: qml/Wizard/Pages/50-location.qml:112
3141-msgid "Not at all"
3142-msgstr "Не дазваляць"
3143-
3144-#: qml/Wizard/Pages/50-location.qml:124
3145-msgid "You can change your mind later in <b>System Settings</b>."
3146-msgstr "Пасля змяніць налады можна з дапамогай <b>Сістэмных наладкаў</b>."
3147-
3148-#: qml/Wizard/Pages/60-reporting.qml:26
3149-msgid "Improving your experience"
3150-msgstr "Спрашчэнне вашай працы"
3151-
3152-#: qml/Wizard/Pages/60-reporting.qml:46
3153-msgid ""
3154-"Your phone is set up to automatically report errors to Canonical and its "
3155-"partners, the makers of the operating system."
3156-msgstr ""
3157-"Ваш тэлефон настроены на аўтаматычную адпраўку справаздач пра памылкі ў "
3158-"Canonical і партнёрскія установы, вытворцам аперацыйнай сістэмы."
3159-
3160-#: qml/Wizard/Pages/60-reporting.qml:53
3161-msgid ""
3162-"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
3163-"Privacy</b>"
3164-msgstr ""
3165-"Гэтае можна адключыць у <b>Сістэмных наладках</b>, дзе <b>Бяспека &amp; "
3166-"канфедэнцыйнасці</b>"
3167-
3168-#: qml/Wizard/Pages/80-finished.qml:24
3169-msgid "All done"
3170-msgstr "Зроблена"
3171-
3172-#: qml/Wizard/Pages/80-finished.qml:39
3173-msgid "Nice work!"
3174-msgstr "Выдатная праца!"
3175-
3176-#: qml/Wizard/Pages/80-finished.qml:46
3177-msgid "Your device is now ready to use."
3178-msgstr ""
3179-
3180-#: qml/Wizard/Pages/80-finished.qml:53
3181-msgid "Finish"
3182-msgstr "Скончыць"
3183-
3184-#: qml/Wizard/Pages/here-terms.qml:27
3185->>>>>>> MERGE-SOURCE
3186 msgid "Terms & Conditions"
3187 msgstr "Умовы карыстання"
3188
3189@@ -1003,7 +820,6 @@
3190 #~ msgid "Store"
3191 #~ msgstr "Крама"
3192
3193-<<<<<<< TREE
3194 #~ msgid "Add a SIM card and restart your device"
3195 #~ msgstr "Дадайце SIM-карту і перазагрузіце Вашую прыладу"
3196
3197@@ -1086,19 +902,6 @@
3198
3199 #~ msgid "Please try again."
3200 #~ msgstr "Калі ласка, паспрабуйце яшчэ раз."
3201-=======
3202-#~ msgid "Welcome to your Ubuntu phone."
3203-#~ msgstr "Вітаем Вас у сістэме тэлефона Ubuntu."
3204-
3205-#~ msgid "Please select how you’d like to unlock your phone."
3206-#~ msgstr "Калі ласка, абярыце спосаб разблакавання тэлефона."
3207-
3208-#~ msgid "Your phone is now ready to use."
3209-#~ msgstr "Цяпер Вашым тэлефонам можна карыстацца."
3210-
3211-#~ msgid "Restart"
3212-#~ msgstr "Перазапусціць"
3213->>>>>>> MERGE-SOURCE
3214
3215 #~ msgid "Close"
3216 #~ msgstr "Закрыць"
3217
3218=== modified file 'po/bg.po'
3219--- po/bg.po 2016-04-28 10:49:18 +0000
3220+++ po/bg.po 2016-04-27 06:03:19 +0000
3221@@ -7,11 +7,7 @@
3222 msgstr ""
3223 "Project-Id-Version: unity\n"
3224 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3225-<<<<<<< TREE
3226 "POT-Creation-Date: 2016-04-21 13:47+0000\n"
3227-=======
3228-"POT-Creation-Date: 2016-02-16 03:29+0000\n"
3229->>>>>>> MERGE-SOURCE
3230 "PO-Revision-Date: 2015-04-12 14:43+0000\n"
3231 "Last-Translator: George Karavasilev <kokoto-java@ubuntu.com>\n"
3232 "Language-Team: Bulgarian <bg@li.org>\n"
3233@@ -19,13 +15,8 @@
3234 "Content-Type: text/plain; charset=UTF-8\n"
3235 "Content-Transfer-Encoding: 8bit\n"
3236 "Plural-Forms: nplurals=2; plural=n != 1;\n"
3237-<<<<<<< TREE
3238 "X-Launchpad-Export-Date: 2016-04-27 06:02+0000\n"
3239 "X-Generator: Launchpad (build 17995)\n"
3240-=======
3241-"X-Launchpad-Export-Date: 2016-02-23 06:03+0000\n"
3242-"X-Generator: Launchpad (build 17925)\n"
3243->>>>>>> MERGE-SOURCE
3244
3245 #: plugins/IntegratedLightDM/Greeter.cpp:112
3246 msgid "Password: "
3247@@ -189,7 +180,6 @@
3248 msgid "Add to Favorites"
3249 msgstr ""
3250
3251-<<<<<<< TREE
3252 #: qml/Dash/FiltersPopover.qml:60
3253 msgid "Refine your results"
3254 msgstr ""
3255@@ -199,25 +189,14 @@
3256 msgstr ""
3257
3258 #: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
3259-=======
3260-#: qml/Dash/GenericScopeView.qml:587 qml/Dash/GenericScopeView.qml:745
3261->>>>>>> MERGE-SOURCE
3262 msgid "See less"
3263 msgstr ""
3264
3265-<<<<<<< TREE
3266 #: qml/Dash/GenericScopeView.qml:570
3267-=======
3268-#: qml/Dash/GenericScopeView.qml:587
3269->>>>>>> MERGE-SOURCE
3270 msgid "See all"
3271 msgstr ""
3272
3273-<<<<<<< TREE
3274 #: qml/Dash/GenericScopeView.qml:627
3275-=======
3276-#: qml/Dash/GenericScopeView.qml:649
3277->>>>>>> MERGE-SOURCE
3278 msgctxt "Label: Hint for dash search line edit"
3279 msgid "Search"
3280 msgstr ""
3281@@ -279,17 +258,10 @@
3282 msgid "Also installed"
3283 msgstr ""
3284
3285-<<<<<<< TREE
3286 #: qml/DisabledScreenNotice.qml:104
3287 msgid ""
3288 "Your device is now connected to an external display. Use this screen as a "
3289 "touch pad to interact with the pointer."
3290-=======
3291-#: qml/DisabledScreenNotice.qml:87
3292-msgid ""
3293-"Your device is now connected to an external display. Use this screen as a "
3294-"touch pad to interact with the mouse."
3295->>>>>>> MERGE-SOURCE
3296 msgstr ""
3297
3298 #: qml/Greeter/CoverPage.qml:118
3299@@ -500,7 +472,6 @@
3300 msgstr ""
3301
3302 #: qml/Wizard/Pages/10-welcome.qml:27
3303-<<<<<<< TREE
3304 msgid "Language"
3305 msgstr ""
3306
3307@@ -531,39 +502,9 @@
3308
3309 #: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
3310 #: qml/Wizard/Pages/sim.qml:101
3311-=======
3312-msgid "Hi!"
3313-msgstr ""
3314-
3315-#: qml/Wizard/Pages/10-welcome.qml:44
3316-msgid "Welcome to your Ubuntu device."
3317-msgstr ""
3318-
3319-#: qml/Wizard/Pages/10-welcome.qml:52
3320-msgid "Let’s get started."
3321-msgstr ""
3322-
3323-#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
3324-#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
3325-#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
3326-#: qml/Wizard/Pages/passwd-set.qml:90
3327-msgid "Continue"
3328-msgstr ""
3329-
3330-#: qml/Wizard/Pages/20-sim.qml:25
3331-msgid "Add a SIM card and restart your device"
3332-msgstr ""
3333-
3334-#: qml/Wizard/Pages/20-sim.qml:59
3335-msgid "Without it, you won’t be able to make calls or use text messaging."
3336-msgstr ""
3337-
3338-#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
3339->>>>>>> MERGE-SOURCE
3340 msgid "Skip"
3341 msgstr ""
3342
3343-<<<<<<< TREE
3344 #: qml/Wizard/Pages/40-location.qml:27
3345 msgid "Location Services"
3346 msgstr ""
3347@@ -660,122 +601,6 @@
3348 msgstr ""
3349
3350 #: qml/Wizard/Pages/here-terms.qml:25
3351-=======
3352-#: qml/Wizard/Pages/30-passwd-type.qml:39
3353-msgid "Lock security"
3354-msgstr ""
3355-
3356-#: qml/Wizard/Pages/30-passwd-type.qml:79
3357-msgid "Please select how you’d like to unlock your device."
3358-msgstr ""
3359-
3360-#: qml/Wizard/Pages/30-passwd-type.qml:102
3361-msgctxt "Label: Type of security method"
3362-msgid "Swipe"
3363-msgstr ""
3364-
3365-#: qml/Wizard/Pages/30-passwd-type.qml:103
3366-msgctxt "Label: Description of security method"
3367-msgid "No security"
3368-msgstr ""
3369-
3370-#: qml/Wizard/Pages/30-passwd-type.qml:105
3371-msgctxt "Label: Type of security method"
3372-msgid "Passcode"
3373-msgstr ""
3374-
3375-#: qml/Wizard/Pages/30-passwd-type.qml:106
3376-msgctxt "Label: Description of security method"
3377-msgid "4 digits only"
3378-msgstr ""
3379-
3380-#: qml/Wizard/Pages/30-passwd-type.qml:108
3381-msgctxt "Label: Type of security method"
3382-msgid "Passphrase"
3383-msgstr ""
3384-
3385-#: qml/Wizard/Pages/30-passwd-type.qml:109
3386-msgctxt "Label: Description of security method"
3387-msgid "Numbers and letters"
3388-msgstr ""
3389-
3390-#: qml/Wizard/Pages/40-wifi.qml:29
3391-msgid "Connect to Wi‑Fi"
3392-msgstr ""
3393-
3394-#: qml/Wizard/Pages/40-wifi.qml:168
3395-msgid "Available networks…"
3396-msgstr ""
3397-
3398-#: qml/Wizard/Pages/40-wifi.qml:169
3399-msgid "No available networks."
3400-msgstr ""
3401-
3402-#: qml/Wizard/Pages/50-location.qml:27
3403-msgid "Location"
3404-msgstr ""
3405-
3406-#: qml/Wizard/Pages/50-location.qml:62
3407-msgid "Let the phone detect your location:"
3408-msgstr ""
3409-
3410-#: qml/Wizard/Pages/50-location.qml:69
3411-msgid "Using GPS only (less accurate)"
3412-msgstr ""
3413-
3414-#: qml/Wizard/Pages/50-location.qml:86
3415-msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
3416-msgstr ""
3417-
3418-#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
3419-#: qml/Wizard/Pages/50-location.qml:103
3420-msgid ""
3421-"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
3422-"conditions</a>."
3423-msgstr ""
3424-
3425-#: qml/Wizard/Pages/50-location.qml:112
3426-msgid "Not at all"
3427-msgstr ""
3428-
3429-#: qml/Wizard/Pages/50-location.qml:124
3430-msgid "You can change your mind later in <b>System Settings</b>."
3431-msgstr ""
3432-
3433-#: qml/Wizard/Pages/60-reporting.qml:26
3434-msgid "Improving your experience"
3435-msgstr ""
3436-
3437-#: qml/Wizard/Pages/60-reporting.qml:46
3438-msgid ""
3439-"Your phone is set up to automatically report errors to Canonical and its "
3440-"partners, the makers of the operating system."
3441-msgstr ""
3442-
3443-#: qml/Wizard/Pages/60-reporting.qml:53
3444-msgid ""
3445-"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
3446-"Privacy</b>"
3447-msgstr ""
3448-
3449-#: qml/Wizard/Pages/80-finished.qml:24
3450-msgid "All done"
3451-msgstr ""
3452-
3453-#: qml/Wizard/Pages/80-finished.qml:39
3454-msgid "Nice work!"
3455-msgstr ""
3456-
3457-#: qml/Wizard/Pages/80-finished.qml:46
3458-msgid "Your device is now ready to use."
3459-msgstr ""
3460-
3461-#: qml/Wizard/Pages/80-finished.qml:53
3462-msgid "Finish"
3463-msgstr ""
3464-
3465-#: qml/Wizard/Pages/here-terms.qml:27
3466->>>>>>> MERGE-SOURCE
3467 msgid "Terms & Conditions"
3468 msgstr ""
3469
3470
3471=== modified file 'po/bn.po'
3472--- po/bn.po 2016-04-28 10:49:18 +0000
3473+++ po/bn.po 2016-04-27 06:03:19 +0000
3474@@ -7,11 +7,7 @@
3475 msgstr ""
3476 "Project-Id-Version: unity8\n"
3477 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3478-<<<<<<< TREE
3479 "POT-Creation-Date: 2016-04-21 13:47+0000\n"
3480-=======
3481-"POT-Creation-Date: 2016-02-16 03:29+0000\n"
3482->>>>>>> MERGE-SOURCE
3483 "PO-Revision-Date: 2015-11-27 19:38+0000\n"
3484 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
3485 "Language-Team: Bengali <bn@li.org>\n"
3486@@ -19,13 +15,8 @@
3487 "Content-Type: text/plain; charset=UTF-8\n"
3488 "Content-Transfer-Encoding: 8bit\n"
3489 "Plural-Forms: nplurals=2; plural=n != 1;\n"
3490-<<<<<<< TREE
3491 "X-Launchpad-Export-Date: 2016-04-27 06:01+0000\n"
3492 "X-Generator: Launchpad (build 17995)\n"
3493-=======
3494-"X-Launchpad-Export-Date: 2016-02-23 06:03+0000\n"
3495-"X-Generator: Launchpad (build 17925)\n"
3496->>>>>>> MERGE-SOURCE
3497
3498 #: plugins/IntegratedLightDM/Greeter.cpp:112
3499 msgid "Password: "
3500@@ -189,7 +180,6 @@
3501 msgid "Add to Favorites"
3502 msgstr "পছন্দতে যোগ করুন"
3503
3504-<<<<<<< TREE
3505 #: qml/Dash/FiltersPopover.qml:60
3506 msgid "Refine your results"
3507 msgstr ""
3508@@ -199,25 +189,14 @@
3509 msgstr ""
3510
3511 #: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
3512-=======
3513-#: qml/Dash/GenericScopeView.qml:587 qml/Dash/GenericScopeView.qml:745
3514->>>>>>> MERGE-SOURCE
3515 msgid "See less"
3516 msgstr "কম দেখুন"
3517
3518-<<<<<<< TREE
3519 #: qml/Dash/GenericScopeView.qml:570
3520-=======
3521-#: qml/Dash/GenericScopeView.qml:587
3522->>>>>>> MERGE-SOURCE
3523 msgid "See all"
3524 msgstr "সব দেখুন"
3525
3526-<<<<<<< TREE
3527 #: qml/Dash/GenericScopeView.qml:627
3528-=======
3529-#: qml/Dash/GenericScopeView.qml:649
3530->>>>>>> MERGE-SOURCE
3531 msgctxt "Label: Hint for dash search line edit"
3532 msgid "Search"
3533 msgstr "খুঁজুন"
3534@@ -279,19 +258,11 @@
3535 msgid "Also installed"
3536 msgstr "আরও ইন্সটল করা রয়েছে..."
3537
3538-<<<<<<< TREE
3539 #: qml/DisabledScreenNotice.qml:104
3540 msgid ""
3541 "Your device is now connected to an external display. Use this screen as a "
3542 "touch pad to interact with the pointer."
3543 msgstr ""
3544-=======
3545-#: qml/DisabledScreenNotice.qml:87
3546-msgid ""
3547-"Your device is now connected to an external display. Use this screen as a "
3548-"touch pad to interact with the mouse."
3549-msgstr ""
3550->>>>>>> MERGE-SOURCE
3551
3552 #: qml/Greeter/CoverPage.qml:118
3553 msgid "Unlock"
3554@@ -502,7 +473,6 @@
3555 msgstr ""
3556
3557 #: qml/Wizard/Pages/10-welcome.qml:27
3558-<<<<<<< TREE
3559 msgid "Language"
3560 msgstr ""
3561
3562@@ -533,39 +503,9 @@
3563
3564 #: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
3565 #: qml/Wizard/Pages/sim.qml:101
3566-=======
3567-msgid "Hi!"
3568-msgstr ""
3569-
3570-#: qml/Wizard/Pages/10-welcome.qml:44
3571-msgid "Welcome to your Ubuntu device."
3572-msgstr ""
3573-
3574-#: qml/Wizard/Pages/10-welcome.qml:52
3575-msgid "Let’s get started."
3576-msgstr "আসুন শুরু করা যাক।"
3577-
3578-#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
3579-#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
3580-#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
3581-#: qml/Wizard/Pages/passwd-set.qml:90
3582-msgid "Continue"
3583-msgstr "পরবর্তী"
3584-
3585-#: qml/Wizard/Pages/20-sim.qml:25
3586-msgid "Add a SIM card and restart your device"
3587-msgstr "সিম কার্ড যোগ করুন এবং ফোন পুনরায় চালু করুন।"
3588-
3589-#: qml/Wizard/Pages/20-sim.qml:59
3590-msgid "Without it, you won’t be able to make calls or use text messaging."
3591-msgstr "এটি ছাড়া, আপনি ফোন কল বা টেক্সট মেসেজ ব্যবহার করতে পারবেন না।"
3592-
3593-#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
3594->>>>>>> MERGE-SOURCE
3595 msgid "Skip"
3596 msgstr "এড়িয়ে যান"
3597
3598-<<<<<<< TREE
3599 #: qml/Wizard/Pages/40-location.qml:27
3600 msgid "Location Services"
3601 msgstr ""
3602@@ -662,122 +602,6 @@
3603 msgstr ""
3604
3605 #: qml/Wizard/Pages/here-terms.qml:25
3606-=======
3607-#: qml/Wizard/Pages/30-passwd-type.qml:39
3608-msgid "Lock security"
3609-msgstr "নিরাপত্তা লক"
3610-
3611-#: qml/Wizard/Pages/30-passwd-type.qml:79
3612-msgid "Please select how you’d like to unlock your device."
3613-msgstr ""
3614-
3615-#: qml/Wizard/Pages/30-passwd-type.qml:102
3616-msgctxt "Label: Type of security method"
3617-msgid "Swipe"
3618-msgstr ""
3619-
3620-#: qml/Wizard/Pages/30-passwd-type.qml:103
3621-msgctxt "Label: Description of security method"
3622-msgid "No security"
3623-msgstr "কোন নিরাপত্তা নেই"
3624-
3625-#: qml/Wizard/Pages/30-passwd-type.qml:105
3626-msgctxt "Label: Type of security method"
3627-msgid "Passcode"
3628-msgstr "পাসকোড"
3629-
3630-#: qml/Wizard/Pages/30-passwd-type.qml:106
3631-msgctxt "Label: Description of security method"
3632-msgid "4 digits only"
3633-msgstr "কেবল মাত্র ৪টি সংখ্যা"
3634-
3635-#: qml/Wizard/Pages/30-passwd-type.qml:108
3636-msgctxt "Label: Type of security method"
3637-msgid "Passphrase"
3638-msgstr ""
3639-
3640-#: qml/Wizard/Pages/30-passwd-type.qml:109
3641-msgctxt "Label: Description of security method"
3642-msgid "Numbers and letters"
3643-msgstr ""
3644-
3645-#: qml/Wizard/Pages/40-wifi.qml:29
3646-msgid "Connect to Wi‑Fi"
3647-msgstr ""
3648-
3649-#: qml/Wizard/Pages/40-wifi.qml:168
3650-msgid "Available networks…"
3651-msgstr ""
3652-
3653-#: qml/Wizard/Pages/40-wifi.qml:169
3654-msgid "No available networks."
3655-msgstr ""
3656-
3657-#: qml/Wizard/Pages/50-location.qml:27
3658-msgid "Location"
3659-msgstr ""
3660-
3661-#: qml/Wizard/Pages/50-location.qml:62
3662-msgid "Let the phone detect your location:"
3663-msgstr ""
3664-
3665-#: qml/Wizard/Pages/50-location.qml:69
3666-msgid "Using GPS only (less accurate)"
3667-msgstr ""
3668-
3669-#: qml/Wizard/Pages/50-location.qml:86
3670-msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
3671-msgstr ""
3672-
3673-#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
3674-#: qml/Wizard/Pages/50-location.qml:103
3675-msgid ""
3676-"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
3677-"conditions</a>."
3678-msgstr ""
3679-
3680-#: qml/Wizard/Pages/50-location.qml:112
3681-msgid "Not at all"
3682-msgstr ""
3683-
3684-#: qml/Wizard/Pages/50-location.qml:124
3685-msgid "You can change your mind later in <b>System Settings</b>."
3686-msgstr ""
3687-
3688-#: qml/Wizard/Pages/60-reporting.qml:26
3689-msgid "Improving your experience"
3690-msgstr ""
3691-
3692-#: qml/Wizard/Pages/60-reporting.qml:46
3693-msgid ""
3694-"Your phone is set up to automatically report errors to Canonical and its "
3695-"partners, the makers of the operating system."
3696-msgstr ""
3697-
3698-#: qml/Wizard/Pages/60-reporting.qml:53
3699-msgid ""
3700-"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
3701-"Privacy</b>"
3702-msgstr ""
3703-
3704-#: qml/Wizard/Pages/80-finished.qml:24
3705-msgid "All done"
3706-msgstr ""
3707-
3708-#: qml/Wizard/Pages/80-finished.qml:39
3709-msgid "Nice work!"
3710-msgstr ""
3711-
3712-#: qml/Wizard/Pages/80-finished.qml:46
3713-msgid "Your device is now ready to use."
3714-msgstr ""
3715-
3716-#: qml/Wizard/Pages/80-finished.qml:53
3717-msgid "Finish"
3718-msgstr ""
3719-
3720-#: qml/Wizard/Pages/here-terms.qml:27
3721->>>>>>> MERGE-SOURCE
3722 msgid "Terms & Conditions"
3723 msgstr ""
3724
3725@@ -956,9 +780,6 @@
3726 #~ msgid "No security"
3727 #~ msgstr "কোন নিরাপত্তা নেই"
3728
3729-#~ msgid "Welcome to your Ubuntu phone."
3730-#~ msgstr "আপনার উবুন্টু ফোনে স্বাগতম।"
3731-
3732 #~ msgid "Log out"
3733 #~ msgstr "লগ অাউট"
3734
3735@@ -1024,7 +845,6 @@
3736
3737 #~ msgid "Please re-enter"
3738 #~ msgstr "অনুগ্রহ করে আবার লিখুন"
3739-<<<<<<< TREE
3740
3741 #~ msgctxt "Button: Shut down the system"
3742 #~ msgid "Shut down"
3743@@ -1052,8 +872,3 @@
3744
3745 #~ msgid "Continue"
3746 #~ msgstr "পরবর্তী"
3747-=======
3748-
3749-#~ msgid "Please select how you’d like to unlock your phone."
3750-#~ msgstr "আপনি কিভাবে ফোনের লক খুলতে চান তা নির্ধারণ করুন।"
3751->>>>>>> MERGE-SOURCE
3752
3753=== modified file 'po/br.po'
3754--- po/br.po 2016-04-28 10:49:18 +0000
3755+++ po/br.po 2016-04-28 05:59:14 +0000
3756@@ -7,26 +7,16 @@
3757 msgstr ""
3758 "Project-Id-Version: unity8\n"
3759 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3760-<<<<<<< TREE
3761 "POT-Creation-Date: 2016-04-21 13:47+0000\n"
3762 "PO-Revision-Date: 2016-04-27 12:20+0000\n"
3763-=======
3764-"POT-Creation-Date: 2016-02-16 03:29+0000\n"
3765-"PO-Revision-Date: 2016-02-22 12:29+0000\n"
3766->>>>>>> MERGE-SOURCE
3767 "Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
3768 "Language-Team: Breton <br@li.org>\n"
3769 "MIME-Version: 1.0\n"
3770 "Content-Type: text/plain; charset=UTF-8\n"
3771 "Content-Transfer-Encoding: 8bit\n"
3772 "Plural-Forms: nplurals=2; plural=n > 1;\n"
3773-<<<<<<< TREE
3774 "X-Launchpad-Export-Date: 2016-04-28 05:59+0000\n"
3775 "X-Generator: Launchpad (build 17995)\n"
3776-=======
3777-"X-Launchpad-Export-Date: 2016-02-23 06:03+0000\n"
3778-"X-Generator: Launchpad (build 17925)\n"
3779->>>>>>> MERGE-SOURCE
3780
3781 #: plugins/IntegratedLightDM/Greeter.cpp:112
3782 msgid "Password: "
3783@@ -154,12 +144,8 @@
3784 "Re-dock means connect the device again to an external screen/mouse/keyboard"
3785 msgid "Re-dock, save your work and close these apps to continue."
3786 msgstr ""
3787-<<<<<<< TREE
3788 "Adkevreit ouzh ar savlec'h degemer, enrollot ho labour ha serrit an arloadoù-"
3789 "mañ evit kenderc'hel."
3790-=======
3791-"Adlugit, enrollit ho labour ha serrit an arloadoù-mañ evit kenderc'hel."
3792->>>>>>> MERGE-SOURCE
3793
3794 #: qml/Components/ModeSwitchWarningDialog.qml:63
3795 msgid "Or force close now (unsaved data will be lost)."
3796@@ -201,7 +187,6 @@
3797 msgid "Add to Favorites"
3798 msgstr "Ouzhpennañ d'ar sinedoù"
3799
3800-<<<<<<< TREE
3801 #: qml/Dash/FiltersPopover.qml:60
3802 msgid "Refine your results"
3803 msgstr "Purañ ho tisoc'hoù"
3804@@ -211,25 +196,14 @@
3805 msgstr "Adderaouekaat"
3806
3807 #: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
3808-=======
3809-#: qml/Dash/GenericScopeView.qml:587 qml/Dash/GenericScopeView.qml:745
3810->>>>>>> MERGE-SOURCE
3811 msgid "See less"
3812 msgstr "Gwelet nebeutoc'h"
3813
3814-<<<<<<< TREE
3815 #: qml/Dash/GenericScopeView.qml:570
3816-=======
3817-#: qml/Dash/GenericScopeView.qml:587
3818->>>>>>> MERGE-SOURCE
3819 msgid "See all"
3820 msgstr "Gwelet pep tra"
3821
3822-<<<<<<< TREE
3823 #: qml/Dash/GenericScopeView.qml:627
3824-=======
3825-#: qml/Dash/GenericScopeView.qml:649
3826->>>>>>> MERGE-SOURCE
3827 msgctxt "Label: Hint for dash search line edit"
3828 msgid "Search"
3829 msgstr "Klask"
3830@@ -291,20 +265,11 @@
3831 msgid "Also installed"
3832 msgstr "Staliet ivez"
3833
3834-<<<<<<< TREE
3835 #: qml/DisabledScreenNotice.qml:104
3836 msgid ""
3837 "Your device is now connected to an external display. Use this screen as a "
3838 "touch pad to interact with the pointer."
3839-=======
3840-#: qml/DisabledScreenNotice.qml:87
3841-msgid ""
3842-"Your device is now connected to an external display. Use this screen as a "
3843-"touch pad to interact with the mouse."
3844->>>>>>> MERGE-SOURCE
3845 msgstr ""
3846-"N'eo ket kevreet ho penveg ouzh un diskwel diavaez. Implijit ar skramm-mañ "
3847-"da douch evit ober gant al logodenn."
3848
3849 #: qml/Greeter/CoverPage.qml:118
3850 msgid "Unlock"
3851@@ -462,7 +427,6 @@
3852 #: qml/Panel/Indicators/MessageMenuItemFactory.qml:213
3853 msgctxt "Button: Call back on phone"
3854 msgid "Call back"
3855-<<<<<<< TREE
3856 msgstr "Gervel en-dro"
3857
3858 #: qml/Stages/SideStage.qml:76
3859@@ -514,78 +478,11 @@
3860 msgstr ""
3861
3862 #: qml/Wizard/Page.qml:54
3863-=======
3864-msgstr "Gervel en-dro"
3865-
3866-#: qml/Panel/Indicators/ModemInfoItem.qml:105
3867-msgid "Unlock SIM"
3868-msgstr "Dibrennañ ar gartenn SIM"
3869-
3870-#: qml/Panel/Indicators/RoamingIndication.qml:27
3871-msgid "Roaming"
3872-msgstr "O kantren"
3873-
3874-#: qml/Tutorial/TutorialBottom.qml:28
3875-msgid "Open special menus"
3876-msgstr "Digeriñ al lañserioù ispisial"
3877-
3878-#: qml/Tutorial/TutorialBottom.qml:29
3879-msgid "Swipe up from the bottom edge."
3880-msgstr "Riklit war-du an nec'h adalek an traoñ"
3881-
3882-#: qml/Tutorial/TutorialBottomFinish.qml:24
3883-msgid "This action does different things for different apps"
3884-msgstr "An ober-mañ a ra meur a dra evit meur a arload"
3885-
3886-#: qml/Tutorial/TutorialBottomFinish.qml:25
3887-msgid "Tap here to finish."
3888-msgstr "Pouezañ amañ evit echuiñ."
3889-
3890-#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
3891-#: qml/Tutorial/TutorialRight.qml:144
3892-msgid "Tap here to continue."
3893-msgstr "Pouzañ amañ evit kenderc'hel"
3894-
3895-#: qml/Tutorial/TutorialLeft.qml:26
3896-msgid "Open the launcher"
3897-msgstr "Digeriñ al lañser"
3898-
3899-#: qml/Tutorial/TutorialLeft.qml:27
3900-msgid "Short swipe from the left edge."
3901-msgstr "Riklik dousik adalek ar bord kleiz."
3902-
3903-#: qml/Tutorial/TutorialLeftFinish.qml:24
3904-msgid "These are the shortcuts to favorite apps"
3905-msgstr "Berradennoù war-du hoc'h arloadoù gwellañ-deuet eo ar re-mañ"
3906-
3907-#: qml/Tutorial/TutorialPage.qml:178
3908-msgid "You almost got it!"
3909-msgstr "Deuet eo ganeoc'h pe dost ?"
3910-
3911-#: qml/Tutorial/TutorialPage.qml:195
3912-msgid "Try again."
3913-msgstr "Esaeit en-dro."
3914-
3915-#: qml/Tutorial/TutorialRight.qml:31
3916-msgid "To view open apps"
3917-msgstr "Evit gwelet an arloadoù digor"
3918-
3919-#: qml/Tutorial/TutorialRight.qml:32
3920-msgid "Long swipe from the right edge."
3921-msgstr "Riklit pell adalek ar bord dehoù."
3922-
3923-#: qml/Tutorial/TutorialRight.qml:122
3924-msgid "View all your running tasks."
3925-msgstr "Gwelet an holl drevelloù a ya en-dro."
3926-
3927-#: qml/Wizard/Page.qml:89
3928->>>>>>> MERGE-SOURCE
3929 msgctxt "Button: Go back one page in the Wizard"
3930 msgid "Back"
3931 msgstr "Distreiñ"
3932
3933 #: qml/Wizard/Pages/10-welcome.qml:27
3934-<<<<<<< TREE
3935 msgid "Language"
3936 msgstr "Yezh"
3937
3938@@ -616,39 +513,9 @@
3939
3940 #: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
3941 #: qml/Wizard/Pages/sim.qml:101
3942-=======
3943-msgid "Hi!"
3944-msgstr "Salud deoc'h !"
3945-
3946-#: qml/Wizard/Pages/10-welcome.qml:44
3947-msgid "Welcome to your Ubuntu device."
3948-msgstr "Donemat en ho penveg Ubuntu"
3949-
3950-#: qml/Wizard/Pages/10-welcome.qml:52
3951-msgid "Let’s get started."
3952-msgstr "Krogomp ganti."
3953-
3954-#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
3955-#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
3956-#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
3957-#: qml/Wizard/Pages/passwd-set.qml:90
3958-msgid "Continue"
3959-msgstr "Kenderc'hel"
3960-
3961-#: qml/Wizard/Pages/20-sim.qml:25
3962-msgid "Add a SIM card and restart your device"
3963-msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"
3964-
3965-#: qml/Wizard/Pages/20-sim.qml:59
3966-msgid "Without it, you won’t be able to make calls or use text messaging."
3967-msgstr "Ne vioc'h ket evit pellgomz pe kas kemennadennoù hepti."
3968-
3969-#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
3970->>>>>>> MERGE-SOURCE
3971 msgid "Skip"
3972 msgstr "Tremen hebiou"
3973
3974-<<<<<<< TREE
3975 #: qml/Wizard/Pages/40-location.qml:27
3976 msgid "Location Services"
3977 msgstr "Servijoù lec'hiañ"
3978@@ -745,129 +612,6 @@
3979 msgstr "Kregiñ ganti"
3980
3981 #: qml/Wizard/Pages/here-terms.qml:25
3982-=======
3983-#: qml/Wizard/Pages/30-passwd-type.qml:39
3984-msgid "Lock security"
3985-msgstr "Surentez ar prennañ"
3986-
3987-#: qml/Wizard/Pages/30-passwd-type.qml:79
3988-msgid "Please select how you’d like to unlock your device."
3989-msgstr "Diuzit penaos e fell deoc'h dibrennañ ho penveg, mar plij."
3990-
3991-#: qml/Wizard/Pages/30-passwd-type.qml:102
3992-msgctxt "Label: Type of security method"
3993-msgid "Swipe"
3994-msgstr "Riklañ"
3995-
3996-#: qml/Wizard/Pages/30-passwd-type.qml:103
3997-msgctxt "Label: Description of security method"
3998-msgid "No security"
3999-msgstr "Tamm surentez ebet"
4000-
4001-#: qml/Wizard/Pages/30-passwd-type.qml:105
4002-msgctxt "Label: Type of security method"
4003-msgid "Passcode"
4004-msgstr "Kod-tremen"
4005-
4006-#: qml/Wizard/Pages/30-passwd-type.qml:106
4007-msgctxt "Label: Description of security method"
4008-msgid "4 digits only"
4009-msgstr "4 sifr hepken"
4010-
4011-#: qml/Wizard/Pages/30-passwd-type.qml:108
4012-msgctxt "Label: Type of security method"
4013-msgid "Passphrase"
4014-msgstr "Frazenn-dremen"
4015-
4016-#: qml/Wizard/Pages/30-passwd-type.qml:109
4017-msgctxt "Label: Description of security method"
4018-msgid "Numbers and letters"
4019-msgstr "Sifroù ha lizherennoù"
4020-
4021-#: qml/Wizard/Pages/40-wifi.qml:29
4022-msgid "Connect to Wi‑Fi"
4023-msgstr "Kevreañ ouzh ar Wi-Fi"
4024-
4025-#: qml/Wizard/Pages/40-wifi.qml:168
4026-msgid "Available networks…"
4027-msgstr "Rouedadoù a c'haller kaout..."
4028-
4029-#: qml/Wizard/Pages/40-wifi.qml:169
4030-msgid "No available networks."
4031-msgstr "N'eus rouedad ebet da gaout."
4032-
4033-#: qml/Wizard/Pages/50-location.qml:27
4034-msgid "Location"
4035-msgstr "Lec'h"
4036-
4037-#: qml/Wizard/Pages/50-location.qml:62
4038-msgid "Let the phone detect your location:"
4039-msgstr "Lezel ar pellgomzer da gavout pelec'h emaoc'h :"
4040-
4041-#: qml/Wizard/Pages/50-location.qml:69
4042-msgid "Using GPS only (less accurate)"
4043-msgstr "Implijout ar GPS hepken (n'eo ket ken resis)"
4044-
4045-#: qml/Wizard/Pages/50-location.qml:86
4046-msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
4047-msgstr ""
4048-"Implijout ar GPS, Wi-Fi dizanv pe titouroù ar rouedad kelligel (aliet)"
4049-
4050-#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
4051-#: qml/Wizard/Pages/50-location.qml:103
4052-msgid ""
4053-"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
4054-"conditions</a>."
4055-msgstr ""
4056-"Pa ziuzit an dibarzh-mañ ez asantit da <a href='#'>zivizoù implij</a> Nokia."
4057-
4058-#: qml/Wizard/Pages/50-location.qml:112
4059-msgid "Not at all"
4060-msgstr "Tamm ebet"
4061-
4062-#: qml/Wizard/Pages/50-location.qml:124
4063-msgid "You can change your mind later in <b>System Settings</b>."
4064-msgstr ""
4065-"Gallout a rit cheñch soñj diwezhatoc'h en <b>Arventennoù ar reizhad</b>."
4066-
4067-#: qml/Wizard/Pages/60-reporting.qml:26
4068-msgid "Improving your experience"
4069-msgstr "Gwellaat ho skiant-prenet"
4070-
4071-#: qml/Wizard/Pages/60-reporting.qml:46
4072-msgid ""
4073-"Your phone is set up to automatically report errors to Canonical and its "
4074-"partners, the makers of the operating system."
4075-msgstr ""
4076-"Arventennet eo ho pellgomzer evit titourañ ent emgefre ar fazioù da "
4077-"gCanonical ha d'e gevelerien, ar re o deus savet ar reizhiad korvoiñ."
4078-
4079-#: qml/Wizard/Pages/60-reporting.qml:53
4080-msgid ""
4081-"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
4082-"Privacy</b>"
4083-msgstr ""
4084-"Gallout a ra bezañ diweredekaet e-barzh <b>Arventennoù ar reizhiad</b> "
4085-"dindan <b>Surentez &amp; Prevezded</b>"
4086-
4087-#: qml/Wizard/Pages/80-finished.qml:24
4088-msgid "All done"
4089-msgstr "Echu penn-da-benn"
4090-
4091-#: qml/Wizard/Pages/80-finished.qml:39
4092-msgid "Nice work!"
4093-msgstr "Gwellat labour !"
4094-
4095-#: qml/Wizard/Pages/80-finished.qml:46
4096-msgid "Your device is now ready to use."
4097-msgstr "Prest eo ho penveg da vezañ implijet bremañ."
4098-
4099-#: qml/Wizard/Pages/80-finished.qml:53
4100-msgid "Finish"
4101-msgstr "Echuiñ"
4102-
4103-#: qml/Wizard/Pages/here-terms.qml:27
4104->>>>>>> MERGE-SOURCE
4105 msgid "Terms & Conditions"
4106 msgstr "Penndivizoù implij"
4107
4108@@ -1109,7 +853,6 @@
4109 #~ msgid "Please re-enter"
4110 #~ msgstr "Adverkañ, mar plij"
4111
4112-<<<<<<< TREE
4113 #~ msgid "Lock security"
4114 #~ msgstr "Surentez ar prennañ"
4115
4116@@ -1291,18 +1034,6 @@
4117 #~ msgid "Numbers and letters"
4118 #~ msgstr "Sifroù ha lizherennoù"
4119
4120-=======
4121-#~ msgid "Please select how you’d like to unlock your phone."
4122-#~ msgstr ""
4123-#~ "Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."
4124-
4125-#~ msgid "Welcome to your Ubuntu phone."
4126-#~ msgstr "Deuet-mat oc'h en ho pellgomzer Ubuntu."
4127-
4128-#~ msgid "Your phone is now ready to use."
4129-#~ msgstr "Prest eo ho pellgomzer da vezañ implijet bremañ."
4130-
4131->>>>>>> MERGE-SOURCE
4132 #~ msgid "%a %d %b %H:%M"
4133 #~ msgstr "%a %b %d %H:%M"
4134
4135
4136=== modified file 'po/bs.po'
4137--- po/bs.po 2016-04-28 10:49:18 +0000
4138+++ po/bs.po 2016-04-27 06:03:19 +0000
4139@@ -7,11 +7,7 @@
4140 msgstr ""
4141 "Project-Id-Version: unity8\n"
4142 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4143-<<<<<<< TREE
4144 "POT-Creation-Date: 2016-04-21 13:47+0000\n"
4145-=======
4146-"POT-Creation-Date: 2016-02-16 03:29+0000\n"
4147->>>>>>> MERGE-SOURCE
4148 "PO-Revision-Date: 2015-12-01 20:06+0000\n"
4149 "Last-Translator: Kenan Gutić <Unknown>\n"
4150 "Language-Team: Bosnian <bs@li.org>\n"
4151@@ -20,13 +16,8 @@
4152 "Content-Transfer-Encoding: 8bit\n"
4153 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
4154 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
4155-<<<<<<< TREE
4156 "X-Launchpad-Export-Date: 2016-04-27 06:01+0000\n"
4157 "X-Generator: Launchpad (build 17995)\n"
4158-=======
4159-"X-Launchpad-Export-Date: 2016-02-23 06:03+0000\n"
4160-"X-Generator: Launchpad (build 17925)\n"
4161->>>>>>> MERGE-SOURCE
4162
4163 #: plugins/IntegratedLightDM/Greeter.cpp:112
4164 msgid "Password: "
4165@@ -193,7 +184,6 @@
4166 msgid "Add to Favorites"
4167 msgstr "Dodaj u Omiljene"
4168
4169-<<<<<<< TREE
4170 #: qml/Dash/FiltersPopover.qml:60
4171 msgid "Refine your results"
4172 msgstr ""
4173@@ -203,25 +193,14 @@
4174 msgstr ""
4175
4176 #: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
4177-=======
4178-#: qml/Dash/GenericScopeView.qml:587 qml/Dash/GenericScopeView.qml:745
4179->>>>>>> MERGE-SOURCE
4180 msgid "See less"
4181 msgstr "Pogledati manje"
4182
4183-<<<<<<< TREE
4184 #: qml/Dash/GenericScopeView.qml:570
4185-=======
4186-#: qml/Dash/GenericScopeView.qml:587
4187->>>>>>> MERGE-SOURCE
4188 msgid "See all"
4189 msgstr "Pogledati sve"
4190
4191-<<<<<<< TREE
4192 #: qml/Dash/GenericScopeView.qml:627
4193-=======
4194-#: qml/Dash/GenericScopeView.qml:649
4195->>>>>>> MERGE-SOURCE
4196 msgctxt "Label: Hint for dash search line edit"
4197 msgid "Search"
4198 msgstr "Pretraži"
4199@@ -283,19 +262,11 @@
4200 msgid "Also installed"
4201 msgstr "Također instalirano"
4202
4203-<<<<<<< TREE
4204 #: qml/DisabledScreenNotice.qml:104
4205 msgid ""
4206 "Your device is now connected to an external display. Use this screen as a "
4207 "touch pad to interact with the pointer."
4208 msgstr ""
4209-=======
4210-#: qml/DisabledScreenNotice.qml:87
4211-msgid ""
4212-"Your device is now connected to an external display. Use this screen as a "
4213-"touch pad to interact with the mouse."
4214-msgstr ""
4215->>>>>>> MERGE-SOURCE
4216
4217 #: qml/Greeter/CoverPage.qml:118
4218 msgid "Unlock"
4219@@ -512,7 +483,6 @@
4220 msgstr "Nazad"
4221
4222 #: qml/Wizard/Pages/10-welcome.qml:27
4223-<<<<<<< TREE
4224 msgid "Language"
4225 msgstr ""
4226
4227@@ -543,41 +513,9 @@
4228
4229 #: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
4230 #: qml/Wizard/Pages/sim.qml:101
4231-=======
4232-msgid "Hi!"
4233-msgstr "Ćao!"
4234-
4235-#: qml/Wizard/Pages/10-welcome.qml:44
4236-msgid "Welcome to your Ubuntu device."
4237-msgstr ""
4238-
4239-#: qml/Wizard/Pages/10-welcome.qml:52
4240-msgid "Let’s get started."
4241-msgstr "Započnimo"
4242-
4243-#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
4244-#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
4245-#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
4246-#: qml/Wizard/Pages/passwd-set.qml:90
4247-msgid "Continue"
4248-msgstr "Nastavite"
4249-
4250-#: qml/Wizard/Pages/20-sim.qml:25
4251-msgid "Add a SIM card and restart your device"
4252-msgstr "Dodajte SIM karticu i restartujte vaš uređaj"
4253-
4254-#: qml/Wizard/Pages/20-sim.qml:59
4255-msgid "Without it, you won’t be able to make calls or use text messaging."
4256-msgstr ""
4257-"Bez nje, nećete biti u mogućnosti da uspostavite pozive ili koristite "
4258-"tekstualne poruke."
4259-
4260-#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
4261->>>>>>> MERGE-SOURCE
4262 msgid "Skip"
4263 msgstr "Preskočite"
4264
4265-<<<<<<< TREE
4266 #: qml/Wizard/Pages/40-location.qml:27
4267 msgid "Location Services"
4268 msgstr ""
4269@@ -674,128 +612,6 @@
4270 msgstr ""
4271
4272 #: qml/Wizard/Pages/here-terms.qml:25
4273-=======
4274-#: qml/Wizard/Pages/30-passwd-type.qml:39
4275-msgid "Lock security"
4276-msgstr "Sigurnost zaključavanja"
4277-
4278-#: qml/Wizard/Pages/30-passwd-type.qml:79
4279-msgid "Please select how you’d like to unlock your device."
4280-msgstr ""
4281-
4282-#: qml/Wizard/Pages/30-passwd-type.qml:102
4283-msgctxt "Label: Type of security method"
4284-msgid "Swipe"
4285-msgstr "Prevlačenje"
4286-
4287-#: qml/Wizard/Pages/30-passwd-type.qml:103
4288-msgctxt "Label: Description of security method"
4289-msgid "No security"
4290-msgstr "Bez sigurnosti"
4291-
4292-#: qml/Wizard/Pages/30-passwd-type.qml:105
4293-msgctxt "Label: Type of security method"
4294-msgid "Passcode"
4295-msgstr "Pristupni kod"
4296-
4297-#: qml/Wizard/Pages/30-passwd-type.qml:106
4298-msgctxt "Label: Description of security method"
4299-msgid "4 digits only"
4300-msgstr "samo 4 cifre"
4301-
4302-#: qml/Wizard/Pages/30-passwd-type.qml:108
4303-msgctxt "Label: Type of security method"
4304-msgid "Passphrase"
4305-msgstr "Pristupna fraza"
4306-
4307-#: qml/Wizard/Pages/30-passwd-type.qml:109
4308-msgctxt "Label: Description of security method"
4309-msgid "Numbers and letters"
4310-msgstr "Brojevi i slova"
4311-
4312-#: qml/Wizard/Pages/40-wifi.qml:29
4313-msgid "Connect to Wi‑Fi"
4314-msgstr "Povezati na Wi-Fi"
4315-
4316-#: qml/Wizard/Pages/40-wifi.qml:168
4317-msgid "Available networks…"
4318-msgstr "Dostupne mreže..."
4319-
4320-#: qml/Wizard/Pages/40-wifi.qml:169
4321-msgid "No available networks."
4322-msgstr "Nema dostupnih mreža."
4323-
4324-#: qml/Wizard/Pages/50-location.qml:27
4325-msgid "Location"
4326-msgstr "Lokacija"
4327-
4328-#: qml/Wizard/Pages/50-location.qml:62
4329-msgid "Let the phone detect your location:"
4330-msgstr "Dopustite da telefon otkrije Vašu lokaciju:"
4331-
4332-#: qml/Wizard/Pages/50-location.qml:69
4333-msgid "Using GPS only (less accurate)"
4334-msgstr "Samo pomoću GPS (manje precizno)"
4335-
4336-#: qml/Wizard/Pages/50-location.qml:86
4337-msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
4338-msgstr "Pomoću GPS, anonimnog Wi-Fi i podataka mobilne mreže (preporučeno)"
4339-
4340-#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
4341-#: qml/Wizard/Pages/50-location.qml:103
4342-msgid ""
4343-"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
4344-"conditions</a>."
4345-msgstr ""
4346-"Birajući ovu opciju prihvatate za Nokia OVDJE <a href='#'>terms and "
4347-"conditions</a>."
4348-
4349-#: qml/Wizard/Pages/50-location.qml:112
4350-msgid "Not at all"
4351-msgstr "Nipošto"
4352-
4353-#: qml/Wizard/Pages/50-location.qml:124
4354-msgid "You can change your mind later in <b>System Settings</b>."
4355-msgstr "Možete se predomisliti kasnije u <b>System Settings</b>."
4356-
4357-#: qml/Wizard/Pages/60-reporting.qml:26
4358-msgid "Improving your experience"
4359-msgstr "Poboljšavajući vaše iskustvo"
4360-
4361-#: qml/Wizard/Pages/60-reporting.qml:46
4362-msgid ""
4363-"Your phone is set up to automatically report errors to Canonical and its "
4364-"partners, the makers of the operating system."
4365-msgstr ""
4366-"Vaš telefon je podešen da automatski prijavljuje greške Canonical i "
4367-"njegovim partnerima, tvorcima operativnog sistema."
4368-
4369-#: qml/Wizard/Pages/60-reporting.qml:53
4370-msgid ""
4371-"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
4372-"Privacy</b>"
4373-msgstr ""
4374-"Ovo može biti isključeno u <b>System Settings</b> under <b>Security &amp; "
4375-"Privacy</b>"
4376-
4377-#: qml/Wizard/Pages/80-finished.qml:24
4378-msgid "All done"
4379-msgstr "Sve urađeno"
4380-
4381-#: qml/Wizard/Pages/80-finished.qml:39
4382-msgid "Nice work!"
4383-msgstr "Dobro urađeno!"
4384-
4385-#: qml/Wizard/Pages/80-finished.qml:46
4386-msgid "Your device is now ready to use."
4387-msgstr ""
4388-
4389-#: qml/Wizard/Pages/80-finished.qml:53
4390-msgid "Finish"
4391-msgstr "Završiti"
4392-
4393-#: qml/Wizard/Pages/here-terms.qml:27
4394->>>>>>> MERGE-SOURCE
4395 msgid "Terms & Conditions"
4396 msgstr "Uslovi i odredbe"
4397
4398@@ -953,7 +769,6 @@
4399
4400 #~ msgid "Please re-enter"
4401 #~ msgstr "Molimo ponovo unesite"
4402-<<<<<<< TREE
4403
4404 #~ msgid "This action does different things for different apps"
4405 #~ msgstr "Ova radnja čini različite stvari za različite aplikacije"
4406@@ -1137,14 +952,3 @@
4407 #~ msgctxt "Button: Reboot the system"
4408 #~ msgid "Reboot"
4409 #~ msgstr "Ponovo pokreni"
4410-=======
4411-
4412-#~ msgid "Welcome to your Ubuntu phone."
4413-#~ msgstr "Dobrodošli u vaš Ubuntu telefon."
4414-
4415-#~ msgid "Please select how you’d like to unlock your phone."
4416-#~ msgstr "Molimo izaberite kako biste željeli da otključavate vaš telefon."
4417-
4418-#~ msgid "Your phone is now ready to use."
4419-#~ msgstr "Vaš telefon je sada spreman za upotrebu."
4420->>>>>>> MERGE-SOURCE
4421
4422=== modified file 'po/ca.po'
4423--- po/ca.po 2016-04-28 10:49:18 +0000
4424+++ po/ca.po 2016-04-27 06:03:19 +0000
4425@@ -7,11 +7,7 @@
4426 msgstr ""
4427 "Project-Id-Version: unity\n"
4428 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4429-<<<<<<< TREE
4430 "POT-Creation-Date: 2016-04-21 13:47+0000\n"
4431-=======
4432-"POT-Creation-Date: 2016-02-16 03:29+0000\n"
4433->>>>>>> MERGE-SOURCE
4434 "PO-Revision-Date: 2015-07-04 09:48+0000\n"
4435 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
4436 "Language-Team: Catalan <ca@li.org>\n"
4437@@ -19,13 +15,8 @@
4438 "Content-Type: text/plain; charset=UTF-8\n"
4439 "Content-Transfer-Encoding: 8bit\n"
4440 "Plural-Forms: nplurals=2; plural=n != 1;\n"
4441-<<<<<<< TREE
4442 "X-Launchpad-Export-Date: 2016-04-27 06:02+0000\n"
4443 "X-Generator: Launchpad (build 17995)\n"
4444-=======
4445-"X-Launchpad-Export-Date: 2016-02-23 06:03+0000\n"
4446-"X-Generator: Launchpad (build 17925)\n"
4447->>>>>>> MERGE-SOURCE
4448
4449 #: plugins/IntegratedLightDM/Greeter.cpp:112
4450 msgid "Password: "
4451@@ -153,8 +144,6 @@
4452 "Re-dock means connect the device again to an external screen/mouse/keyboard"
4453 msgid "Re-dock, save your work and close these apps to continue."
4454 msgstr ""
4455-"Torneu a connectar, deseu la feina i tanqueu aquestes aplicacions per "
4456-"continuar."
4457
4458 #: qml/Components/ModeSwitchWarningDialog.qml:63
4459 msgid "Or force close now (unsaved data will be lost)."
4460@@ -195,7 +184,6 @@
4461 msgid "Add to Favorites"
4462 msgstr "Afegeix als preferits"
4463
4464-<<<<<<< TREE
4465 #: qml/Dash/FiltersPopover.qml:60
4466 msgid "Refine your results"
4467 msgstr ""
4468@@ -205,25 +193,14 @@
4469 msgstr ""
4470
4471 #: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
4472-=======
4473-#: qml/Dash/GenericScopeView.qml:587 qml/Dash/GenericScopeView.qml:745
4474->>>>>>> MERGE-SOURCE
4475 msgid "See less"
4476 msgstr "Mostra'n menys"
4477
4478-<<<<<<< TREE
4479 #: qml/Dash/GenericScopeView.qml:570
4480-=======
4481-#: qml/Dash/GenericScopeView.qml:587
4482->>>>>>> MERGE-SOURCE
4483 msgid "See all"
4484 msgstr "Mostra-ho tot"
4485
4486-<<<<<<< TREE
4487 #: qml/Dash/GenericScopeView.qml:627
4488-=======
4489-#: qml/Dash/GenericScopeView.qml:649
4490->>>>>>> MERGE-SOURCE
4491 msgctxt "Label: Hint for dash search line edit"
4492 msgid "Search"
4493 msgstr "Cerca"
4494@@ -285,17 +262,10 @@
4495 msgid "Also installed"
4496 msgstr "També instal·lat"
4497
4498-<<<<<<< TREE
4499 #: qml/DisabledScreenNotice.qml:104
4500 msgid ""
4501 "Your device is now connected to an external display. Use this screen as a "
4502 "touch pad to interact with the pointer."
4503-=======
4504-#: qml/DisabledScreenNotice.qml:87
4505-msgid ""
4506-"Your device is now connected to an external display. Use this screen as a "
4507-"touch pad to interact with the mouse."
4508->>>>>>> MERGE-SOURCE
4509 msgstr ""
4510
4511 #: qml/Greeter/CoverPage.qml:118
4512@@ -456,7 +426,6 @@
4513 #: qml/Panel/Indicators/MessageMenuItemFactory.qml:213
4514 msgctxt "Button: Call back on phone"
4515 msgid "Call back"
4516-<<<<<<< TREE
4517 msgstr "Retorna la trucada"
4518
4519 #: qml/Stages/SideStage.qml:76
4520@@ -508,78 +477,11 @@
4521 msgstr ""
4522
4523 #: qml/Wizard/Page.qml:54
4524-=======
4525-msgstr "Retorna la trucada"
4526-
4527-#: qml/Panel/Indicators/ModemInfoItem.qml:105
4528-msgid "Unlock SIM"
4529-msgstr "Desbloca la SIM"
4530-
4531-#: qml/Panel/Indicators/RoamingIndication.qml:27
4532-msgid "Roaming"
4533-msgstr "Itinerància"
4534-
4535-#: qml/Tutorial/TutorialBottom.qml:28
4536-msgid "Open special menus"
4537-msgstr "Obre els menús especials"
4538-
4539-#: qml/Tutorial/TutorialBottom.qml:29
4540-msgid "Swipe up from the bottom edge."
4541-msgstr "Llisqueu el dit des de la vora inferior."
4542-
4543-#: qml/Tutorial/TutorialBottomFinish.qml:24
4544-msgid "This action does different things for different apps"
4545-msgstr "Aquesta acció fa coses diferents depenent de l'aplicació"
4546-
4547-#: qml/Tutorial/TutorialBottomFinish.qml:25
4548-msgid "Tap here to finish."
4549-msgstr "Feu un toc per finalitzar."
4550-
4551-#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
4552-#: qml/Tutorial/TutorialRight.qml:144
4553-msgid "Tap here to continue."
4554-msgstr "Feu un toc per continuar."
4555-
4556-#: qml/Tutorial/TutorialLeft.qml:26
4557-msgid "Open the launcher"
4558-msgstr "Obre el llançador"
4559-
4560-#: qml/Tutorial/TutorialLeft.qml:27
4561-msgid "Short swipe from the left edge."
4562-msgstr "Lliscament curt des de la vora esquerra."
4563-
4564-#: qml/Tutorial/TutorialLeftFinish.qml:24
4565-msgid "These are the shortcuts to favorite apps"
4566-msgstr "Aquestes són les dreceres a les aplicacions preferides"
4567-
4568-#: qml/Tutorial/TutorialPage.qml:178
4569-msgid "You almost got it!"
4570-msgstr "Ja gairebé ho teniu!"
4571-
4572-#: qml/Tutorial/TutorialPage.qml:195
4573-msgid "Try again."
4574-msgstr "Torneu-ho a provar."
4575-
4576-#: qml/Tutorial/TutorialRight.qml:31
4577-msgid "To view open apps"
4578-msgstr "Per veure les aplicacions obertes"
4579-
4580-#: qml/Tutorial/TutorialRight.qml:32
4581-msgid "Long swipe from the right edge."
4582-msgstr "Lliscament llarg des de la vora dreta."
4583-
4584-#: qml/Tutorial/TutorialRight.qml:122
4585-msgid "View all your running tasks."
4586-msgstr "Mostra totes les tasques en execució."
4587-
4588-#: qml/Wizard/Page.qml:89
4589->>>>>>> MERGE-SOURCE
4590 msgctxt "Button: Go back one page in the Wizard"
4591 msgid "Back"
4592 msgstr "Enrere"
4593
4594 #: qml/Wizard/Pages/10-welcome.qml:27
4595-<<<<<<< TREE
4596 msgid "Language"
4597 msgstr ""
4598
4599@@ -610,39 +512,9 @@
4600
4601 #: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
4602 #: qml/Wizard/Pages/sim.qml:101
4603-=======
4604-msgid "Hi!"
4605-msgstr "Hola!"
4606-
4607-#: qml/Wizard/Pages/10-welcome.qml:44
4608-msgid "Welcome to your Ubuntu device."
4609-msgstr ""
4610-
4611-#: qml/Wizard/Pages/10-welcome.qml:52
4612-msgid "Let’s get started."
4613-msgstr "Comencem."
4614-
4615-#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
4616-#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
4617-#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
4618-#: qml/Wizard/Pages/passwd-set.qml:90
4619-msgid "Continue"
4620-msgstr "Continua"
4621-
4622-#: qml/Wizard/Pages/20-sim.qml:25
4623-msgid "Add a SIM card and restart your device"
4624-msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
4625-
4626-#: qml/Wizard/Pages/20-sim.qml:59
4627-msgid "Without it, you won’t be able to make calls or use text messaging."
4628-msgstr "Sense ella, no podreu fer trucades o enviar missatges de text."
4629-
4630-#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
4631->>>>>>> MERGE-SOURCE
4632 msgid "Skip"
4633 msgstr "Omet"
4634
4635-<<<<<<< TREE
4636 #: qml/Wizard/Pages/40-location.qml:27
4637 msgid "Location Services"
4638 msgstr ""
4639@@ -739,131 +611,6 @@
4640 msgstr ""
4641
4642 #: qml/Wizard/Pages/here-terms.qml:25
4643-=======
4644-#: qml/Wizard/Pages/30-passwd-type.qml:39
4645-msgid "Lock security"
4646-msgstr "Seguretat del bloqueig"
4647-
4648-#: qml/Wizard/Pages/30-passwd-type.qml:79
4649-msgid "Please select how you’d like to unlock your device."
4650-msgstr ""
4651-
4652-#: qml/Wizard/Pages/30-passwd-type.qml:102
4653-msgctxt "Label: Type of security method"
4654-msgid "Swipe"
4655-msgstr "Lliscament amb el dit"
4656-
4657-#: qml/Wizard/Pages/30-passwd-type.qml:103
4658-msgctxt "Label: Description of security method"
4659-msgid "No security"
4660-msgstr "Sense seguretat"
4661-
4662-#: qml/Wizard/Pages/30-passwd-type.qml:105
4663-msgctxt "Label: Type of security method"
4664-msgid "Passcode"
4665-msgstr "Codi d'accés"
4666-
4667-#: qml/Wizard/Pages/30-passwd-type.qml:106
4668-msgctxt "Label: Description of security method"
4669-msgid "4 digits only"
4670-msgstr "Només 4 dígits"
4671-
4672-#: qml/Wizard/Pages/30-passwd-type.qml:108
4673-msgctxt "Label: Type of security method"
4674-msgid "Passphrase"
4675-msgstr "Contrasenya"
4676-
4677-#: qml/Wizard/Pages/30-passwd-type.qml:109
4678-msgctxt "Label: Description of security method"
4679-msgid "Numbers and letters"
4680-msgstr "Números i lletres"
4681-
4682-#: qml/Wizard/Pages/40-wifi.qml:29
4683-msgid "Connect to Wi‑Fi"
4684-msgstr "Connecta't a la Wi-Fi"
4685-
4686-#: qml/Wizard/Pages/40-wifi.qml:168
4687-msgid "Available networks…"
4688-msgstr "Xarxes disponibles..."
4689-
4690-#: qml/Wizard/Pages/40-wifi.qml:169
4691-msgid "No available networks."
4692-msgstr "No hi ha xarxes disponibles"
4693-
4694-#: qml/Wizard/Pages/50-location.qml:27
4695-msgid "Location"
4696-msgstr "Ubicació"
4697-
4698-#: qml/Wizard/Pages/50-location.qml:62
4699-msgid "Let the phone detect your location:"
4700-msgstr "Fes que el telèfon detecti la meva ubicació:"
4701-
4702-#: qml/Wizard/Pages/50-location.qml:69
4703-msgid "Using GPS only (less accurate)"
4704-msgstr "Utilitza només el GPS (menys precís)"
4705-
4706-#: qml/Wizard/Pages/50-location.qml:86
4707-msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
4708-msgstr ""
4709-"Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "
4710-"(recomanat)"
4711-
4712-#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
4713-#: qml/Wizard/Pages/50-location.qml:103
4714-msgid ""
4715-"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
4716-"conditions</a>."
4717-msgstr ""
4718-"Si seleccioneu aquesta opció, accepteu <a href='#'>les condicions generals "
4719-"del servei Nokia HERE</a>."
4720-
4721-#: qml/Wizard/Pages/50-location.qml:112
4722-msgid "Not at all"
4723-msgstr "No"
4724-
4725-#: qml/Wizard/Pages/50-location.qml:124
4726-msgid "You can change your mind later in <b>System Settings</b>."
4727-msgstr ""
4728-"Podeu canviar-ho més endavant a l'aplicació <b>Paràmetres del sistema</b>"
4729-
4730-#: qml/Wizard/Pages/60-reporting.qml:26
4731-msgid "Improving your experience"
4732-msgstr "Millora de l'experiència"
4733-
4734-#: qml/Wizard/Pages/60-reporting.qml:46
4735-msgid ""
4736-"Your phone is set up to automatically report errors to Canonical and its "
4737-"partners, the makers of the operating system."
4738-msgstr ""
4739-"Aquest telèfon està configurat per enviar errors de manera automàtica a "
4740-"Canonical i associats, els creadors del sistema operatiu."
4741-
4742-#: qml/Wizard/Pages/60-reporting.qml:53
4743-msgid ""
4744-"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
4745-"Privacy</b>"
4746-msgstr ""
4747-"Podeu inhabilitar-ho a <b>Configuració del sistema</b>, a la secció "
4748-"<b>Seguretat i privadesa</b>"
4749-
4750-#: qml/Wizard/Pages/80-finished.qml:24
4751-msgid "All done"
4752-msgstr "Tot fet"
4753-
4754-#: qml/Wizard/Pages/80-finished.qml:39
4755-msgid "Nice work!"
4756-msgstr "Bona feina!"
4757-
4758-#: qml/Wizard/Pages/80-finished.qml:46
4759-msgid "Your device is now ready to use."
4760-msgstr ""
4761-
4762-#: qml/Wizard/Pages/80-finished.qml:53
4763-msgid "Finish"
4764-msgstr "Finalitza"
4765-
4766-#: qml/Wizard/Pages/here-terms.qml:27
4767->>>>>>> MERGE-SOURCE
4768 msgid "Terms & Conditions"
4769 msgstr "Condicions generals"
4770
4771@@ -1106,7 +853,6 @@
4772 #~ msgid "Manage Scopes"
4773 #~ msgstr "Gestioneu les lents"
4774
4775-<<<<<<< TREE
4776 #~ msgid "Add a SIM card and restart your device"
4777 #~ msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
4778
4779@@ -1289,17 +1035,6 @@
4780 #~ msgid "Numbers and letters"
4781 #~ msgstr "Números i lletres"
4782
4783-=======
4784-#~ msgid "Welcome to your Ubuntu phone."
4785-#~ msgstr "Us donem la benvinguda al vostre telèfon Ubuntu."
4786-
4787-#~ msgid "Please select how you’d like to unlock your phone."
4788-#~ msgstr "Seleccioneu com voleu desblocar el telèfon."
4789-
4790-#~ msgid "Your phone is now ready to use."
4791-#~ msgstr "Ja podeu utilitzar el vostre telèfon."
4792-
4793->>>>>>> MERGE-SOURCE
4794 #~ msgid "Yesterday %l:%M %p"
4795 #~ msgstr "Ahir %l.%M %p"
4796
4797
4798=== modified file 'po/ca@valencia.po'
4799--- po/ca@valencia.po 2016-04-28 10:49:18 +0000
4800+++ po/ca@valencia.po 2016-04-27 06:03:19 +0000
4801@@ -7,11 +7,7 @@
4802 msgstr ""
4803 "Project-Id-Version: unity\n"
4804 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4805-<<<<<<< TREE
4806 "POT-Creation-Date: 2016-04-21 13:47+0000\n"
4807-=======
4808-"POT-Creation-Date: 2016-02-16 03:29+0000\n"
4809->>>>>>> MERGE-SOURCE
4810 "PO-Revision-Date: 2015-02-22 15:22+0000\n"
4811 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
4812 "Language-Team: Catalan <ca@li.org>\n"
4813@@ -19,13 +15,8 @@
4814 "Content-Type: text/plain; charset=UTF-8\n"
4815 "Content-Transfer-Encoding: 8bit\n"
4816 "Plural-Forms: nplurals=2; plural=n != 1;\n"
4817-<<<<<<< TREE
4818 "X-Launchpad-Export-Date: 2016-04-27 06:03+0000\n"
4819 "X-Generator: Launchpad (build 17995)\n"
4820-=======
4821-"X-Launchpad-Export-Date: 2016-02-23 06:04+0000\n"
4822-"X-Generator: Launchpad (build 17925)\n"
4823->>>>>>> MERGE-SOURCE
4824
4825 #: plugins/IntegratedLightDM/Greeter.cpp:112
4826 msgid "Password: "
4827@@ -193,7 +184,6 @@
4828 msgid "Add to Favorites"
4829 msgstr "Afig als preferits"
4830
4831-<<<<<<< TREE
4832 #: qml/Dash/FiltersPopover.qml:60
4833 msgid "Refine your results"
4834 msgstr ""
4835@@ -203,25 +193,14 @@
4836 msgstr ""
4837
4838 #: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
4839-=======
4840-#: qml/Dash/GenericScopeView.qml:587 qml/Dash/GenericScopeView.qml:745
4841->>>>>>> MERGE-SOURCE
4842 msgid "See less"
4843 msgstr "Mostra'n menys"
4844
4845-<<<<<<< TREE
4846 #: qml/Dash/GenericScopeView.qml:570
4847-=======
4848-#: qml/Dash/GenericScopeView.qml:587
4849->>>>>>> MERGE-SOURCE
4850 msgid "See all"
4851 msgstr "Mostra-ho tot"
4852
4853-<<<<<<< TREE
4854 #: qml/Dash/GenericScopeView.qml:627
4855-=======
4856-#: qml/Dash/GenericScopeView.qml:649
4857->>>>>>> MERGE-SOURCE
4858 msgctxt "Label: Hint for dash search line edit"
4859 msgid "Search"
4860 msgstr ""
4861@@ -283,17 +262,10 @@
4862 msgid "Also installed"
4863 msgstr "També instal·lat"
4864
4865-<<<<<<< TREE
4866 #: qml/DisabledScreenNotice.qml:104
4867 msgid ""
4868 "Your device is now connected to an external display. Use this screen as a "
4869 "touch pad to interact with the pointer."
4870-=======
4871-#: qml/DisabledScreenNotice.qml:87
4872-msgid ""
4873-"Your device is now connected to an external display. Use this screen as a "
4874-"touch pad to interact with the mouse."
4875->>>>>>> MERGE-SOURCE
4876 msgstr ""
4877
4878 #: qml/Greeter/CoverPage.qml:118
4879@@ -510,7 +482,6 @@
4880 msgstr ""
4881
4882 #: qml/Wizard/Pages/10-welcome.qml:27
4883-<<<<<<< TREE
4884 msgid "Language"
4885 msgstr ""
4886
4887@@ -541,39 +512,9 @@
4888
4889 #: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
4890 #: qml/Wizard/Pages/sim.qml:101
4891-=======
4892-msgid "Hi!"
4893-msgstr "Hola!"
4894-
4895-#: qml/Wizard/Pages/10-welcome.qml:44
4896-msgid "Welcome to your Ubuntu device."
4897-msgstr ""
4898-
4899-#: qml/Wizard/Pages/10-welcome.qml:52
4900-msgid "Let’s get started."
4901-msgstr "Comencem."
4902-
4903-#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
4904-#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
4905-#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
4906-#: qml/Wizard/Pages/passwd-set.qml:90
4907-msgid "Continue"
4908-msgstr "Continua"
4909-
4910-#: qml/Wizard/Pages/20-sim.qml:25
4911-msgid "Add a SIM card and restart your device"
4912-msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
4913-
4914-#: qml/Wizard/Pages/20-sim.qml:59
4915-msgid "Without it, you won’t be able to make calls or use text messaging."
4916-msgstr "Sense ella, no podreu fer cridades o enviar missatges de text."
4917-
4918-#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
4919->>>>>>> MERGE-SOURCE
4920 msgid "Skip"
4921 msgstr "Omet"
4922
4923-<<<<<<< TREE
4924 #: qml/Wizard/Pages/40-location.qml:27
4925 msgid "Location Services"
4926 msgstr ""
4927@@ -670,131 +611,6 @@
4928 msgstr ""
4929
4930 #: qml/Wizard/Pages/here-terms.qml:25
4931-=======
4932-#: qml/Wizard/Pages/30-passwd-type.qml:39
4933-msgid "Lock security"
4934-msgstr "Seguretat del bloqueig"
4935-
4936-#: qml/Wizard/Pages/30-passwd-type.qml:79
4937-msgid "Please select how you’d like to unlock your device."
4938-msgstr ""
4939-
4940-#: qml/Wizard/Pages/30-passwd-type.qml:102
4941-msgctxt "Label: Type of security method"
4942-msgid "Swipe"
4943-msgstr ""
4944-
4945-#: qml/Wizard/Pages/30-passwd-type.qml:103
4946-msgctxt "Label: Description of security method"
4947-msgid "No security"
4948-msgstr ""
4949-
4950-#: qml/Wizard/Pages/30-passwd-type.qml:105
4951-msgctxt "Label: Type of security method"
4952-msgid "Passcode"
4953-msgstr ""
4954-
4955-#: qml/Wizard/Pages/30-passwd-type.qml:106
4956-msgctxt "Label: Description of security method"
4957-msgid "4 digits only"
4958-msgstr ""
4959-
4960-#: qml/Wizard/Pages/30-passwd-type.qml:108
4961-msgctxt "Label: Type of security method"
4962-msgid "Passphrase"
4963-msgstr ""
4964-
4965-#: qml/Wizard/Pages/30-passwd-type.qml:109
4966-msgctxt "Label: Description of security method"
4967-msgid "Numbers and letters"
4968-msgstr ""
4969-
4970-#: qml/Wizard/Pages/40-wifi.qml:29
4971-msgid "Connect to Wi‑Fi"
4972-msgstr "Connecta't a la Wi-Fi"
4973-
4974-#: qml/Wizard/Pages/40-wifi.qml:168
4975-msgid "Available networks…"
4976-msgstr "Xarxes disponibles..."
4977-
4978-#: qml/Wizard/Pages/40-wifi.qml:169
4979-msgid "No available networks."
4980-msgstr "No hi ha xarxes disponibles"
4981-
4982-#: qml/Wizard/Pages/50-location.qml:27
4983-msgid "Location"
4984-msgstr "Ubicació"
4985-
4986-#: qml/Wizard/Pages/50-location.qml:62
4987-msgid "Let the phone detect your location:"
4988-msgstr "Fes que el telèfon detecti la meua ubicació:"
4989-
4990-#: qml/Wizard/Pages/50-location.qml:69
4991-msgid "Using GPS only (less accurate)"
4992-msgstr "Utilitza només el GPS (menys precís)"
4993-
4994-#: qml/Wizard/Pages/50-location.qml:86
4995-msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
4996-msgstr ""
4997-"Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "
4998-"(recomanat)"
4999-
5000-#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches