on xenial help sign in
Merge from trunk
d0b8547Michael Terry
CMakeLists.txt+5
@@ -61,6 +61,11 @@ include(GNUInstallDirs)
61set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)
61set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)
62set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)
62set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)
63
63
64+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugin_private_module_dir SystemSettings OUTPUT_VARIABLE USS_PRIVATE_PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
65+if(USS_PRIVATE_PLUGINDIR STREQUAL "")
66+ message(FATAL_ERROR "Could not determine USS private plugin installation dir.")
67+endif()
68+
64execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir_suffix unity-shell-api OUTPUT_VARIABLE SHELL_INSTALL_QML OUTPUT_STRIP_TRAILING_WHITESPACE)
69execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir_suffix unity-shell-api OUTPUT_VARIABLE SHELL_INSTALL_QML OUTPUT_STRIP_TRAILING_WHITESPACE)
65if(SHELL_INSTALL_QML STREQUAL "")
70if(SHELL_INSTALL_QML STREQUAL "")
66 message(FATAL_ERROR "Could not determine plugin installation dir.")
71 message(FATAL_ERROR "Could not determine plugin installation dir.")
build.sh+5−1
@@ -54,13 +54,17 @@ install_dependencies() {
54 qtdeclarative5-unity-notifications-plugin \
54 qtdeclarative5-unity-notifications-plugin \
55 qml-module-ubuntu-connectivity \
55 qml-module-ubuntu-connectivity \
56 ubuntu-mobile-icons \
56 ubuntu-mobile-icons \
57+ ubuntu-system-settings \
57 unity-plugin-scopes \
58 unity-plugin-scopes \
58 xvfb \
59 xvfb \
59 || exit 5
60 || exit 5
60}
61}
61
62
62mk_build_deps() {
63mk_build_deps() {
64+ if [ ! -f control -o $CODE_DIR/debian/control -nt control ]; then
65+ sed 's/\:native//g' $CODE_DIR/debian/control > control
63− [ ! -f unity8-build-deps*deb -o $CODE_DIR/debian/control -nt unity8-build-deps*deb ] && mk-build-deps --install --root-cmd sudo $CODE_DIR/debian/control
66+ mk-build-deps --install --root-cmd sudo control
67+ fi
64}
68}
65
69
66if [ -f "/usr/bin/ccache" ] ; then
70if [ -f "/usr/bin/ccache" ] ; then
cmake/modules/QmlTest.cmake+3
@@ -153,7 +153,9 @@ endmacro(add_qml_test_internal)
153
153
154macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)
154macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)
155 set(testCommand
155 set(testCommand
156+ ${ENVVAR}
156 LD_LIBRARY_PATH=${LD_PATH}
157 LD_LIBRARY_PATH=${LD_PATH}
158+ dbus-launch
157 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
159 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
158 -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
160 -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
159 -o -,txt)
161 -o -,txt)
@@ -171,6 +173,7 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)
171 ${ENVVAR}
173 ${ENVVAR}
172 LD_LIBRARY_PATH=${LD_PATH}
174 LD_LIBRARY_PATH=${LD_PATH}
173 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
175 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
176+ dbus-launch
174 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
177 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
175 -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
178 -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
176 -o -,txt)
179 -o -,txt)
com.canonical.Unity8.gschema.xmlnew file+14
@@ -0,0 +1,14 @@
1+<schemalist>
2+ <enum id="usage-mode-enum">
3+ <value nick="Staged" value="0" />
4+ <value nick="Windowed" value="1" />
5+ </enum>
6+
7+ <schema path="/com/canonical/unity8/" id="com.canonical.Unity8" gettext-domain="unity8">
8+ <key enum="usage-mode-enum" name="usage-mode">
9+ <default>"Staged"</default>
10+ <summary>The usage mode.</summary>
11+ <description>The usage mode chosen will affect the Window Management behaviour.</description>
12+ </key>
13+ </schema>
14+</schemalist>
debian/changelog+258
@@ -1,3 +1,261 @@
1+unity8 (8.02+15.04.20150205-0ubuntu1) vivid; urgency=medium
2+
3+ [ Andrea Cimitan ]
4+ * Fix continue button in wifi wizard page, adds qml-module-
5+ qtsysteminfo as unity8 dep (LP: #1363400)
6+ * Background needs to be specified to be visible in horizontal cards
7+ (LP: #1411748)
8+
9+ [ CI Train Bot ]
10+ * Resync trunk
11+
12+ [ Michał Sawicz ]
13+ * Add workaround for gcc ICE.
14+
15+ [ Albert Astals ]
16+ * Implement proper updateRanges for horizontal items (i.e. Carousel,
17+ Horizontal List)
18+
19+ [ Michael Terry ]
20+ * Don't accept multiple "Finish" clicks during the last step of the
21+ wizard
22+
23+ [ Daniel d'Andrada ]
24+ * Unify all liblightdm mocks
25+ * Ensure the greeter password field is not covered by the keyboard
26+ * Don't show() the lockscreen if it's already being shown
27+
28+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 05 Feb 2015 10:30:13 +0000
29+
30+unity8 (8.02+15.04.20150123.3-0ubuntu1) vivid; urgency=low
31+
32+ [ Sebastien Bacher ]
33+ * Set text hint property for the messaging menus inline reply widget
34+ (LP: #1389234)
35+
36+ [ Ying-Chun Liu ]
37+ * Added an initial set of autopilot tests for the display indicator.
38+
39+ [ Nick Dedekind ]
40+ * Removed filtering the indicator model by visibility.
41+
42+ [ Michael Zanetti ]
43+ * fixes left edge drag when in spread
44+
45+ [ Albert Astals Cid ]
46+ * Fix ninja build in a different way The previous one was adding rpath
47+ to some .so that broke our tests that use LD_LIBRARY_PATH to change
48+ which one is picked up
49+
50+ [ Leo Arias ]
51+ * Added an initial set of autopilot tests for the display indicator.
52+
53+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 23 Jan 2015 12:12:41 +0000
54+
55+unity8 (8.02+15.04.20150121.2-0ubuntu1) vivid; urgency=low
56+
57+ [ Michael Terry ]
58+ * Don't show any power dialogs while the screen is off. This is a
59+ band-aid to avoid the symptom, while we still investigate the source
60+ of why the screen doesn't turn on (and why we seem to not handle the
61+ power-button-release event). (LP: #1409003, #1410830)
62+ * Don't refocus the dialer-app when a call is started by the user.
63+ Because of how qtmir works, this would cause the dialer-app to
64+ unfocus momentarily, causing interface oddities for the user. (LP:
65+ #1413065)
66+
67+ [ CI Train Bot ]
68+ * Resync trunk
69+
70+ [ Albert Astals Cid ]
71+ * Build with ninja
72+ * Fixes for Table Preview Widget (LP: #1410420)
73+
74+ [ Michael Zanetti ]
75+ * Add support for earpiece media buttons (LP: #1398427)
76+ * Add a WindowMoveResizeArea and tests for it
77+
78+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 21 Jan 2015 18:33:18 +0000
79+
80+unity8 (8.02+15.04.20150113.1-0ubuntu1) vivid; urgency=low
81+
82+ [ Andrea Cimitan ]
83+ * support background on horizontal cards with summary (LP: #1393008)
84+
85+ [ Gerry Boland ]
86+ * DashCommunicator: replace QDBusInterface with a non-blocking
87+ simplification which does not introspect the service on creation
88+ (LP: #1403508)
89+
90+ [ Leo Arias ]
91+ * Added an autopilot test for the edges demo.
92+
93+ [ Albert Astals ]
94+ * Don't show the manage dash pull up arrow on temp scopes (LP:
95+ #1401869)
96+ * Remove hack, newer Qt already support keyClick(char)
97+ * Tests: Add Qt 5.5 removal TODOs
98+ * Make sure we use fPIC when compiling files for the static library
99+ too
100+ * Make sure changing a scope doesn't trigger creation/destruction of
101+ delegates until it's finished (LP: #1410122)
102+
103+ [ Michael Zanetti ]
104+ * patch debian/control file before using it to make it work with mk-
105+ build-deps
106+
107+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 13 Jan 2015 20:58:08 +0000
108+
109+unity8 (8.02+15.04.20150109.2-0ubuntu1) vivid; urgency=low
110+
111+ [ Michał Sawicz ]
112+ * We don't need the SIGSTOP in main() any more.
113+ * Add a test to make sure the shell always starts disabled until it is
114+ enabled by a complete PAM interaction.
115+
116+ [ Leo Arias ]
117+ * Added an autopilot test for the edges demo.
118+
119+ [ Nick Dedekind ]
120+ * Unhook Lights interface from indicator widgets (LP: #1385331)
121+
122+ [ Albert Astals ]
123+ * Fix going to scopes when the Manage Dash is open (LP: #1403464)
124+ * QSortFilterProxyModelQML -> UnitySortFilterProxyModelQML
125+ * Clip the Scopes List header
126+ * Fix ScopesList not being under finger
127+ * Make waitForRendering with no item fail instead of crash
128+ * Disable Dash horizontal scroll while Navigation InverseMouseArea is
129+ pressed (LP: #1403048)
130+ * Test: Make sure the mouse area is enabled before clicking into it
131+ * Test: We actually need to click on the customBackButton and not on
132+ backButton
133+ * Test: By default mouseX act on the middle
134+
135+ [ Michael Terry ]
136+ * Don't block handling power events on loading the greeter's qml and
137+ the background image.
138+ * Show OSK above the wizard. (LP: #1401213)
139+ * Unify the name of the Greeter DBus test, make it use our standard
140+ binary test macro (which also nicely exports xml results), and make
141+ the test a little more robust against timing issues.
142+ * Add a test to make sure the shell always starts disabled until it is
143+ enabled by a complete PAM interaction.
144+
145+ [ Martin Pitt ]
146+ * tests: Fix Notify.Notification.add_action invocation to work also
147+ with unpatched libnotify API. (LP: #1223401)
148+
149+ [ Rodney Dawes ]
150+ * Depend on :native version of g++ to allow cross-compiling to work.
151+ (LP: #1353855)
152+
153+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 09 Jan 2015 10:43:06 +0000
154+
155+unity8 (8.02+15.04.20141216.1-0ubuntu1) vivid; urgency=low
156+
157+ [ Ubuntu daily release ]
158+ * New rebuild forced
159+
160+ [ Albert Astals ]
161+ * Need to wait until loaded is true to use the count property
162+ * Manage Dash: Ellide properly
163+
164+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 16 Dec 2014 11:03:37 +0000
165+
166+unity8 (8.02+15.04.20141215.3-0ubuntu1) vivid; urgency=low
167+
168+ [ Albert Astals Cid ]
169+ * ScopesList: Use the default scope style for the header
170+
171+ [ Daniel d'Andrada ]
172+ * Refactor Dialogs.qml to use proper in-scene dialogs
173+ * Make Greeter nicely handle being resized
174+
175+ [ Albert Astals ]
176+ * Rework how we set the ranges so we get some more asynchronousity
177+ from item views (LP: #1384374)
178+ * clickscope is back to being unfavoritable (LP: #1400762)
179+ * Fix clicking on the manage dash list after having moved the current
180+ scope
181+ * Make the drag range be a multiple of the drag "rate" value.
182+ Workarounds https://bugs.launchpad.net/mir/+bug/1399690
183+
184+ [ Gerry Boland ]
185+ * MockAppMan: emit SIGSTOP so AP test apps are run (LP: #1394208)
186+
187+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 15 Dec 2014 22:43:16 +0000
188+
189+unity8 (8.02+15.04.20141212.1-0ubuntu1) vivid; urgency=low
190+
191+ [ Ubuntu daily release ]
192+ * New rebuild forced
193+
194+ [ Albert Astals ]
195+ * Make Navigation work when "jumping" to the non root
196+
197+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 12 Dec 2014 12:28:10 +0000
198+
199+unity8 (8.02+15.04.20141211.2-0ubuntu1) vivid; urgency=medium
200+
201+ [ Michał Sawicz ]
202+ * Bump version due to new Manage Dash
203+
204+ [ Gerry Boland ]
205+ * [indicators] Fix positioning on panel resize.
206+
207+ [ Nick Dedekind ]
208+ * [indicators] Fix positioning on panel resize.
209+
210+ [ Albert Astals ]
211+ * Fix the Dash Header hamburger menu background color
212+ * Fix tests (LP: #1400449)
213+ * Allow pulling manage dash if there's no favorite scopes (LP:
214+ #1400774)
215+ * Manage Dash: Make store button work even if you have no favorites
216+ (LP: #1400771)
217+ * Make pot_file
218+
219+ [ CI Train Bot ]
220+ * Resync trunk
221+
222+ [ Andrea Cimitan ]
223+ * Remove dismiss timer in Launcher (LP: #1368778)
224+
225+ [ Michael Zanetti ]
226+ * decrease opacity changes in spread, move it to a separate surface.
227+ * Add an initial, rudimentary DesktopStage to get started
228+ * Uninvert Launcher in Desktop Mode
229+ * Add support for Wallpaper in Desktop stage
230+ * Add window control buttons to panel for fullscreen applications
231+
232+ [ Rodney Dawes ]
233+ * Add dependency on gir1.2-notify-0.7 to unity8-autopilot package.
234+ (LP: #1400437)
235+
236+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 11 Dec 2014 13:25:44 +0000
237+
238+unity8 (8.01+15.04.20141205-0ubuntu1) vivid; urgency=low
239+
240+ [ CI Train Bot ]
241+ * Resync trunk
242+
243+ [ Albert Astals ]
244+ * Replace Scopes Overview by the new Manage Dash (LP: #1386698,
245+ #1368670)
246+
247+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 05 Dec 2014 10:55:50 +0000
248+
249+unity8 (8.01+15.04.20141204-0ubuntu1) vivid; urgency=low
250+
251+ [ Michael Terry ]
252+ * Import wizard code from ubuntu-system-settings.
253+ * Convert the welcome wizard from a separate executable into a qml
254+ plugin (with a small C++ plugin for support).
255+ * Add tests for welcome wizard.
256+
257+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 04 Dec 2014 20:55:11 +0000
258+
1unity8 (8.01+15.04.20141202-0ubuntu1) vivid; urgency=low
259unity8 (8.01+15.04.20141202-0ubuntu1) vivid; urgency=low
2
260
3 [ Michael Terry ]
261 [ Michael Terry ]
debian/control+19−7
@@ -10,8 +10,10 @@ Build-Depends: cmake,
10 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
10 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
11# We rely on C++11 features, and to prevent from ABI breaks
11# We rely on C++11 features, and to prevent from ABI breaks
12# in libstdc++ causing us issues, we explicitly select a G++
12# in libstdc++ causing us issues, we explicitly select a G++
13−# version.
13+# version. To allow cross-compiling to work, we also must
14+# append :native to g++-4.9 so we don't try to run armhf g++
15+# on an x86 CPU for eaxmple, when cross-compiling.
14− g++-4.9,
16+ g++-4.9:native,
15 libconnectivity-qt1-dev,
17 libconnectivity-qt1-dev,
16 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
18 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
17 libgl1-mesa-dri,
19 libgl1-mesa-dri,
@@ -22,9 +24,10 @@ Build-Depends: cmake,
22 libpam0g-dev,
24 libpam0g-dev,
23 libpay2-dev,
25 libpay2-dev,
24 libpulse-dev,
26 libpulse-dev,
25− libqmenumodel-dev (>= 0.2.8),
27+ libqmenumodel-dev (>= 0.2.9),
26 libqt5xmlpatterns5-dev,
28 libqt5xmlpatterns5-dev,
29+ libsystemsettings-dev,
27− libunity-api-dev (>= 7.93),
30+ libunity-api-dev (>= 7.94),
28 libusermetricsoutput1-dev,
31 libusermetricsoutput1-dev,
29 libxcb1-dev,
32 libxcb1-dev,
30 pkg-config,
33 pkg-config,
@@ -32,9 +35,11 @@ Build-Depends: cmake,
32 python3-all:any,
35 python3-all:any,
33 python3-setuptools,
36 python3-setuptools,
34 python:any (>= 2.7),
37 python:any (>= 2.7),
38+ qml-module-qt-labs-folderlistmodel,
35 qml-module-qtquick-layouts,
39 qml-module-qtquick-layouts,
36 qml-module-qtquick-xmllistmodel,
40 qml-module-qtquick-xmllistmodel,
37 qml-module-qtquick2,
41 qml-module-qtquick2,
42+ qml-module-qtsysteminfo,
38 qml-module-qttest,
43 qml-module-qttest,
39 qt5-default,
44 qt5-default,
40 qtbase5-dev (>= 5.2.1),
45 qtbase5-dev (>= 5.2.1),
@@ -44,8 +49,9 @@ Build-Depends: cmake,
44 qtdeclarative5-dev-tools,
49 qtdeclarative5-dev-tools,
45 qtdeclarative5-private-dev (>= 5.2.1),
50 qtdeclarative5-private-dev (>= 5.2.1),
46 qtdeclarative5-qtmultimedia-plugin,
51 qtdeclarative5-qtmultimedia-plugin,
47− qtdeclarative5-ubuntu-settings-components (>= 0.4),
52+ qtdeclarative5-ubuntu-settings-components (>= 0.5),
48 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
53 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
54+ qtdeclarative5-ubuntu-web-plugin,
49 ttf-ubuntu-font-family,
55 ttf-ubuntu-font-family,
50Standards-Version: 3.9.4
56Standards-Version: 3.9.4
51Homepage: http://launchpad.net/unity
57Homepage: http://launchpad.net/unity
@@ -58,7 +64,7 @@ X-Ubuntu-Use-Langpack: yes
58
64
59Package: indicators-client
65Package: indicators-client
60Architecture: amd64 armhf i386
66Architecture: amd64 armhf i386
61−Depends: qmenumodel-qml (>= 0.2.8),
67+Depends: qmenumodel-qml (>= 0.2.9),
62 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
68 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
63 unity8 (= ${binary:Version}),
69 unity8 (= ${binary:Version}),
64 ${misc:Depends},
70 ${misc:Depends},
@@ -82,11 +88,15 @@ Provides: indicator-renderer,
82Depends: gsettings-desktop-schemas,
88Depends: gsettings-desktop-schemas,
83 libcap2-bin,
89 libcap2-bin,
84 libglib2.0-bin,
90 libglib2.0-bin,
85− qmenumodel-qml (>= 0.2.8),
91+ qmenumodel-qml (>= 0.2.9),
92+ qml-module-qt-labs-folderlistmodel,
86 qml-module-qtquick-xmllistmodel,
93 qml-module-qtquick-xmllistmodel,
94+ qml-module-qtsysteminfo,
87 qtdeclarative5-gsettings1.0,
95 qtdeclarative5-gsettings1.0,
88 qtdeclarative5-qtmir-plugin (>= 0.4.4),
96 qtdeclarative5-qtmir-plugin (>= 0.4.4),
89 qtdeclarative5-ubuntu-telephony0.1,
97 qtdeclarative5-ubuntu-telephony0.1,
98+ qtdeclarative5-ubuntu-web-plugin,
99+ ubuntu-system-settings,
90 unity-launcher-impl-4,
100 unity-launcher-impl-4,
91 unity8-common (= ${source:Version}),
101 unity8-common (= ${source:Version}),
92 unity8-private (= ${binary:Version}),
102 unity8-private (= ${binary:Version}),
@@ -101,6 +111,7 @@ Breaks: indicator-network (<< 0.5.1+14.10.20141014),
101 unity8-greeter (<< 7.89),
111 unity8-greeter (<< 7.89),
102Replaces: ubuntu-touch-session (<< 0.82~),
112Replaces: ubuntu-touch-session (<< 0.82~),
103 unity8-greeter (<< 7.89),
113 unity8-greeter (<< 7.89),
114+Conflicts: ubuntu-system-settings-wizard,
104Description: Unity 8 shell
115Description: Unity 8 shell
105 The Unity 8 shell is the primary user interface for Ubuntu devices.
116 The Unity 8 shell is the primary user interface for Ubuntu devices.
106
117
@@ -129,6 +140,7 @@ Description: Unity 8 shell (common files)
129Package: unity8-autopilot
140Package: unity8-autopilot
130Architecture: all
141Architecture: all
131Depends: gir1.2-glib-2.0,
142Depends: gir1.2-glib-2.0,
143+ gir1.2-notify-0.7,
132 libautopilot-qt (>= 1.4),
144 libautopilot-qt (>= 1.4),
133 libqt5test5,
145 libqt5test5,
134 libqt5widgets5,
146 libqt5widgets5,
debian/unity8-common.install+2
@@ -3,3 +3,5 @@ usr/share/unity8/Components
3usr/share/unity8/Dash
3usr/share/unity8/Dash
4usr/share/unity8/Notifications
4usr/share/unity8/Notifications
5usr/share/unity8/graphics
5usr/share/unity8/graphics
6+com.canonical.Unity8.gschema.xml usr/share/glib-2.0/schemas/
7+var/lib/polkit-1/localauthority/10-vendor.d
debian/unity8-private.install+1
@@ -9,6 +9,7 @@ usr/lib/*/unity8/qml/ScreenGrabber
9usr/lib/*/unity8/qml/Ubuntu
9usr/lib/*/unity8/qml/Ubuntu
10usr/lib/*/unity8/qml/Unity
10usr/lib/*/unity8/qml/Unity
11usr/lib/*/unity8/qml/Utils
11usr/lib/*/unity8/qml/Utils
12+usr/lib/*/unity8/qml/Wizard
12usr/lib/*/unity8/libUbuntuGestures*
13usr/lib/*/unity8/libUbuntuGestures*
13usr/share/accountsservice/interfaces
14usr/share/accountsservice/interfaces
14usr/share/dbus-1/interfaces
15usr/share/dbus-1/interfaces
debian/unity8.install+1
@@ -10,4 +10,5 @@ usr/share/unity8/Launcher
10usr/share/unity8/Panel
10usr/share/unity8/Panel
11usr/share/unity8/Shell.qml
11usr/share/unity8/Shell.qml
12usr/share/unity8/Stages
12usr/share/unity8/Stages
13+usr/share/unity8/Wizard
13usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
14usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
include/paths.h.in+2
@@ -71,9 +71,11 @@ inline QStringList fallbackImportPaths() {
71 QStringList paths;
71 QStringList paths;
72 if (isRunningInstalled()) {
72 if (isRunningInstalled()) {
73 paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
73 paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
74+ paths << QString("@USS_PRIVATE_PLUGINDIR@");
74 paths << QString("@SHELL_PLUGINDIR@");
75 paths << QString("@SHELL_PLUGINDIR@");
75 paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
76 paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
76 } else {
77 } else {
78+ paths << QString("@USS_PRIVATE_PLUGINDIR@");
77 paths << QString("@SHELL_PLUGINDIR@");
79 paths << QString("@SHELL_PLUGINDIR@");
78 paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");
80 paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");
79 }
81 }
plugins/AccountsService/AccountsService.cpp+61−2
@@ -19,23 +19,28 @@
19#include "AccountsService.h"
19#include "AccountsService.h"
20#include "AccountsServiceDBusAdaptor.h"
20#include "AccountsServiceDBusAdaptor.h"
21
21
22+#include <QFile>
22#include <QStringList>
23#include <QStringList>
23
24
24AccountsService::AccountsService(QObject* parent)
25AccountsService::AccountsService(QObject* parent)
25 : QObject(parent),
26 : QObject(parent),
26 m_service(new AccountsServiceDBusAdaptor(this)),
27 m_service(new AccountsServiceDBusAdaptor(this)),
27− m_user(qgetenv("USER")),
28+ m_user(""),
28 m_demoEdges(false),
29 m_demoEdges(false),
29 m_enableLauncherWhileLocked(false),
30 m_enableLauncherWhileLocked(false),
30 m_enableIndicatorsWhileLocked(false),
31 m_enableIndicatorsWhileLocked(false),
31 m_statsWelcomeScreen(false),
32 m_statsWelcomeScreen(false),
32 m_passwordDisplayHint(Keyboard),
33 m_passwordDisplayHint(Keyboard),
33− m_failedLogins(0)
34+ m_failedLogins(0),
35+ m_hereEnabled(false),
36+ m_hereLicensePath() // null means not set yet
34{
37{
35 connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),
38 connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),
36 this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
39 this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
37 connect(m_service, SIGNAL(maybeChanged(const QString &)),
40 connect(m_service, SIGNAL(maybeChanged(const QString &)),
38 this, SLOT(maybeChanged(const QString &)));
41 this, SLOT(maybeChanged(const QString &)));
42+
43+ setUser(qgetenv("USER"));
39}
44}
40
45
41QString AccountsService::user() const
46QString AccountsService::user() const
@@ -45,6 +50,9 @@ QString AccountsService::user() const
45
50
46void AccountsService::setUser(const QString &user)
51void AccountsService::setUser(const QString &user)
47{
52{
53+ if (user.isEmpty() || m_user == user)
54+ return;
55+
48 m_user = user;
56 m_user = user;
49 Q_EMIT userChanged();
57 Q_EMIT userChanged();
50
58
@@ -55,6 +63,8 @@ void AccountsService::setUser(const QString &user)
55 updateStatsWelcomeScreen();
63 updateStatsWelcomeScreen();
56 updatePasswordDisplayHint();
64 updatePasswordDisplayHint();
57 updateFailedLogins();
65 updateFailedLogins();
66+ updateHereEnabled();
67+ updateHereLicensePath();
58}
68}
59
69
60bool AccountsService::demoEdges() const
70bool AccountsService::demoEdges() const
@@ -93,6 +103,26 @@ AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() cons
93 return m_passwordDisplayHint;
103 return m_passwordDisplayHint;
94}
104}
95
105
106+bool AccountsService::hereEnabled() const
107+{
108+ return m_hereEnabled;
109+}
110+
111+void AccountsService::setHereEnabled(bool enabled)
112+{
113+ m_service->setUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted", enabled);
114+}
115+
116+QString AccountsService::hereLicensePath() const
117+{
118+ return m_hereLicensePath;
119+}
120+
121+bool AccountsService::hereLicensePathValid() const
122+{
123+ return !m_hereLicensePath.isNull();
124+}
125+
96void AccountsService::updateDemoEdges()
126void AccountsService::updateDemoEdges()
97{
127{
98 auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();
128 auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();
@@ -156,6 +186,28 @@ void AccountsService::updateFailedLogins()
156 }
186 }
157}
187}
158
188
189+void AccountsService::updateHereEnabled()
190+{
191+ bool hereEnabled = m_service->getUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted").toBool();
192+ if (m_hereEnabled != hereEnabled) {
193+ m_hereEnabled = hereEnabled;
194+ Q_EMIT hereEnabledChanged();
195+ }
196+}
197+
198+void AccountsService::updateHereLicensePath()
199+{
200+ QString hereLicensePath = m_service->getUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseBasePath").toString();
201+
202+ if (hereLicensePath.isEmpty() || !QFile::exists(hereLicensePath))
203+ hereLicensePath = "";
204+
205+ if (m_hereLicensePath.isNull() || m_hereLicensePath != hereLicensePath) {
206+ m_hereLicensePath = hereLicensePath;
207+ Q_EMIT hereLicensePathChanged();
208+ }
209+}
210+
159uint AccountsService::failedLogins() const
211uint AccountsService::failedLogins() const
160{
212{
161 return m_failedLogins;
213 return m_failedLogins;
@@ -195,6 +247,13 @@ void AccountsService::propertiesChanged(const QString &user, const QString &inte
195 if (changed.contains("EnableIndicatorsWhileLocked")) {
247 if (changed.contains("EnableIndicatorsWhileLocked")) {
196 updateEnableIndicatorsWhileLocked();
248 updateEnableIndicatorsWhileLocked();
197 }
249 }
250+ } else if (interface == "com.ubuntu.location.providers.here.AccountsService") {
251+ if (changed.contains("LicenseAccepted")) {
252+ updateHereEnabled();
253+ }
254+ if (changed.contains("LicenseBasePath")) {
255+ updateHereLicensePath();
256+ }
198 }
257 }
199}
258}
200
259
plugins/AccountsService/AccountsService.h+20
@@ -55,6 +55,16 @@ class AccountsService: public QObject
55 READ failedLogins
55 READ failedLogins
56 WRITE setFailedLogins
56 WRITE setFailedLogins
57 NOTIFY failedLoginsChanged)
57 NOTIFY failedLoginsChanged)
58+ Q_PROPERTY(bool hereEnabled
59+ READ hereEnabled
60+ WRITE setHereEnabled
61+ NOTIFY hereEnabledChanged)
62+ Q_PROPERTY(QString hereLicensePath
63+ READ hereLicensePath
64+ NOTIFY hereLicensePathChanged)
65+ Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that
66+ READ hereLicensePathValid
67+ NOTIFY hereLicensePathChanged)
58
68
59public:
69public:
60 enum PasswordDisplayHint {
70 enum PasswordDisplayHint {
@@ -75,6 +85,10 @@ public:
75 PasswordDisplayHint passwordDisplayHint() const;
85 PasswordDisplayHint passwordDisplayHint() const;
76 uint failedLogins() const;
86 uint failedLogins() const;
77 void setFailedLogins(uint failedLogins);
87 void setFailedLogins(uint failedLogins);
88+ bool hereEnabled() const;
89+ void setHereEnabled(bool enabled);
90+ QString hereLicensePath() const;
91+ bool hereLicensePathValid() const;
78
92
79Q_SIGNALS:
93Q_SIGNALS:
80 void userChanged();
94 void userChanged();
@@ -85,6 +99,8 @@ Q_SIGNALS:
85 void statsWelcomeScreenChanged();
99 void statsWelcomeScreenChanged();
86 void passwordDisplayHintChanged();
100 void passwordDisplayHintChanged();
87 void failedLoginsChanged();
101 void failedLoginsChanged();
102+ void hereEnabledChanged();
103+ void hereLicensePathChanged();
88
104
89private Q_SLOTS:
105private Q_SLOTS:
90 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
106 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
@@ -98,6 +114,8 @@ private:
98 void updateStatsWelcomeScreen();
114 void updateStatsWelcomeScreen();
99 void updatePasswordDisplayHint();
115 void updatePasswordDisplayHint();
100 void updateFailedLogins();
116 void updateFailedLogins();
117+ void updateHereEnabled();
118+ void updateHereLicensePath();
101
119
102 AccountsServiceDBusAdaptor *m_service;
120 AccountsServiceDBusAdaptor *m_service;
103 QString m_user;
121 QString m_user;
@@ -108,6 +126,8 @@ private:
108 bool m_statsWelcomeScreen;
126 bool m_statsWelcomeScreen;
109 PasswordDisplayHint m_passwordDisplayHint;
127 PasswordDisplayHint m_passwordDisplayHint;
110 uint m_failedLogins;
128 uint m_failedLogins;
129+ bool m_hereEnabled;
130+ QString m_hereLicensePath;
111};
131};
112
132
113#endif
133#endif
plugins/CMakeLists.txt+1
@@ -21,3 +21,4 @@ add_subdirectory(ScreenGrabber)
21add_subdirectory(Ubuntu)
21add_subdirectory(Ubuntu)
22add_subdirectory(Unity)
22add_subdirectory(Unity)
23add_subdirectory(Utils)
23add_subdirectory(Utils)
24+add_subdirectory(Wizard)
plugins/Dash/CardCreator.js+2−1
@@ -320,7 +320,8 @@ function cardString(template, components) {
320 var hasSummary = components["summary"] || false;
320 var hasSummary = components["summary"] || false;
321 var artAndSummary = hasArt && hasSummary;
321 var artAndSummary = hasArt && hasSummary;
322 var isHorizontal = template["card-layout"] === "horizontal";
322 var isHorizontal = template["card-layout"] === "horizontal";
323− var hasBackground = !isHorizontal && (template["card-background"] || components["background"] || artAndSummary);
323+ var hasBackground = (!isHorizontal && (template["card-background"] || components["background"] || artAndSummary)) ||
324+ (hasSummary && (template["card-background"] || components["background"]));
324 var hasTitle = components["title"] || false;
325 var hasTitle = components["title"] || false;
325 var hasMascot = components["mascot"] || false;
326 var hasMascot = components["mascot"] || false;
326 var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;
327 var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;
plugins/Dash/abstractdashview.cpp+24−5
@@ -16,13 +16,12 @@
16
16
17#include "abstractdashview.h"
17#include "abstractdashview.h"
18
18
19−static const qreal bufferRatio = 0.5;
20−
21AbstractDashView::AbstractDashView()
19AbstractDashView::AbstractDashView()
22 : m_delegateModel(nullptr)
20 : m_delegateModel(nullptr)
23 , m_asyncRequestedIndex(-1)
21 , m_asyncRequestedIndex(-1)
24 , m_columnSpacing(0)
22 , m_columnSpacing(0)
25 , m_rowSpacing(0)
23 , m_rowSpacing(0)
24+ , m_buffer(320) // Same value used in qquickitemview.cpp in Qt 5.4
26 , m_displayMarginBeginning(0)
25 , m_displayMarginBeginning(0)
27 , m_displayMarginEnd(0)
26 , m_displayMarginEnd(0)
28 , m_needsRelayout(false)
27 , m_needsRelayout(false)
@@ -112,6 +111,27 @@ void AbstractDashView::setRowSpacing(qreal rowSpacing)
112 }
111 }
113}
112}
114
113
114+int AbstractDashView::cacheBuffer() const
115+{
116+ return m_buffer;
117+}
118+
119+void AbstractDashView::setCacheBuffer(int buffer)
120+{
121+ if (buffer < 0) {
122+ qmlInfo(this) << "Cannot set a negative cache buffer";
123+ return;
124+ }
125+
126+ if (m_buffer != buffer) {
127+ m_buffer = buffer;
128+ if (isComponentComplete()) {
129+ polish();
130+ }
131+ emit cacheBufferChanged();
132+ }
133+}
134+
115qreal AbstractDashView::displayMarginBeginning() const
135qreal AbstractDashView::displayMarginBeginning() const
116{
136{
117 return m_displayMarginBeginning;
137 return m_displayMarginBeginning;
@@ -160,9 +180,8 @@ void AbstractDashView::refill()
160
180
161 const qreal from = -m_displayMarginBeginning;
181 const qreal from = -m_displayMarginBeginning;
162 const qreal to = height() + m_displayMarginEnd;
182 const qreal to = height() + m_displayMarginEnd;
163− const qreal buffer = (to - from) * bufferRatio;
164− const qreal bufferFrom = from - buffer;
183+ const qreal bufferFrom = from - m_buffer;
165− const qreal bufferTo = to + buffer;
184+ const qreal bufferTo = to + m_buffer;
166
185
167 bool added = addVisibleItems(from, to, false);
186 bool added = addVisibleItems(from, to, false);
168 bool removed = removeNonVisibleItems(bufferFrom, bufferTo);
187 bool removed = removeNonVisibleItems(bufferFrom, bufferTo);
plugins/Dash/abstractdashview.h+6
@@ -35,6 +35,7 @@ class AbstractDashView : public QQuickItem
35 Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
35 Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
36 Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setColumnSpacing NOTIFY columnSpacingChanged)
36 Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setColumnSpacing NOTIFY columnSpacingChanged)
37 Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setRowSpacing NOTIFY rowSpacingChanged)
37 Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setRowSpacing NOTIFY rowSpacingChanged)
38+ Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
38 Q_PROPERTY(qreal displayMarginBeginning READ displayMarginBeginning
39 Q_PROPERTY(qreal displayMarginBeginning READ displayMarginBeginning
39 WRITE setDisplayMarginBeginning
40 WRITE setDisplayMarginBeginning
40 NOTIFY displayMarginBeginningChanged)
41 NOTIFY displayMarginBeginningChanged)
@@ -61,6 +62,9 @@ public:
61 qreal rowSpacing() const;
62 qreal rowSpacing() const;
62 void setRowSpacing(qreal rowSpacing);
63 void setRowSpacing(qreal rowSpacing);
63
64
65+ int cacheBuffer() const;
66+ void setCacheBuffer(int);
67+
64 qreal displayMarginBeginning() const;
68 qreal displayMarginBeginning() const;
65 void setDisplayMarginBeginning(qreal);
69 void setDisplayMarginBeginning(qreal);
66
70
@@ -72,6 +76,7 @@ Q_SIGNALS:
72 void delegateChanged();
76 void delegateChanged();
73 void columnSpacingChanged();
77 void columnSpacingChanged();
74 void rowSpacingChanged();
78 void rowSpacingChanged();
79+ void cacheBufferChanged();
75 void displayMarginBeginningChanged();
80 void displayMarginBeginningChanged();
76 void displayMarginEndChanged();
81 void displayMarginEndChanged();
77
82
@@ -117,6 +122,7 @@ private:
117
122
118 int m_columnSpacing;
123 int m_columnSpacing;
119 int m_rowSpacing;
124 int m_rowSpacing;
125+ int m_buffer;
120 qreal m_displayMarginBeginning;
126 qreal m_displayMarginBeginning;
121 qreal m_displayMarginEnd;
127 qreal m_displayMarginEnd;
122 bool m_needsRelayout;
128 bool m_needsRelayout;
plugins/Dash/listviewwithpageheader.cpp+7−2
@@ -334,13 +334,18 @@ qreal ListViewWithPageHeader::headerItemShownHeight() const
334 return m_headerItemShownHeight;
334 return m_headerItemShownHeight;
335}
335}
336
336
337−qreal ListViewWithPageHeader::cacheBuffer() const
337+int ListViewWithPageHeader::cacheBuffer() const
338{
338{
339 return m_cacheBuffer;
339 return m_cacheBuffer;
340}
340}
341
341
342−void ListViewWithPageHeader::setCacheBuffer(qreal cacheBuffer)
342+void ListViewWithPageHeader::setCacheBuffer(int cacheBuffer)
343{
343{
344+ if (cacheBuffer < 0) {
345+ qmlInfo(this) << "Cannot set a negative cache buffer";
346+ return;
347+ }
348+
344 if (cacheBuffer != m_cacheBuffer) {
349 if (cacheBuffer != m_cacheBuffer) {
345 m_cacheBuffer = cacheBuffer;
350 m_cacheBuffer = cacheBuffer;
346 Q_EMIT cacheBufferChanged();
351 Q_EMIT cacheBufferChanged();
plugins/Dash/listviewwithpageheader.h+4−4
@@ -54,7 +54,7 @@ class ListViewWithPageHeader : public QQuickFlickable, public QQuickItemChangeLi
54 Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
54 Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
55 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
55 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
56 Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)
56 Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)
57− Q_PROPERTY(qreal cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
57+ Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
58
58
59 friend class ListViewWithPageHeaderTest;
59 friend class ListViewWithPageHeaderTest;
60 friend class ListViewWithPageHeaderTestSection;
60 friend class ListViewWithPageHeaderTestSection;
@@ -85,8 +85,8 @@ public:
85 int stickyHeaderHeight() const;
85 int stickyHeaderHeight() const;
86 qreal headerItemShownHeight() const;
86 qreal headerItemShownHeight() const;
87
87
88− qreal cacheBuffer() const;
88+ int cacheBuffer() const;
89− void setCacheBuffer(qreal cacheBuffer);
89+ void setCacheBuffer(int cacheBuffer);
90
90
91 Q_INVOKABLE void positionAtBeginning();
91 Q_INVOKABLE void positionAtBeginning();
92 Q_INVOKABLE void showHeader();
92 Q_INVOKABLE void showHeader();
@@ -204,7 +204,7 @@ private:
204 bool m_forceNoClip;
204 bool m_forceNoClip;
205 bool m_inLayout;
205 bool m_inLayout;
206 bool m_inContentHeightKeepHeaderShown;
206 bool m_inContentHeightKeepHeaderShown;
207− qreal m_cacheBuffer;
207+ int m_cacheBuffer;
208
208
209 // Qt 5.0 doesn't like releasing the items just after itemCreated
209 // Qt 5.0 doesn't like releasing the items just after itemCreated
210 // so we delay the releasing until the next updatePolish
210 // so we delay the releasing until the next updatePolish
plugins/LightDM/CMakeLists.txt+4−4
@@ -1,9 +1,9 @@
1−# Dependencies
2−include(FindPkgConfig)
3pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
1pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
4# TODO: Once we split out a separate greeter process, uncomment these lines
2# TODO: Once we split out a separate greeter process, uncomment these lines
5#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)
3#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)
6
4
5+add_subdirectory(liblightdm)
6+
7include_directories(
7include_directories(
8 ${CMAKE_CURRENT_SOURCE_DIR}
8 ${CMAKE_CURRENT_SOURCE_DIR}
9 ${CMAKE_CURRENT_BINARY_DIR}
9 ${CMAKE_CURRENT_BINARY_DIR}
@@ -15,7 +15,7 @@ include_directories(
15)
15)
16
16
17set(QMLPLUGIN_SRC
17set(QMLPLUGIN_SRC
18− ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
18+ ../Utils/unitysortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
19 DBusGreeter.cpp
19 DBusGreeter.cpp
20 DBusGreeterList.cpp
20 DBusGreeterList.cpp
21 Greeter.cpp
21 Greeter.cpp
@@ -28,7 +28,7 @@ add_library(LightDM-qml MODULE
28 )
28 )
29
29
30target_link_libraries(LightDM-qml
30target_link_libraries(LightDM-qml
31− MockLightDM-demo
31+ integratedLightDM
32 unity8-private
32 unity8-private
33# TODO: Once we split out a separate greeter process, uncomment these lines
33# TODO: Once we split out a separate greeter process, uncomment these lines
34# ${LIBLIGHTDM_LDFLAGS}
34# ${LIBLIGHTDM_LDFLAGS}
plugins/LightDM/Greeter.cpp+1−19
@@ -17,26 +17,8 @@
17 */
17 */
18
18
19#include "Greeter.h"
19#include "Greeter.h"
20+#include "GreeterPrivate.h"
20#include <libintl.h>
21#include <libintl.h>
21−#include <QLightDM/Greeter>
22−
23−class GreeterPrivate
24−{
25−public:
26− explicit GreeterPrivate(Greeter *parent);
27−
28− QLightDM::Greeter *m_greeter;
29− bool m_active;
30− bool wasPrompted;
31− bool promptless;
32−
33−protected:
34− Greeter * const q_ptr;
35−
36−private:
37− Q_DECLARE_PUBLIC(Greeter)
38−};
39−
40
22
41GreeterPrivate::GreeterPrivate(Greeter* parent)
23GreeterPrivate::GreeterPrivate(Greeter* parent)
42 : m_greeter(new QLightDM::Greeter(parent)),
24 : m_greeter(new QLightDM::Greeter(parent)),
plugins/LightDM/Greeter.h+1−1
@@ -68,7 +68,7 @@ Q_SIGNALS:
68 // should switch to this user if possible.
68 // should switch to this user if possible.
69 void requestAuthenticationUser(const QString &user);
69 void requestAuthenticationUser(const QString &user);
70
70
71−private:
71+protected:
72 GreeterPrivate * const d_ptr;
72 GreeterPrivate * const d_ptr;
73
73
74 Q_DECLARE_PRIVATE(Greeter)
74 Q_DECLARE_PRIVATE(Greeter)
plugins/LightDM/GreeterPrivate.hnew file+39
@@ -0,0 +1,39 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef UNITY_GREETER_PRIVATE_H
18+#define UNITY_GREETER_PRIVATE_H
19+
20+#include <QLightDM/Greeter>
21+
22+class GreeterPrivate
23+{
24+public:
25+ explicit GreeterPrivate(Greeter *parent);
26+
27+ QLightDM::Greeter *m_greeter;
28+ bool m_active;
29+ bool wasPrompted;
30+ bool promptless;
31+
32+protected:
33+ Greeter * const q_ptr;
34+
35+private:
36+ Q_DECLARE_PUBLIC(Greeter)
37+};
38+
39+#endif // UNITY_GREETER_PRIVATE_H
plugins/LightDM/UsersModel.cpp+1−1
@@ -58,7 +58,7 @@ QVariant MangleModel::data(const QModelIndex &index, int role) const
58// **** Now we continue with actual UsersModel class ****
58// **** Now we continue with actual UsersModel class ****
59
59
60UsersModel::UsersModel(QObject* parent)
60UsersModel::UsersModel(QObject* parent)
61− : QSortFilterProxyModelQML(parent)
61+ : UnitySortFilterProxyModelQML(parent)
62{
62{
63 setModel(new MangleModel(this));
63 setModel(new MangleModel(this));
64 setSortCaseSensitivity(Qt::CaseInsensitive);
64 setSortCaseSensitivity(Qt::CaseInsensitive);
plugins/LightDM/UsersModel.h+2−2
@@ -23,10 +23,10 @@
23#ifndef UNITY_USERSMODEL_H
23#ifndef UNITY_USERSMODEL_H
24#define UNITY_USERSMODEL_H
24#define UNITY_USERSMODEL_H
25
25
26−#include <qsortfilterproxymodelqml.h>
26+#include <unitysortfilterproxymodelqml.h>
27#include <QtCore/QObject>
27#include <QtCore/QObject>
28
28
29−class UsersModel : public QSortFilterProxyModelQML
29+class UsersModel : public UnitySortFilterProxyModelQML
30{
30{
31 Q_OBJECT
31 Q_OBJECT
32
32
tests/mocks/LightDM/demo/CMakeLists.txt → plugins/LightDM/liblightdm/CMakeLists.txtrenamed+6−5
@@ -1,14 +1,14 @@
1pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
1pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
2
2
3set(LibLightDM_SOURCES
3set(LibLightDM_SOURCES
4− ../Greeter.cpp
4+ Greeter.cpp
5− ../UsersModel.cpp
5+ UsersModel.cpp
6 GreeterPrivate.cpp
6 GreeterPrivate.cpp
7 UsersModelPrivate.cpp
7 UsersModelPrivate.cpp
8 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
8 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
9 )
9 )
10
10
11−add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})
11+add_library(integratedLightDM STATIC ${LibLightDM_SOURCES})
12add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})
12add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})
13
13
14include_directories(
14include_directories(
@@ -16,7 +16,7 @@ include_directories(
16 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
16 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
17)
17)
18
18
19−target_link_libraries(MockLightDM-demo
19+target_link_libraries(integratedLightDM
20 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
20 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
21 -lpam
21 -lpam
22)
22)
@@ -25,9 +25,10 @@ target_link_libraries(MockLightDM-demo-shared
25 -lpam
25 -lpam
26)
26)
27
27
28−qt5_use_modules(MockLightDM-demo Concurrent Gui)
28+qt5_use_modules(integratedLightDM Concurrent Gui)
29qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)
29qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)
30
30
31+set_target_properties(integratedLightDM PROPERTIES COMPILE_FLAGS -fPIC)
31set_target_properties(MockLightDM-demo-shared PROPERTIES
32set_target_properties(MockLightDM-demo-shared PROPERTIES
32 OUTPUT_NAME lightdm-qt5-2)
33 OUTPUT_NAME lightdm-qt5-2)
33
34
tests/mocks/LightDM/Greeter.cpp → plugins/LightDM/liblightdm/Greeter.cpprenamed+7−1
@@ -16,6 +16,13 @@
16 * Author: Michael Terry <michael.terry@canonical.com>
16 * Author: Michael Terry <michael.terry@canonical.com>
17 */
17 */
18
18
19+
20+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
21+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
22+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
23+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
24+
25+
19#include "Greeter.h"
26#include "Greeter.h"
20#include "GreeterPrivate.h"
27#include "GreeterPrivate.h"
21#include <QtCore/QCoreApplication>
28#include <QtCore/QCoreApplication>
@@ -128,7 +135,6 @@ void Greeter::authenticate(const QString &username)
128
135
129 d->authenticated = false;
136 d->authenticated = false;
130 d->authenticationUser = username;
137 d->authenticationUser = username;
131− d->twoFactorDone = false;
132 d->handleAuthenticate();
138 d->handleAuthenticate();
133}
139}
134
140
tests/mocks/LightDM/Greeter.h → plugins/LightDM/liblightdm/Greeter.hrenamed+4
@@ -24,6 +24,10 @@
24#include <QtCore/QObject>
24#include <QtCore/QObject>
25#include <QtCore/QVariant>
25#include <QtCore/QVariant>
26
26
27+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
28+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
29+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
30+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
27
31
28namespace QLightDM
32namespace QLightDM
29{
33{
tests/mocks/LightDM/demo/GreeterPrivate.cpp → plugins/LightDM/liblightdm/GreeterPrivate.cpprenamed+2−2
@@ -16,8 +16,8 @@
16 * Author: Michael Terry <michael.terry@canonical.com>
16 * Author: Michael Terry <michael.terry@canonical.com>
17 */
17 */
18
18
19−#include "../Greeter.h"
19+#include "Greeter.h"
20−#include "../GreeterPrivate.h"
20+#include "GreeterPrivate.h"
21#include <QFuture>
21#include <QFuture>
22#include <QFutureInterface>
22#include <QFutureInterface>
23#include <QFutureWatcher>
23#include <QFutureWatcher>
tests/mocks/LightDM/GreeterPrivate.h → plugins/LightDM/liblightdm/GreeterPrivate.hrenamed−1
@@ -35,7 +35,6 @@ public:
35 // These variables may not be used by all subclasses, that's no problem
35 // These variables may not be used by all subclasses, that's no problem
36 bool authenticated;
36 bool authenticated;
37 QString authenticationUser;
37 QString authenticationUser;
38− bool twoFactorDone;
39
38
40 void handleAuthenticate();
39 void handleAuthenticate();
41 void handleRespond(const QString &response);
40 void handleRespond(const QString &response);
tests/mocks/LightDM/UsersModel.cpp → plugins/LightDM/liblightdm/UsersModel.cpprenamed+6
@@ -16,6 +16,12 @@
16 * Author: Michael Terry <michael.terry@canonical.com>
16 * Author: Michael Terry <michael.terry@canonical.com>
17 */
17 */
18
18
19+
20+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
21+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
22+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
23+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
24+
19// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.
25// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.
20// To use the same method of setting role name that it does, we
26// To use the same method of setting role name that it does, we
21// set our compatibility to Qt4 here too.
27// set our compatibility to Qt4 here too.
tests/mocks/LightDM/UsersModel.h → plugins/LightDM/liblightdm/UsersModel.hrenamed+4
@@ -24,6 +24,10 @@
24#include <QtCore/QSharedDataPointer>
24#include <QtCore/QSharedDataPointer>
25#include <QAbstractListModel>
25#include <QAbstractListModel>
26
26
27+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
28+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
29+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
30+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
27
31
28namespace QLightDM
32namespace QLightDM
29{
33{
tests/mocks/LightDM/demo/UsersModelPrivate.cpp → plugins/LightDM/liblightdm/UsersModelPrivate.cpprenamed+1−1
@@ -16,7 +16,7 @@
16 * Author: Michael Terry <michael.terry@canonical.com>
16 * Author: Michael Terry <michael.terry@canonical.com>
17 */
17 */
18
18
19−#include "../UsersModelPrivate.h"
19+#include "UsersModelPrivate.h"
20
20
21#include <QDir>
21#include <QDir>
22#include <QSettings>
22#include <QSettings>
tests/mocks/LightDM/UsersModelPrivate.h → plugins/LightDM/liblightdm/UsersModelPrivate.hrenamed

The content is the same.

plugins/Lights/CMakeLists.txt−2
@@ -1,5 +1,3 @@
1−include(FindPkgConfig)
2−
3pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
1pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
4pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
2pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
5
3
plugins/Lights/Lights.cpp+9−24
@@ -44,12 +44,20 @@ Lights::~Lights()
44
44
45void Lights::setState(Lights::State newState)
45void Lights::setState(Lights::State newState)
46{
46{
47+ if (!init()) {
48+ qWarning() << "No lights device";
49+ return;
50+ }
51+
47 if (m_state != newState) {
52 if (m_state != newState) {
48 if (newState == Lights::On) {
53 if (newState == Lights::On) {
49 turnOn();
54 turnOn();
50 } else {
55 } else {
51 turnOff();
56 turnOff();
52 }
57 }
58+
59+ m_state = newState;
60+ Q_EMIT stateChanged(m_state);
53 }
61 }
54}
62}
55
63
@@ -115,6 +123,7 @@ bool Lights::init()
115 err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);
123 err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);
116 if (err == 0) {
124 if (err == 0) {
117 m_lightDevice = (light_device_t*)device;
125 m_lightDevice = (light_device_t*)device;
126+ turnOff();
118 return true;
127 return true;
119 } else {
128 } else {
120 qWarning() << "Failed to access notification lights";
129 qWarning() << "Failed to access notification lights";
@@ -127,15 +136,6 @@ bool Lights::init()
127
136
128void Lights::turnOn()
137void Lights::turnOn()
129{
138{
130− if (!init()) {
131− qWarning() << "No lights device";
132− return;
133− }
134−
135− if (m_state == Lights::On) {
136− return;
137− }
138−
139 // pulse
139 // pulse
140 light_state_t state;
140 light_state_t state;
141 memset(&state, 0, sizeof(light_state_t));
141 memset(&state, 0, sizeof(light_state_t));
@@ -147,23 +147,11 @@ void Lights::turnOn()
147
147
148 if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
148 if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
149 qWarning() << "Failed to turn the light off";
149 qWarning() << "Failed to turn the light off";
150− } else {
151− m_state = Lights::On;
152− Q_EMIT stateChanged(m_state);
153 }
150 }
154}
151}
155
152
156void Lights::turnOff()
153void Lights::turnOff()
157{
154{
158− if (!init()) {
159− qWarning() << "No lights device";
160− return;
161− }
162−
163− if (m_state == Lights::Off) {
164− return;
165− }
166−
167 light_state_t state;
155 light_state_t state;
168 memset(&state, 0, sizeof(light_state_t));
156 memset(&state, 0, sizeof(light_state_t));
169 state.color = 0x00000000;
157 state.color = 0x00000000;
@@ -174,8 +162,5 @@ void Lights::turnOff()
174
162
175 if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
163 if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
176 qWarning() << "Failed to turn the light off";
164 qWarning() << "Failed to turn the light off";
177− } else {
178− m_state = Lights::Off;
179− Q_EMIT stateChanged(m_state);
180 }
165 }
181}
166}
plugins/Powerd/CMakeLists.txt−2
@@ -1,5 +1,3 @@
1−include(FindPkgConfig)
2−
3pkg_search_module(GIO REQUIRED gio-2.0)
1pkg_search_module(GIO REQUIRED gio-2.0)
4
2
5include_directories(
3include_directories(
plugins/Ubuntu/Gestures/Direction.cpp+6−2
@@ -18,7 +18,9 @@
18
18
19bool Direction::isHorizontal(Direction::Type type)
19bool Direction::isHorizontal(Direction::Type type)
20{
20{
21− return type == Direction::Leftwards || type == Direction::Rightwards;
21+ return type == Direction::Leftwards
22+ || type == Direction::Rightwards
23+ || type == Direction::Horizontal;
22}
24}
23
25
24bool Direction::isVertical(Direction::Type type)
26bool Direction::isVertical(Direction::Type type)
@@ -28,5 +30,7 @@ bool Direction::isVertical(Direction::Type type)
28
30
29bool Direction::isPositive(Direction::Type type)
31bool Direction::isPositive(Direction::Type type)
30{
32{
31− return type == Rightwards || type == Downwards;
33+ return type == Rightwards
34+ || type == Downwards
35+ || type == Horizontal;
32}
36}
plugins/Ubuntu/Gestures/Direction.h+2−1
@@ -33,7 +33,8 @@ public:
33 Rightwards, // Along the positive direction of the X axis
33 Rightwards, // Along the positive direction of the X axis
34 Leftwards, // Along the negative direction of the X axis
34 Leftwards, // Along the negative direction of the X axis
35 Downwards, // Along the positive direction of the Y axis
35 Downwards, // Along the positive direction of the Y axis
36− Upwards // Along the negative direction of the Y axis
36+ Upwards, // Along the negative direction of the Y axis
37+ Horizontal // Along the X axis, in any direction
37 };
38 };
38
39
39 Q_INVOKABLE static bool isHorizontal(Direction::Type type);
40 Q_INVOKABLE static bool isHorizontal(Direction::Type type);
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+27−37
@@ -36,7 +36,7 @@
36using namespace UbuntuGestures;
36using namespace UbuntuGestures;
37
37
38#if DIRECTIONALDRAGAREA_DEBUG
38#if DIRECTIONALDRAGAREA_DEBUG
39−#define DDA_DEBUG(msg) qDebug("[DDA] " msg)
39+#define ddaDebug(params) qDebug().nospace() << "[DDA(" << qPrintable(objectName()) << ")] " << params
40#include "DebugHelpers.h"
40#include "DebugHelpers.h"
41
41
42namespace {
42namespace {
@@ -53,7 +53,7 @@ const char *statusToString(DirectionalDragArea::Status status)
53
53
54} // namespace {
54} // namespace {
55#else // DIRECTIONALDRAGAREA_DEBUG
55#else // DIRECTIONALDRAGAREA_DEBUG
56−#define DDA_DEBUG(msg) do{}while(0)
56+#define ddaDebug(params) ((void)0)
57#endif // DIRECTIONALDRAGAREA_DEBUG
57#endif // DIRECTIONALDRAGAREA_DEBUG
58
58
59
59
@@ -253,7 +253,7 @@ void DirectionalDragArea::touchOwnershipEvent(TouchOwnershipEvent *event)
253 if (event->gained()) {
253 if (event->gained()) {
254 QVector<int> ids;
254 QVector<int> ids;
255 ids.append(event->touchId());
255 ids.append(event->touchId());
256− DDA_DEBUG("grabbing touch");
256+ ddaDebug("grabbing touch");
257 grabTouchPoints(ids);
257 grabTouchPoints(ids);
258
258
259 // Work around for Qt bug. If we grab a touch that is being used for mouse pointer
259 // Work around for Qt bug. If we grab a touch that is being used for mouse pointer
@@ -265,7 +265,7 @@ void DirectionalDragArea::touchOwnershipEvent(TouchOwnershipEvent *event)
265 if (window()) {
265 if (window()) {
266 QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(window());
266 QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(window());
267 if (windowPrivate->touchMouseId == event->touchId() && window()->mouseGrabberItem()) {
267 if (windowPrivate->touchMouseId == event->touchId() && window()->mouseGrabberItem()) {
268− DDA_DEBUG("removing mouse grabber");
268+ ddaDebug("removing mouse grabber");
269 window()->mouseGrabberItem()->ungrabMouse();
269 window()->mouseGrabberItem()->ungrabMouse();
270 }
270 }
271 }
271 }
@@ -283,11 +283,7 @@ void DirectionalDragArea::unownedTouchEvent(UnownedTouchEvent *unownedTouchEvent
283
283
284 Q_ASSERT(!event->touchPointStates().testFlag(Qt::TouchPointPressed));
284 Q_ASSERT(!event->touchPointStates().testFlag(Qt::TouchPointPressed));
285
285
286− #if DIRECTIONALDRAGAREA_DEBUG
287− // TODO Consider using qCDebug() when available (Qt 5.2)
288− qDebug() << "[DDA] Unowned" << m_timeSource->msecsSinceReference()
286+ ddaDebug("Unowned " << m_timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));
289− << qPrintable(touchEventToString(event));
290− #endif
291
287
292 switch (m_status) {
288 switch (m_status) {
293 case WaitingForTouch:
289 case WaitingForTouch:
@@ -322,7 +318,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
322
318
323 if (touchPoint->state() == Qt::TouchPointReleased) {
319 if (touchPoint->state() == Qt::TouchPointReleased) {
324 // touch has ended before recognition concluded
320 // touch has ended before recognition concluded
325− DDA_DEBUG("Touch has ended before recognition concluded");
321+ ddaDebug("Touch has ended before recognition concluded");
326 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
322 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
327 emitSignalIfTapped();
323 emitSignalIfTapped();
328 setStatus(WaitingForTouch);
324 setStatus(WaitingForTouch);
@@ -335,7 +331,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
335 updateVelocityCalculator(touchScenePos);
331 updateVelocityCalculator(touchScenePos);
336
332
337 if (!pointInsideAllowedArea()) {
333 if (!pointInsideAllowedArea()) {
338− DDA_DEBUG("Rejecting gesture because touch point is outside allowed area.");
334+ ddaDebug("Rejecting gesture because touch point is outside allowed area.");
339 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
335 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
340 // We still wanna know when it ends for keeping the composition time window up-to-date
336 // We still wanna know when it ends for keeping the composition time window up-to-date
341 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
337 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
@@ -344,7 +340,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
344 }
340 }
345
341
346 if (!movingInRightDirection()) {
342 if (!movingInRightDirection()) {
347− DDA_DEBUG("Rejecting gesture because touch point is moving in the wrong direction.");
343+ ddaDebug("Rejecting gesture because touch point is moving in the wrong direction.");
348 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
344 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
349 // We still wanna know when it ends for keeping the composition time window up-to-date
345 // We still wanna know when it ends for keeping the composition time window up-to-date
350 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
346 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
@@ -358,7 +354,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
358 if (isWithinTouchCompositionWindow()) {
354 if (isWithinTouchCompositionWindow()) {
359 // There's still time for some new touch to appear and ruin our party as it would be combined
355 // There's still time for some new touch to appear and ruin our party as it would be combined
360 // with our m_touchId one and therefore deny the possibility of a single-finger gesture.
356 // with our m_touchId one and therefore deny the possibility of a single-finger gesture.
361− DDA_DEBUG("Sill within composition window. Let's wait more.");
357+ ddaDebug("Sill within composition window. Let's wait more.");
362 return;
358 return;
363 }
359 }
364
360
@@ -366,7 +362,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
366 TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);
362 TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);
367 setStatus(Recognized);
363 setStatus(Recognized);
368 } else {
364 } else {
369− DDA_DEBUG("Didn't move far enough yet. Let's wait more.");
365+ ddaDebug("Didn't move far enough yet. Let's wait more.");
370 }
366 }
371}
367}
372
368
@@ -375,11 +371,7 @@ void DirectionalDragArea::touchEvent(QTouchEvent *event)
375 // TODO: Consider when more than one touch starts in the same event (although it's not possible
371 // TODO: Consider when more than one touch starts in the same event (although it's not possible
376 // with Mir's android-input). Have to track them all. Consider it a plus/bonus.
372 // with Mir's android-input). Have to track them all. Consider it a plus/bonus.
377
373
378− #if DIRECTIONALDRAGAREA_DEBUG
379− // TODO Consider using qCDebug() when available (Qt 5.2)
380− qDebug() << "[DDA]" << m_timeSource->msecsSinceReference()
381− << qPrintable(touchEventToString(event));
374+ ddaDebug(m_timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));
382− #endif
383
375
384 if (!isEnabled() || !isVisible()) {
376 if (!isEnabled() || !isVisible()) {
385 QQuickItem::touchEvent(event);
377 QQuickItem::touchEvent(event);
@@ -416,9 +408,7 @@ void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)
416 if (isWithinTouchCompositionWindow()) {
408 if (isWithinTouchCompositionWindow()) {
417 // too close to the last touch start. So we consider them as starting roughly at the same time.
409 // too close to the last touch start. So we consider them as starting roughly at the same time.
418 // Can't be a single-touch gesture.
410 // Can't be a single-touch gesture.
419− #if DIRECTIONALDRAGAREA_DEBUG
420− qDebug("[DDA] A new touch point came in but we're still within time composition window. Ignoring it.");
411+ ddaDebug("A new touch point came in but we're still within time composition window. Ignoring it.");
421− #endif
422 allGood = false;
412 allGood = false;
423 }
413 }
424
414
@@ -456,6 +446,7 @@ void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)
456
446
457 if (recognitionIsDisabled()) {
447 if (recognitionIsDisabled()) {
458 // Behave like a dumb TouchArea
448 // Behave like a dumb TouchArea
449+ ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");
459 TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);
450 TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);
460 setStatus(Recognized);
451 setStatus(Recognized);
461 event->accept();
452 event->accept();
@@ -487,7 +478,7 @@ void DirectionalDragArea::touchEvent_undecided(QTouchEvent *event)
487
478
488 if (event->touchPointStates().testFlag(Qt::TouchPointPressed) && isWithinTouchCompositionWindow()) {
479 if (event->touchPointStates().testFlag(Qt::TouchPointPressed) && isWithinTouchCompositionWindow()) {
489 // multi-finger drags are not accepted
480 // multi-finger drags are not accepted
490− DDA_DEBUG("Multi-finger drags are not accepted");
481+ ddaDebug("Multi-finger drags are not accepted");
491
482
492 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
483 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
493 // We still wanna know when it ends for keeping the composition time window up-to-date
484 // We still wanna know when it ends for keeping the composition time window up-to-date
@@ -581,12 +572,16 @@ bool DirectionalDragArea::pointInsideAllowedArea() const
581
572
582bool DirectionalDragArea::movingInRightDirection() const
573bool DirectionalDragArea::movingInRightDirection() const
583{
574{
575+ if (m_direction == Direction::Horizontal) {
576+ return true;
577+ } else {
584− QPointF movementVector(m_dampedScenePos.x() - m_previousDampedScenePos.x(),
578+ QPointF movementVector(m_dampedScenePos.x() - m_previousDampedScenePos.x(),
585− m_dampedScenePos.y() - m_previousDampedScenePos.y());
579+ m_dampedScenePos.y() - m_previousDampedScenePos.y());
586
580
587− qreal scalarProjection = projectOntoDirectionVector(movementVector);
581+ qreal scalarProjection = projectOntoDirectionVector(movementVector);
588
582
589− return scalarProjection >= 0.;
583+ return scalarProjection >= 0.;
584+ }
590}
585}
591
586
592bool DirectionalDragArea::movedFarEnough(const QPointF &point) const
587bool DirectionalDragArea::movedFarEnough(const QPointF &point) const
@@ -614,7 +609,7 @@ void DirectionalDragArea::checkSpeed()
614 qreal minSpeedMsecs = m_minSpeed / 1000.0;
609 qreal minSpeedMsecs = m_minSpeed / 1000.0;
615
610
616 if (speed < minSpeedMsecs) {
611 if (speed < minSpeedMsecs) {
617− DDA_DEBUG("Rejecting gesture because it's below minimum speed.");
612+ ddaDebug("Rejecting gesture because it's below minimum speed.");
618 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
613 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
619 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
614 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
620 setStatus(WaitingForTouch);
615 setStatus(WaitingForTouch);
@@ -625,7 +620,7 @@ void DirectionalDragArea::checkSpeed()
625 m_silenceTime += m_recognitionTimer->interval();
620 m_silenceTime += m_recognitionTimer->interval();
626
621
627 if (m_silenceTime > m_maxSilenceTime) {
622 if (m_silenceTime > m_maxSilenceTime) {
628− DDA_DEBUG("Rejecting gesture because its silence time has been exceeded.");
623+ ddaDebug("Rejecting gesture because its silence time has been exceeded.");
629 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
624 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
630 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
625 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
631 setStatus(WaitingForTouch);
626 setStatus(WaitingForTouch);
@@ -646,7 +641,7 @@ void DirectionalDragArea::giveUpIfDisabledOrInvisible()
646 }
641 }
647
642
648 if (m_status != WaitingForTouch) {
643 if (m_status != WaitingForTouch) {
649− DDA_DEBUG("Resetting status because got disabled or made invisible");
644+ ddaDebug("Resetting status because got disabled or made invisible");
650 setStatus(WaitingForTouch);
645 setStatus(WaitingForTouch);
651 }
646 }
652 }
647 }
@@ -666,9 +661,7 @@ void DirectionalDragArea::setStatus(DirectionalDragArea::Status newStatus)
666 m_status = newStatus;
661 m_status = newStatus;
667 Q_EMIT statusChanged(m_status);
662 Q_EMIT statusChanged(m_status);
668
663
669− #if DIRECTIONALDRAGAREA_DEBUG
670− qDebug() << "[DDA]" << statusToString(oldStatus) << "->" << statusToString(newStatus);
664+ ddaDebug(statusToString(oldStatus) << " -> " << statusToString(newStatus));
671− #endif
672
665
673 switch (newStatus) {
666 switch (newStatus) {
674 case WaitingForTouch:
667 case WaitingForTouch:
@@ -875,7 +868,7 @@ void DirectionalDragArea::updateSceneDirectionVector()
875 localDirection.rx() = -1.;
868 localDirection.rx() = -1.;
876 localDirection.ry() = 0.;
869 localDirection.ry() = 0.;
877 break;
870 break;
878− default: // Direction::Rightwards:
871+ default: // Direction::Rightwards || Direction.Horizontal
879 localDirection.rx() = 1.;
872 localDirection.rx() = 1.;
880 localDirection.ry() = 0.;
873 localDirection.ry() = 0.;
881 break;
874 break;
@@ -891,6 +884,3 @@ qreal DirectionalDragArea::projectOntoDirectionVector(const QPointF &sceneVector
891 return sceneVector.x() * m_sceneDirectionVector.x() +
884 return sceneVector.x() * m_sceneDirectionVector.x() +
892 sceneVector.y() * m_sceneDirectionVector.y();
885 sceneVector.y() * m_sceneDirectionVector.y();
893}
886}
894−
895−// Because we are defining a new QObject-based class (RecognitionTimer) here.
896−#include "DirectionalDragArea.moc"
plugins/Unity/DashCommunicator/dashconnection.cpp+30
@@ -19,12 +19,42 @@
19#include <QDBusInterface>
19#include <QDBusInterface>
20#include <QDBusPendingCall>
20#include <QDBusPendingCall>
21
21
22+/* The default implementation of AbstractDBusServiceMonitor creates a QDBusInterface when the service
23+ * appears on the bus.
24+ *
25+ * On construction QDBusInterface synchronously introspects the service, which will block the GUI
26+ * thread of this process if the service is busy. QDBusAbstractInterface does not perform this
27+ * introspection, so let's subclass that and avoid the blocking scenario.
28+ *
29+ * However we lose Qt's wrapping of the DBus service with a MetaObject, with the result that we
30+ * cannot easily connect to DBus signals with the usual connect() calls. So this approach only
31+ * suited to push communication with the DBus service.
32+ */
33+class AsyncDBusInterface : public QDBusAbstractInterface
34+{
35+public:
36+ AsyncDBusInterface(const QString &service, const QString &path,
37+ const QString &interface, const QDBusConnection &connection,
38+ QObject *parent = 0)
39+ : QDBusAbstractInterface(service, path, interface.toLatin1().data(), connection, parent)
40+ {}
41+ ~AsyncDBusInterface() = default;
42+};
43+
44+
22DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):
45DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):
23 AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)
46 AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)
24{
47{
25
48
26}
49}
27
50
51+/* Override the default implementation to create a non-blocking DBus interface (see note above). */
52+QDBusAbstractInterface* DashConnection::createInterface(const QString &service, const QString &path,
53+ const QString &interface, const QDBusConnection &connection)
54+{
55+ return new AsyncDBusInterface(service, path, interface, connection);
56+}
57+
28void DashConnection::setCurrentScope(int index, bool animate, bool isSwipe)
58void DashConnection::setCurrentScope(int index, bool animate, bool isSwipe)
29{
59{
30 if (dbusInterface()) {
60 if (dbusInterface()) {
plugins/Unity/DashCommunicator/dashconnection.h+4−1
@@ -20,7 +20,6 @@
20// local
20// local
21#include "abstractdbusservicemonitor.h"
21#include "abstractdbusservicemonitor.h"
22
22
23−
24class DashConnection: public AbstractDBusServiceMonitor
23class DashConnection: public AbstractDBusServiceMonitor
25{
24{
26 Q_OBJECT
25 Q_OBJECT
@@ -29,6 +28,10 @@ public:
29
28
30public Q_SLOTS:
29public Q_SLOTS:
31 void setCurrentScope(int index, bool animate, bool isSwipe);
30 void setCurrentScope(int index, bool animate, bool isSwipe);
31+
32+private:
33+ QDBusAbstractInterface* createInterface(const QString &service, const QString &path,
34+ const QString &interface, const QDBusConnection &connection) override;
32};
35};
33
36
34#endif
37#endif
plugins/Unity/Indicators/CMakeLists.txt+3−2
@@ -16,18 +16,19 @@ include_directories(
16)
16)
17
17
18set(IndicatorsQML_SOURCES
18set(IndicatorsQML_SOURCES
19+ actionrootstate.cpp
19 indicator.cpp
20 indicator.cpp
20 indicators.h
21 indicators.h
21 indicatorsmanager.cpp
22 indicatorsmanager.cpp
22 indicatorsmodel.cpp
23 indicatorsmodel.cpp
23 menucontentactivator.cpp
24 menucontentactivator.cpp
25+ modelactionrootstate.cpp
24 modelprinter.cpp
26 modelprinter.cpp
25 plugin.cpp
27 plugin.cpp
26− rootactionstate.cpp
28+ rootstateparser.cpp
27 sharedunitymenumodel.cpp
29 sharedunitymenumodel.cpp
28 unitymenumodelcache.cpp
30 unitymenumodelcache.cpp
29 unitymenumodelstack.cpp
31 unitymenumodelstack.cpp
30− visibleindicatorsmodel.cpp
31)
32)
32add_definitions(-DUNITYINDICATORS_LIBRARY)
33add_definitions(-DUNITYINDICATORS_LIBRARY)
33
34
plugins/Unity/Indicators/Indicators.qmltypes+18−7
@@ -7,6 +7,14 @@ import QtQuick.tooling 1.1
7// 'qmlplugindump -notrelocatable Unity.Indicators 0.1 plugins'
7// 'qmlplugindump -notrelocatable Unity.Indicators 0.1 plugins'
8
8
9Module {
9Module {
10+ Component {
11+ name: "ActionRootState"
12+ prototype: "RootStateObject"
13+ exports: ["Unity.Indicators/ActionRootState 0.1"]
14+ exportMetaObjectRevisions: [0]
15+ Property { name: "actionGroup"; type: "QDBusActionGroup"; isPointer: true }
16+ Property { name: "actionName"; type: "string" }
17+ }
10 Component {
18 Component {
11 name: "ActionState"
19 name: "ActionState"
12 prototype: "QObject"
20 prototype: "QObject"
@@ -23,7 +31,6 @@ Module {
23 }
31 }
24 }
32 }
25 }
33 }
26− Component { name: "ActionStateParser"; prototype: "QObject" }
27 Component {
34 Component {
28 name: "FlatMenuProxyModelRole"
35 name: "FlatMenuProxyModelRole"
29 prototype: "QObject"
36 prototype: "QObject"
@@ -146,6 +153,14 @@ Module {
146 exportMetaObjectRevisions: [0]
153 exportMetaObjectRevisions: [0]
147 Property { name: "active"; type: "bool"; isReadonly: true }
154 Property { name: "active"; type: "bool"; isReadonly: true }
148 }
155 }
156+ Component {
157+ name: "ModelActionRootState"
158+ prototype: "RootStateObject"
159+ exports: ["Unity.Indicators/ModelActionRootState 0.1"]
160+ exportMetaObjectRevisions: [0]
161+ Property { name: "menu"; type: "UnityMenuModel"; isPointer: true }
162+ Signal { name: "indexChanged" }
163+ }
149 Component {
164 Component {
150 name: "ModelPrinter"
165 name: "ModelPrinter"
151 prototype: "QObject"
166 prototype: "QObject"
@@ -192,11 +207,8 @@ Module {
192 }
207 }
193 Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }
208 Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }
194 Component {
209 Component {
195− name: "RootActionState"
210+ name: "RootStateObject"
196− prototype: "ActionStateParser"
211+ prototype: "QObject"
197− exports: ["Unity.Indicators/RootActionState 0.1"]
198− exportMetaObjectRevisions: [0]
199− Property { name: "menu"; type: "UnityMenuModel"; isPointer: true }
200 Property { name: "valid"; type: "bool"; isReadonly: true }
212 Property { name: "valid"; type: "bool"; isReadonly: true }
201 Property { name: "title"; type: "string"; isReadonly: true }
213 Property { name: "title"; type: "string"; isReadonly: true }
202 Property { name: "leftLabel"; type: "string"; isReadonly: true }
214 Property { name: "leftLabel"; type: "string"; isReadonly: true }
@@ -205,7 +217,6 @@ Module {
205 Property { name: "accessibleName"; type: "string"; isReadonly: true }
217 Property { name: "accessibleName"; type: "string"; isReadonly: true }
206 Property { name: "visible"; type: "bool"; isReadonly: true }
218 Property { name: "visible"; type: "bool"; isReadonly: true }
207 Signal { name: "updated" }
219 Signal { name: "updated" }
208− Signal { name: "indexChanged" }
209 }
220 }
210 Component {
221 Component {
211 name: "SharedUnityMenuModel"
222 name: "SharedUnityMenuModel"
plugins/Unity/Indicators/actionrootstate.cppnew file+97
@@ -0,0 +1,97 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "actionrootstate.h"
18+
19+#include <qdbusactiongroup.h>
20+#include <QDebug>
21+
22+ActionRootState::ActionRootState(QObject *parent)
23+ : RootStateObject(parent)
24+ , m_actionGroup(nullptr)
25+{
26+}
27+
28+QDBusActionGroup *ActionRootState::actionGroup() const
29+{
30+ return m_actionGroup;
31+}
32+
33+void ActionRootState::setActionGroup(QDBusActionGroup *actionGroup)
34+{
35+ if (m_actionGroup != actionGroup) {
36+ bool wasValid = valid();
37+
38+ if (m_actionGroup) {
39+ disconnect(m_actionGroup, 0, this, 0);
40+ }
41+ m_actionGroup = actionGroup;
42+
43+ if (m_actionGroup) {
44+ connect(m_actionGroup, &QDBusActionGroup::statusChanged, this, [&](bool) { updateActionState(); });
45+ connect(m_actionGroup, &QDBusActionGroup::actionAppear, this, [&](const QString&) { updateActionState(); });
46+ connect(m_actionGroup, &QDBusActionGroup::actionVanish, this, [&](const QString&) { updateActionState(); });
47+ connect(m_actionGroup, &QDBusActionGroup::actionStateChanged, this, [&](QVariant) { updateActionState(); });
48+
49+ connect(m_actionGroup, &QObject::destroyed, this, [&](QObject*) { updateActionState(); });
50+ }
51+ updateActionState();
52+ Q_EMIT actionGroupChanged();
53+
54+ if (wasValid != valid()) Q_EMIT validChanged();
55+ }
56+}
57+
58+QString ActionRootState::actionName() const
59+{
60+ return m_actionName;
61+}
62+
63+void ActionRootState::setActionName(const QString &actionName)
64+{
65+ if (m_actionName != actionName) {
66+ bool wasValid = valid();
67+
68+ m_actionName = actionName;
69+ updateActionState();
70+
71+ Q_EMIT actionNameChanged();
72+
73+ if (wasValid != valid()) Q_EMIT validChanged();
74+ }
75+}
76+
77+bool ActionRootState::valid() const
78+{
79+ return m_actionGroup && m_actionGroup->status() == DBusEnums::Connected &&
80+ !m_actionName.isEmpty() && m_actionGroup->hasAction(m_actionName);
81+}
82+
83+void ActionRootState::updateActionState()
84+{
85+ if (valid()) {
86+ ActionStateParser* oldParser = m_actionGroup->actionStateParser();
87+ m_actionGroup->setActionStateParser(&m_parser);
88+
89+ QVariantMap state = m_actionGroup->actionState(m_actionName).toMap();
90+
91+ m_actionGroup->setActionStateParser(oldParser);
92+
93+ setCurrentState(state);
94+ } else {
95+ setCurrentState(QVariantMap());
96+ }
97+}
plugins/Unity/Indicators/actionrootstate.hnew file+55
@@ -0,0 +1,55 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef ACTIONROOTSTATE_H
18+#define ACTIONROOTSTATE_H
19+
20+#include "unityindicatorsglobal.h"
21+
22+#include "rootstateparser.h"
23+
24+class QDBusActionGroup;
25+
26+class UNITYINDICATORS_EXPORT ActionRootState : public RootStateObject
27+{
28+ Q_OBJECT
29+ Q_PROPERTY(QDBusActionGroup* actionGroup READ actionGroup WRITE setActionGroup NOTIFY actionGroupChanged)
30+ Q_PROPERTY(QString actionName READ actionName WRITE setActionName NOTIFY actionNameChanged)
31+
32+public:
33+ ActionRootState(QObject *parent = 0);
34+
35+ QDBusActionGroup *actionGroup() const;
36+ void setActionGroup(QDBusActionGroup *actionGroup);
37+
38+ QString actionName() const;
39+ void setActionName(const QString& actionName);
40+
41+ bool valid() const override;
42+
43+Q_SIGNALS:
44+ void actionGroupChanged();
45+ void actionNameChanged();
46+
47+private Q_SLOTS:
48+ void updateActionState();
49+
50+private:
51+ QDBusActionGroup* m_actionGroup;
52+ QString m_actionName;
53+};
54+
55+#endif // ACTIONROOTSTATE_H
plugins/Unity/Indicators/indicators.h+1−2
@@ -74,8 +74,7 @@ public:
74 enum Roles {
74 enum Roles {
75 Identifier = 0,
75 Identifier = 0,
76 Position,
76 Position,
77− IndicatorProperties,
77+ IndicatorProperties
78− IsVisible
79 };
78 };
80
79
81 IndicatorsModelRole(QObject*parent=0):QObject(parent) {}
80 IndicatorsModelRole(QObject*parent=0):QObject(parent) {}
plugins/Unity/Indicators/modelactionrootstate.cppnew file+129
@@ -0,0 +1,129 @@
1+/*
2+ * Copyright 2013 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors:
17+ * Nick Dedekind <nick.dedekind@canonical.com>
18+ */
19+
20+#include "modelactionrootstate.h"
21+#include "indicators.h"
22+
23+#include <unitymenumodel.h>
24+#include <QVariant>
25+#include <QIcon>
26+
27+extern "C" {
28+#include <glib.h>
29+#include <gio/gio.h>
30+}
31+
32+ModelActionRootState::ModelActionRootState(QObject *parent)
33+ : RootStateObject(parent),
34+ m_menu(nullptr)
35+{
36+}
37+
38+ModelActionRootState::~ModelActionRootState()
39+{
40+}
41+
42+UnityMenuModel* ModelActionRootState::menu() const
43+{
44+ return m_menu;
45+}
46+
47+void ModelActionRootState::setMenu(UnityMenuModel* menu)
48+{
49+ if (m_menu != menu) {
50+ bool wasValid = valid();
51+
52+ if (m_menu) {
53+ m_menu->disconnect(this);
54+ }
55+ m_menu = menu;
56+
57+ if (m_menu) {
58+ connect(m_menu, SIGNAL(rowsInserted(const QModelIndex&, int, int)), SLOT(onModelRowsAdded(const QModelIndex&, int, int)));
59+ connect(m_menu, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SLOT(onModelRowsRemoved(const QModelIndex&, int, int)));
60+ connect(m_menu, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)), SLOT(onModelDataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
61+
62+ connect(m_menu, SIGNAL(destroyed()), SLOT(reset()));
63+ }
64+ updateActionState();
65+ Q_EMIT menuChanged();
66+
67+ if (wasValid != valid())
68+ Q_EMIT validChanged();
69+ }
70+}
71+
72+bool ModelActionRootState::valid() const
73+{
74+ return !currentState().empty();
75+}
76+
77+void ModelActionRootState::onModelRowsAdded(const QModelIndex& parent, int start, int end)
78+{
79+ Q_UNUSED(parent);
80+ if (start == 0 && end >= 0) {
81+ updateActionState();
82+ }
83+}
84+
85+void ModelActionRootState::onModelRowsRemoved(const QModelIndex& parent, int start, int end)
86+{
87+ Q_UNUSED(parent);
88+ if (start == 0 && end >= 0) {
89+ updateActionState();
90+ }
91+}
92+
93+void ModelActionRootState::onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)
94+{
95+ Q_UNUSED(roles);
96+ if (!topLeft.isValid() || !bottomRight.isValid()) {
97+ return;
98+ }
99+
100+ if (topLeft.row() <= 0 && bottomRight.row() >= 0) {
101+ updateActionState();
102+ }
103+}
104+
105+void ModelActionRootState::reset()
106+{
107+ m_menu = nullptr;
108+
109+ Q_EMIT menuChanged();
110+ setCurrentState(QVariantMap());
111+}
112+
113+void ModelActionRootState::updateActionState()
114+{
115+ if (m_menu && m_menu->rowCount() > 0) {
116+ ActionStateParser* oldParser = m_menu->actionStateParser();
117+ m_menu->setActionStateParser(&m_parser);
118+
119+ QVariantMap state = m_menu->get(0, "actionState").toMap();
120+
121+ m_menu->setActionStateParser(oldParser);
122+
123+ setCurrentState(state);
124+ } else if (!m_menu) {
125+ setCurrentState(QVariantMap());
126+ }
127+ // else if m_menu->rowCount() == 0, let's leave existing cache in place
128+ // until the new menu comes in, to avoid flashing the UI empty for a moment
129+}
plugins/Unity/Indicators/modelactionrootstate.hnew file+61
@@ -0,0 +1,61 @@
1+/*
2+ * Copyright 2013 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors:
17+ * Nick Dedekind <nick.dedekind@canonical.com>
18+ */
19+
20+#ifndef MODELACTIONROOTSTATE_H
21+#define MODELACTIONROOTSTATE_H
22+
23+#include "unityindicatorsglobal.h"
24+
25+#include "rootstateparser.h"
26+
27+class UnityMenuModel;
28+
29+class UNITYINDICATORS_EXPORT ModelActionRootState : public RootStateObject
30+{
31+ Q_OBJECT
32+ Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)
33+public:
34+ ModelActionRootState(QObject *parent = 0);
35+ virtual ~ModelActionRootState();
36+
37+ UnityMenuModel* menu() const;
38+ void setMenu(UnityMenuModel* menu);
39+
40+ int index() const;
41+ void setIndex(int index);
42+
43+ bool valid() const override;
44+
45+Q_SIGNALS:
46+ void menuChanged();
47+ void indexChanged();
48+
49+private Q_SLOTS:
50+ void onModelRowsAdded(const QModelIndex& parent, int start, int end);
51+ void onModelRowsRemoved(const QModelIndex& parent, int start, int end);
52+ void onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>&);
53+ void reset();
54+
55+private:
56+ void updateActionState();
57+
58+ UnityMenuModel* m_menu;
59+};
60+
61+#endif // MODELACTIONROOTSTATE_H
plugins/Unity/Indicators/plugin.cpp+4−4
@@ -24,16 +24,16 @@
24#include "plugin.h"
24#include "plugin.h"
25
25
26// local
26// local
27+#include "actionrootstate.h"
27#include "indicators.h"
28#include "indicators.h"
28#include "indicatorsmanager.h"
29#include "indicatorsmanager.h"
29#include "indicatorsmodel.h"
30#include "indicatorsmodel.h"
30#include "menucontentactivator.h"
31#include "menucontentactivator.h"
32+#include "modelactionrootstate.h"
31#include "modelprinter.h"
33#include "modelprinter.h"
32−#include "rootactionstate.h"
33#include "sharedunitymenumodel.h"
34#include "sharedunitymenumodel.h"
34#include "unitymenumodelcache.h"
35#include "unitymenumodelcache.h"
35#include "unitymenumodelstack.h"
36#include "unitymenumodelstack.h"
36−#include "visibleindicatorsmodel.h"
37
37
38#include <unitymenumodel.h>
38#include <unitymenumodel.h>
39
39
@@ -51,9 +51,9 @@ void IndicatorsPlugin::registerTypes(const char *uri)
51 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");
51 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");
52 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
52 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
53 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");
53 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");
54− qmlRegisterType<RootActionState>(uri, 0, 1, "RootActionState");
54+ qmlRegisterType<ModelActionRootState>(uri, 0, 1, "ModelActionRootState");
55+ qmlRegisterType<ActionRootState>(uri, 0, 1, "ActionRootState");
55 qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");
56 qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");
56− qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");
57 qmlRegisterType<SharedUnityMenuModel>(uri, 0, 1, "SharedUnityMenuModel");
57 qmlRegisterType<SharedUnityMenuModel>(uri, 0, 1, "SharedUnityMenuModel");
58
58
59 qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);
59 qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);
plugins/Unity/Indicators/rootactionstate.cpp → plugins/Unity/Indicators/rootstateparser.cpprenamed+74−143
@@ -12,157 +12,18 @@
12 *
12 *
13 * You should have received a copy of the GNU Lesser General Public License
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Nick Dedekind <nick.dedekind@canonical.com>
18 */
15 */
19
16
20−#include "rootactionstate.h"
17+#include "rootstateparser.h"
21−#include "indicators.h"
22−
23−#include <unitymenumodel.h>
24−#include <QVariant>
25−#include <QIcon>
26
18
27extern "C" {
19extern "C" {
28#include <glib.h>
20#include <glib.h>
29#include <gio/gio.h>
21#include <gio/gio.h>
30}
22}
31
23
32−RootActionState::RootActionState(QObject *parent)
24+RootStateParser::RootStateParser(QObject* parent)
33− : ActionStateParser(parent),
25+ : ActionStateParser(parent)
34− m_menu(nullptr)
35−{
36−}
37−
38−RootActionState::~RootActionState()
39−{
40−}
41−
42−UnityMenuModel* RootActionState::menu() const
43−{
44− return m_menu;
45−}
46−
47−void RootActionState::setMenu(UnityMenuModel* menu)
48−{
49− if (m_menu != menu) {
50− if (m_menu) {
51− m_menu->disconnect(this);
52− }
53− m_menu = menu;
54−
55− if (m_menu) {
56− connect(m_menu, SIGNAL(rowsInserted(const QModelIndex&, int, int)), SLOT(onModelRowsAdded(const QModelIndex&, int, int)));
57− connect(m_menu, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SLOT(onModelRowsRemoved(const QModelIndex&, int, int)));
58− connect(m_menu, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)), SLOT(onModelDataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
59−
60− connect(m_menu, SIGNAL(destroyed()), SLOT(reset()));
61− }
62− updateActionState();
63− Q_EMIT menuChanged();
64− }
65−}
66−
67−void RootActionState::onModelRowsAdded(const QModelIndex& parent, int start, int end)
68{
26{
69− Q_UNUSED(parent);
70− if (start == 0 && end >= 0) {
71− updateActionState();
72− }
73−}
74−
75−void RootActionState::onModelRowsRemoved(const QModelIndex& parent, int start, int end)
76−{
77− Q_UNUSED(parent);
78− if (start == 0 && end >= 0) {
79− updateActionState();
80− }
81−}
82−
83−void RootActionState::onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)
84−{
85− Q_UNUSED(roles);
86− if (!topLeft.isValid() || !bottomRight.isValid()) {
87− return;
88− }
89−
90− if (topLeft.row() <= 0 && bottomRight.row() >= 0) {
91− updateActionState();
92− }
93−}
94−
95−void RootActionState::reset()
96−{
97− m_cachedState.clear();
98− m_menu = nullptr;
99−
100− Q_EMIT menuChanged();
101− Q_EMIT updated();
102−}
103−
104−void RootActionState::updateActionState()
105−{
106− if (m_menu && m_menu->rowCount() > 0) {
107− ActionStateParser* oldParser = m_menu->actionStateParser();
108− m_menu->setActionStateParser(this);
109−
110− m_cachedState = m_menu->get(0, "actionState").toMap();
111−
112− m_menu->setActionStateParser(oldParser);
113− } else if (!m_menu) {
114− m_cachedState.clear();
115− }
116− // else if m_menu->rowCount() == 0, let's leave existing cache in place
117− // until the new menu comes in, to avoid flashing the UI empty for a moment
118− Q_EMIT updated();
119−}
120−
121−bool RootActionState::isValid() const
122−{
123− return !m_cachedState.empty();
124−}
125−
126−QString RootActionState::title() const
127−{
128− if (!isValid()) return QString();
129−
130− return m_cachedState.value("title", QVariant::fromValue(QString())).toString();
131−}
132−
133−QString RootActionState::leftLabel() const
134−{
135− if (!isValid()) return QString();
136−
137− return m_cachedState.value("pre-label", QVariant::fromValue(QString())).toString();
138−}
139−
140−QString RootActionState::rightLabel() const
141−{
142− if (!isValid()) return QString();
143−
144− return m_cachedState.value("label", QVariant::fromValue(QString())).toString();
145−}
146−
147−QStringList RootActionState::icons() const
148−{
149− if (!isValid()) return QStringList();
150−
151− return m_cachedState.value("icons", QVariant::fromValue(QStringList())).toStringList();
152−}
153−
154−QString RootActionState::accessibleName() const
155−{
156− if (!isValid()) return QString();
157−
158− return m_cachedState.value("accessible-desc", QVariant::fromValue(QString())).toString();
159−}
160−
161−bool RootActionState::indicatorVisible() const
162−{
163− if (!isValid()) return false;
164−
165− return m_cachedState.value("visible", QVariant::fromValue(true)).toBool();
166}
27}
167
28
168static QString iconUri(GIcon *icon)
29static QString iconUri(GIcon *icon)
@@ -211,7 +72,7 @@ static QString iconUri(GIcon *icon)
211 return uri;
72 return uri;
212}
73}
213
74
214−QVariant RootActionState::toQVariant(GVariant* state) const
75+QVariant RootStateParser::toQVariant(GVariant* state) const
215{
76{
216 if (!state) {
77 if (!state) {
217 return QVariant();
78 return QVariant();
@@ -298,3 +159,73 @@ QVariant RootActionState::toQVariant(GVariant* state) const
298 }
159 }
299 return ActionStateParser::toQVariant(state);
160 return ActionStateParser::toQVariant(state);
300}
161}
162+
163+
164+RootStateObject::RootStateObject(QObject* parent)
165+ : QObject(parent)
166+{
167+}
168+
169+QString RootStateObject::title() const
170+{
171+ if (!valid()) return QString();
172+
173+ return m_currentState.value("title", QVariant::fromValue(QString())).toString();
174+}
175+
176+QString RootStateObject::leftLabel() const
177+{
178+ if (!valid()) return QString();
179+
180+ return m_currentState.value("pre-label", QVariant::fromValue(QString())).toString();
181+}
182+
183+QString RootStateObject::rightLabel() const
184+{
185+ if (!valid()) return QString();
186+
187+ return m_currentState.value("label", QVariant::fromValue(QString())).toString();
188+}
189+
190+QStringList RootStateObject::icons() const
191+{
192+ if (!valid()) return QStringList();
193+
194+ return m_currentState.value("icons", QVariant::fromValue(QStringList())).toStringList();
195+}
196+
197+QString RootStateObject::accessibleName() const
198+{
199+ if (!valid()) return QString();
200+
201+ return m_currentState.value("accessible-desc", QVariant::fromValue(QString())).toString();
202+}
203+
204+bool RootStateObject::indicatorVisible() const
205+{
206+ if (!valid()) return false;
207+
208+ return m_currentState.value("visible", QVariant::fromValue(true)).toBool();
209+}
210+
211+void RootStateObject::setCurrentState(const QVariantMap& newState)
212+{
213+ QString oldTitle = title();
214+ QString oldLeftLabel = leftLabel();
215+ QString oldRightLabel = rightLabel();
216+ QStringList oldIcons = icons();
217+ QString oldAccessibleName = accessibleName();
218+ bool oldIndicatorVisible = indicatorVisible();
219+
220+ if (m_currentState != newState) {
221+ m_currentState = newState;
222+ Q_EMIT updated();
223+
224+ if (oldTitle != title()) Q_EMIT titleChanged();
225+ if (oldLeftLabel != leftLabel()) Q_EMIT leftLabelChanged();
226+ if (oldRightLabel != rightLabel()) Q_EMIT rightLabelChanged();
227+ if (oldIcons != icons()) Q_EMIT iconsChanged();
228+ if (oldAccessibleName != accessibleName()) Q_EMIT accessibleNameChanged();
229+ if (oldIndicatorVisible != indicatorVisible()) Q_EMIT indicatorVisibleChanged();
230+ }
231+}
plugins/Unity/Indicators/rootactionstate.h → plugins/Unity/Indicators/rootstateparser.hrenamed+18−34
@@ -12,26 +12,27 @@
12 *
12 *
13 * You should have received a copy of the GNU Lesser General Public License
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Nick Dedekind <nick.dedekind@canonical.com>
18 */
15 */
19
16
20−#ifndef ROOTACTIONSTATE_H
17+#ifndef ROOTSTATEPARSER_H
21−#define ROOTACTIONSTATE_H
18+#define ROOTSTATEPARSER_H
22
19
23#include "unityindicatorsglobal.h"
20#include "unityindicatorsglobal.h"
24
21
25#include <actionstateparser.h>
22#include <actionstateparser.h>
26
23
27−class UnityMenuModel;
24+class UNITYINDICATORS_EXPORT RootStateParser : public ActionStateParser
25+{
26+public:
27+ RootStateParser(QObject* parent = nullptr);
28+ virtual QVariant toQVariant(GVariant* state) const override;
29+};
28
30
29−class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser
31+class UNITYINDICATORS_EXPORT RootStateObject : public QObject
30{
32{
31 Q_OBJECT
33 Q_OBJECT
32− Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)
33
34
34− Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)
35+ Q_PROPERTY(bool valid READ valid NOTIFY validChanged)
35 Q_PROPERTY(QString title READ title NOTIFY titleChanged)
36 Q_PROPERTY(QString title READ title NOTIFY titleChanged)
36 Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)
37 Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)
37 Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)
38 Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)
@@ -39,16 +40,10 @@ class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser
39 Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)
40 Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)
40 Q_PROPERTY(bool indicatorVisible READ indicatorVisible NOTIFY indicatorVisibleChanged)
41 Q_PROPERTY(bool indicatorVisible READ indicatorVisible NOTIFY indicatorVisibleChanged)
41public:
42public:
42− RootActionState(QObject *parent = 0);
43+ RootStateObject(QObject* parent = 0);
43− virtual ~RootActionState();
44
44
45− UnityMenuModel* menu() const;
45+ virtual bool valid() const = 0;
46− void setMenu(UnityMenuModel* menu);
47
46
48− int index() const;
49− void setIndex(int index);
50−
51− bool isValid() const;
52 QString title() const;
47 QString title() const;
53 QString leftLabel() const;
48 QString leftLabel() const;
54 QString rightLabel() const;
49 QString rightLabel() const;
@@ -56,15 +51,12 @@ public:
56 QString accessibleName() const;
51 QString accessibleName() const;
57 bool indicatorVisible() const;
52 bool indicatorVisible() const;
58
53
59− // from ActionStateParser
54+ QVariantMap currentState() const { return m_currentState; }
60− virtual QVariant toQVariant(GVariant* state) const override;
55+ void setCurrentState(const QVariantMap& currentState);
61
56
62Q_SIGNALS:
57Q_SIGNALS:
63 void updated();
58 void updated();
64
59
65− void menuChanged();
66− void indexChanged();
67−
68 void validChanged();
60 void validChanged();
69 void titleChanged();
61 void titleChanged();
70 void leftLabelChanged();
62 void leftLabelChanged();
@@ -73,17 +65,9 @@ Q_SIGNALS:
73 void accessibleNameChanged();
65 void accessibleNameChanged();
74 void indicatorVisibleChanged();
66 void indicatorVisibleChanged();
75
67
76−private Q_SLOTS:
68+protected:
77− void onModelRowsAdded(const QModelIndex& parent, int start, int end);
69+ RootStateParser m_parser;
78− void onModelRowsRemoved(const QModelIndex& parent, int start, int end);
79− void onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>&);
80− void reset();
81−
82−private:
83− void updateActionState();
84−
85− UnityMenuModel* m_menu;
86− QVariantMap m_cachedState;
70+ QVariantMap m_currentState;
87};
71};
88
72
89−#endif // ROOTACTIONSTATE_H
73+#endif // ROOTSTATEPARSER_H
plugins/Unity/Indicators/visibleindicatorsmodel.cppdeleted−90
@@ -1,90 +0,0 @@
1−/*
2− * Copyright (C) 2012, 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−// self
18−#include "visibleindicatorsmodel.h"
19−#include "indicators.h"
20−
21−VisibleIndicatorsModel::VisibleIndicatorsModel(QObject *parent)
22− : QIdentityProxyModel(parent),
23− m_inserting(false)
24−{
25− QObject::connect(this, SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(onBeginRowInserted(QModelIndex, int, int)));
26− QObject::connect(this, SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(onRowInserted(QModelIndex, int, int)));
27−}
28−
29−QHash<int, QByteArray> VisibleIndicatorsModel::roleNames() const
30−{
31− static QHash<int, QByteArray> roles;
32− if (roles.isEmpty())
33− {
34− roles[IndicatorsModelRole::Identifier] = "identifier";
35− roles[IndicatorsModelRole::Position] = "position";
36− roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
37− roles[IndicatorsModelRole::IsVisible] = "isVisible";
38− }
39− return roles;
40−}
41−
42−void VisibleIndicatorsModel::setSourceModel(QAbstractItemModel *model)
43−{
44− if (sourceModel() != model) {
45− QIdentityProxyModel::setSourceModel(model);
46− Q_EMIT modelChanged();
47− }
48−}
49−
50−QVariantMap VisibleIndicatorsModel::visible() const
51−{
52− return m_visible;
53−}
54−
55−void VisibleIndicatorsModel::onBeginRowInserted(const QModelIndex&, int, int)
56−{
57− m_inserting = true;
58−}
59−
60−void VisibleIndicatorsModel::onRowInserted(const QModelIndex&, int, int)
61−{
62− m_inserting = false;
63−}
64−
65−void VisibleIndicatorsModel::setVisible(const QVariantMap& visible)
66−{
67− if (m_visible != visible) {
68− m_visible = visible;
69− Q_EMIT visibleChanged();
70−
71− // need to tell the view that the visible data has changed.
72− if (!m_inserting && rowCount() > 0) {
73− Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), QVector<int>() << IndicatorsModelRole::IsVisible);
74− }
75− }
76−}
77−
78−QVariant VisibleIndicatorsModel::data(const QModelIndex &index, int role) const
79−{
80− if (role != IndicatorsModelRole::IsVisible) {
81− return QIdentityProxyModel::data(index, role);
82− }
83−
84− if (!index.isValid()) {
85− return false;
86− }
87−
88− QString ident = QIdentityProxyModel::data(index, IndicatorsModelRole::Identifier).toString();
89− return m_visible.value(ident, false).toBool();
90−}
plugins/Unity/Indicators/visibleindicatorsmodel.hdeleted−56
@@ -1,56 +0,0 @@
1−/*
2− * Copyright (C) 2012, 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Nick Dedekind <nick.dedekind@canonical.com>
18− */
19−
20−#ifndef VISIBLEINDICATORSMODEL_H
21−#define VISIBLEINDICATORSMODEL_H
22−
23−#include <QIdentityProxyModel>
24−
25−class VisibleIndicatorsModel : public QIdentityProxyModel
26−{
27− Q_OBJECT
28−
29− Q_PROPERTY(QAbstractItemModel* model READ sourceModel WRITE setSourceModel NOTIFY modelChanged)
30− Q_PROPERTY(QVariantMap visible READ visible WRITE setVisible NOTIFY visibleChanged)
31−
32−public:
33− explicit VisibleIndicatorsModel(QObject *parent = 0);
34−
35− virtual void setSourceModel(QAbstractItemModel *model);
36− virtual QHash<int, QByteArray> roleNames() const;
37− virtual QVariant data(const QModelIndex &index, int role) const;
38−
39− QVariantMap visible() const;
40− void setVisible(const QVariantMap& visible);
41−
42−public Q_SLOTS:
43− void onBeginRowInserted(const QModelIndex&, int start, int end);
44− void onRowInserted(const QModelIndex&, int start, int end);
45−
46−Q_SIGNALS:
47− void totalCountChanged();
48− void modelChanged();
49− void visibleChanged();
50−
51−private:
52− QVariantMap m_visible;
53− bool m_inserting;
54−};
55−
56−#endif // VISIBLEINDICATORSMODEL_H
plugins/Unity/Launcher/CMakeLists.txt−1
@@ -1,4 +1,3 @@
1−include(FindPkgConfig)
2pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=5)
1pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=5)
3pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
2pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
4pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
3pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
plugins/Unity/Launcher/desktopfilehandler.cpp+1−1
@@ -110,7 +110,7 @@ QString DesktopFileHandler::displayName() const
110 settings.beginGroup("Desktop Entry");
110 settings.beginGroup("Desktop Entry");
111
111
112 // First try to find Name[xx_YY] and Name[xx] in .desktop file
112 // First try to find Name[xx_YY] and Name[xx] in .desktop file
113− QString locale = QLocale::system().name();
113+ QString locale = QLocale().name();
114 QString shortLocale = locale.split('_').first();
114 QString shortLocale = locale.split('_').first();
115
115
116 if (locale != shortLocale && settings.contains(QString("Name[%1]").arg(locale))) {
116 if (locale != shortLocale && settings.contains(QString("Name[%1]").arg(locale))) {
plugins/Unity/Launcher/launcheritem.cpp+11−4
@@ -60,6 +60,10 @@ void LauncherItem::setName(const QString &name)
60{
60{
61 if (m_name != name) {
61 if (m_name != name) {
62 m_name = name;
62 m_name = name;
63+ QuickListEntry entry;
64+ entry.setActionId("launch_item");
65+ entry.setText(m_name);
66+ m_quickList->updateAction(entry);
63 Q_EMIT nameChanged(name);
67 Q_EMIT nameChanged(name);
64 }
68 }
65}
69}
@@ -86,12 +90,15 @@ void LauncherItem::setPinned(bool pinned)
86{
90{
87 if (m_pinned != pinned) {
91 if (m_pinned != pinned) {
88 m_pinned = pinned;
92 m_pinned = pinned;
89− QuickListEntry entry;
90− entry.setActionId("pin_item");
91− entry.setText(pinned ? gettext("Unpin shortcut") : gettext("Pin shortcut"));
92− m_quickList->updateAction(entry);
93 Q_EMIT pinnedChanged(pinned);
93 Q_EMIT pinnedChanged(pinned);
94 }
94 }
95+
96+ // Even if pinned status didn't change, we want to update text in case
97+ // the locale has changed since we last set pinned status.
98+ QuickListEntry entry;
99+ entry.setActionId("pin_item");
100+ entry.setText(pinned ? gettext("Unpin shortcut") : gettext("Pin shortcut"));
101+ m_quickList->updateAction(entry);
95}
102}
96
103
97bool LauncherItem::running() const
104bool LauncherItem::running() const
plugins/Unity/Launcher/launchermodel.cpp+1
@@ -370,6 +370,7 @@ void LauncherModel::refresh()
370 int idx = m_list.indexOf(item);
370 int idx = m_list.indexOf(item);
371 item->setName(desktopFile.displayName());
371 item->setName(desktopFile.displayName());
372 item->setIcon(desktopFile.icon());
372 item->setIcon(desktopFile.icon());
373+ item->setPinned(item->pinned()); // update pinned text if needed
373 Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
374 Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
374 }
375 }
375 }
376 }
plugins/Unity/Launcher/launchermodel.h+1−1
@@ -58,6 +58,7 @@ public:
58
58
59public Q_SLOTS:
59public Q_SLOTS:
60 void requestRemove(const QString &appId);
60 void requestRemove(const QString &appId);
61+ Q_INVOKABLE void refresh();
61
62
62private:
63private:
63 void storeAppList();
64 void storeAppList();
@@ -68,7 +69,6 @@ private Q_SLOTS:
68 void countChanged(const QString &appId, int count);
69 void countChanged(const QString &appId, int count);
69 void countVisibleChanged(const QString &appId, int count);
70 void countVisibleChanged(const QString &appId, int count);
70 void progressChanged(const QString &appId, int progress);
71 void progressChanged(const QString &appId, int progress);
71− void refresh();
72
72
73 void applicationAdded(const QModelIndex &parent, int row);
73 void applicationAdded(const QModelIndex &parent, int row);
74 void applicationRemoved(const QModelIndex &parent, int row);
74 void applicationRemoved(const QModelIndex &parent, int row);
plugins/Unity/Session/CMakeLists.txt−2
@@ -1,5 +1,3 @@
1−include(FindPkgConfig)
2−
3pkg_search_module(GIO REQUIRED gio-2.0)
1pkg_search_module(GIO REQUIRED gio-2.0)
4
2
5include_directories(
3include_directories(
plugins/Unity/Session/dbusunitysessionservice.h+5
@@ -35,6 +35,11 @@ public:
35 DBusUnitySessionService();
35 DBusUnitySessionService();
36 ~DBusUnitySessionService();
36 ~DBusUnitySessionService();
37
37
38+ // For use in QML. Javascript doesn't accept functions beginning with capital letters
39+ Q_INVOKABLE void logout() { Logout(); }
40+ Q_INVOKABLE void reboot() { Reboot(); }
41+ Q_INVOKABLE void shutdown() { Shutdown(); }
42+
38Q_SIGNALS:
43Q_SIGNALS:
39 /**
44 /**
40 * logoutRequested signal
45 * logoutRequested signal
plugins/Utils/CMakeLists.txt+1−4
@@ -1,6 +1,3 @@
1−# Dependencies
2−include(FindPkgConfig)
3−
4pkg_search_module(GIO REQUIRED gio-2.0)
1pkg_search_module(GIO REQUIRED gio-2.0)
5
2
6include_directories(
3include_directories(
@@ -12,7 +9,7 @@ include_directories(
12
9
13set(QMLPLUGIN_SRC
10set(QMLPLUGIN_SRC
14 qlimitproxymodelqml.cpp
11 qlimitproxymodelqml.cpp
15− qsortfilterproxymodelqml.cpp
12+ unitysortfilterproxymodelqml.cpp
16 relativetimeformatter.cpp
13 relativetimeformatter.cpp
17 timeformatter.cpp
14 timeformatter.cpp
18 unitymenumodelpaths.cpp
15 unitymenumodelpaths.cpp
plugins/Utils/plugin.cpp+2−2
@@ -27,7 +27,7 @@
27
27
28// local
28// local
29#include "qlimitproxymodelqml.h"
29#include "qlimitproxymodelqml.h"
30−#include "qsortfilterproxymodelqml.h"
30+#include "unitysortfilterproxymodelqml.h"
31#include "relativetimeformatter.h"
31#include "relativetimeformatter.h"
32#include "timeformatter.h"
32#include "timeformatter.h"
33#include "unitymenumodelpaths.h"
33#include "unitymenumodelpaths.h"
@@ -39,7 +39,7 @@ void UtilsPlugin::registerTypes(const char *uri)
39 Q_ASSERT(uri == QLatin1String("Utils"));
39 Q_ASSERT(uri == QLatin1String("Utils"));
40 qmlRegisterType<QAbstractItemModel>();
40 qmlRegisterType<QAbstractItemModel>();
41 qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
41 qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
42− qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");
42+ qmlRegisterType<UnitySortFilterProxyModelQML>(uri, 0, 1, "UnitySortFilterProxyModel");
43 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
43 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
44 qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");
44 qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");
45 qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");
45 qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");
plugins/Utils/qsortfilterproxymodelqml.cpp → plugins/Utils/unitysortfilterproxymodelqml.cpprenamed+15−15
@@ -15,12 +15,12 @@
15 */
15 */
16
16
17// self
17// self
18−#include "qsortfilterproxymodelqml.h"
18+#include "unitysortfilterproxymodelqml.h"
19
19
20// Qt
20// Qt
21#include <QDebug>
21#include <QDebug>
22
22
23−QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)
23+UnitySortFilterProxyModelQML::UnitySortFilterProxyModelQML(QObject *parent)
24 : QSortFilterProxyModel(parent)
24 : QSortFilterProxyModel(parent)
25 , m_invertMatch(false)
25 , m_invertMatch(false)
26{
26{
@@ -32,7 +32,7 @@ QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)
32/*
32/*
33 * Enter row index of filtered/sorted model, returns row index of source model
33 * Enter row index of filtered/sorted model, returns row index of source model
34 */
34 */
35−int QSortFilterProxyModelQML::mapRowToSource(int row)
35+int UnitySortFilterProxyModelQML::mapRowToSource(int row)
36{
36{
37 if (sourceModel() == nullptr)
37 if (sourceModel() == nullptr)
38 return -1;
38 return -1;
@@ -40,13 +40,13 @@ int QSortFilterProxyModelQML::mapRowToSource(int row)
40 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();
40 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();
41}
41}
42
42
43−QHash<int, QByteArray> QSortFilterProxyModelQML::roleNames() const
43+QHash<int, QByteArray> UnitySortFilterProxyModelQML::roleNames() const
44{
44{
45 return sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();
45 return sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();
46}
46}
47
47
48void
48void
49−QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)
49+UnitySortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)
50{
50{
51 if (itemModel == nullptr) {
51 if (itemModel == nullptr) {
52 return;
52 return;
@@ -69,7 +69,7 @@ QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)
69}
69}
70
70
71QVariantMap
71QVariantMap
72−QSortFilterProxyModelQML::get(int row)
72+UnitySortFilterProxyModelQML::get(int row)
73{
73{
74 QVariantMap res;
74 QVariantMap res;
75 const QHash<int, QByteArray> roles = roleNames();
75 const QHash<int, QByteArray> roles = roleNames();
@@ -81,7 +81,7 @@ QSortFilterProxyModelQML::get(int row)
81}
81}
82
82
83QVariant
83QVariant
84−QSortFilterProxyModelQML::data(int row, int role)
84+UnitySortFilterProxyModelQML::data(int row, int role)
85{
85{
86 if (sourceModel() == nullptr) {
86 if (sourceModel() == nullptr) {
87 return QVariant();
87 return QVariant();
@@ -91,7 +91,7 @@ QSortFilterProxyModelQML::data(int row, int role)
91}
91}
92
92
93int
93int
94−QSortFilterProxyModelQML::totalCount() const
94+UnitySortFilterProxyModelQML::totalCount() const
95{
95{
96 if (sourceModel() != nullptr) {
96 if (sourceModel() != nullptr) {
97 return sourceModel()->rowCount();
97 return sourceModel()->rowCount();
@@ -101,19 +101,19 @@ QSortFilterProxyModelQML::totalCount() const
101}
101}
102
102
103int
103int
104−QSortFilterProxyModelQML::count()
104+UnitySortFilterProxyModelQML::count()
105{
105{
106 return rowCount();
106 return rowCount();
107}
107}
108
108
109bool
109bool
110−QSortFilterProxyModelQML::invertMatch() const
110+UnitySortFilterProxyModelQML::invertMatch() const
111{
111{
112 return m_invertMatch;
112 return m_invertMatch;
113}
113}
114
114
115void
115void
116−QSortFilterProxyModelQML::setInvertMatch(bool invertMatch)
116+UnitySortFilterProxyModelQML::setInvertMatch(bool invertMatch)
117{
117{
118 if (invertMatch != m_invertMatch) {
118 if (invertMatch != m_invertMatch) {
119 m_invertMatch = invertMatch;
119 m_invertMatch = invertMatch;
@@ -123,7 +123,7 @@ QSortFilterProxyModelQML::setInvertMatch(bool invertMatch)
123}
123}
124
124
125bool
125bool
126−QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,
126+UnitySortFilterProxyModelQML::filterAcceptsRow(int sourceRow,
127 const QModelIndex &sourceParent) const
127 const QModelIndex &sourceParent) const
128{
128{
129 // If there's no regexp set, always accept all rows indepenently of the invertMatch setting
129 // If there's no regexp set, always accept all rows indepenently of the invertMatch setting
@@ -136,7 +136,7 @@ QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,
136}
136}
137
137
138int
138int
139−QSortFilterProxyModelQML::findFirst(int role, const QVariant& value) const
139+UnitySortFilterProxyModelQML::findFirst(int role, const QVariant& value) const
140{
140{
141 QModelIndexList matches = match(index(0, 0), role, value, 1, Qt::MatchExactly);
141 QModelIndexList matches = match(index(0, 0), role, value, 1, Qt::MatchExactly);
142 if (!matches.isEmpty()) {
142 if (!matches.isEmpty()) {
@@ -147,7 +147,7 @@ QSortFilterProxyModelQML::findFirst(int role, const QVariant& value) const
147}
147}
148
148
149int
149int
150−QSortFilterProxyModelQML::mapFromSource(int row)
150+UnitySortFilterProxyModelQML::mapFromSource(int row)
151{
151{
152 if (sourceModel() != nullptr) {
152 if (sourceModel() != nullptr) {
153 return QSortFilterProxyModel::mapFromSource(sourceModel()->index(row, 0)).row();
153 return QSortFilterProxyModel::mapFromSource(sourceModel()->index(row, 0)).row();
@@ -157,7 +157,7 @@ QSortFilterProxyModelQML::mapFromSource(int row)
157}
157}
158
158
159int
159int
160−QSortFilterProxyModelQML::mapToSource(int row)
160+UnitySortFilterProxyModelQML::mapToSource(int row)
161{
161{
162 if (sourceModel() != nullptr) {
162 if (sourceModel() != nullptr) {
163 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();
163 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();
plugins/Utils/qsortfilterproxymodelqml.h → plugins/Utils/unitysortfilterproxymodelqml.hrenamed+5−5
@@ -14,12 +14,12 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−#ifndef QSORTFILTERPROXYMODELQML_H
17+#ifndef UNITYSORTFILTERPROXYMODELQML_H
18−#define QSORTFILTERPROXYMODELQML_H
18+#define UNITYSORTFILTERPROXYMODELQML_H
19
19
20#include <QSortFilterProxyModel>
20#include <QSortFilterProxyModel>
21
21
22−class QSortFilterProxyModelQML : public QSortFilterProxyModel
22+class UnitySortFilterProxyModelQML : public QSortFilterProxyModel
23{
23{
24 Q_OBJECT
24 Q_OBJECT
25
25
@@ -29,7 +29,7 @@ class QSortFilterProxyModelQML : public QSortFilterProxyModel
29 Q_PROPERTY(bool invertMatch READ invertMatch WRITE setInvertMatch NOTIFY invertMatchChanged)
29 Q_PROPERTY(bool invertMatch READ invertMatch WRITE setInvertMatch NOTIFY invertMatchChanged)
30
30
31public:
31public:
32− explicit QSortFilterProxyModelQML(QObject *parent = 0);
32+ explicit UnitySortFilterProxyModelQML(QObject *parent = 0);
33
33
34 Q_INVOKABLE QVariantMap get(int row); // Use with caution, it can be slow to query all the roles
34 Q_INVOKABLE QVariantMap get(int row); // Use with caution, it can be slow to query all the roles
35 Q_INVOKABLE QVariant data(int row, int role);
35 Q_INVOKABLE QVariant data(int row, int role);
@@ -60,4 +60,4 @@ private:
60 bool m_invertMatch;
60 bool m_invertMatch;
61};
61};
62
62
63−#endif // QSORTFILTERPROXYMODELQML_H
63+#endif // UNITYSORTFILTERPROXYMODELQML_H
plugins/Wizard/50-com.canonical.unity.wizard.pklanew file+6
@@ -0,0 +1,6 @@
1+[Allow welcome wizard to set AccountsService fields]
2+Identity=unix-user:lightdm
3+Action=org.freedesktop.accounts.user-administration
4+ResultActive=yes
5+ResultInactive=no
6+ResultAny=no
plugins/Wizard/CMakeLists.txtnew file+11
@@ -0,0 +1,11 @@
1+add_library(Wizard-qml MODULE
2+ plugin.cpp
3+ PageList.cpp
4+ System.cpp
5+)
6+
7+qt5_use_modules(Wizard-qml DBus Qml)
8+add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
9+
10+set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
11+install(FILES 50-com.canonical.unity.wizard.pkla DESTINATION ${POLKIT_LIB_DIR}/localauthority/10-vendor.d)
plugins/Wizard/PageList.cppnew file+112
@@ -0,0 +1,112 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+/**
18+ * This class lets the list of wizard pages be dynamic.
19+ * - To add new ones, drop them into
20+ * $XDG_DATA_DIRS/Wizard/Pages with a numbered prefix,
21+ * like "21-custom-page.qml". The number determines the order in the page
22+ * sequence that your page will appear.
23+ * - To disable an existing page, add a file like "21-custom-page.qml.disabled"
24+ * - To go to the next page, use pageStack.next()
25+ * - To go back to the previous page, use pageStack.prev()
26+ * - To load a page outside of the normal flow (so that it doesn't affect the
27+ * back button), use pageStack.push(Qt.resolvedUrl("custom-page.qml")) in
28+ * your page.
29+ * - See default pages for plenty of examples.
30+ */
31+
32+#include "PageList.h"
33+#include <paths.h>
34+#include <QDir>
35+#include <QSet>
36+#include <QStandardPaths>
37+
38+PageList::PageList(QObject *parent)
39+ : QObject(parent),
40+ m_index(-1),
41+ m_pages()
42+{
43+ QString qmlSuffix = ".qml";
44+ QString disabledSuffix = ".disabled";
45+ QSet<QString> disabledPages;
46+ QStringList dataDirs;
47+
48+ if (!isRunningInstalled() && getenv("UNITY_TEST_ENV") == nullptr) {
49+ dataDirs = QStringList() << qmlDirectory();
50+ } else {
51+ dataDirs = shellDataDirs();
52+ }
53+
54+ Q_FOREACH(const QString &dataDir, dataDirs) {
55+ QDir dir(dataDir + "/Wizard/Pages");
56+ QStringList entries = dir.entryList(QStringList("[0-9]*"), QDir::Files | QDir::Readable);
57+ Q_FOREACH(const QString &entry, entries) {
58+ if (!m_pages.contains(entry) && entry.endsWith(qmlSuffix))
59+ m_pages.insert(entry, dir.absoluteFilePath(entry));
60+ else if (entry.endsWith(qmlSuffix + disabledSuffix))
61+ disabledPages.insert(entry.left(entry.size() - disabledSuffix.size()));
62+ }
63+ }
64+
65+ // Now remove any explicitly disabled entries
66+ Q_FOREACH(const QString &page, disabledPages) {
67+ m_pages.remove(page);
68+ }
69+}
70+
71+QStringList PageList::entries() const
72+{
73+ return m_pages.keys();
74+}
75+
76+QStringList PageList::paths() const
77+{
78+ return m_pages.values();
79+}
80+
81+int PageList::index() const
82+{
83+ return m_index;
84+}
85+
86+int PageList::numPages() const
87+{
88+ return m_pages.size();
89+}
90+
91+QString PageList::prev()
92+{
93+ if (m_index > 0)
94+ return m_pages.values()[setIndex(m_index - 1)];
95+ else
96+ return QString();
97+}
98+
99+QString PageList::next()
100+{
101+ if (m_index < m_pages.count() - 1)
102+ return m_pages.values()[setIndex(m_index + 1)];
103+ else
104+ return QString();
105+}
106+
107+int PageList::setIndex(int index)
108+{
109+ m_index = index;
110+ Q_EMIT indexChanged();
111+ return m_index;
112+}
plugins/Wizard/PageList.hnew file+53
@@ -0,0 +1,53 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef WIZARD_PAGELIST_H
18+#define WIZARD_PAGELIST_H
19+
20+#include <QMap>
21+#include <QObject>
22+#include <QString>
23+
24+class PageList : public QObject
25+{
26+ Q_OBJECT
27+ Q_PROPERTY(int index READ index NOTIFY indexChanged)
28+ Q_PROPERTY(int numPages READ numPages NOTIFY numPagesChanged)
29+
30+public:
31+ explicit PageList(QObject *parent = 0);
32+
33+ QStringList entries() const;
34+ QStringList paths() const;
35+ int index() const;
36+ int numPages() const;
37+
38+public Q_SLOTS:
39+ QString prev();
40+ QString next();
41+
42+Q_SIGNALS:
43+ void indexChanged();
44+ void numPagesChanged(); // never emitted, just here to quiet Qml warnings
45+
46+private:
47+ int setIndex(int index);
48+
49+ int m_index;
50+ QMap<QString, QString> m_pages;
51+};
52+
53+#endif // WIZARD_PAGELIST_H
plugins/Wizard/System.cppnew file+99
@@ -0,0 +1,99 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "System.h"
18+
19+#include <QDBusInterface>
20+#include <QDBusMetaType>
21+#include <QDir>
22+#include <QFile>
23+#include <QLocale>
24+#include <QMap>
25+#include <QProcess>
26+
27+System::System()
28+ : QObject(),
29+ m_fsWatcher()
30+{
31+ // Register the argument needed for UpdateActivationEnvironment below
32+ qDBusRegisterMetaType<QMap<QString,QString>>();
33+
34+ m_fsWatcher.addPath(wizardEnabledPath());
35+ connect(&m_fsWatcher, SIGNAL(fileChanged(const QString &)),
36+ this, SIGNAL(wizardEnabledChanged()));
37+}
38+
39+QString System::wizardEnabledPath()
40+{
41+ // Uses ubuntu-system-settings namespace for historic compatibility reasons
42+ return QDir::home().filePath(".config/ubuntu-system-settings/wizard-has-run");
43+}
44+
45+bool System::wizardEnabled() const
46+{
47+ return !QFile::exists(wizardEnabledPath());
48+}
49+
50+void System::setWizardEnabled(bool enabled)
51+{
52+ if (wizardEnabled() == enabled)
53+ return;
54+
55+ if (enabled) {
56+ QFile::remove(wizardEnabledPath());
57+ } else {
58+ QDir(wizardEnabledPath()).mkpath("..");
59+ QFile(wizardEnabledPath()).open(QIODevice::WriteOnly);
60+ m_fsWatcher.addPath(wizardEnabledPath());
61+ wizardEnabledChanged();
62+ }
63+}
64+
65+void System::setSessionVariable(const QString &variable, const QString &value)
66+{
67+ // We need to update both upstart's and DBus's environment
68+ QProcess::execute(QString("initctl set-env --global %1=%2").arg(variable, value));
69+
70+ QDBusInterface iface("org.freedesktop.DBus",
71+ "/org/freedesktop/DBus",
72+ "org.freedesktop.DBus",
73+ QDBusConnection::sessionBus());
74+
75+ QMap<QString,QString> valueMap;
76+ valueMap.insert(variable, value);
77+ iface.call("UpdateActivationEnvironment", QVariant::fromValue(valueMap));
78+}
79+
80+void System::updateSessionLanguage(const QString &locale)
81+{
82+ QString language = locale.split(".")[0];
83+
84+ setSessionVariable("LANGUAGE", language);
85+ setSessionVariable("LANG", locale);
86+ setSessionVariable("LC_ALL", locale);
87+
88+ // QLocale caches the default locale on startup, and Qt uses that cached
89+ // copy when formatting dates. So manually update it here.
90+ QLocale::setDefault(QLocale(locale));
91+
92+ // Restart bits of the session to pick up new language.
93+ QProcess::startDetached("sh -c \"initctl emit indicator-services-end; \
94+ initctl stop scope-registry; \
95+ initctl stop smart-scopes-proxy; \
96+ initctl emit --no-wait indicator-services-start; \
97+ initctl restart --no-wait maliit-server; \
98+ initctl restart --no-wait unity8-dash\"");
99+}
plugins/Wizard/System.hnew file+50
@@ -0,0 +1,50 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef WIZARD_SYSTEM_H
18+#define WIZARD_SYSTEM_H
19+
20+#include <QFileSystemWatcher>
21+#include <QObject>
22+#include <QString>
23+
24+class System : public QObject
25+{
26+ Q_OBJECT
27+ Q_PROPERTY(bool wizardEnabled READ wizardEnabled WRITE setWizardEnabled NOTIFY wizardEnabledChanged)
28+
29+public:
30+ System();
31+
32+ bool wizardEnabled() const;
33+ void setWizardEnabled(bool enabled);
34+
35+public Q_SLOTS:
36+ void updateSessionLanguage(const QString &locale);
37+
38+Q_SIGNALS:
39+ void wizardEnabledChanged();
40+
41+private:
42+ Q_DISABLE_COPY(System)
43+
44+ static QString wizardEnabledPath();
45+ static void setSessionVariable(const QString &variable, const QString &value);
46+
47+ QFileSystemWatcher m_fsWatcher;
48+};
49+
50+#endif
plugins/Wizard/Wizard.qmltypesnew file+36
@@ -0,0 +1,36 @@
1+import QtQuick.tooling 1.1
2+
3+// This file describes the plugin-supplied types contained in the library.
4+// It is used for QML tooling purposes only.
5+//
6+// This file was auto-generated by:
7+// 'qmlplugindump -notrelocatable Wizard 0.1 plugins'
8+
9+Module {
10+ Component {
11+ name: "PageList"
12+ prototype: "QObject"
13+ exports: ["Wizard/PageList 0.1"]
14+ isCreatable: false
15+ isSingleton: true
16+ exportMetaObjectRevisions: [0]
17+ Property { name: "index"; type: "int"; isReadonly: true }
18+ Property { name: "numPages"; type: "int"; isReadonly: true }
19+ Method { name: "prev"; type: "string" }
20+ Method { name: "next"; type: "string" }
21+ }
22+ Component {
23+ name: "System"
24+ prototype: "QObject"
25+ exports: ["Wizard/System 0.1"]
26+ isCreatable: false
27+ isSingleton: true
28+ exportMetaObjectRevisions: [0]
29+ Property { name: "wizardEnabled"; type: "bool" }
30+ Method {
31+ name: "updateSessionLanguage"
32+ Parameter { name: "locale"; type: "string" }
33+ }
34+ }
35+}
36+
plugins/Wizard/plugin.cppnew file+35
@@ -0,0 +1,35 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "plugin.h"
18+#include "PageList.h"
19+#include "System.h"
20+
21+#include <QtQml/qqml.h>
22+
23+static QObject *system_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
24+{
25+ Q_UNUSED(engine)
26+ Q_UNUSED(scriptEngine)
27+ return new System();
28+}
29+
30+void WizardPlugin::registerTypes(const char *uri)
31+{
32+ Q_ASSERT(uri == QLatin1String("Wizard"));
33+ qmlRegisterType<PageList>(uri, 0, 1, "PageList");
34+ qmlRegisterSingletonType<System>(uri, 0, 1, "System", system_provider);
35+}
plugins/Wizard/plugin.hnew file+32
@@ -0,0 +1,32 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef WIZARD_PLUGIN_H
18+#define WIZARD_PLUGIN_H
19+
20+#include <QtQml/QQmlEngine>
21+#include <QtQml/QQmlExtensionPlugin>
22+
23+class WizardPlugin : public QQmlExtensionPlugin
24+{
25+ Q_OBJECT
26+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
27+
28+public:
29+ void registerTypes(const char *uri);
30+};
31+
32+#endif
plugins/Wizard/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module Wizard
2+plugin Wizard-qml
3+typeinfo Wizard.qmltypes
po/am.po+272−80
@@ -7,27 +7,27 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-11-06 00:53+0000\n"
11+"PO-Revision-Date: 2015-01-29 00:07+0000\n"
12"Last-Translator: samson <Unknown>\n"
12"Last-Translator: samson <Unknown>\n"
13"Language-Team: Amharic <am@li.org>\n"
13"Language-Team: Amharic <am@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-30 07:08+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "የ መግቢያ ቃል: "
23msgstr "የ መግቢያ ቃል: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "አቋራጭ ማጣበቂያ"
28msgstr "አቋራጭ ማጣበቂያ"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "አቋራጭ መለያያ"
32msgstr "አቋራጭ መለያያ"
33
33
@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] "እባክዎን ይቆዩ %1 ደቂቃ እና ከዛ እንደ ገና ይምክሩ…"
50msgstr[0] "እባክዎን ይቆዩ %1 ደቂቃ እና ከዛ እንደ ገና ይምክሩ…"
51msgstr[1] "እባክዎን ይቆዩ %1 ደቂቃዎች እና ከዛ እንደ ገና ይምክሩ…"
51msgstr[1] "እባክዎን ይቆዩ %1 ደቂቃዎች እና ከዛ እንደ ገና ይምክሩ…"
52
52
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
54msgid "Log out"
54msgid "Log out"
55msgstr "መውጫ"
55msgstr "መውጫ"
56
56
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr "በእርግጥ መውጣት ይፈልጋሉ?"
59msgstr "በእርግጥ መውጣት ይፈልጋሉ?"
60
60
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:134
63msgid "No"
63msgid "No"
64msgstr "አይ"
64msgstr "አይ"
65
65
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:140
68msgid "Yes"
68msgid "Yes"
69msgstr "አዎ"
69msgstr "አዎ"
70
70
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
72msgid "Shut down"
72msgid "Shut down"
73msgstr "ማጥፊያ"
73msgstr "ማጥፊያ"
74
74
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr "በእርግጥ ማጥፋት ይፈልጋሉ?"
77msgstr "በእርግጥ ማጥፋት ይፈልጋሉ?"
78
78
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
80msgid "Reboot"
80msgid "Reboot"
81msgstr "እንደገና ማስነሻ"
81msgstr "እንደገና ማስነሻ"
82
82
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr "በእርግጥ እንደገና ማስነሳት ይፈልጋሉ?"
85msgstr "በእርግጥ እንደገና ማስነሳት ይፈልጋሉ?"
86
86
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
88msgid "Power"
88msgid "Power"
89msgstr "ሐይል"
89msgstr "ሐይል"
90
90
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
96"በእርግጥ ሐይሉን ማጥፋት\n"
96"በእርግጥ ሐይሉን ማጥፋት\n"
97"ይፈልጋሉ?"
97"ይፈልጋሉ?"
98
98
99−#: qml/Components/Dialogs.qml:151
99+#: qml/Components/Dialogs.qml:157
100msgid "Power off"
100msgid "Power off"
101msgstr "ማጥፊያ"
101msgstr "ማጥፊያ"
102
102
103−#: qml/Components/Dialogs.qml:161
103+#: qml/Components/Dialogs.qml:166
104msgid "Restart"
104msgid "Restart"
105msgstr "እንደገና ማስጀመሪያ"
105msgstr "እንደገና ማስጀመሪያ"
106
106
107−#: qml/Components/Dialogs.qml:171
107+#: qml/Components/Dialogs.qml:175
108msgid "Cancel"
108msgid "Cancel"
109msgstr "መሰረዣ"
109msgstr "መሰረዣ"
110
110
@@ -112,83 +112,87 @@ msgstr "መሰረዣ"
112msgid "Skip intro"
112msgid "Skip intro"
113msgstr "መግቢያውን መዝለያ"
113msgstr "መግቢያውን መዝለያ"
114
114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116msgid "Right edge"
116msgid "Right edge"
117msgstr "የቀኝ ጠርዝ"
117msgstr "የቀኝ ጠርዝ"
118
118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120msgid "Try swiping from the right edge to unlock the phone"
120msgid "Try swiping from the right edge to unlock the phone"
121msgstr "ስልኩን ለመክፈት ከ ቀኝ ጠርዝ በኩል ወደ ግራ ይጥረጉ"
121msgstr "ስልኩን ለመክፈት ከ ቀኝ ጠርዝ በኩል ወደ ግራ ይጥረጉ"
122
122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124msgid "Top edge"
124msgid "Top edge"
125msgstr "የላይ ጠርዝ"
125msgstr "የላይ ጠርዝ"
126
126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128msgid "Try swiping from the top edge to access the indicators"
128msgid "Try swiping from the top edge to access the indicators"
129msgstr "ጠቋሚዎች ጋር ለመድረስ ከ ላይ ጠርዝ በኩል ወደ ታች ይጥረጉ"
129msgstr "ጠቋሚዎች ጋር ለመድረስ ከ ላይ ጠርዝ በኩል ወደ ታች ይጥረጉ"
130
130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132msgid "Close"
132msgid "Close"
133msgstr "መዝጊያ"
133msgstr "መዝጊያ"
134
134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136msgid "Swipe up again to close the settings screen"
136msgid "Swipe up again to close the settings screen"
137msgstr "የማሰናጃውን መመልከቻ ለመዝጋት እንደገና ወደ ላይ ይጥረጉ"
137msgstr "የማሰናጃውን መመልከቻ ለመዝጋት እንደገና ወደ ላይ ይጥረጉ"
138
138
139−#: qml/Components/EdgeDemo.qml:201
139+#: qml/Components/EdgeDemo.qml:214
140msgid "Left edge"
140msgid "Left edge"
141msgstr "የግራ ጠርዝ"
141msgstr "የግራ ጠርዝ"
142
142
143−#: qml/Components/EdgeDemo.qml:202
143+#: qml/Components/EdgeDemo.qml:215
144msgid "Swipe from the left to reveal the launcher for quick access to apps"
144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145msgstr "ከ ግራ በኩል ወደ ቀኝ ይጥረጉ በፍጥነት መተግበሪያዎች ጋር ለመድረስ እና ለማስጀመር"
145msgstr "ከ ግራ በኩል ወደ ቀኝ ይጥረጉ በፍጥነት መተግበሪያዎች ጋር ለመድረስ እና ለማስጀመር"
146
146
147−#: qml/Components/EdgeDemo.qml:229
147+#: qml/Components/EdgeDemo.qml:242
148msgid "Well done"
148msgid "Well done"
149msgstr "ጥሩ አድረገዋል"
149msgstr "ጥሩ አድረገዋል"
150
150
151−#: qml/Components/EdgeDemo.qml:230
151+#: qml/Components/EdgeDemo.qml:243
152msgid ""
152msgid ""
153"You have now mastered the edge gestures and can start using the "
153"You have now mastered the edge gestures and can start using the "
154"phone<br><br>Tap on the screen to start"
154"phone<br><br>Tap on the screen to start"
155msgstr ""
155msgstr ""
156"አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"
156"አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"
157
157
158−#: qml/Components/Lockscreen.qml:223
158+#: qml/Components/Lockscreen.qml:238
159msgid "Return to Call"
159msgid "Return to Call"
160msgstr "ወደ ጥሪ መመለሻ"
160msgstr "ወደ ጥሪ መመለሻ"
161
161
162−#: qml/Components/Lockscreen.qml:223
162+#: qml/Components/Lockscreen.qml:238
163msgid "Emergency Call"
163msgid "Emergency Call"
164msgstr "የ ድንገተኛ ጥሪ"
164msgstr "የ ድንገተኛ ጥሪ"
165
165
166−#: qml/Components/Lockscreen.qml:255
166+#: qml/Components/Lockscreen.qml:270
167msgid "OK"
167msgid "OK"
168msgstr "እሺ"
168msgstr "እሺ"
169
169
170−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
170+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
171msgid "See less"
171msgid "See less"
172msgstr "አነስተኛ መመልከቻ"
172msgstr "አነስተኛ መመልከቻ"
173
173
174−#: qml/Dash/GenericScopeView.qml:434
174+#: qml/Dash/GenericScopeView.qml:485
175msgid "See all"
175msgid "See all"
176msgstr "ሁሉንም መመልከቻ"
176msgstr "ሁሉንም መመልከቻ"
177
177
178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
178+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
179#: qml/Panel/SearchIndicator.qml:27
179#: qml/Panel/SearchIndicator.qml:27
180msgid "Search"
180msgid "Search"
181msgstr "መፈለጊያ"
181msgstr "መፈለጊያ"
182
182
183−#: qml/Dash/PageHeader.qml:268
183+#: qml/Dash/PageHeader.qml:267
184+msgid "Store"
185+msgstr "ማስቀመጫ"
186+
187+#: qml/Dash/PageHeader.qml:284
184msgid "Settings"
188msgid "Settings"
185msgstr "ማሰናጃ"
189msgstr "ማሰናጃ"
186
190
187−#: qml/Dash/PageHeader.qml:275
191+#: qml/Dash/PageHeader.qml:291
188msgid "Remove from Favorites"
192msgid "Remove from Favorites"
189msgstr "ከምወዳቸው ማስወገጃ"
193msgstr "ከምወዳቸው ማስወገጃ"
190
194
191−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:291
192msgid "Add to Favorites"
196msgid "Add to Favorites"
193msgstr "ወደምወዳቸው መጨመሪያ"
197msgstr "ወደምወዳቸው መጨመሪያ"
194
198
@@ -220,31 +224,23 @@ msgstr "ይሳቡ ለማነቃቃት…"
220msgid "Release to refresh…"
224msgid "Release to refresh…"
221msgstr "ይልቀቁ ለማነቃቃት…"
225msgstr "ይልቀቁ ለማነቃቃት…"
222
226
223−#: qml/Dash/ScopesOverview.qml:215
227+#: qml/Dash/ScopesList.qml:66
224−msgid "Manage Scopes"
228+msgid "Manage"
225−msgstr "የ ክልል አስተዳዳሪ"
229+msgstr "አስተዳዳሪ"
226
230
227−#: qml/Dash/ScopesOverview.qml:437
231+#: qml/Dash/ScopesList.qml:112
228−msgid "Done"
232+msgid "Home"
229−msgstr "ጨርሷል"
233+msgstr "ቤት"
230
234
231−#: qml/Dash/ScopesOverview.qml:463
235+#: qml/Dash/ScopesList.qml:113
232−msgid "Store"
236+msgid "Also installed"
233−msgstr "ማስቀመጫ"
237+msgstr "እንዲሁም የተገጠሙ"
234
238
235−#: qml/Dash/ScopesOverviewTab.qml:36
236−msgid "Favorites"
237−msgstr "የምወዳቸው"
238−
239−#: qml/Dash/ScopesOverviewTab.qml:54
240−msgid "All"
241−msgstr "ሁሉንም"
242−
243−#: qml/Greeter/Greeter.qml:174
239+#: qml/Greeter/Greeter.qml:133
244msgid "Unlock"
240msgid "Unlock"
245msgstr "መክፈቻ"
241msgstr "መክፈቻ"
246
242
247−#: qml/Notifications/NotificationMenuItemFactory.qml:116
243+#: qml/Notifications/NotificationMenuItemFactory.qml:128
248msgid "Show password"
244msgid "Show password"
249msgstr "የመግቢያ ቃል ማሳያ"
245msgstr "የመግቢያ ቃል ማሳያ"
250
246
@@ -284,6 +280,10 @@ msgstr "ጨርሷል"
284msgid "Failed, tap to retry"
280msgid "Failed, tap to retry"
285msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"
281msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"
286
282
283+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
284+msgid "Reply"
285+msgstr "መመለሻ"
286+
287#: qml/Panel/Indicators/ModemInfoItem.qml:105
287#: qml/Panel/Indicators/ModemInfoItem.qml:105
288msgid "Unlock SIM"
288msgid "Unlock SIM"
289msgstr "ሲም መክፈቻ"
289msgstr "ሲም መክፈቻ"
@@ -292,49 +292,49 @@ msgstr "ሲም መክፈቻ"
292msgid "Roaming"
292msgid "Roaming"
293msgstr "ማዘዋወሪያ"
293msgstr "ማዘዋወሪያ"
294
294
295−#: qml/Shell.qml:391
295+#: qml/Shell.qml:390
296+#, qt-format
297+msgid "Enter %1"
298+msgstr "ማስገቢያ %1"
299+
300+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
296msgid "Enter passphrase"
301msgid "Enter passphrase"
297msgstr "የ ማለፊያ ሀረግ ያስገቡ"
302msgstr "የ ማለፊያ ሀረግ ያስገቡ"
298
303
299#: qml/Shell.qml:392
304#: qml/Shell.qml:392
305+msgid "Enter passcode"
306+msgstr "የ ማለፊያ ኮድ ያስገቡ"
307+
308+#: qml/Shell.qml:393
309+#, qt-format
310+msgid "Sorry, incorrect %1"
311+msgstr "አዝናለሁ: የተሳሳተ%1"
312+
313+#: qml/Shell.qml:394
300msgid "Sorry, incorrect passphrase"
314msgid "Sorry, incorrect passphrase"
301msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
315msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
302
316
303−#: qml/Shell.qml:393
317+#: qml/Shell.qml:395
304msgid "Please re-enter"
318msgid "Please re-enter"
305msgstr "እባክዎን እንደገና-ያስገቡ"
319msgstr "እባክዎን እንደገና-ያስገቡ"
306
320
307−#: qml/Shell.qml:395
308−msgid "Enter passcode"
309−msgstr "የ ማለፊያ ኮድ ያስገቡ"
310−
311#: qml/Shell.qml:396
321#: qml/Shell.qml:396
312msgid "Sorry, incorrect passcode"
322msgid "Sorry, incorrect passcode"
313msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
323msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
314
324
315−#: qml/Shell.qml:399
325+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
316−#, qt-format
317−msgid "Enter %1"
318−msgstr "ማስገቢያ %1"
319−
320−#: qml/Shell.qml:400
321−#, qt-format
322−msgid "Sorry, incorrect %1"
323−msgstr "አዝናለሁ: የተሳሳተ%1"
324−
325−#: qml/Shell.qml:441
326msgid "Sorry, incorrect passphrase."
326msgid "Sorry, incorrect passphrase."
327msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
327msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
328
328
329−#: qml/Shell.qml:442
329+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
330msgid "Sorry, incorrect passcode."
330msgid "Sorry, incorrect passcode."
331msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
331msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
332
332
333−#: qml/Shell.qml:443
333+#: qml/Shell.qml:492
334msgid "This will be your last attempt."
334msgid "This will be your last attempt."
335msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
335msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
336
336
337−#: qml/Shell.qml:445
337+#: qml/Shell.qml:494
338msgid ""
338msgid ""
339"If passphrase is entered incorrectly, your phone will conduct a factory "
339"If passphrase is entered incorrectly, your phone will conduct a factory "
340"reset and all personal data will be deleted."
340"reset and all personal data will be deleted."
@@ -342,7 +342,7 @@ msgstr ""
342"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
342"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
343"ይጠፋል"
343"ይጠፋል"
344
344
345−#: qml/Shell.qml:446
345+#: qml/Shell.qml:495
346msgid ""
346msgid ""
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"and all personal data will be deleted."
348"and all personal data will be deleted."
@@ -350,6 +350,186 @@ msgstr ""
350"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
350"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
351"ይጠፋል"
351"ይጠፋል"
352
352
353+#: qml/Wizard/Page.qml:89
354+msgid "Back"
355+msgstr "ወደ ኋላ"
356+
357+#: qml/Wizard/Pages/10-welcome.qml:27
358+msgid "Hi!"
359+msgstr "ሰላም"
360+
361+#: qml/Wizard/Pages/10-welcome.qml:44
362+msgid "Welcome to your Ubuntu phone."
363+msgstr "እንኳን ደህና መጡ ወደ እርስዎ ኡቡንቱ ስልክ"
364+
365+#: qml/Wizard/Pages/10-welcome.qml:52
366+msgid "Let’s get started."
367+msgstr "ስራ እንጀምር"
368+
369+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
370+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
371+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
372+#: qml/Wizard/Pages/passwd-set.qml:90
373+msgid "Continue"
374+msgstr "ይቀጥሉ"
375+
376+#: qml/Wizard/Pages/20-sim.qml:25
377+msgid "Add a SIM card and restart your device"
378+msgstr "የ ሲም ካርድ ይጨምሩ እና አካሉን እንደገና ያስነሱ"
379+
380+#: qml/Wizard/Pages/20-sim.qml:55
381+msgid "Without it, you won’t be able to make calls or use text messaging."
382+msgstr "ያለ እሱ ጥሪ መፈጸም ወይንም የ ጽሁፍ መልእክት መላክ አይችሉም"
383+
384+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
385+msgid "Skip"
386+msgstr "መዝለያ"
387+
388+#: qml/Wizard/Pages/30-passwd-type.qml:39
389+msgid "Lock security"
390+msgstr "ደህንነት መቆለፊያ"
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:74
393+msgid "Please select how you’d like to unlock your phone."
394+msgstr "እባክዎን የ እርስዎን ስልክ እንዴት እንደሚከፍቱ ይምረጡ"
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:97
397+msgid "Swipe"
398+msgstr "መጥረጊያ"
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:98
401+msgid "No security"
402+msgstr "ደህንነት አልተገኘም"
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:100
405+msgid "Passcode"
406+msgstr "ማለፊያ ኮድ"
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:101
409+msgid "4 digits only"
410+msgstr "4 ዲጂትስ ብቻ"
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:103
413+msgid "Passphrase"
414+msgstr "ማለፊያ ሐረግ"
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:104
417+msgid "Numbers and letters"
418+msgstr "ቁጥሮች እና ፊደሎች"
419+
420+#: qml/Wizard/Pages/40-wifi.qml:28
421+msgid "Connect to Wi‑Fi"
422+msgstr "ወደ ዋይ‑ፋይ መገናኛ"
423+
424+#: qml/Wizard/Pages/40-wifi.qml:147
425+msgid "Available networks…"
426+msgstr "ዝግጁ ኔትዎርኮች…"
427+
428+#: qml/Wizard/Pages/40-wifi.qml:148
429+msgid "No available networks."
430+msgstr "ዝግጁ ኔትዎርኮች አልተገኙም"
431+
432+#: qml/Wizard/Pages/50-location.qml:27
433+msgid "Location"
434+msgstr "አካባቢ"
435+
436+#: qml/Wizard/Pages/50-location.qml:62
437+msgid "Let the phone detect your location:"
438+msgstr "እባክዎን እርስዎ ያሉበትን አካባቢ ስልኩ እራሱ ይፈልግ:"
439+
440+#: qml/Wizard/Pages/50-location.qml:69
441+msgid "Using GPS only (less accurate)"
442+msgstr "ጂፒኤስን ብቻ መጠቀሚያ(በጣም ቅርብ)"
443+
444+#: qml/Wizard/Pages/50-location.qml:86
445+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
446+msgstr "ይጠቀሙ ጂፒኤስ ግልጽ ያልሆነ ዋይ-ፋይ እና ተንቀሳቃሽ ኔትዎርክ መረጃ (ይመከራሉ)"
447+
448+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
449+#: qml/Wizard/Pages/50-location.qml:103
450+msgid ""
451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
452+"conditions</a>."
453+msgstr "ይህን ምርጫ በመምረጥ ተስማምቻለሁ ከ Nokia HERE <a href='#'>ውሎች እና ሁኔታዎች ጋር</a>."
454+
455+#: qml/Wizard/Pages/50-location.qml:112
456+msgid "Not at all"
457+msgstr "አይደለም"
458+
459+#: qml/Wizard/Pages/50-location.qml:124
460+msgid "You can change your mind later in <b>System Settings</b>."
461+msgstr "እርስዎ በኋላ መቀየር ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b>."
462+
463+#: qml/Wizard/Pages/60-reporting.qml:24
464+msgid "Improving your experience"
465+msgstr "የ እርስዎን ልምምድ ማሻሻያ"
466+
467+#: qml/Wizard/Pages/60-reporting.qml:36
468+msgid ""
469+"Your phone is set up to automatically report errors to Canonical and its "
470+"partners, the makers of the operating system."
471+msgstr ""
472+"የ እርስዎ ስልክ ራሱ በራሱ የ ስህተት መግለጫዎች ወደ Canonical and its partners, የ መስሪያ ስርአት "
473+"አምራቾች"
474+
475+#: qml/Wizard/Pages/60-reporting.qml:43
476+msgid ""
477+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
478+"Privacy</b>"
479+msgstr ""
480+"ይህን ግልጋሎት ማሰናከል ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b> under <b>Security &amp; Privacy</b>"
481+
482+#: qml/Wizard/Pages/80-finished.qml:24
483+msgid "All done"
484+msgstr "ሁሉም ተፈጽሟል"
485+
486+#: qml/Wizard/Pages/80-finished.qml:39
487+msgid "Nice work!"
488+msgstr "ጥሩ ሰርተዋል!"
489+
490+#: qml/Wizard/Pages/80-finished.qml:46
491+msgid "Your phone is now ready to use."
492+msgstr "ስልኩ አሁን ለመጠቀም ዝግጁ ነው"
493+
494+#: qml/Wizard/Pages/80-finished.qml:53
495+msgid "Finish"
496+msgstr "መጨረሻ"
497+
498+#: qml/Wizard/Pages/here-terms.qml:27
499+msgid "Terms & Conditions"
500+msgstr "ውሎች & ሁኔታዎች"
501+
502+#: qml/Wizard/Pages/passwd-confirm.qml:49
503+msgid "Confirm passphrase"
504+msgstr "የ ማለፊያ ሐረግ ማረጋገጫ"
505+
506+#: qml/Wizard/Pages/passwd-confirm.qml:50
507+msgid "Confirm passcode"
508+msgstr "የማለፊያ ኮድ ማረጋገጫ"
509+
510+#: qml/Wizard/Pages/passwd-confirm.qml:53
511+#: qml/Wizard/Pages/passwd-confirm.qml:54
512+msgid "Please try again."
513+msgstr "እባክዎን እንደገና ይሞክሩ"
514+
515+#: qml/Wizard/Pages/passwd-set.qml:61
516+msgid "Choose your passcode"
517+msgstr "የ እርስዎን የማለፊያ ኮድ ይምረጡ"
518+
519+#: qml/Wizard/Pages/passwd-set.qml:68
520+msgid "Passphrase must be 4 characters long"
521+msgstr "የ ማለፊያ ሀረግ ቢያንስ 4 ባህሪዎች መሆን አለበት"
522+
523+#: qml/Wizard/StackButton.qml:39
524+#, qt-format
525+msgid "〈 %1"
526+msgstr "〈 %1"
527+
528+#: qml/Wizard/StackButton.qml:42
529+#, qt-format
530+msgid "%1 〉"
531+msgstr "%1 〉"
532+
353#~ msgid "Type or say a command"
533#~ msgid "Type or say a command"
354#~ msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"
534#~ msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"
355
535
@@ -364,3 +544,15 @@ msgstr ""
364
544
365#~ msgid "Confirm"
545#~ msgid "Confirm"
366#~ msgstr "ማረጋገጫ"
546#~ msgstr "ማረጋገጫ"
547+
548+#~ msgid "Favorites"
549+#~ msgstr "የምወዳቸው"
550+
551+#~ msgid "All"
552+#~ msgstr "ሁሉንም"
553+
554+#~ msgid "Done"
555+#~ msgstr "ጨርሷል"
556+
557+#~ msgid "Manage Scopes"
558+#~ msgstr "የ ክልል አስተዳዳሪ"
po/ar.po+251−74
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2014-05-22 08:22+0000\n"
11"PO-Revision-Date: 2014-05-22 08:22+0000\n"
12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
13"Language-Team: Arabic <ar@li.org>\n"
13"Language-Team: Arabic <ar@li.org>\n"
@@ -16,19 +16,19 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
17"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
18"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
18"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19+"X-Launchpad-Export-Date: 2015-01-28 06:29+0000\n"
20−"X-Generator: Launchpad (build 17231)\n"
20+"X-Generator: Launchpad (build 17306)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
23msgid "Password: "
23msgid "Password: "
24msgstr ""
24msgstr ""
25
25
26#: plugins/Unity/Launcher/launcheritem.cpp:45
26#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
28msgid "Pin shortcut"
28msgid "Pin shortcut"
29msgstr ""
29msgstr ""
30
30
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
32msgid "Unpin shortcut"
32msgid "Unpin shortcut"
33msgstr ""
33msgstr ""
34
34
@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
51msgstr[0] ""
51msgstr[0] ""
52msgstr[1] ""
52msgstr[1] ""
53
53
54−#: qml/Components/Dialogs.qml:74
54+#: qml/Components/Dialogs.qml:86
55msgid "Log out"
55msgid "Log out"
56msgstr ""
56msgstr ""
57
57
58−#: qml/Components/Dialogs.qml:75
58+#: qml/Components/Dialogs.qml:87
59msgid "Are you sure you want to log out?"
59msgid "Are you sure you want to log out?"
60msgstr ""
60msgstr ""
61
61
62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63−#: qml/Components/Dialogs.qml:126
63+#: qml/Components/Dialogs.qml:134
64msgid "No"
64msgid "No"
65msgstr ""
65msgstr ""
66
66
67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68−#: qml/Components/Dialogs.qml:133
68+#: qml/Components/Dialogs.qml:140
69msgid "Yes"
69msgid "Yes"
70msgstr ""
70msgstr ""
71
71
72−#: qml/Components/Dialogs.qml:98
72+#: qml/Components/Dialogs.qml:108
73msgid "Shut down"
73msgid "Shut down"
74msgstr ""
74msgstr ""
75
75
76−#: qml/Components/Dialogs.qml:99
76+#: qml/Components/Dialogs.qml:109
77msgid "Are you sure you want to shut down?"
77msgid "Are you sure you want to shut down?"
78msgstr ""
78msgstr ""
79
79
80−#: qml/Components/Dialogs.qml:123
80+#: qml/Components/Dialogs.qml:131
81msgid "Reboot"
81msgid "Reboot"
82msgstr ""
82msgstr ""
83
83
84−#: qml/Components/Dialogs.qml:124
84+#: qml/Components/Dialogs.qml:132
85msgid "Are you sure you want to reboot?"
85msgid "Are you sure you want to reboot?"
86msgstr ""
86msgstr ""
87
87
88−#: qml/Components/Dialogs.qml:148
88+#: qml/Components/Dialogs.qml:154
89msgid "Power"
89msgid "Power"
90msgstr ""
90msgstr ""
91
91
92−#: qml/Components/Dialogs.qml:149
92+#: qml/Components/Dialogs.qml:155
93msgid ""
93msgid ""
94"Are you sure you would like\n"
94"Are you sure you would like\n"
95"to power off?"
95"to power off?"
96msgstr ""
96msgstr ""
97
97
98−#: qml/Components/Dialogs.qml:151
98+#: qml/Components/Dialogs.qml:157
99msgid "Power off"
99msgid "Power off"
100msgstr ""
100msgstr ""
101
101
102−#: qml/Components/Dialogs.qml:161
102+#: qml/Components/Dialogs.qml:166
103msgid "Restart"
103msgid "Restart"
104msgstr ""
104msgstr ""
105
105
106−#: qml/Components/Dialogs.qml:171
106+#: qml/Components/Dialogs.qml:175
107msgid "Cancel"
107msgid "Cancel"
108msgstr ""
108msgstr ""
109
109
@@ -111,44 +111,44 @@ msgstr ""
111msgid "Skip intro"
111msgid "Skip intro"
112msgstr "تخطي المقدمة"
112msgstr "تخطي المقدمة"
113
113
114−#: qml/Components/EdgeDemo.qml:112
114+#: qml/Components/EdgeDemo.qml:125
115msgid "Right edge"
115msgid "Right edge"
116msgstr "الحافة اليمنى"
116msgstr "الحافة اليمنى"
117
117
118−#: qml/Components/EdgeDemo.qml:113
118+#: qml/Components/EdgeDemo.qml:126
119msgid "Try swiping from the right edge to unlock the phone"
119msgid "Try swiping from the right edge to unlock the phone"
120msgstr "اسحب اصبعك من الحافة اليمنى لفتح قفل الهاتف"
120msgstr "اسحب اصبعك من الحافة اليمنى لفتح قفل الهاتف"
121
121
122−#: qml/Components/EdgeDemo.qml:144
122+#: qml/Components/EdgeDemo.qml:157
123msgid "Top edge"
123msgid "Top edge"
124msgstr "الحافة العلوية"
124msgstr "الحافة العلوية"
125
125
126−#: qml/Components/EdgeDemo.qml:145
126+#: qml/Components/EdgeDemo.qml:158
127msgid "Try swiping from the top edge to access the indicators"
127msgid "Try swiping from the top edge to access the indicators"
128msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"
128msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"
129
129
130−#: qml/Components/EdgeDemo.qml:170
130+#: qml/Components/EdgeDemo.qml:183
131msgid "Close"
131msgid "Close"
132msgstr "أغلق"
132msgstr "أغلق"
133
133
134−#: qml/Components/EdgeDemo.qml:171
134+#: qml/Components/EdgeDemo.qml:184
135msgid "Swipe up again to close the settings screen"
135msgid "Swipe up again to close the settings screen"
136msgstr "اسحب اصعبك لأعلى مرة أخرى لغلق شاشة الإعدادات"
136msgstr "اسحب اصعبك لأعلى مرة أخرى لغلق شاشة الإعدادات"
137
137
138−#: qml/Components/EdgeDemo.qml:201
138+#: qml/Components/EdgeDemo.qml:214
139msgid "Left edge"
139msgid "Left edge"
140msgstr "الحافة اليسرى"
140msgstr "الحافة اليسرى"
141
141
142−#: qml/Components/EdgeDemo.qml:202
142+#: qml/Components/EdgeDemo.qml:215
143msgid "Swipe from the left to reveal the launcher for quick access to apps"
143msgid "Swipe from the left to reveal the launcher for quick access to apps"
144msgstr ""
144msgstr ""
145"اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"
145"اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"
146
146
147−#: qml/Components/EdgeDemo.qml:229
147+#: qml/Components/EdgeDemo.qml:242
148msgid "Well done"
148msgid "Well done"
149msgstr "أحسنت!"
149msgstr "أحسنت!"
150
150
151−#: qml/Components/EdgeDemo.qml:230
151+#: qml/Components/EdgeDemo.qml:243
152msgid ""
152msgid ""
153"You have now mastered the edge gestures and can start using the "
153"You have now mastered the edge gestures and can start using the "
154"phone<br><br>Tap on the screen to start"
154"phone<br><br>Tap on the screen to start"
@@ -156,40 +156,44 @@ msgstr ""
156"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
156"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
157"الشاشة للبدء"
157"الشاشة للبدء"
158
158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160msgid "Return to Call"
160msgid "Return to Call"
161msgstr ""
161msgstr ""
162
162
163−#: qml/Components/Lockscreen.qml:223
163+#: qml/Components/Lockscreen.qml:238
164msgid "Emergency Call"
164msgid "Emergency Call"
165msgstr "مكالمة طوارئ"
165msgstr "مكالمة طوارئ"
166
166
167−#: qml/Components/Lockscreen.qml:255
167+#: qml/Components/Lockscreen.qml:270
168msgid "OK"
168msgid "OK"
169msgstr ""
169msgstr ""
170
170
171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
172msgid "See less"
172msgid "See less"
173msgstr "شاهد أقل"
173msgstr "شاهد أقل"
174
174
175−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:485
176msgid "See all"
176msgid "See all"
177msgstr ""
177msgstr ""
178
178
179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
181msgid "Search"
181msgid "Search"
182msgstr "ابحث"
182msgstr "ابحث"
183
183
184−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:267
185+msgid "Store"
186+msgstr ""
187+
188+#: qml/Dash/PageHeader.qml:284
185msgid "Settings"
189msgid "Settings"
186msgstr ""
190msgstr ""
187
191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189msgid "Remove from Favorites"
193msgid "Remove from Favorites"
190msgstr ""
194msgstr ""
191
195
192−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:291
193msgid "Add to Favorites"
197msgid "Add to Favorites"
194msgstr ""
198msgstr ""
195
199
@@ -221,31 +225,23 @@ msgstr ""
221msgid "Release to refresh…"
225msgid "Release to refresh…"
222msgstr ""
226msgstr ""
223
227
224−#: qml/Dash/ScopesOverview.qml:215
228+#: qml/Dash/ScopesList.qml:66
225−msgid "Manage Scopes"
229+msgid "Manage"
226−msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:437
229−msgid "Done"
230−msgstr ""
231−
232−#: qml/Dash/ScopesOverview.qml:463
233−msgid "Store"
234msgstr ""
230msgstr ""
235
231
236−#: qml/Dash/ScopesOverviewTab.qml:36
232+#: qml/Dash/ScopesList.qml:112
237−msgid "Favorites"
233+msgid "Home"
238msgstr ""
234msgstr ""
239
235
240−#: qml/Dash/ScopesOverviewTab.qml:54
236+#: qml/Dash/ScopesList.qml:113
241−msgid "All"
237+msgid "Also installed"
242msgstr ""
238msgstr ""
243
239
244−#: qml/Greeter/Greeter.qml:174
240+#: qml/Greeter/Greeter.qml:133
245msgid "Unlock"
241msgid "Unlock"
246msgstr ""
242msgstr ""
247
243
248−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
249msgid "Show password"
245msgid "Show password"
250msgstr "عرض كلمة السر"
246msgstr "عرض كلمة السر"
251
247
@@ -285,6 +281,10 @@ msgstr ""
285msgid "Failed, tap to retry"
281msgid "Failed, tap to retry"
286msgstr ""
282msgstr ""
287
283
284+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
285+msgid "Reply"
286+msgstr ""
287+
288#: qml/Panel/Indicators/ModemInfoItem.qml:105
288#: qml/Panel/Indicators/ModemInfoItem.qml:105
289msgid "Unlock SIM"
289msgid "Unlock SIM"
290msgstr ""
290msgstr ""
@@ -293,60 +293,237 @@ msgstr ""
293msgid "Roaming"
293msgid "Roaming"
294msgstr ""
294msgstr ""
295
295
296−#: qml/Shell.qml:391
296+#: qml/Shell.qml:390
297+#, qt-format
298+msgid "Enter %1"
299+msgstr ""
300+
301+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
297msgid "Enter passphrase"
302msgid "Enter passphrase"
298msgstr ""
303msgstr ""
299
304
300#: qml/Shell.qml:392
305#: qml/Shell.qml:392
301−msgid "Sorry, incorrect passphrase"
306+msgid "Enter passcode"
302msgstr ""
307msgstr ""
303
308
304#: qml/Shell.qml:393
309#: qml/Shell.qml:393
305−msgid "Please re-enter"
310+#, qt-format
311+msgid "Sorry, incorrect %1"
312+msgstr ""
313+
314+#: qml/Shell.qml:394
315+msgid "Sorry, incorrect passphrase"
306msgstr ""
316msgstr ""
307
317
308#: qml/Shell.qml:395
318#: qml/Shell.qml:395
309−msgid "Enter passcode"
319+msgid "Please re-enter"
310msgstr ""
320msgstr ""
311
321
312#: qml/Shell.qml:396
322#: qml/Shell.qml:396
313msgid "Sorry, incorrect passcode"
323msgid "Sorry, incorrect passcode"
314msgstr ""
324msgstr ""
315
325
316−#: qml/Shell.qml:399
326+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
317−#, qt-format
318−msgid "Enter %1"
319−msgstr ""
320−
321−#: qml/Shell.qml:400
322−#, qt-format
323−msgid "Sorry, incorrect %1"
324−msgstr ""
325−
326−#: qml/Shell.qml:441
327msgid "Sorry, incorrect passphrase."
327msgid "Sorry, incorrect passphrase."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Shell.qml:442
330+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331msgid "Sorry, incorrect passcode."
331msgid "Sorry, incorrect passcode."
332msgstr ""
332msgstr ""
333
333
334−#: qml/Shell.qml:443
334+#: qml/Shell.qml:492
335msgid "This will be your last attempt."
335msgid "This will be your last attempt."
336msgstr ""
336msgstr ""
337
337
338−#: qml/Shell.qml:445
338+#: qml/Shell.qml:494
339msgid ""
339msgid ""
340"If passphrase is entered incorrectly, your phone will conduct a factory "
340"If passphrase is entered incorrectly, your phone will conduct a factory "
341"reset and all personal data will be deleted."
341"reset and all personal data will be deleted."
342msgstr ""
342msgstr ""
343
343
344−#: qml/Shell.qml:446
344+#: qml/Shell.qml:495
345msgid ""
345msgid ""
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"and all personal data will be deleted."
347"and all personal data will be deleted."
348msgstr ""
348msgstr ""
349
349
350+#: qml/Wizard/Page.qml:89
351+msgid "Back"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:27
355+msgid "Hi!"
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:44
359+msgid "Welcome to your Ubuntu phone."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:52
363+msgid "Let’s get started."
364+msgstr ""
365+
366+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
367+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
368+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369+#: qml/Wizard/Pages/passwd-set.qml:90
370+msgid "Continue"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:25
374+msgid "Add a SIM card and restart your device"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:55
378+msgid "Without it, you won’t be able to make calls or use text messaging."
379+msgstr ""
380+
381+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
382+msgid "Skip"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:39
386+msgid "Lock security"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:74
390+msgid "Please select how you’d like to unlock your phone."
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:97
394+msgid "Swipe"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:98
398+msgid "No security"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:100
402+msgid "Passcode"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:101
406+msgid "4 digits only"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:103
410+msgid "Passphrase"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:104
414+msgid "Numbers and letters"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:28
418+msgid "Connect to Wi‑Fi"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:147
422+msgid "Available networks…"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/40-wifi.qml:148
426+msgid "No available networks."
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:27
430+msgid "Location"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:62
434+msgid "Let the phone detect your location:"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:69
438+msgid "Using GPS only (less accurate)"
439+msgstr ""
440+
441+#: qml/Wizard/Pages/50-location.qml:86
442+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
443+msgstr ""
444+
445+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
446+#: qml/Wizard/Pages/50-location.qml:103
447+msgid ""
448+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
449+"conditions</a>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:112
453+msgid "Not at all"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/50-location.qml:124
457+msgid "You can change your mind later in <b>System Settings</b>."
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:24
461+msgid "Improving your experience"
462+msgstr ""
463+
464+#: qml/Wizard/Pages/60-reporting.qml:36
465+msgid ""
466+"Your phone is set up to automatically report errors to Canonical and its "
467+"partners, the makers of the operating system."
468+msgstr ""
469+
470+#: qml/Wizard/Pages/60-reporting.qml:43
471+msgid ""
472+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
473+"Privacy</b>"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:24
477+msgid "All done"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:39
481+msgid "Nice work!"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:46
485+msgid "Your phone is now ready to use."
486+msgstr ""
487+
488+#: qml/Wizard/Pages/80-finished.qml:53
489+msgid "Finish"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/here-terms.qml:27
493+msgid "Terms & Conditions"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:49
497+msgid "Confirm passphrase"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:50
501+msgid "Confirm passcode"
502+msgstr ""
503+
504+#: qml/Wizard/Pages/passwd-confirm.qml:53
505+#: qml/Wizard/Pages/passwd-confirm.qml:54
506+msgid "Please try again."
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:61
510+msgid "Choose your passcode"
511+msgstr ""
512+
513+#: qml/Wizard/Pages/passwd-set.qml:68
514+msgid "Passphrase must be 4 characters long"
515+msgstr ""
516+
517+#: qml/Wizard/StackButton.qml:39
518+#, qt-format
519+msgid "〈 %1"
520+msgstr ""
521+
522+#: qml/Wizard/StackButton.qml:42
523+#, qt-format
524+msgid "%1 〉"
525+msgstr ""
526+
350#~ msgid "Confirm"
527#~ msgid "Confirm"
351#~ msgstr "التأكيد"
528#~ msgstr "التأكيد"
352
529
po/ast.po+268−79
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2014-11-08 18:24+0000\n"
11"PO-Revision-Date: 2014-11-08 18:24+0000\n"
12"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
12"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
13"Language-Team: Asturian <ast@li.org>\n"
13"Language-Team: Asturian <ast@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:29+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Contraseña: "
23msgstr "Contraseña: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Anclar"
28msgstr "Anclar"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Desanclar"
32msgstr "Desanclar"
33
33
@@ -51,45 +51,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
51msgstr[0] "Espera %1 minutu y vuelvi a intentalo…"
51msgstr[0] "Espera %1 minutu y vuelvi a intentalo…"
52msgstr[1] "Espera %1 minutos y vuelvi a intentalo…"
52msgstr[1] "Espera %1 minutos y vuelvi a intentalo…"
53
53
54−#: qml/Components/Dialogs.qml:74
54+#: qml/Components/Dialogs.qml:86
55msgid "Log out"
55msgid "Log out"
56msgstr "Zarrar sesión"
56msgstr "Zarrar sesión"
57
57
58−#: qml/Components/Dialogs.qml:75
58+#: qml/Components/Dialogs.qml:87
59msgid "Are you sure you want to log out?"
59msgid "Are you sure you want to log out?"
60msgstr "De xuru que quies zarrar la sesión?"
60msgstr "De xuru que quies zarrar la sesión?"
61
61
62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63−#: qml/Components/Dialogs.qml:126
63+#: qml/Components/Dialogs.qml:134
64msgid "No"
64msgid "No"
65msgstr "Non"
65msgstr "Non"
66
66
67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68−#: qml/Components/Dialogs.qml:133
68+#: qml/Components/Dialogs.qml:140
69msgid "Yes"
69msgid "Yes"
70msgstr "Sí"
70msgstr "Sí"
71
71
72−#: qml/Components/Dialogs.qml:98
72+#: qml/Components/Dialogs.qml:108
73msgid "Shut down"
73msgid "Shut down"
74msgstr "Apagar"
74msgstr "Apagar"
75
75
76−#: qml/Components/Dialogs.qml:99
76+#: qml/Components/Dialogs.qml:109
77msgid "Are you sure you want to shut down?"
77msgid "Are you sure you want to shut down?"
78msgstr "De xuru que quies apagar?"
78msgstr "De xuru que quies apagar?"
79
79
80−#: qml/Components/Dialogs.qml:123
80+#: qml/Components/Dialogs.qml:131
81msgid "Reboot"
81msgid "Reboot"
82msgstr "Reaniciar"
82msgstr "Reaniciar"
83
83
84−#: qml/Components/Dialogs.qml:124
84+#: qml/Components/Dialogs.qml:132
85msgid "Are you sure you want to reboot?"
85msgid "Are you sure you want to reboot?"
86msgstr "De xuru que quies reaniciar?"
86msgstr "De xuru que quies reaniciar?"
87
87
88−#: qml/Components/Dialogs.qml:148
88+#: qml/Components/Dialogs.qml:154
89msgid "Power"
89msgid "Power"
90msgstr "Enerxía"
90msgstr "Enerxía"
91
91
92−#: qml/Components/Dialogs.qml:149
92+#: qml/Components/Dialogs.qml:155
93msgid ""
93msgid ""
94"Are you sure you would like\n"
94"Are you sure you would like\n"
95"to power off?"
95"to power off?"
@@ -97,15 +97,15 @@ msgstr ""
97"De xuru que quies\n"
97"De xuru que quies\n"
98"apagar?"
98"apagar?"
99
99
100−#: qml/Components/Dialogs.qml:151
100+#: qml/Components/Dialogs.qml:157
101msgid "Power off"
101msgid "Power off"
102msgstr "Apagar"
102msgstr "Apagar"
103
103
104−#: qml/Components/Dialogs.qml:161
104+#: qml/Components/Dialogs.qml:166
105msgid "Restart"
105msgid "Restart"
106msgstr "Reaniciar"
106msgstr "Reaniciar"
107
107
108−#: qml/Components/Dialogs.qml:171
108+#: qml/Components/Dialogs.qml:175
109msgid "Cancel"
109msgid "Cancel"
110msgstr "Encaboxar"
110msgstr "Encaboxar"
111
111
@@ -113,45 +113,45 @@ msgstr "Encaboxar"
113msgid "Skip intro"
113msgid "Skip intro"
114msgstr "Omitir la intro"
114msgstr "Omitir la intro"
115
115
116−#: qml/Components/EdgeDemo.qml:112
116+#: qml/Components/EdgeDemo.qml:125
117msgid "Right edge"
117msgid "Right edge"
118msgstr "Berbesu drechu"
118msgstr "Berbesu drechu"
119
119
120−#: qml/Components/EdgeDemo.qml:113
120+#: qml/Components/EdgeDemo.qml:126
121msgid "Try swiping from the right edge to unlock the phone"
121msgid "Try swiping from the right edge to unlock the phone"
122msgstr "Esliza'l deu dende'l berbesu drechu pa desbloquiar el teléfonu"
122msgstr "Esliza'l deu dende'l berbesu drechu pa desbloquiar el teléfonu"
123
123
124−#: qml/Components/EdgeDemo.qml:144
124+#: qml/Components/EdgeDemo.qml:157
125msgid "Top edge"
125msgid "Top edge"
126msgstr "Berbesu superior"
126msgstr "Berbesu superior"
127
127
128−#: qml/Components/EdgeDemo.qml:145
128+#: qml/Components/EdgeDemo.qml:158
129msgid "Try swiping from the top edge to access the indicators"
129msgid "Try swiping from the top edge to access the indicators"
130msgstr "Esliza'l deu dende'l berbesu superior p'acceder a los menús"
130msgstr "Esliza'l deu dende'l berbesu superior p'acceder a los menús"
131
131
132−#: qml/Components/EdgeDemo.qml:170
132+#: qml/Components/EdgeDemo.qml:183
133msgid "Close"
133msgid "Close"
134msgstr "Zarrar"
134msgstr "Zarrar"
135
135
136−#: qml/Components/EdgeDemo.qml:171
136+#: qml/Components/EdgeDemo.qml:184
137msgid "Swipe up again to close the settings screen"
137msgid "Swipe up again to close the settings screen"
138msgstr "Esliza hacia arriba pa zarrar la pantalla d'axustes"
138msgstr "Esliza hacia arriba pa zarrar la pantalla d'axustes"
139
139
140−#: qml/Components/EdgeDemo.qml:201
140+#: qml/Components/EdgeDemo.qml:214
141msgid "Left edge"
141msgid "Left edge"
142msgstr "Berbesu esquierdu"
142msgstr "Berbesu esquierdu"
143
143
144−#: qml/Components/EdgeDemo.qml:202
144+#: qml/Components/EdgeDemo.qml:215
145msgid "Swipe from the left to reveal the launcher for quick access to apps"
145msgid "Swipe from the left to reveal the launcher for quick access to apps"
146msgstr ""
146msgstr ""
147"Esliza'l deu dende la esquierda p'amosar el llanzador y acceder rápidamente "
147"Esliza'l deu dende la esquierda p'amosar el llanzador y acceder rápidamente "
148"a les aplicaciones"
148"a les aplicaciones"
149
149
150−#: qml/Components/EdgeDemo.qml:229
150+#: qml/Components/EdgeDemo.qml:242
151msgid "Well done"
151msgid "Well done"
152msgstr "Bien fecho"
152msgstr "Bien fecho"
153
153
154−#: qml/Components/EdgeDemo.qml:230
154+#: qml/Components/EdgeDemo.qml:243
155msgid ""
155msgid ""
156"You have now mastered the edge gestures and can start using the "
156"You have now mastered the edge gestures and can start using the "
157"phone<br><br>Tap on the screen to start"
157"phone<br><br>Tap on the screen to start"
@@ -159,40 +159,44 @@ msgstr ""
159"Agora yá domines los xestos de los berbesos y pues entamar a usar el "
159"Agora yá domines los xestos de los berbesos y pues entamar a usar el "
160"teléfonu<br><br>Toca la pantalla pa comenzar"
160"teléfonu<br><br>Toca la pantalla pa comenzar"
161
161
162−#: qml/Components/Lockscreen.qml:223
162+#: qml/Components/Lockscreen.qml:238
163msgid "Return to Call"
163msgid "Return to Call"
164msgstr "Tornar a la llamada"
164msgstr "Tornar a la llamada"
165
165
166−#: qml/Components/Lockscreen.qml:223
166+#: qml/Components/Lockscreen.qml:238
167msgid "Emergency Call"
167msgid "Emergency Call"
168msgstr "Llamada d'emerxencia"
168msgstr "Llamada d'emerxencia"
169
169
170−#: qml/Components/Lockscreen.qml:255
170+#: qml/Components/Lockscreen.qml:270
171msgid "OK"
171msgid "OK"
172msgstr "Aceutar"
172msgstr "Aceutar"
173
173
174−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
174+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
175msgid "See less"
175msgid "See less"
176msgstr "Ver menos"
176msgstr "Ver menos"
177
177
178−#: qml/Dash/GenericScopeView.qml:434
178+#: qml/Dash/GenericScopeView.qml:485
179msgid "See all"
179msgid "See all"
180msgstr "Ver too"
180msgstr "Ver too"
181
181
182−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
182+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
183#: qml/Panel/SearchIndicator.qml:27
183#: qml/Panel/SearchIndicator.qml:27
184msgid "Search"
184msgid "Search"
185msgstr "Guetar"
185msgstr "Guetar"
186
186
187−#: qml/Dash/PageHeader.qml:268
187+#: qml/Dash/PageHeader.qml:267
188+msgid "Store"
189+msgstr "Tienda"
190+
191+#: qml/Dash/PageHeader.qml:284
188msgid "Settings"
192msgid "Settings"
189msgstr "Axustes"
193msgstr "Axustes"
190
194
191−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:291
192msgid "Remove from Favorites"
196msgid "Remove from Favorites"
193msgstr "Desaniciar de favoritos"
197msgstr "Desaniciar de favoritos"
194
198
195−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:291
196msgid "Add to Favorites"
200msgid "Add to Favorites"
197msgstr "Amestar a favoritos"
201msgstr "Amestar a favoritos"
198
202
@@ -224,31 +228,23 @@ msgstr "Tirar p'anovar..."
224msgid "Release to refresh…"
228msgid "Release to refresh…"
225msgstr "Soltar p'anovar..."
229msgstr "Soltar p'anovar..."
226
230
227−#: qml/Dash/ScopesOverview.qml:215
231+#: qml/Dash/ScopesList.qml:66
228−msgid "Manage Scopes"
232+msgid "Manage"
229−msgstr "Xestionar ámbitos"
233+msgstr ""
230−
231−#: qml/Dash/ScopesOverview.qml:437
232−msgid "Done"
233−msgstr "Fecho"
234−
235−#: qml/Dash/ScopesOverview.qml:463
236−msgid "Store"
237−msgstr "Tienda"
238
234
239−#: qml/Dash/ScopesOverviewTab.qml:36
235+#: qml/Dash/ScopesList.qml:112
240−msgid "Favorites"
236+msgid "Home"
241−msgstr "Favoritos"
237+msgstr ""
242
238
243−#: qml/Dash/ScopesOverviewTab.qml:54
239+#: qml/Dash/ScopesList.qml:113
244−msgid "All"
240+msgid "Also installed"
245−msgstr "Too"
241+msgstr ""
246
242
247−#: qml/Greeter/Greeter.qml:174
243+#: qml/Greeter/Greeter.qml:133
248msgid "Unlock"
244msgid "Unlock"
249msgstr "Desbloquiar"
245msgstr "Desbloquiar"
250
246
251−#: qml/Notifications/NotificationMenuItemFactory.qml:116
247+#: qml/Notifications/NotificationMenuItemFactory.qml:128
252msgid "Show password"
248msgid "Show password"
253msgstr "Amosar contraseña"
249msgstr "Amosar contraseña"
254
250
@@ -288,6 +284,10 @@ msgstr "Finó"
288msgid "Failed, tap to retry"
284msgid "Failed, tap to retry"
289msgstr "Falló, toca pa reintentar"
285msgstr "Falló, toca pa reintentar"
290
286
287+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
288+msgid "Reply"
289+msgstr ""
290+
291#: qml/Panel/Indicators/ModemInfoItem.qml:105
291#: qml/Panel/Indicators/ModemInfoItem.qml:105
292msgid "Unlock SIM"
292msgid "Unlock SIM"
293msgstr "Desbloquiar SIM"
293msgstr "Desbloquiar SIM"
@@ -296,49 +296,49 @@ msgstr "Desbloquiar SIM"
296msgid "Roaming"
296msgid "Roaming"
297msgstr "Roaming"
297msgstr "Roaming"
298
298
299−#: qml/Shell.qml:391
299+#: qml/Shell.qml:390
300+#, qt-format
301+msgid "Enter %1"
302+msgstr "Escribi %1"
303+
304+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
300msgid "Enter passphrase"
305msgid "Enter passphrase"
301msgstr "Escribi la frase contraseña"
306msgstr "Escribi la frase contraseña"
302
307
303#: qml/Shell.qml:392
308#: qml/Shell.qml:392
309+msgid "Enter passcode"
310+msgstr "Escribi'l códigu de pasu"
311+
312+#: qml/Shell.qml:393
313+#, qt-format
314+msgid "Sorry, incorrect %1"
315+msgstr "Sentímoslo, %1 incorreutu"
316+
317+#: qml/Shell.qml:394
304msgid "Sorry, incorrect passphrase"
318msgid "Sorry, incorrect passphrase"
305msgstr "Sentímoslo, contraseña incorreuta"
319msgstr "Sentímoslo, contraseña incorreuta"
306
320
307−#: qml/Shell.qml:393
321+#: qml/Shell.qml:395
308msgid "Please re-enter"
322msgid "Please re-enter"
309msgstr "Vuelvi a escribila"
323msgstr "Vuelvi a escribila"
310
324
311−#: qml/Shell.qml:395
312−msgid "Enter passcode"
313−msgstr "Escribi'l códigu de pasu"
314−
315#: qml/Shell.qml:396
325#: qml/Shell.qml:396
316msgid "Sorry, incorrect passcode"
326msgid "Sorry, incorrect passcode"
317msgstr "Sentímoslo, códigu de pasu incorreutu"
327msgstr "Sentímoslo, códigu de pasu incorreutu"
318
328
319−#: qml/Shell.qml:399
329+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
320−#, qt-format
321−msgid "Enter %1"
322−msgstr "Escribi %1"
323−
324−#: qml/Shell.qml:400
325−#, qt-format
326−msgid "Sorry, incorrect %1"
327−msgstr "Sentímoslo, %1 incorreutu"
328−
329−#: qml/Shell.qml:441
330msgid "Sorry, incorrect passphrase."
330msgid "Sorry, incorrect passphrase."
331msgstr "Fras de pasu incorreuta"
331msgstr "Fras de pasu incorreuta"
332
332
333−#: qml/Shell.qml:442
333+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
334msgid "Sorry, incorrect passcode."
334msgid "Sorry, incorrect passcode."
335msgstr "Códigu de pasu incorreutu"
335msgstr "Códigu de pasu incorreutu"
336
336
337−#: qml/Shell.qml:443
337+#: qml/Shell.qml:492
338msgid "This will be your last attempt."
338msgid "This will be your last attempt."
339msgstr "Esti ye'l caberu intentu."
339msgstr "Esti ye'l caberu intentu."
340
340
341−#: qml/Shell.qml:445
341+#: qml/Shell.qml:494
342msgid ""
342msgid ""
343"If passphrase is entered incorrectly, your phone will conduct a factory "
343"If passphrase is entered incorrectly, your phone will conduct a factory "
344"reset and all personal data will be deleted."
344"reset and all personal data will be deleted."
@@ -346,7 +346,7 @@ msgstr ""
346"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "
346"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "
347"configuración de fábrica y van perdese tolos datos personales."
347"configuración de fábrica y van perdese tolos datos personales."
348
348
349−#: qml/Shell.qml:446
349+#: qml/Shell.qml:495
350msgid ""
350msgid ""
351"If passcode is entered incorrectly, your phone will conduct a factory reset "
351"If passcode is entered incorrectly, your phone will conduct a factory reset "
352"and all personal data will be deleted."
352"and all personal data will be deleted."
@@ -354,6 +354,183 @@ msgstr ""
354"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "
354"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "
355"configuración de fábrica y van perdese tolos datos personales."
355"configuración de fábrica y van perdese tolos datos personales."
356
356
357+#: qml/Wizard/Page.qml:89
358+msgid "Back"
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:27
362+msgid "Hi!"
363+msgstr ""
364+
365+#: qml/Wizard/Pages/10-welcome.qml:44
366+msgid "Welcome to your Ubuntu phone."
367+msgstr ""
368+
369+#: qml/Wizard/Pages/10-welcome.qml:52
370+msgid "Let’s get started."
371+msgstr ""
372+
373+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
374+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
375+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
376+#: qml/Wizard/Pages/passwd-set.qml:90
377+msgid "Continue"
378+msgstr ""
379+
380+#: qml/Wizard/Pages/20-sim.qml:25
381+msgid "Add a SIM card and restart your device"
382+msgstr ""
383+
384+#: qml/Wizard/Pages/20-sim.qml:55
385+msgid "Without it, you won’t be able to make calls or use text messaging."
386+msgstr ""
387+
388+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
389+msgid "Skip"
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:39
393+msgid "Lock security"
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:74
397+msgid "Please select how you’d like to unlock your phone."
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:97
401+msgid "Swipe"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:98
405+msgid "No security"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:100
409+msgid "Passcode"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:101
413+msgid "4 digits only"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:103
417+msgid "Passphrase"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/30-passwd-type.qml:104
421+msgid "Numbers and letters"
422+msgstr ""
423+
424+#: qml/Wizard/Pages/40-wifi.qml:28
425+msgid "Connect to Wi‑Fi"
426+msgstr ""
427+
428+#: qml/Wizard/Pages/40-wifi.qml:147
429+msgid "Available networks…"
430+msgstr ""
431+
432+#: qml/Wizard/Pages/40-wifi.qml:148
433+msgid "No available networks."
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:27
437+msgid "Location"
438+msgstr ""
439+
440+#: qml/Wizard/Pages/50-location.qml:62
441+msgid "Let the phone detect your location:"
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:69
445+msgid "Using GPS only (less accurate)"
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:86
449+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
450+msgstr ""
451+
452+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
453+#: qml/Wizard/Pages/50-location.qml:103
454+msgid ""
455+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
456+"conditions</a>."
457+msgstr ""
458+
459+#: qml/Wizard/Pages/50-location.qml:112
460+msgid "Not at all"
461+msgstr ""
462+
463+#: qml/Wizard/Pages/50-location.qml:124
464+msgid "You can change your mind later in <b>System Settings</b>."
465+msgstr ""
466+
467+#: qml/Wizard/Pages/60-reporting.qml:24
468+msgid "Improving your experience"
469+msgstr ""
470+
471+#: qml/Wizard/Pages/60-reporting.qml:36
472+msgid ""
473+"Your phone is set up to automatically report errors to Canonical and its "
474+"partners, the makers of the operating system."
475+msgstr ""
476+
477+#: qml/Wizard/Pages/60-reporting.qml:43
478+msgid ""
479+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
480+"Privacy</b>"
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:24
484+msgid "All done"
485+msgstr ""
486+
487+#: qml/Wizard/Pages/80-finished.qml:39
488+msgid "Nice work!"
489+msgstr ""
490+
491+#: qml/Wizard/Pages/80-finished.qml:46
492+msgid "Your phone is now ready to use."
493+msgstr ""
494+
495+#: qml/Wizard/Pages/80-finished.qml:53
496+msgid "Finish"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/here-terms.qml:27
500+msgid "Terms & Conditions"
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:49
504+msgid "Confirm passphrase"
505+msgstr ""
506+
507+#: qml/Wizard/Pages/passwd-confirm.qml:50
508+msgid "Confirm passcode"
509+msgstr ""
510+
511+#: qml/Wizard/Pages/passwd-confirm.qml:53
512+#: qml/Wizard/Pages/passwd-confirm.qml:54
513+msgid "Please try again."
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-set.qml:61
517+msgid "Choose your passcode"
518+msgstr ""
519+
520+#: qml/Wizard/Pages/passwd-set.qml:68
521+msgid "Passphrase must be 4 characters long"
522+msgstr ""
523+
524+#: qml/Wizard/StackButton.qml:39
525+#, qt-format
526+msgid "〈 %1"
527+msgstr ""
528+
529+#: qml/Wizard/StackButton.qml:42
530+#, qt-format
531+msgid "%1 〉"
532+msgstr ""
533+
357#~ msgid "Confirm"
534#~ msgid "Confirm"
358#~ msgstr "Confirmar"
535#~ msgstr "Confirmar"
359
536
@@ -368,3 +545,15 @@ msgstr ""
368
545
369#~ msgid "Speak Now..."
546#~ msgid "Speak Now..."
370#~ msgstr "Fala agora…"
547#~ msgstr "Fala agora…"
548+
549+#~ msgid "Done"
550+#~ msgstr "Fecho"
551+
552+#~ msgid "Favorites"
553+#~ msgstr "Favoritos"
554+
555+#~ msgid "All"
556+#~ msgstr "Too"
557+
558+#~ msgid "Manage Scopes"
559+#~ msgstr "Xestionar ámbitos"
po/az.po+263−77
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2014-09-03 16:39+0000\n"
11"PO-Revision-Date: 2014-09-03 16:39+0000\n"
12"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
12"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
13"Language-Team: Azerbaijani <az@li.org>\n"
13"Language-Team: Azerbaijani <az@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:29+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Şifrә: "
23msgstr "Şifrә: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Pin qısayolu"
28msgstr "Pin qısayolu"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Açma qısayolu"
32msgstr "Açma qısayolu"
33
33
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] ""
50msgstr[0] ""
51msgstr[1] ""
51msgstr[1] ""
52
52
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
54msgid "Log out"
54msgid "Log out"
55msgstr "Çıxış"
55msgstr "Çıxış"
56
56
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr "Çıxmaq istәdiyinizdәn әminsiniz?"
59msgstr "Çıxmaq istәdiyinizdәn әminsiniz?"
60
60
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:134
63msgid "No"
63msgid "No"
64msgstr "Yox"
64msgstr "Yox"
65
65
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:140
68msgid "Yes"
68msgid "Yes"
69msgstr "Hə"
69msgstr "Hə"
70
70
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
72msgid "Shut down"
72msgid "Shut down"
73msgstr "Sistemi Söndür"
73msgstr "Sistemi Söndür"
74
74
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"
77msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"
78
78
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
80msgid "Reboot"
80msgid "Reboot"
81msgstr "Yenidən yüklə"
81msgstr "Yenidən yüklə"
82
82
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr "Yenidәn başlatmaq istәdiyinizә әminsiniz?"
85msgstr "Yenidәn başlatmaq istәdiyinizә әminsiniz?"
86
86
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
88msgid "Power"
88msgid "Power"
89msgstr ""
89msgstr ""
90
90
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
95msgstr ""
95msgstr ""
96
96
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
98msgid "Power off"
98msgid "Power off"
99msgstr "Söndür"
99msgstr "Söndür"
100
100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102msgid "Restart"
102msgid "Restart"
103msgstr ""
103msgstr ""
104
104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106msgid "Cancel"
106msgid "Cancel"
107msgstr "İmtina"
107msgstr "İmtina"
108
108
@@ -110,44 +110,44 @@ msgstr "İmtina"
110msgid "Skip intro"
110msgid "Skip intro"
111msgstr "Tәqdimatı keç"
111msgstr "Tәqdimatı keç"
112
112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114msgid "Right edge"
114msgid "Right edge"
115msgstr "Sağ Künc"
115msgstr "Sağ Künc"
116
116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118msgid "Try swiping from the right edge to unlock the phone"
118msgid "Try swiping from the right edge to unlock the phone"
119msgstr "Kilidi açmaq üçün sağ küncdən sürüşdürün"
119msgstr "Kilidi açmaq üçün sağ küncdən sürüşdürün"
120
120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122msgid "Top edge"
122msgid "Top edge"
123msgstr "Yuxarı künc"
123msgstr "Yuxarı künc"
124
124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126msgid "Try swiping from the top edge to access the indicators"
126msgid "Try swiping from the top edge to access the indicators"
127msgstr "Göstəriciləri görmәk üçün yuxarı küncdən sürüşdürün"
127msgstr "Göstəriciləri görmәk üçün yuxarı küncdən sürüşdürün"
128
128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130msgid "Close"
130msgid "Close"
131msgstr "Bağla"
131msgstr "Bağla"
132
132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134msgid "Swipe up again to close the settings screen"
134msgid "Swipe up again to close the settings screen"
135msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı sürüşdürün"
135msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı sürüşdürün"
136
136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
138msgid "Left edge"
139msgstr "Sol künc"
139msgstr "Sol künc"
140
140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143msgstr ""
143msgstr ""
144"Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"
144"Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"
145
145
146−#: qml/Components/EdgeDemo.qml:229
146+#: qml/Components/EdgeDemo.qml:242
147msgid "Well done"
147msgid "Well done"
148msgstr "Təbriklər"
148msgstr "Təbriklər"
149
149
150−#: qml/Components/EdgeDemo.qml:230
150+#: qml/Components/EdgeDemo.qml:243
151msgid ""
151msgid ""
152"You have now mastered the edge gestures and can start using the "
152"You have now mastered the edge gestures and can start using the "
153"phone<br><br>Tap on the screen to start"
153"phone<br><br>Tap on the screen to start"
@@ -155,40 +155,44 @@ msgstr ""
155"Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "
155"Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "
156"bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"
156"bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"
157
157
158−#: qml/Components/Lockscreen.qml:223
158+#: qml/Components/Lockscreen.qml:238
159msgid "Return to Call"
159msgid "Return to Call"
160msgstr ""
160msgstr ""
161
161
162−#: qml/Components/Lockscreen.qml:223
162+#: qml/Components/Lockscreen.qml:238
163msgid "Emergency Call"
163msgid "Emergency Call"
164msgstr "Zərurət zəngi"
164msgstr "Zərurət zəngi"
165
165
166−#: qml/Components/Lockscreen.qml:255
166+#: qml/Components/Lockscreen.qml:270
167msgid "OK"
167msgid "OK"
168msgstr "Oldu"
168msgstr "Oldu"
169
169
170−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
170+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
171msgid "See less"
171msgid "See less"
172msgstr "Daha azını gör"
172msgstr "Daha azını gör"
173
173
174−#: qml/Dash/GenericScopeView.qml:434
174+#: qml/Dash/GenericScopeView.qml:485
175msgid "See all"
175msgid "See all"
176msgstr "Hamısını gör"
176msgstr "Hamısını gör"
177
177
178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
178+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
179#: qml/Panel/SearchIndicator.qml:27
179#: qml/Panel/SearchIndicator.qml:27
180msgid "Search"
180msgid "Search"
181msgstr "Axtar"
181msgstr "Axtar"
182
182
183−#: qml/Dash/PageHeader.qml:268
183+#: qml/Dash/PageHeader.qml:267
184+msgid "Store"
185+msgstr ""
186+
187+#: qml/Dash/PageHeader.qml:284
184msgid "Settings"
188msgid "Settings"
185msgstr "Tənzimləmələr"
189msgstr "Tənzimləmələr"
186
190
187−#: qml/Dash/PageHeader.qml:275
191+#: qml/Dash/PageHeader.qml:291
188msgid "Remove from Favorites"
192msgid "Remove from Favorites"
189msgstr "Seçilmişlәrdәn çıxart"
193msgstr "Seçilmişlәrdәn çıxart"
190
194
191−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:291
192msgid "Add to Favorites"
196msgid "Add to Favorites"
193msgstr "Seçilmişlәrә әlavә et"
197msgstr "Seçilmişlәrә әlavә et"
194
198
@@ -220,31 +224,23 @@ msgstr ""
220msgid "Release to refresh…"
224msgid "Release to refresh…"
221msgstr ""
225msgstr ""
222
226
223−#: qml/Dash/ScopesOverview.qml:215
227+#: qml/Dash/ScopesList.qml:66
224−msgid "Manage Scopes"
228+msgid "Manage"
225msgstr ""
229msgstr ""
226
230
227−#: qml/Dash/ScopesOverview.qml:437
231+#: qml/Dash/ScopesList.qml:112
228−msgid "Done"
232+msgid "Home"
229−msgstr "Başa çatdı"
230−
231−#: qml/Dash/ScopesOverview.qml:463
232−msgid "Store"
233msgstr ""
233msgstr ""
234
234
235−#: qml/Dash/ScopesOverviewTab.qml:36
235+#: qml/Dash/ScopesList.qml:113
236−msgid "Favorites"
236+msgid "Also installed"
237−msgstr "Seçilmişlər"
238−
239−#: qml/Dash/ScopesOverviewTab.qml:54
240−msgid "All"
241−msgstr "Hamısı"
237+msgstr ""
242
238
243−#: qml/Greeter/Greeter.qml:174
239+#: qml/Greeter/Greeter.qml:133
244msgid "Unlock"
240msgid "Unlock"
245msgstr ""
241msgstr ""
246
242
247−#: qml/Notifications/NotificationMenuItemFactory.qml:116
243+#: qml/Notifications/NotificationMenuItemFactory.qml:128
248msgid "Show password"
244msgid "Show password"
249msgstr "Şifrәni göstәr"
245msgstr "Şifrәni göstәr"
250
246
@@ -284,6 +280,10 @@ msgstr "Bitdi"
284msgid "Failed, tap to retry"
280msgid "Failed, tap to retry"
285msgstr "Alınmadı. Yenidәn cәhd etmək üçün toxunun"
281msgstr "Alınmadı. Yenidәn cәhd etmək üçün toxunun"
286
282
283+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
284+msgid "Reply"
285+msgstr ""
286+
287#: qml/Panel/Indicators/ModemInfoItem.qml:105
287#: qml/Panel/Indicators/ModemInfoItem.qml:105
288msgid "Unlock SIM"
288msgid "Unlock SIM"
289msgstr "SIM kilidini aç"
289msgstr "SIM kilidini aç"
@@ -292,49 +292,49 @@ msgstr "SIM kilidini aç"
292msgid "Roaming"
292msgid "Roaming"
293msgstr "Rominq"
293msgstr "Rominq"
294
294
295−#: qml/Shell.qml:391
295+#: qml/Shell.qml:390
296+#, qt-format
297+msgid "Enter %1"
298+msgstr ""
299+
300+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
296msgid "Enter passphrase"
301msgid "Enter passphrase"
297msgstr ""
302msgstr ""
298
303
299#: qml/Shell.qml:392
304#: qml/Shell.qml:392
300−msgid "Sorry, incorrect passphrase"
305+msgid "Enter passcode"
301−msgstr "Bağışlayın, açar söz yanlışdır"
306+msgstr ""
302
307
303#: qml/Shell.qml:393
308#: qml/Shell.qml:393
304−msgid "Please re-enter"
309+#, qt-format
305−msgstr ""
310+msgid "Sorry, incorrect %1"
311+msgstr "Bağışlayın, %1 yanlışdır"
312+
313+#: qml/Shell.qml:394
314+msgid "Sorry, incorrect passphrase"
315+msgstr "Bağışlayın, açar söz yanlışdır"
306
316
307#: qml/Shell.qml:395
317#: qml/Shell.qml:395
308−msgid "Enter passcode"
318+msgid "Please re-enter"
309msgstr ""
319msgstr ""
310
320
311#: qml/Shell.qml:396
321#: qml/Shell.qml:396
312msgid "Sorry, incorrect passcode"
322msgid "Sorry, incorrect passcode"
313msgstr ""
323msgstr ""
314
324
315−#: qml/Shell.qml:399
325+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
316−#, qt-format
317−msgid "Enter %1"
318−msgstr ""
319−
320−#: qml/Shell.qml:400
321−#, qt-format
322−msgid "Sorry, incorrect %1"
323−msgstr "Bağışlayın, %1 yanlışdır"
324−
325−#: qml/Shell.qml:441
326msgid "Sorry, incorrect passphrase."
326msgid "Sorry, incorrect passphrase."
327msgstr "Bağışlayın, açar söz yanlışdır."
327msgstr "Bağışlayın, açar söz yanlışdır."
328
328
329−#: qml/Shell.qml:442
329+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
330msgid "Sorry, incorrect passcode."
330msgid "Sorry, incorrect passcode."
331msgstr "Təəssüf ki, açar kod yanlışdır."
331msgstr "Təəssüf ki, açar kod yanlışdır."
332
332
333−#: qml/Shell.qml:443
333+#: qml/Shell.qml:492
334msgid "This will be your last attempt."
334msgid "This will be your last attempt."
335msgstr "Bu sizin son cəhdiniz olacaq."
335msgstr "Bu sizin son cəhdiniz olacaq."
336
336
337−#: qml/Shell.qml:445
337+#: qml/Shell.qml:494
338msgid ""
338msgid ""
339"If passphrase is entered incorrectly, your phone will conduct a factory "
339"If passphrase is entered incorrectly, your phone will conduct a factory "
340"reset and all personal data will be deleted."
340"reset and all personal data will be deleted."
@@ -342,7 +342,7 @@ msgstr ""
342"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
342"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
343"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
343"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
344
344
345−#: qml/Shell.qml:446
345+#: qml/Shell.qml:495
346msgid ""
346msgid ""
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"and all personal data will be deleted."
348"and all personal data will be deleted."
@@ -350,6 +350,183 @@ msgstr ""
350"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
350"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
351"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
351"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
352
352
353+#: qml/Wizard/Page.qml:89
354+msgid "Back"
355+msgstr ""
356+
357+#: qml/Wizard/Pages/10-welcome.qml:27
358+msgid "Hi!"
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:44
362+msgid "Welcome to your Ubuntu phone."
363+msgstr ""
364+
365+#: qml/Wizard/Pages/10-welcome.qml:52
366+msgid "Let’s get started."
367+msgstr ""
368+
369+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
370+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
371+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
372+#: qml/Wizard/Pages/passwd-set.qml:90
373+msgid "Continue"
374+msgstr ""
375+
376+#: qml/Wizard/Pages/20-sim.qml:25
377+msgid "Add a SIM card and restart your device"
378+msgstr ""
379+
380+#: qml/Wizard/Pages/20-sim.qml:55
381+msgid "Without it, you won’t be able to make calls or use text messaging."
382+msgstr ""
383+
384+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
385+msgid "Skip"
386+msgstr ""
387+
388+#: qml/Wizard/Pages/30-passwd-type.qml:39
389+msgid "Lock security"
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:74
393+msgid "Please select how you’d like to unlock your phone."
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:97
397+msgid "Swipe"
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:98
401+msgid "No security"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:100
405+msgid "Passcode"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:101
409+msgid "4 digits only"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:103
413+msgid "Passphrase"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:104
417+msgid "Numbers and letters"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/40-wifi.qml:28
421+msgid "Connect to Wi‑Fi"
422+msgstr ""
423+
424+#: qml/Wizard/Pages/40-wifi.qml:147
425+msgid "Available networks…"
426+msgstr ""
427+
428+#: qml/Wizard/Pages/40-wifi.qml:148
429+msgid "No available networks."
430+msgstr ""
431+
432+#: qml/Wizard/Pages/50-location.qml:27
433+msgid "Location"
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:62
437+msgid "Let the phone detect your location:"
438+msgstr ""
439+
440+#: qml/Wizard/Pages/50-location.qml:69
441+msgid "Using GPS only (less accurate)"
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:86
445+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
446+msgstr ""
447+
448+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
449+#: qml/Wizard/Pages/50-location.qml:103
450+msgid ""
451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
452+"conditions</a>."
453+msgstr ""
454+
455+#: qml/Wizard/Pages/50-location.qml:112
456+msgid "Not at all"
457+msgstr ""
458+
459+#: qml/Wizard/Pages/50-location.qml:124
460+msgid "You can change your mind later in <b>System Settings</b>."
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:24
464+msgid "Improving your experience"
465+msgstr ""
466+
467+#: qml/Wizard/Pages/60-reporting.qml:36
468+msgid ""
469+"Your phone is set up to automatically report errors to Canonical and its "
470+"partners, the makers of the operating system."
471+msgstr ""
472+
473+#: qml/Wizard/Pages/60-reporting.qml:43
474+msgid ""
475+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
476+"Privacy</b>"
477+msgstr ""
478+
479+#: qml/Wizard/Pages/80-finished.qml:24
480+msgid "All done"
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:39
484+msgid "Nice work!"
485+msgstr ""
486+
487+#: qml/Wizard/Pages/80-finished.qml:46
488+msgid "Your phone is now ready to use."
489+msgstr ""
490+
491+#: qml/Wizard/Pages/80-finished.qml:53
492+msgid "Finish"
493+msgstr ""
494+
495+#: qml/Wizard/Pages/here-terms.qml:27
496+msgid "Terms & Conditions"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/passwd-confirm.qml:49
500+msgid "Confirm passphrase"
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:50
504+msgid "Confirm passcode"
505+msgstr ""
506+
507+#: qml/Wizard/Pages/passwd-confirm.qml:53
508+#: qml/Wizard/Pages/passwd-confirm.qml:54
509+msgid "Please try again."
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-set.qml:61
513+msgid "Choose your passcode"
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-set.qml:68
517+msgid "Passphrase must be 4 characters long"
518+msgstr ""
519+
520+#: qml/Wizard/StackButton.qml:39
521+#, qt-format
522+msgid "〈 %1"
523+msgstr ""
524+
525+#: qml/Wizard/StackButton.qml:42
526+#, qt-format
527+msgid "%1 〉"
528+msgstr ""
529+
353#~ msgid "Confirm"
530#~ msgid "Confirm"
354#~ msgstr "Təsdiqlə"
531#~ msgstr "Təsdiqlə"
355
532
@@ -362,5 +539,14 @@ msgstr ""
362#~ msgid "Speak Now..."
539#~ msgid "Speak Now..."
363#~ msgstr "Danışın..."
540#~ msgstr "Danışın..."
364
541
542+#~ msgid "All"
543+#~ msgstr "Hamısı"
544+
545+#~ msgid "Favorites"
546+#~ msgstr "Seçilmişlər"
547+
548+#~ msgid "Done"
549+#~ msgstr "Başa çatdı"
550+
365#~ msgid "Type or say a command"
551#~ msgid "Type or say a command"
366#~ msgstr "Bir әmr söyləyin və ya yazın"
552#~ msgstr "Bir әmr söyləyin və ya yazın"
po/be.po+356−142
@@ -7,339 +7,553 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-09-24 17:12+0000\n"
11+"PO-Revision-Date: 2015-02-03 22:02+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12+"Last-Translator: Arsień Šachalevič <semen.shah@gmail.com>\n"
13"Language-Team: Belarusian <be@li.org>\n"
13"Language-Team: Belarusian <be@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
17"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19+"X-Launchpad-Export-Date: 2015-02-04 07:13+0000\n"
20−"X-Generator: Launchpad (build 17231)\n"
20+"X-Generator: Launchpad (build 17331)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
23msgid "Password: "
23msgid "Password: "
24−msgstr ""
24+msgstr "Пароль: "
25
25
26#: plugins/Unity/Launcher/launcheritem.cpp:45
26#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
28msgid "Pin shortcut"
28msgid "Pin shortcut"
29−msgstr ""
29+msgstr "Заблакаваць кнопку"
30
30
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
32msgid "Unpin shortcut"
32msgid "Unpin shortcut"
33−msgstr ""
33+msgstr "Разблакаваць кнопку"
34
34
35#: qml/Components/DelayedLockscreen.qml:47
35#: qml/Components/DelayedLockscreen.qml:47
36msgid "Device Locked"
36msgid "Device Locked"
37−msgstr ""
37+msgstr "Прылада заблакаваная"
38
38
39#: qml/Components/DelayedLockscreen.qml:62
39#: qml/Components/DelayedLockscreen.qml:62
40msgid "You have been locked out due to too many failed passphrase attempts."
40msgid "You have been locked out due to too many failed passphrase attempts."
41msgstr ""
41msgstr ""
42+"Вы былі заблакаваныя з-за занадта вялікай колькасці няўдалых спробаў."
42
43
43#: qml/Components/DelayedLockscreen.qml:63
44#: qml/Components/DelayedLockscreen.qml:63
44msgid "You have been locked out due to too many failed passcode attempts."
45msgid "You have been locked out due to too many failed passcode attempts."
45msgstr ""
46msgstr ""
47+"Вы былі заблакаваныя з-за занадта вялікай колькасці няўдалых спробаў уводу "
48+"код доступу."
46
49
47#: qml/Components/DelayedLockscreen.qml:72
50#: qml/Components/DelayedLockscreen.qml:72
48#, qt-format
51#, qt-format
49msgid "Please wait %1 minute and then try again…"
52msgid "Please wait %1 minute and then try again…"
50msgid_plural "Please wait %1 minutes and then try again…"
53msgid_plural "Please wait %1 minutes and then try again…"
51−msgstr[0] ""
54+msgstr[0] "Пачакайце %1 хвіліну і паўтарыце спробу…"
52−msgstr[1] ""
55+msgstr[1] "Пачакайце %1 хвіліны і паўтарыце спробу…"
56+msgstr[2] "Пачакайце %1 хвілінаў і паўтарыце спробу…"
53
57
54−#: qml/Components/Dialogs.qml:74
58+#: qml/Components/Dialogs.qml:86
55msgid "Log out"
59msgid "Log out"
56−msgstr ""
60+msgstr "Выйсці"
57
61
58−#: qml/Components/Dialogs.qml:75
62+#: qml/Components/Dialogs.qml:87
59msgid "Are you sure you want to log out?"
63msgid "Are you sure you want to log out?"
60−msgstr ""
64+msgstr "Вы насамрэч хочаце выйсці?"
61
65
62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
66+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63−#: qml/Components/Dialogs.qml:126
67+#: qml/Components/Dialogs.qml:134
64msgid "No"
68msgid "No"
65−msgstr ""
69+msgstr "Не"
66
70
67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
71+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68−#: qml/Components/Dialogs.qml:133
72+#: qml/Components/Dialogs.qml:140
69msgid "Yes"
73msgid "Yes"
70−msgstr ""
74+msgstr "Так"
71
75
72−#: qml/Components/Dialogs.qml:98
76+#: qml/Components/Dialogs.qml:108
73msgid "Shut down"
77msgid "Shut down"
74−msgstr ""
78+msgstr "Выключыць"
75
79
76−#: qml/Components/Dialogs.qml:99
80+#: qml/Components/Dialogs.qml:109
77msgid "Are you sure you want to shut down?"
81msgid "Are you sure you want to shut down?"
78−msgstr ""
82+msgstr "Вы ўпэўненыя, што жадаеце выключыць прыладу?"
79
83
80−#: qml/Components/Dialogs.qml:123
84+#: qml/Components/Dialogs.qml:131
81msgid "Reboot"
85msgid "Reboot"
82−msgstr ""
86+msgstr "Перазагрузіць"
83
87
84−#: qml/Components/Dialogs.qml:124
88+#: qml/Components/Dialogs.qml:132
85msgid "Are you sure you want to reboot?"
89msgid "Are you sure you want to reboot?"
86−msgstr ""
90+msgstr "Вы ўпэўненыя, што жадаеце перазагрузіць?"
87
91
88−#: qml/Components/Dialogs.qml:148
92+#: qml/Components/Dialogs.qml:154
89msgid "Power"
93msgid "Power"
90−msgstr ""
94+msgstr "Сілкаванне"
91
95
92−#: qml/Components/Dialogs.qml:149
96+#: qml/Components/Dialogs.qml:155
93msgid ""
97msgid ""
94"Are you sure you would like\n"
98"Are you sure you would like\n"
95"to power off?"
99"to power off?"
96msgstr ""
100msgstr ""
101+"Вы сапраўды хочаце выключыць\n"
102+"сілкаванне?"
97
103
98−#: qml/Components/Dialogs.qml:151
104+#: qml/Components/Dialogs.qml:157
99msgid "Power off"
105msgid "Power off"
100−msgstr ""
106+msgstr "Выключыць"
101
107
102−#: qml/Components/Dialogs.qml:161
108+#: qml/Components/Dialogs.qml:166
103msgid "Restart"
109msgid "Restart"
104−msgstr ""
110+msgstr "Перазапуск"
105
111
106−#: qml/Components/Dialogs.qml:171
112+#: qml/Components/Dialogs.qml:175
107msgid "Cancel"
113msgid "Cancel"
108−msgstr ""
114+msgstr "Скасаваць"
109
115
110#: qml/Components/EdgeDemoOverlay.qml:151
116#: qml/Components/EdgeDemoOverlay.qml:151
111msgid "Skip intro"
117msgid "Skip intro"
112−msgstr ""
118+msgstr "Прапусціць уводзіны"
113
119
114−#: qml/Components/EdgeDemo.qml:112
120+#: qml/Components/EdgeDemo.qml:125
115msgid "Right edge"
121msgid "Right edge"
116−msgstr ""
122+msgstr "Правы край"
117
123
118−#: qml/Components/EdgeDemo.qml:113
124+#: qml/Components/EdgeDemo.qml:126
119msgid "Try swiping from the right edge to unlock the phone"
125msgid "Try swiping from the right edge to unlock the phone"
120−msgstr ""
126+msgstr "Правядзіце пальцам з правага краю, каб разблакаваць тэлефон"
121
127
122−#: qml/Components/EdgeDemo.qml:144
128+#: qml/Components/EdgeDemo.qml:157
123msgid "Top edge"
129msgid "Top edge"
124−msgstr ""
130+msgstr "Верхні край"
125
131
126−#: qml/Components/EdgeDemo.qml:145
132+#: qml/Components/EdgeDemo.qml:158
127msgid "Try swiping from the top edge to access the indicators"
133msgid "Try swiping from the top edge to access the indicators"
128msgstr ""
134msgstr ""
135+"Паспрабуйце правесці пальцам ад верхняга краю, для доступу да індыкатараў"
129
136
130−#: qml/Components/EdgeDemo.qml:170
137+#: qml/Components/EdgeDemo.qml:183
131msgid "Close"
138msgid "Close"
132−msgstr ""
139+msgstr "Зачыніць"
133
140
134−#: qml/Components/EdgeDemo.qml:171
141+#: qml/Components/EdgeDemo.qml:184
135msgid "Swipe up again to close the settings screen"
142msgid "Swipe up again to close the settings screen"
136−msgstr ""
143+msgstr "Правядзіце пальцам яшчэ раз, каб зачыніць акно параметраў"
137
144
138−#: qml/Components/EdgeDemo.qml:201
145+#: qml/Components/EdgeDemo.qml:214
139msgid "Left edge"
146msgid "Left edge"
140−msgstr ""
147+msgstr "Левы край"
141
148
142−#: qml/Components/EdgeDemo.qml:202
149+#: qml/Components/EdgeDemo.qml:215
143msgid "Swipe from the left to reveal the launcher for quick access to apps"
150msgid "Swipe from the left to reveal the launcher for quick access to apps"
144msgstr ""
151msgstr ""
152+"Правядзіце пальцам ад левага краю, каб адкрыць панэль запуску для паскарэння "
153+"доступу да праграм"
145
154
146−#: qml/Components/EdgeDemo.qml:229
155+#: qml/Components/EdgeDemo.qml:242
147msgid "Well done"
156msgid "Well done"
148−msgstr ""
157+msgstr "Добра"
149
158
150−#: qml/Components/EdgeDemo.qml:230
159+#: qml/Components/EdgeDemo.qml:243
151msgid ""
160msgid ""
152"You have now mastered the edge gestures and can start using the "
161"You have now mastered the edge gestures and can start using the "
153"phone<br><br>Tap on the screen to start"
162"phone<br><br>Tap on the screen to start"
154msgstr ""
163msgstr ""
164+"Вамі наладжаныя дзеянні на дакрананні па краях экрана. Цяпер тэлефон можна "
165+"выкарыстоўваць.<br><br>Дакраніцеся да экрана, каб пачаць."
155
166
156−#: qml/Components/Lockscreen.qml:223
167+#: qml/Components/Lockscreen.qml:238
157msgid "Return to Call"
168msgid "Return to Call"
158−msgstr ""
169+msgstr "Вярнуцца да Выкліку"
159
170
160−#: qml/Components/Lockscreen.qml:223
171+#: qml/Components/Lockscreen.qml:238
161msgid "Emergency Call"
172msgid "Emergency Call"
162−msgstr ""
173+msgstr "Терміновы Выклік"
163
174
164−#: qml/Components/Lockscreen.qml:255
175+#: qml/Components/Lockscreen.qml:270
165msgid "OK"
176msgid "OK"
166−msgstr ""
177+msgstr "Добра"
167
178
168−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
179+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
169msgid "See less"
180msgid "See less"
170−msgstr ""
181+msgstr "Карацей"
171
182
172−#: qml/Dash/GenericScopeView.qml:434
183+#: qml/Dash/GenericScopeView.qml:485
173msgid "See all"
184msgid "See all"
174−msgstr ""
185+msgstr "Больш падрабязна"
175
186
176−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
187+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
177#: qml/Panel/SearchIndicator.qml:27
188#: qml/Panel/SearchIndicator.qml:27
178msgid "Search"
189msgid "Search"
179−msgstr ""
190+msgstr "Пошук"
180
191
181−#: qml/Dash/PageHeader.qml:268
192+#: qml/Dash/PageHeader.qml:267
193+msgid "Store"
194+msgstr "Крама"
195+
196+#: qml/Dash/PageHeader.qml:284
182msgid "Settings"
197msgid "Settings"
183−msgstr ""
198+msgstr "Параметры"
184
199
185−#: qml/Dash/PageHeader.qml:275
200+#: qml/Dash/PageHeader.qml:291
186msgid "Remove from Favorites"
201msgid "Remove from Favorites"
187−msgstr ""
202+msgstr "Выдаліць з абранага"
188
203
189−#: qml/Dash/PageHeader.qml:275
204+#: qml/Dash/PageHeader.qml:291
190msgid "Add to Favorites"
205msgid "Add to Favorites"
191−msgstr ""
206+msgstr "Дадаць да абранага"
192
207
193#: qml/Dash/Previews/PreviewActionCombo.qml:35
208#: qml/Dash/Previews/PreviewActionCombo.qml:35
194msgid "More..."
209msgid "More..."
195−msgstr ""
210+msgstr "Болей…"
196
211
197#: qml/Dash/Previews/PreviewActionCombo.qml:35
212#: qml/Dash/Previews/PreviewActionCombo.qml:35
198msgid "Less..."
213msgid "Less..."
199−msgstr ""
214+msgstr "Менш..."
200
215
201#: qml/Dash/Previews/PreviewRatingInput.qml:81
216#: qml/Dash/Previews/PreviewRatingInput.qml:81
202msgid "Rate this"
217msgid "Rate this"
203−msgstr ""
218+msgstr "Ацаніць"
204
219
205#: qml/Dash/Previews/PreviewRatingInput.qml:126
220#: qml/Dash/Previews/PreviewRatingInput.qml:126
206msgid "Add a review"
221msgid "Add a review"
207−msgstr ""
222+msgstr "Дадаць рэцэнзію"
208
223
209#: qml/Dash/Previews/PreviewRatingInput.qml:166
224#: qml/Dash/Previews/PreviewRatingInput.qml:166
210msgid "Send"
225msgid "Send"
211−msgstr ""
226+msgstr "Адправіць"
212
227
213#: qml/Dash/PullToRefreshScopeStyle.qml:55
228#: qml/Dash/PullToRefreshScopeStyle.qml:55
214msgid "Pull to refresh…"
229msgid "Pull to refresh…"
215−msgstr ""
230+msgstr "Пацягніце для абнаўлення ..."
216
231
217#: qml/Dash/PullToRefreshScopeStyle.qml:60
232#: qml/Dash/PullToRefreshScopeStyle.qml:60
218msgid "Release to refresh…"
233msgid "Release to refresh…"
219−msgstr ""
234+msgstr "Адпусціце для абнаўлення ..."
220
235
221−#: qml/Dash/ScopesOverview.qml:215
236+#: qml/Dash/ScopesList.qml:66
222−msgid "Manage Scopes"
237+msgid "Manage"
223−msgstr ""
238+msgstr "Кіраванне"
224
239
225−#: qml/Dash/ScopesOverview.qml:437
240+#: qml/Dash/ScopesList.qml:112
226−msgid "Done"
241+msgid "Home"
227−msgstr ""
242+msgstr "Дом"
228
243
229−#: qml/Dash/ScopesOverview.qml:463
244+#: qml/Dash/ScopesList.qml:113
230−msgid "Store"
245+msgid "Also installed"
231−msgstr ""
246+msgstr "Таксама ўсталявана"
232
247
233−#: qml/Dash/ScopesOverviewTab.qml:36
234−msgid "Favorites"
235−msgstr ""
236−
237−#: qml/Dash/ScopesOverviewTab.qml:54
238−msgid "All"
239−msgstr ""
240−
241−#: qml/Greeter/Greeter.qml:174
248+#: qml/Greeter/Greeter.qml:133
242msgid "Unlock"
249msgid "Unlock"
243−msgstr ""
250+msgstr "Разблакаваць"
244
251
245−#: qml/Notifications/NotificationMenuItemFactory.qml:116
252+#: qml/Notifications/NotificationMenuItemFactory.qml:128
246msgid "Show password"
253msgid "Show password"
247−msgstr ""
254+msgstr "Паказаць пароль"
248
255
249#: qml/Panel/ActiveCallHint.qml:79
256#: qml/Panel/ActiveCallHint.qml:79
250msgid "Tap to return to call..."
257msgid "Tap to return to call..."
251−msgstr ""
258+msgstr "Націсніце, каб вярнуцца да выкліку..."
252
259
253#: qml/Panel/ActiveCallHint.qml:92
260#: qml/Panel/ActiveCallHint.qml:92
254msgid "Conference"
261msgid "Conference"
255−msgstr ""
262+msgstr "Канферэнцыя"
256
263
257#: qml/Panel/Indicators/MenuItemFactory.qml:643
264#: qml/Panel/Indicators/MenuItemFactory.qml:643
258msgid "Nothing is playing"
265msgid "Nothing is playing"
259−msgstr ""
266+msgstr "Анічога не прайграецца"
260
267
261#: qml/Panel/Indicators/MenuItemFactory.qml:791
268#: qml/Panel/Indicators/MenuItemFactory.qml:791
262msgid "In queue…"
269msgid "In queue…"
263−msgstr ""
270+msgstr "У чарзе..."
264
271
265#: qml/Panel/Indicators/MenuItemFactory.qml:795
272#: qml/Panel/Indicators/MenuItemFactory.qml:795
266msgid "Downloading"
273msgid "Downloading"
267−msgstr ""
274+msgstr "Запампоўка"
268
275
269#: qml/Panel/Indicators/MenuItemFactory.qml:797
276#: qml/Panel/Indicators/MenuItemFactory.qml:797
270msgid "Paused, tap to resume"
277msgid "Paused, tap to resume"
271−msgstr ""
278+msgstr "Прыпынена, націсніце для працягу"
272
279
273#: qml/Panel/Indicators/MenuItemFactory.qml:799
280#: qml/Panel/Indicators/MenuItemFactory.qml:799
274msgid "Canceled"
281msgid "Canceled"
275−msgstr ""
282+msgstr "Скасавана"
276
283
277#: qml/Panel/Indicators/MenuItemFactory.qml:801
284#: qml/Panel/Indicators/MenuItemFactory.qml:801
278msgid "Finished"
285msgid "Finished"
279−msgstr ""
286+msgstr "Скончана"
280
287
281#: qml/Panel/Indicators/MenuItemFactory.qml:803
288#: qml/Panel/Indicators/MenuItemFactory.qml:803
282msgid "Failed, tap to retry"
289msgid "Failed, tap to retry"
283−msgstr ""
290+msgstr "Памылка, націсніце для паўтору"
291+
292+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
293+msgid "Reply"
294+msgstr "Адказаць"
284
295
285#: qml/Panel/Indicators/ModemInfoItem.qml:105
296#: qml/Panel/Indicators/ModemInfoItem.qml:105
286msgid "Unlock SIM"
297msgid "Unlock SIM"
287−msgstr ""
298+msgstr "Разблакаваць SIM"
288
299
289#: qml/Panel/Indicators/RoamingIndication.qml:27
300#: qml/Panel/Indicators/RoamingIndication.qml:27
290msgid "Roaming"
301msgid "Roaming"
291−msgstr ""
302+msgstr "Роўмінг"
303+
304+#: qml/Shell.qml:390
305+#, qt-format
306+msgid "Enter %1"
307+msgstr "Увядзіце %1"
292
308
293−#: qml/Shell.qml:391
309+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
294msgid "Enter passphrase"
310msgid "Enter passphrase"
295−msgstr ""
311+msgstr "Увядзіце парольную фразу"
296
312
297#: qml/Shell.qml:392
313#: qml/Shell.qml:392
298−msgid "Sorry, incorrect passphrase"
314+msgid "Enter passcode"
299−msgstr ""
315+msgstr "Увядзіце код"
300
316
301#: qml/Shell.qml:393
317#: qml/Shell.qml:393
302−msgid "Please re-enter"
318+#, qt-format
303−msgstr ""
319+msgid "Sorry, incorrect %1"
320+msgstr "Даруйце, некарэктны %1"
321+
322+#: qml/Shell.qml:394
323+msgid "Sorry, incorrect passphrase"
324+msgstr "Даруйце, няслушны пароль"
304
325
305#: qml/Shell.qml:395
326#: qml/Shell.qml:395
306−msgid "Enter passcode"
327+msgid "Please re-enter"
307−msgstr ""
328+msgstr "Калі ласка паўтарыце ўвод"
308
329
309#: qml/Shell.qml:396
330#: qml/Shell.qml:396
310msgid "Sorry, incorrect passcode"
331msgid "Sorry, incorrect passcode"
311−msgstr ""
332+msgstr "Даруйце, няслушны код"
312
333
313−#: qml/Shell.qml:399
334+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
314−#, qt-format
315−msgid "Enter %1"
316−msgstr ""
317−
318−#: qml/Shell.qml:400
319−#, qt-format
320−msgid "Sorry, incorrect %1"
321−msgstr ""
322−
323−#: qml/Shell.qml:441
324msgid "Sorry, incorrect passphrase."
335msgid "Sorry, incorrect passphrase."
325−msgstr ""
336+msgstr "Даруце, няслушны пароль"
326
337
327−#: qml/Shell.qml:442
338+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
328msgid "Sorry, incorrect passcode."
339msgid "Sorry, incorrect passcode."
329−msgstr ""
340+msgstr "Даруйце, няслушны код"
330
341
331−#: qml/Shell.qml:443
342+#: qml/Shell.qml:492
332msgid "This will be your last attempt."
343msgid "This will be your last attempt."
333−msgstr ""
344+msgstr "Апошняя спроба."
334
345
335−#: qml/Shell.qml:445
346+#: qml/Shell.qml:494
336msgid ""
347msgid ""
337"If passphrase is entered incorrectly, your phone will conduct a factory "
348"If passphrase is entered incorrectly, your phone will conduct a factory "
338"reset and all personal data will be deleted."
349"reset and all personal data will be deleted."
339msgstr ""
350msgstr ""
351+"Калі пароль паказаны няправільна, тэлефон вернецца ў зыходны стан, усе "
352+"асабістыя дадзеныя будуць выдаленыя."
340
353
341−#: qml/Shell.qml:446
354+#: qml/Shell.qml:495
342msgid ""
355msgid ""
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
356"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"and all personal data will be deleted."
357"and all personal data will be deleted."
345msgstr ""
358msgstr ""
359+"Калі пароль уведзены няправільна, то ваш тэлефон будзе праводзіць скід да "
360+"завадскіх налад і ўсе асабістыя дадзеныя будуць выдаленыя."
361+
362+#: qml/Wizard/Page.qml:89
363+msgid "Back"
364+msgstr "Назад"
365+
366+#: qml/Wizard/Pages/10-welcome.qml:27
367+msgid "Hi!"
368+msgstr "Вітай!"
369+
370+#: qml/Wizard/Pages/10-welcome.qml:44
371+msgid "Welcome to your Ubuntu phone."
372+msgstr "Вітаем Вас у сістэме тэлефона Ubuntu."
373+
374+#: qml/Wizard/Pages/10-welcome.qml:52
375+msgid "Let’s get started."
376+msgstr "Пачнем."
377+
378+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
379+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
380+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
381+#: qml/Wizard/Pages/passwd-set.qml:90
382+msgid "Continue"
383+msgstr "Працягнуць"
384+
385+#: qml/Wizard/Pages/20-sim.qml:25
386+msgid "Add a SIM card and restart your device"
387+msgstr "Дадайце SIM-карту і перазагрузіце Вашую прыладу"
388+
389+#: qml/Wizard/Pages/20-sim.qml:55
390+msgid "Without it, you won’t be able to make calls or use text messaging."
391+msgstr "Без яе вы не зможаце тэлефанаваць ці адпраўляць паведамленні."
392+
393+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
394+msgid "Skip"
395+msgstr "Прапусціць"
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:39
398+msgid "Lock security"
399+msgstr "Блакаванне бяспекі"
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:74
402+msgid "Please select how you’d like to unlock your phone."
403+msgstr "Калі ласка, абярыце спосаб разблакавання тэлефона."
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:97
406+msgid "Swipe"
407+msgstr "Свайп(Рух пальцам)"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:98
410+msgid "No security"
411+msgstr "Без абароны"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:100
414+msgid "Passcode"
415+msgstr "Код-пароль"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:101
418+msgid "4 digits only"
419+msgstr "Толькі 4 лічбы"
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:103
422+msgid "Passphrase"
423+msgstr "Пароль"
424+
425+#: qml/Wizard/Pages/30-passwd-type.qml:104
426+msgid "Numbers and letters"
427+msgstr "Лічбы і літары"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:28
430+msgid "Connect to Wi‑Fi"
431+msgstr "Злучыцца з Wi-Fi"
432+
433+#: qml/Wizard/Pages/40-wifi.qml:147
434+msgid "Available networks…"
435+msgstr "Даступныя сеткі..."
436+
437+#: qml/Wizard/Pages/40-wifi.qml:148
438+msgid "No available networks."
439+msgstr "Няма даступных сетак."
440+
441+#: qml/Wizard/Pages/50-location.qml:27
442+msgid "Location"
443+msgstr "Месца"
444+
445+#: qml/Wizard/Pages/50-location.qml:62
446+msgid "Let the phone detect your location:"
447+msgstr "Дазволіць тэлефону вызначаць месцазнаходжанне:"
448+
449+#: qml/Wizard/Pages/50-location.qml:69
450+msgid "Using GPS only (less accurate)"
451+msgstr "З дапамогай толькі GPS (найменш дакладна)"
452+
453+#: qml/Wizard/Pages/50-location.qml:86
454+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
455+msgstr ""
456+"На аснове GPS, ананімізаванага Wi-Fi і дадзеных сотавай сеткі (рэкамендуецца)"
457+
458+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
459+#: qml/Wizard/Pages/50-location.qml:103
460+msgid ""
461+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
462+"conditions</a>."
463+msgstr ""
464+"Выбарам гэтага варыянту дзеянняў вы згаджаецеся з <a href='#'> умовамі "
465+"прадстаўлення паслуг Nokia HERE</a>."
466+
467+#: qml/Wizard/Pages/50-location.qml:112
468+msgid "Not at all"
469+msgstr "Не дазваляць"
470+
471+#: qml/Wizard/Pages/50-location.qml:124
472+msgid "You can change your mind later in <b>System Settings</b>."
473+msgstr "Пасля змяніць налады можна з дапамогай <b>Сістэмных параметраў</b>."
474+
475+#: qml/Wizard/Pages/60-reporting.qml:24
476+msgid "Improving your experience"
477+msgstr "Спрашчэнне вашай працы"
478+
479+#: qml/Wizard/Pages/60-reporting.qml:36
480+msgid ""
481+"Your phone is set up to automatically report errors to Canonical and its "
482+"partners, the makers of the operating system."
483+msgstr ""
484+"Ваш тэлефон настроены на аўтаматычную адпраўку справаздач пра памылкі ў "
485+"Canonical і партнёрскія установы, вытворцам аперацыйнай сістэмы."
486+
487+#: qml/Wizard/Pages/60-reporting.qml:43
488+msgid ""
489+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
490+"Privacy</b>"
491+msgstr ""
492+"Гэтае можна адключыць у <b>Сістэмных параметрах</b>, <b>Бяспека &amp; "
493+"канфедэнцыйнасць</b>"
494+
495+#: qml/Wizard/Pages/80-finished.qml:24
496+msgid "All done"
497+msgstr "Зроблена"
498+
499+#: qml/Wizard/Pages/80-finished.qml:39
500+msgid "Nice work!"
501+msgstr "Выдатная праца!"
502+
503+#: qml/Wizard/Pages/80-finished.qml:46
504+msgid "Your phone is now ready to use."
505+msgstr "Цяпер Вашым тэлефонам можна карыстацца."
506+
507+#: qml/Wizard/Pages/80-finished.qml:53
508+msgid "Finish"
509+msgstr "Скончыць"
510+
511+#: qml/Wizard/Pages/here-terms.qml:27
512+msgid "Terms & Conditions"
513+msgstr "Умовы карыстання"
514+
515+#: qml/Wizard/Pages/passwd-confirm.qml:49
516+msgid "Confirm passphrase"
517+msgstr "Пацвердзіце пароль"
518+
519+#: qml/Wizard/Pages/passwd-confirm.qml:50
520+msgid "Confirm passcode"
521+msgstr "Пацвердзіце код-пароль"
522+
523+#: qml/Wizard/Pages/passwd-confirm.qml:53
524+#: qml/Wizard/Pages/passwd-confirm.qml:54
525+msgid "Please try again."
526+msgstr "Калі ласка, паспрабуйце яшчэ раз."
527+
528+#: qml/Wizard/Pages/passwd-set.qml:61
529+msgid "Choose your passcode"
530+msgstr "Выберыце ваш код-пароль"
531+
532+#: qml/Wizard/Pages/passwd-set.qml:68
533+msgid "Passphrase must be 4 characters long"
534+msgstr "Пароль мусіць складацца мінімум з 4 сімвалаў"
535+
536+#: qml/Wizard/StackButton.qml:39
537+#, qt-format
538+msgid "〈 %1"
539+msgstr "〈 %1"
540+
541+#: qml/Wizard/StackButton.qml:42
542+#, qt-format
543+msgid "%1 〉"
544+msgstr "%1 〉"
545+
546+#~ msgid "Confirm"
547+#~ msgstr "Пацвердзіць"
548+
549+#~ msgid "Loading. Please Wait..."
550+#~ msgstr "Загрузка. Чакайце..."
551+
552+#~ msgid "Speaking..."
553+#~ msgstr "Кажа..."
554+
555+#~ msgid "Speak Now..."
556+#~ msgstr "Кажыце..."
557+
558+#~ msgid "Type or say a command"
559+#~ msgstr "Напішыце або вымавіце каманду"
po/bg.po+251−74
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2014-04-01 14:08+0000\n"
11"PO-Revision-Date: 2014-04-01 14:08+0000\n"
12"Last-Translator: Atanas Kovachki <Unknown>\n"
12"Last-Translator: Atanas Kovachki <Unknown>\n"
13"Language-Team: Bulgarian <bg@li.org>\n"
13"Language-Team: Bulgarian <bg@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr ""
23msgstr ""
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr ""
28msgstr ""
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr ""
32msgstr ""
33
33
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] ""
50msgstr[0] ""
51msgstr[1] ""
51msgstr[1] ""
52
52
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
54msgid "Log out"
54msgid "Log out"
55msgstr ""
55msgstr ""
56
56
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr ""
59msgstr ""
60
60
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:134
63msgid "No"
63msgid "No"
64msgstr ""
64msgstr ""
65
65
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:140
68msgid "Yes"
68msgid "Yes"
69msgstr ""
69msgstr ""
70
70
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
72msgid "Shut down"
72msgid "Shut down"
73msgstr ""
73msgstr ""
74
74
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr ""
77msgstr ""
78
78
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
80msgid "Reboot"
80msgid "Reboot"
81msgstr ""
81msgstr ""
82
82
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr ""
85msgstr ""
86
86
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
88msgid "Power"
88msgid "Power"
89msgstr ""
89msgstr ""
90
90
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
95msgstr ""
95msgstr ""
96
96
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
98msgid "Power off"
98msgid "Power off"
99msgstr ""
99msgstr ""
100
100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102msgid "Restart"
102msgid "Restart"
103msgstr ""
103msgstr ""
104
104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106msgid "Cancel"
106msgid "Cancel"
107msgstr ""
107msgstr ""
108
108
@@ -110,89 +110,93 @@ msgstr ""
110msgid "Skip intro"
110msgid "Skip intro"
111msgstr "Пропусни интрото"
111msgstr "Пропусни интрото"
112
112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114msgid "Right edge"
114msgid "Right edge"
115msgstr "Десен край"
115msgstr "Десен край"
116
116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118msgid "Try swiping from the right edge to unlock the phone"
118msgid "Try swiping from the right edge to unlock the phone"
119msgstr ""
119msgstr ""
120"Опитайте се да приплъзнете пръста си от десния край към левия, за да "
120"Опитайте се да приплъзнете пръста си от десния край към левия, за да "
121"отключите телефона"
121"отключите телефона"
122
122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124msgid "Top edge"
124msgid "Top edge"
125msgstr "Горен край"
125msgstr "Горен край"
126
126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128msgid "Try swiping from the top edge to access the indicators"
128msgid "Try swiping from the top edge to access the indicators"
129msgstr ""
129msgstr ""
130"Опитайте се да приплъзнете пръста си от горния край към долния, за да "
130"Опитайте се да приплъзнете пръста си от горния край към долния, за да "
131"получите достъп до индикаторите"
131"получите достъп до индикаторите"
132
132
133−#: qml/Components/EdgeDemo.qml:170
133+#: qml/Components/EdgeDemo.qml:183
134msgid "Close"
134msgid "Close"
135msgstr "Затвори"
135msgstr "Затвори"
136
136
137−#: qml/Components/EdgeDemo.qml:171
137+#: qml/Components/EdgeDemo.qml:184
138msgid "Swipe up again to close the settings screen"
138msgid "Swipe up again to close the settings screen"
139msgstr ""
139msgstr ""
140"Отново приплъзнете пръста си нагоре за да затворите екрана с настройките"
140"Отново приплъзнете пръста си нагоре за да затворите екрана с настройките"
141
141
142−#: qml/Components/EdgeDemo.qml:201
142+#: qml/Components/EdgeDemo.qml:214
143msgid "Left edge"
143msgid "Left edge"
144msgstr "Ляв край"
144msgstr "Ляв край"
145
145
146−#: qml/Components/EdgeDemo.qml:202
146+#: qml/Components/EdgeDemo.qml:215
147msgid "Swipe from the left to reveal the launcher for quick access to apps"
147msgid "Swipe from the left to reveal the launcher for quick access to apps"
148msgstr ""
148msgstr ""
149"Приплъзнете пръста си от левия край към десния, за да отворите стартера за "
149"Приплъзнете пръста си от левия край към десния, за да отворите стартера за "
150"бърз достъп до приложенията"
150"бърз достъп до приложенията"
151
151
152−#: qml/Components/EdgeDemo.qml:229
152+#: qml/Components/EdgeDemo.qml:242
153msgid "Well done"
153msgid "Well done"
154msgstr "Великолепно"
154msgstr "Великолепно"
155
155
156−#: qml/Components/EdgeDemo.qml:230
156+#: qml/Components/EdgeDemo.qml:243
157msgid ""
157msgid ""
158"You have now mastered the edge gestures and can start using the "
158"You have now mastered the edge gestures and can start using the "
159"phone<br><br>Tap on the screen to start"
159"phone<br><br>Tap on the screen to start"
160msgstr ""
160msgstr ""
161
161
162−#: qml/Components/Lockscreen.qml:223
162+#: qml/Components/Lockscreen.qml:238
163msgid "Return to Call"
163msgid "Return to Call"
164msgstr ""
164msgstr ""
165
165
166−#: qml/Components/Lockscreen.qml:223
166+#: qml/Components/Lockscreen.qml:238
167msgid "Emergency Call"
167msgid "Emergency Call"
168msgstr "Спешно повикване"
168msgstr "Спешно повикване"
169
169
170−#: qml/Components/Lockscreen.qml:255
170+#: qml/Components/Lockscreen.qml:270
171msgid "OK"
171msgid "OK"
172msgstr ""
172msgstr ""
173
173
174−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
174+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
175msgid "See less"
175msgid "See less"
176msgstr ""
176msgstr ""
177
177
178−#: qml/Dash/GenericScopeView.qml:434
178+#: qml/Dash/GenericScopeView.qml:485
179msgid "See all"
179msgid "See all"
180msgstr ""
180msgstr ""
181
181
182−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
182+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
183#: qml/Panel/SearchIndicator.qml:27
183#: qml/Panel/SearchIndicator.qml:27
184msgid "Search"
184msgid "Search"
185msgstr "Търсене"
185msgstr "Търсене"
186
186
187−#: qml/Dash/PageHeader.qml:268
187+#: qml/Dash/PageHeader.qml:267
188+msgid "Store"
189+msgstr ""
190+
191+#: qml/Dash/PageHeader.qml:284
188msgid "Settings"
192msgid "Settings"
189msgstr ""
193msgstr ""
190
194
191−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:291
192msgid "Remove from Favorites"
196msgid "Remove from Favorites"
193msgstr ""
197msgstr ""
194
198
195−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:291
196msgid "Add to Favorites"
200msgid "Add to Favorites"
197msgstr ""
201msgstr ""
198
202
@@ -224,31 +228,23 @@ msgstr ""
224msgid "Release to refresh…"
228msgid "Release to refresh…"
225msgstr ""
229msgstr ""
226
230
227−#: qml/Dash/ScopesOverview.qml:215
231+#: qml/Dash/ScopesList.qml:66
228−msgid "Manage Scopes"
232+msgid "Manage"
229−msgstr ""
230−
231−#: qml/Dash/ScopesOverview.qml:437
232−msgid "Done"
233−msgstr ""
234−
235−#: qml/Dash/ScopesOverview.qml:463
236−msgid "Store"
237msgstr ""
233msgstr ""
238
234
239−#: qml/Dash/ScopesOverviewTab.qml:36
235+#: qml/Dash/ScopesList.qml:112
240−msgid "Favorites"
236+msgid "Home"
241msgstr ""
237msgstr ""
242
238
243−#: qml/Dash/ScopesOverviewTab.qml:54
239+#: qml/Dash/ScopesList.qml:113
244−msgid "All"
240+msgid "Also installed"
245msgstr ""
241msgstr ""
246
242
247−#: qml/Greeter/Greeter.qml:174
243+#: qml/Greeter/Greeter.qml:133
248msgid "Unlock"
244msgid "Unlock"
249msgstr ""
245msgstr ""
250
246
251−#: qml/Notifications/NotificationMenuItemFactory.qml:116
247+#: qml/Notifications/NotificationMenuItemFactory.qml:128
252msgid "Show password"
248msgid "Show password"
253msgstr "Покажи паролата"
249msgstr "Покажи паролата"
254
250
@@ -288,6 +284,10 @@ msgstr ""
288msgid "Failed, tap to retry"
284msgid "Failed, tap to retry"
289msgstr ""
285msgstr ""
290
286
287+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
288+msgid "Reply"
289+msgstr ""
290+
291#: qml/Panel/Indicators/ModemInfoItem.qml:105
291#: qml/Panel/Indicators/ModemInfoItem.qml:105
292msgid "Unlock SIM"
292msgid "Unlock SIM"
293msgstr ""
293msgstr ""
@@ -296,60 +296,237 @@ msgstr ""
296msgid "Roaming"
296msgid "Roaming"
297msgstr ""
297msgstr ""
298
298
299−#: qml/Shell.qml:391
299+#: qml/Shell.qml:390
300+#, qt-format
301+msgid "Enter %1"
302+msgstr ""
303+
304+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
300msgid "Enter passphrase"
305msgid "Enter passphrase"
301msgstr ""
306msgstr ""
302
307
303#: qml/Shell.qml:392
308#: qml/Shell.qml:392
304−msgid "Sorry, incorrect passphrase"
309+msgid "Enter passcode"
305msgstr ""
310msgstr ""
306
311
307#: qml/Shell.qml:393
312#: qml/Shell.qml:393
308−msgid "Please re-enter"
313+#, qt-format
314+msgid "Sorry, incorrect %1"
315+msgstr ""
316+
317+#: qml/Shell.qml:394
318+msgid "Sorry, incorrect passphrase"
309msgstr ""
319msgstr ""
310
320
311#: qml/Shell.qml:395
321#: qml/Shell.qml:395
312−msgid "Enter passcode"
322+msgid "Please re-enter"
313msgstr ""
323msgstr ""
314
324
315#: qml/Shell.qml:396
325#: qml/Shell.qml:396
316msgid "Sorry, incorrect passcode"
326msgid "Sorry, incorrect passcode"
317msgstr ""
327msgstr ""
318
328
319−#: qml/Shell.qml:399
329+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
320−#, qt-format
321−msgid "Enter %1"
322−msgstr ""
323−
324−#: qml/Shell.qml:400
325−#, qt-format
326−msgid "Sorry, incorrect %1"
327−msgstr ""
328−
329−#: qml/Shell.qml:441
330msgid "Sorry, incorrect passphrase."
330msgid "Sorry, incorrect passphrase."
331msgstr ""
331msgstr ""
332
332
333−#: qml/Shell.qml:442
333+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
334msgid "Sorry, incorrect passcode."
334msgid "Sorry, incorrect passcode."
335msgstr ""
335msgstr ""
336
336
337−#: qml/Shell.qml:443
337+#: qml/Shell.qml:492
338msgid "This will be your last attempt."
338msgid "This will be your last attempt."
339msgstr ""
339msgstr ""
340
340
341−#: qml/Shell.qml:445
341+#: qml/Shell.qml:494
342msgid ""
342msgid ""
343"If passphrase is entered incorrectly, your phone will conduct a factory "
343"If passphrase is entered incorrectly, your phone will conduct a factory "
344"reset and all personal data will be deleted."
344"reset and all personal data will be deleted."
345msgstr ""
345msgstr ""
346
346
347−#: qml/Shell.qml:446
347+#: qml/Shell.qml:495
348msgid ""
348msgid ""
349"If passcode is entered incorrectly, your phone will conduct a factory reset "
349"If passcode is entered incorrectly, your phone will conduct a factory reset "
350"and all personal data will be deleted."
350"and all personal data will be deleted."
351msgstr ""
351msgstr ""
352
352
353+#: qml/Wizard/Page.qml:89
354+msgid "Back"
355+msgstr ""
356+
357+#: qml/Wizard/Pages/10-welcome.qml:27
358+msgid "Hi!"
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:44
362+msgid "Welcome to your Ubuntu phone."
363+msgstr ""
364+
365+#: qml/Wizard/Pages/10-welcome.qml:52
366+msgid "Let’s get started."
367+msgstr ""
368+
369+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
370+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
371+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
372+#: qml/Wizard/Pages/passwd-set.qml:90
373+msgid "Continue"
374+msgstr ""
375+
376+#: qml/Wizard/Pages/20-sim.qml:25
377+msgid "Add a SIM card and restart your device"
378+msgstr ""
379+
380+#: qml/Wizard/Pages/20-sim.qml:55
381+msgid "Without it, you won’t be able to make calls or use text messaging."
382+msgstr ""
383+
384+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
385+msgid "Skip"
386+msgstr ""
387+
388+#: qml/Wizard/Pages/30-passwd-type.qml:39
389+msgid "Lock security"
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:74
393+msgid "Please select how you’d like to unlock your phone."
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:97
397+msgid "Swipe"
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:98
401+msgid "No security"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:100
405+msgid "Passcode"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:101
409+msgid "4 digits only"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:103
413+msgid "Passphrase"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:104
417+msgid "Numbers and letters"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/40-wifi.qml:28
421+msgid "Connect to Wi‑Fi"
422+msgstr ""
423+
424+#: qml/Wizard/Pages/40-wifi.qml:147
425+msgid "Available networks…"
426+msgstr ""
427+
428+#: qml/Wizard/Pages/40-wifi.qml:148
429+msgid "No available networks."
430+msgstr ""
431+
432+#: qml/Wizard/Pages/50-location.qml:27
433+msgid "Location"
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:62
437+msgid "Let the phone detect your location:"
438+msgstr ""
439+
440+#: qml/Wizard/Pages/50-location.qml:69
441+msgid "Using GPS only (less accurate)"
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:86
445+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
446+msgstr ""
447+
448+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
449+#: qml/Wizard/Pages/50-location.qml:103
450+msgid ""
451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
452+"conditions</a>."
453+msgstr ""
454+
455+#: qml/Wizard/Pages/50-location.qml:112
456+msgid "Not at all"
457+msgstr ""
458+
459+#: qml/Wizard/Pages/50-location.qml:124
460+msgid "You can change your mind later in <b>System Settings</b>."
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:24
464+msgid "Improving your experience"
465+msgstr ""
466+
467+#: qml/Wizard/Pages/60-reporting.qml:36
468+msgid ""
469+"Your phone is set up to automatically report errors to Canonical and its "
470+"partners, the makers of the operating system."
471+msgstr ""
472+
473+#: qml/Wizard/Pages/60-reporting.qml:43
474+msgid ""
475+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
476+"Privacy</b>"
477+msgstr ""
478+
479+#: qml/Wizard/Pages/80-finished.qml:24
480+msgid "All done"
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:39
484+msgid "Nice work!"
485+msgstr ""
486+
487+#: qml/Wizard/Pages/80-finished.qml:46
488+msgid "Your phone is now ready to use."
489+msgstr ""
490+
491+#: qml/Wizard/Pages/80-finished.qml:53
492+msgid "Finish"
493+msgstr ""
494+
495+#: qml/Wizard/Pages/here-terms.qml:27
496+msgid "Terms & Conditions"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/passwd-confirm.qml:49
500+msgid "Confirm passphrase"
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:50
504+msgid "Confirm passcode"
505+msgstr ""
506+
507+#: qml/Wizard/Pages/passwd-confirm.qml:53
508+#: qml/Wizard/Pages/passwd-confirm.qml:54
509+msgid "Please try again."
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-set.qml:61
513+msgid "Choose your passcode"
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-set.qml:68
517+msgid "Passphrase must be 4 characters long"
518+msgstr ""
519+
520+#: qml/Wizard/StackButton.qml:39
521+#, qt-format
522+msgid "〈 %1"
523+msgstr ""
524+
525+#: qml/Wizard/StackButton.qml:42
526+#, qt-format
527+msgid "%1 〉"
528+msgstr ""
529+
353#~ msgid "Confirm"
530#~ msgid "Confirm"
354#~ msgstr "Потвърди"
531#~ msgstr "Потвърди"
355
532
po/br.po+277−80
@@ -7,27 +7,27 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-11-05 07:24+0000\n"
11+"PO-Revision-Date: 2014-12-16 07:27+0000\n"
12"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
12"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
13"Language-Team: Breton <br@li.org>\n"
13"Language-Team: Breton <br@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Ger-tremen : "
23msgstr "Ger-tremen : "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Spilhennañ ar verradenn"
28msgstr "Spilhennañ ar verradenn"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Dispilhennañ ar verradenn"
32msgstr "Dispilhennañ ar verradenn"
33
33
@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
54msgstr[0] "Gortozit %1 vunutenn, mar plij, hag esaeit en-dro..."
54msgstr[0] "Gortozit %1 vunutenn, mar plij, hag esaeit en-dro..."
55msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."
55msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."
56
56
57−#: qml/Components/Dialogs.qml:74
57+#: qml/Components/Dialogs.qml:86
58msgid "Log out"
58msgid "Log out"
59msgstr "Digevreañ"
59msgstr "Digevreañ"
60
60
61−#: qml/Components/Dialogs.qml:75
61+#: qml/Components/Dialogs.qml:87
62msgid "Are you sure you want to log out?"
62msgid "Are you sure you want to log out?"
63msgstr "Ha sur oc'h e fell deoc'h digevreañ ?"
63msgstr "Ha sur oc'h e fell deoc'h digevreañ ?"
64
64
65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
65+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66−#: qml/Components/Dialogs.qml:126
66+#: qml/Components/Dialogs.qml:134
67msgid "No"
67msgid "No"
68msgstr "N'on ket"
68msgstr "N'on ket"
69
69
70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
70+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71−#: qml/Components/Dialogs.qml:133
71+#: qml/Components/Dialogs.qml:140
72msgid "Yes"
72msgid "Yes"
73msgstr "Ya"
73msgstr "Ya"
74
74
75−#: qml/Components/Dialogs.qml:98
75+#: qml/Components/Dialogs.qml:108
76msgid "Shut down"
76msgid "Shut down"
77msgstr "Lazhañ ar benveg"
77msgstr "Lazhañ ar benveg"
78
78
79−#: qml/Components/Dialogs.qml:99
79+#: qml/Components/Dialogs.qml:109
80msgid "Are you sure you want to shut down?"
80msgid "Are you sure you want to shut down?"
81msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"
81msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"
82
82
83−#: qml/Components/Dialogs.qml:123
83+#: qml/Components/Dialogs.qml:131
84msgid "Reboot"
84msgid "Reboot"
85msgstr "Adloc'hañ"
85msgstr "Adloc'hañ"
86
86
87−#: qml/Components/Dialogs.qml:124
87+#: qml/Components/Dialogs.qml:132
88msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
89msgstr "Ha sur oc'h e fell deoc'h adloc'hañ ?"
89msgstr "Ha sur oc'h e fell deoc'h adloc'hañ ?"
90
90
91−#: qml/Components/Dialogs.qml:148
91+#: qml/Components/Dialogs.qml:154
92msgid "Power"
92msgid "Power"
93msgstr "Tredan"
93msgstr "Tredan"
94
94
95−#: qml/Components/Dialogs.qml:149
95+#: qml/Components/Dialogs.qml:155
96msgid ""
96msgid ""
97"Are you sure you would like\n"
97"Are you sure you would like\n"
98"to power off?"
98"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100"Ha sur oc'h e fell deoc'h\n"
100"Ha sur oc'h e fell deoc'h\n"
101"troc'hañ an tredan ?"
101"troc'hañ an tredan ?"
102
102
103−#: qml/Components/Dialogs.qml:151
103+#: qml/Components/Dialogs.qml:157
104msgid "Power off"
104msgid "Power off"
105msgstr "Lazhañ"
105msgstr "Lazhañ"
106
106
107−#: qml/Components/Dialogs.qml:161
107+#: qml/Components/Dialogs.qml:166
108msgid "Restart"
108msgid "Restart"
109msgstr "Adloc'hañ"
109msgstr "Adloc'hañ"
110
110
111−#: qml/Components/Dialogs.qml:171
111+#: qml/Components/Dialogs.qml:175
112msgid "Cancel"
112msgid "Cancel"
113msgstr "Nullañ"
113msgstr "Nullañ"
114
114
@@ -116,48 +116,48 @@ msgstr "Nullañ"
116msgid "Skip intro"
116msgid "Skip intro"
117msgstr "Tremen hep sellet ouzh an digoradur"
117msgstr "Tremen hep sellet ouzh an digoradur"
118
118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120msgid "Right edge"
120msgid "Right edge"
121msgstr "Bord dehoù"
121msgstr "Bord dehoù"
122
122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124msgid "Try swiping from the right edge to unlock the phone"
124msgid "Try swiping from the right edge to unlock the phone"
125msgstr ""
125msgstr ""
126"Lakait ho piz da riklañ adalek ar bord dehoù da zibrennañ ar pellgomzer."
126"Lakait ho piz da riklañ adalek ar bord dehoù da zibrennañ ar pellgomzer."
127
127
128−#: qml/Components/EdgeDemo.qml:144
128+#: qml/Components/EdgeDemo.qml:157
129msgid "Top edge"
129msgid "Top edge"
130msgstr "Bord uhelañ"
130msgstr "Bord uhelañ"
131
131
132−#: qml/Components/EdgeDemo.qml:145
132+#: qml/Components/EdgeDemo.qml:158
133msgid "Try swiping from the top edge to access the indicators"
133msgid "Try swiping from the top edge to access the indicators"
134msgstr ""
134msgstr ""
135"Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war wel."
135"Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war wel."
136
136
137−#: qml/Components/EdgeDemo.qml:170
137+#: qml/Components/EdgeDemo.qml:183
138msgid "Close"
138msgid "Close"
139msgstr "Serriñ"
139msgstr "Serriñ"
140
140
141−#: qml/Components/EdgeDemo.qml:171
141+#: qml/Components/EdgeDemo.qml:184
142msgid "Swipe up again to close the settings screen"
142msgid "Swipe up again to close the settings screen"
143msgstr ""
143msgstr ""
144"Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an arventennoù"
144"Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an arventennoù"
145
145
146−#: qml/Components/EdgeDemo.qml:201
146+#: qml/Components/EdgeDemo.qml:214
147msgid "Left edge"
147msgid "Left edge"
148msgstr "Bord kleiz"
148msgstr "Bord kleiz"
149
149
150−#: qml/Components/EdgeDemo.qml:202
150+#: qml/Components/EdgeDemo.qml:215
151msgid "Swipe from the left to reveal the launcher for quick access to apps"
151msgid "Swipe from the left to reveal the launcher for quick access to apps"
152msgstr ""
152msgstr ""
153"Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser arloadoù "
153"Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser arloadoù "
154"prim."
154"prim."
155
155
156−#: qml/Components/EdgeDemo.qml:229
156+#: qml/Components/EdgeDemo.qml:242
157msgid "Well done"
157msgid "Well done"
158msgstr "Gourc'hemennoù !"
158msgstr "Gourc'hemennoù !"
159
159
160−#: qml/Components/EdgeDemo.qml:230
160+#: qml/Components/EdgeDemo.qml:243
161msgid ""
161msgid ""
162"You have now mastered the edge gestures and can start using the "
162"You have now mastered the edge gestures and can start using the "
163"phone<br><br>Tap on the screen to start"
163"phone<br><br>Tap on the screen to start"
@@ -165,40 +165,44 @@ msgstr ""
165"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
165"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
166"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
166"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
167
167
168−#: qml/Components/Lockscreen.qml:223
168+#: qml/Components/Lockscreen.qml:238
169msgid "Return to Call"
169msgid "Return to Call"
170msgstr "Distreiñ d'ar bellgomzadenn"
170msgstr "Distreiñ d'ar bellgomzadenn"
171
171
172−#: qml/Components/Lockscreen.qml:223
172+#: qml/Components/Lockscreen.qml:238
173msgid "Emergency Call"
173msgid "Emergency Call"
174msgstr "Pellgomzadenn vallus"
174msgstr "Pellgomzadenn vallus"
175
175
176−#: qml/Components/Lockscreen.qml:255
176+#: qml/Components/Lockscreen.qml:270
177msgid "OK"
177msgid "OK"
178msgstr "Mat eo"
178msgstr "Mat eo"
179
179
180−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
180+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
181msgid "See less"
181msgid "See less"
182msgstr "Gwelet nebeutoc'h"
182msgstr "Gwelet nebeutoc'h"
183
183
184−#: qml/Dash/GenericScopeView.qml:434
184+#: qml/Dash/GenericScopeView.qml:485
185msgid "See all"
185msgid "See all"
186msgstr "Gwelet pep tra"
186msgstr "Gwelet pep tra"
187
187
188−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
188+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
189#: qml/Panel/SearchIndicator.qml:27
189#: qml/Panel/SearchIndicator.qml:27
190msgid "Search"
190msgid "Search"
191msgstr "Klask"
191msgstr "Klask"
192
192
193−#: qml/Dash/PageHeader.qml:268
193+#: qml/Dash/PageHeader.qml:267
194+msgid "Store"
195+msgstr "Enrollañ"
196+
197+#: qml/Dash/PageHeader.qml:284
194msgid "Settings"
198msgid "Settings"
195msgstr "Arventennoù"
199msgstr "Arventennoù"
196
200
197−#: qml/Dash/PageHeader.qml:275
201+#: qml/Dash/PageHeader.qml:291
198msgid "Remove from Favorites"
202msgid "Remove from Favorites"
199msgstr "Lemel eus ar sinedoù"
203msgstr "Lemel eus ar sinedoù"
200
204
201−#: qml/Dash/PageHeader.qml:275
205+#: qml/Dash/PageHeader.qml:291
202msgid "Add to Favorites"
206msgid "Add to Favorites"
203msgstr "Ouzhpennañ d'ar sinedoù"
207msgstr "Ouzhpennañ d'ar sinedoù"
204
208
@@ -230,31 +234,23 @@ msgstr "Tennañ evit freskaat..."
230msgid "Release to refresh…"
234msgid "Release to refresh…"
231msgstr "Lezel da vont evit freskaat..."
235msgstr "Lezel da vont evit freskaat..."
232
236
233−#: qml/Dash/ScopesOverview.qml:215
237+#: qml/Dash/ScopesList.qml:66
234−msgid "Manage Scopes"
238+msgid "Manage"
235−msgstr "Merañ ar c'hefluskerioù enklask"
239+msgstr "Merañ"
236−
237−#: qml/Dash/ScopesOverview.qml:437
238−msgid "Done"
239−msgstr "Graet eo"
240−
241−#: qml/Dash/ScopesOverview.qml:463
242−msgid "Store"
243−msgstr "Enrollañ"
244
240
245−#: qml/Dash/ScopesOverviewTab.qml:36
241+#: qml/Dash/ScopesList.qml:112
246−msgid "Favorites"
242+msgid "Home"
247−msgstr "Gwellañ deuet"
243+msgstr "Er gêr"
248
244
249−#: qml/Dash/ScopesOverviewTab.qml:54
245+#: qml/Dash/ScopesList.qml:113
250−msgid "All"
246+msgid "Also installed"
251−msgstr "An holl anezho"
247+msgstr "Staliet ivez"
252
248
253−#: qml/Greeter/Greeter.qml:174
249+#: qml/Greeter/Greeter.qml:133
254msgid "Unlock"
250msgid "Unlock"
255msgstr "Dibrennañ"
251msgstr "Dibrennañ"
256
252
257−#: qml/Notifications/NotificationMenuItemFactory.qml:116
253+#: qml/Notifications/NotificationMenuItemFactory.qml:128
258msgid "Show password"
254msgid "Show password"
259msgstr "Diskouez ar ger-tremen"
255msgstr "Diskouez ar ger-tremen"
260
256
@@ -294,6 +290,10 @@ msgstr "Echu"
294msgid "Failed, tap to retry"
290msgid "Failed, tap to retry"
295msgstr "C'hwitet, touchit evit adkregiñ"
291msgstr "C'hwitet, touchit evit adkregiñ"
296
292
293+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
294+msgid "Reply"
295+msgstr ""
296+
297#: qml/Panel/Indicators/ModemInfoItem.qml:105
297#: qml/Panel/Indicators/ModemInfoItem.qml:105
298msgid "Unlock SIM"
298msgid "Unlock SIM"
299msgstr "Dibrennañ ar gartenn SIM"
299msgstr "Dibrennañ ar gartenn SIM"
@@ -302,49 +302,49 @@ msgstr "Dibrennañ ar gartenn SIM"
302msgid "Roaming"
302msgid "Roaming"
303msgstr "O kantren"
303msgstr "O kantren"
304
304
305−#: qml/Shell.qml:391
305+#: qml/Shell.qml:390
306+#, qt-format
307+msgid "Enter %1"
308+msgstr "Merkañ %1"
309+
310+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
306msgid "Enter passphrase"
311msgid "Enter passphrase"
307msgstr "Merkañ ar frazenn-dremen"
312msgstr "Merkañ ar frazenn-dremen"
308
313
309#: qml/Shell.qml:392
314#: qml/Shell.qml:392
315+msgid "Enter passcode"
316+msgstr "Merkañ ar c'hod-tremen"
317+
318+#: qml/Shell.qml:393
319+#, qt-format
320+msgid "Sorry, incorrect %1"
321+msgstr "Siwazh, %1 direizh"
322+
323+#: qml/Shell.qml:394
310msgid "Sorry, incorrect passphrase"
324msgid "Sorry, incorrect passphrase"
311msgstr "Siwazh, frazenn-dremen direizh"
325msgstr "Siwazh, frazenn-dremen direizh"
312
326
313−#: qml/Shell.qml:393
327+#: qml/Shell.qml:395
314msgid "Please re-enter"
328msgid "Please re-enter"
315msgstr "Adverkañ, mar plij"
329msgstr "Adverkañ, mar plij"
316
330
317−#: qml/Shell.qml:395
318−msgid "Enter passcode"
319−msgstr "Merkañ ar c'hod-tremen"
320−
321#: qml/Shell.qml:396
331#: qml/Shell.qml:396
322msgid "Sorry, incorrect passcode"
332msgid "Sorry, incorrect passcode"
323msgstr "Digarezit, kod-tremen direizh"
333msgstr "Digarezit, kod-tremen direizh"
324
334
325−#: qml/Shell.qml:399
335+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
326−#, qt-format
327−msgid "Enter %1"
328−msgstr "Merkañ %1"
329−
330−#: qml/Shell.qml:400
331−#, qt-format
332−msgid "Sorry, incorrect %1"
333−msgstr "Siwazh, %1 direizh"
334−
335−#: qml/Shell.qml:441
336msgid "Sorry, incorrect passphrase."
336msgid "Sorry, incorrect passphrase."
337msgstr "Siwazh, frazenn-dremen direizh"
337msgstr "Siwazh, frazenn-dremen direizh"
338
338
339−#: qml/Shell.qml:442
339+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
340msgid "Sorry, incorrect passcode."
340msgid "Sorry, incorrect passcode."
341msgstr "Siwazh, kod-tremen direizh"
341msgstr "Siwazh, kod-tremen direizh"
342
342
343−#: qml/Shell.qml:443
343+#: qml/Shell.qml:492
344msgid "This will be your last attempt."
344msgid "This will be your last attempt."
345msgstr "Ho taol-esae diwezhañ e vo."
345msgstr "Ho taol-esae diwezhañ e vo."
346
346
347−#: qml/Shell.qml:445
347+#: qml/Shell.qml:494
348msgid ""
348msgid ""
349"If passphrase is entered incorrectly, your phone will conduct a factory "
349"If passphrase is entered incorrectly, your phone will conduct a factory "
350"reset and all personal data will be deleted."
350"reset and all personal data will be deleted."
@@ -352,7 +352,7 @@ msgstr ""
352"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "
352"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "
353"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"
353"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"
354
354
355−#: qml/Shell.qml:446
355+#: qml/Shell.qml:495
356msgid ""
356msgid ""
357"If passcode is entered incorrectly, your phone will conduct a factory reset "
357"If passcode is entered incorrectly, your phone will conduct a factory reset "
358"and all personal data will be deleted."
358"and all personal data will be deleted."
@@ -360,6 +360,191 @@ msgstr ""
360"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "
360"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "
361"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."
361"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."
362
362
363+#: qml/Wizard/Page.qml:89
364+msgid "Back"
365+msgstr "Distreiñ"
366+
367+#: qml/Wizard/Pages/10-welcome.qml:27
368+msgid "Hi!"
369+msgstr "Salud deoc'h !"
370+
371+#: qml/Wizard/Pages/10-welcome.qml:44
372+msgid "Welcome to your Ubuntu phone."
373+msgstr "Deuet-mat oc'h en ho pellgomzer Ubuntu."
374+
375+#: qml/Wizard/Pages/10-welcome.qml:52
376+msgid "Let’s get started."
377+msgstr "Krogomp ganti."
378+
379+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
380+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
381+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
382+#: qml/Wizard/Pages/passwd-set.qml:90
383+msgid "Continue"
384+msgstr "Kenderc'hel"
385+
386+#: qml/Wizard/Pages/20-sim.qml:25
387+msgid "Add a SIM card and restart your device"
388+msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"
389+
390+#: qml/Wizard/Pages/20-sim.qml:55
391+msgid "Without it, you won’t be able to make calls or use text messaging."
392+msgstr "Ne vioc'h ket evit pellgomz pe kas kemennadennoù hepti."
393+
394+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
395+msgid "Skip"
396+msgstr "Tremen hebiou"
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:39
399+msgid "Lock security"
400+msgstr "Surentez ar prennañ"
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:74
403+msgid "Please select how you’d like to unlock your phone."
404+msgstr ""
405+"Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."
406+
407+#: qml/Wizard/Pages/30-passwd-type.qml:97
408+msgid "Swipe"
409+msgstr "Riklañ"
410+
411+#: qml/Wizard/Pages/30-passwd-type.qml:98
412+msgid "No security"
413+msgstr "Tamm surentez ebet"
414+
415+#: qml/Wizard/Pages/30-passwd-type.qml:100
416+msgid "Passcode"
417+msgstr "Kod-tremen"
418+
419+#: qml/Wizard/Pages/30-passwd-type.qml:101
420+msgid "4 digits only"
421+msgstr "4 sifr hepken"
422+
423+#: qml/Wizard/Pages/30-passwd-type.qml:103
424+msgid "Passphrase"
425+msgstr "Frazenn-dremen"
426+
427+#: qml/Wizard/Pages/30-passwd-type.qml:104
428+msgid "Numbers and letters"
429+msgstr "Sifroù ha lizherennoù"
430+
431+#: qml/Wizard/Pages/40-wifi.qml:28
432+msgid "Connect to Wi‑Fi"
433+msgstr "Kevreañ ouzh ar Wi-Fi"
434+
435+#: qml/Wizard/Pages/40-wifi.qml:147
436+msgid "Available networks…"
437+msgstr "Rouedadoù a c'haller kaout..."
438+
439+#: qml/Wizard/Pages/40-wifi.qml:148
440+msgid "No available networks."
441+msgstr "N'eus rouedad ebet da gaout."
442+
443+#: qml/Wizard/Pages/50-location.qml:27
444+msgid "Location"
445+msgstr "Lec'h"
446+
447+#: qml/Wizard/Pages/50-location.qml:62
448+msgid "Let the phone detect your location:"
449+msgstr "Lezel ar pellgomzer da gavout pelec'h emaoc'h :"
450+
451+#: qml/Wizard/Pages/50-location.qml:69
452+msgid "Using GPS only (less accurate)"
453+msgstr "Implijout ar GPS hepken (n'eo ket ken resis)"
454+
455+#: qml/Wizard/Pages/50-location.qml:86
456+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
457+msgstr ""
458+"Implijout ar GPS, Wi-Fi dizanv pe titouroù ar rouedad kelligel (aliet)"
459+
460+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
461+#: qml/Wizard/Pages/50-location.qml:103
462+msgid ""
463+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
464+"conditions</a>."
465+msgstr ""
466+"Pa ziuzit an dibarzh-mañ ez asantit da <a href='#'>zivizoù implij</a> Nokia."
467+
468+#: qml/Wizard/Pages/50-location.qml:112
469+msgid "Not at all"
470+msgstr "Tamm ebet"
471+
472+#: qml/Wizard/Pages/50-location.qml:124
473+msgid "You can change your mind later in <b>System Settings</b>."
474+msgstr ""
475+"Gallout a rit cheñch soñj diwezhatoc'h en <b>Arventennoù ar reizhad</b>."
476+
477+#: qml/Wizard/Pages/60-reporting.qml:24
478+msgid "Improving your experience"
479+msgstr "Gwellaat ho skiant-prenet"
480+
481+#: qml/Wizard/Pages/60-reporting.qml:36
482+msgid ""
483+"Your phone is set up to automatically report errors to Canonical and its "
484+"partners, the makers of the operating system."
485+msgstr ""
486+"Arventennet eo ho pellgomzer evit titourañ ent emgefre ar fazioù da "
487+"gCanonical ha d'e gevelerien, ar re o deus savet ar reizhiad korvoiñ."
488+
489+#: qml/Wizard/Pages/60-reporting.qml:43
490+msgid ""
491+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
492+"Privacy</b>"
493+msgstr ""
494+"Gallout a ra bezañ diweredekaet e-barzh <b>Arventennoù ar reizhiad</b> "
495+"dindan <b>Surentez &amp; Prevezded</b>"
496+
497+#: qml/Wizard/Pages/80-finished.qml:24
498+msgid "All done"
499+msgstr "Echu penn-da-benn"
500+
501+#: qml/Wizard/Pages/80-finished.qml:39
502+msgid "Nice work!"
503+msgstr "Gwellat labour !"
504+
505+#: qml/Wizard/Pages/80-finished.qml:46
506+msgid "Your phone is now ready to use."
507+msgstr "Prest eo ho pellgomzer da vezañ implijet bremañ."
508+
509+#: qml/Wizard/Pages/80-finished.qml:53
510+msgid "Finish"
511+msgstr "Echuiñ"
512+
513+#: qml/Wizard/Pages/here-terms.qml:27
514+msgid "Terms & Conditions"
515+msgstr "Penndivizoù implij"
516+
517+#: qml/Wizard/Pages/passwd-confirm.qml:49
518+msgid "Confirm passphrase"
519+msgstr "Kadarnaat ar frazenn-dremen"
520+
521+#: qml/Wizard/Pages/passwd-confirm.qml:50
522+msgid "Confirm passcode"
523+msgstr "Kadarnaat ar c'hod-tremen"
524+
525+#: qml/Wizard/Pages/passwd-confirm.qml:53
526+#: qml/Wizard/Pages/passwd-confirm.qml:54
527+msgid "Please try again."
528+msgstr "Esaeit en-dro, mar plij."
529+
530+#: qml/Wizard/Pages/passwd-set.qml:61
531+msgid "Choose your passcode"
532+msgstr "Choaz ho kod-tremen"
533+
534+#: qml/Wizard/Pages/passwd-set.qml:68
535+msgid "Passphrase must be 4 characters long"
536+msgstr "4 arouezenn a rank bezañ er frazenn-dremen"
537+
538+#: qml/Wizard/StackButton.qml:39
539+#, qt-format
540+msgid "〈 %1"
541+msgstr "〈 %1"
542+
543+#: qml/Wizard/StackButton.qml:42
544+#, qt-format
545+msgid "%1 〉"
546+msgstr "%1 〉"
547+
363#~ msgid "Loading. Please Wait..."
548#~ msgid "Loading. Please Wait..."
364#~ msgstr "O kargañ. Gortozit, mar plij..."
549#~ msgstr "O kargañ. Gortozit, mar plij..."
365
550
@@ -374,3 +559,15 @@ msgstr ""
374
559
375#~ msgid "Type or say a command"
560#~ msgid "Type or say a command"
376#~ msgstr "Skrivit pe lavarit un urzhiad"
561#~ msgstr "Skrivit pe lavarit un urzhiad"
562+
563+#~ msgid "Done"
564+#~ msgstr "Graet eo"
565+
566+#~ msgid "All"
567+#~ msgstr "An holl anezho"
568+
569+#~ msgid "Favorites"
570+#~ msgstr "Gwellañ deuet"
571+
572+#~ msgid "Manage Scopes"
573+#~ msgstr "Merañ ar c'hefluskerioù enklask"
po/bs.po+251−74
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2014-01-16 22:33+0000\n"
11"PO-Revision-Date: 2014-01-16 22:33+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Bosnian <bs@li.org>\n"
13"Language-Team: Bosnian <bs@li.org>\n"
@@ -16,19 +16,19 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
20−"X-Generator: Launchpad (build 17231)\n"
20+"X-Generator: Launchpad (build 17306)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
23msgid "Password: "
23msgid "Password: "
24msgstr ""
24msgstr ""
25
25
26#: plugins/Unity/Launcher/launcheritem.cpp:45
26#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
28msgid "Pin shortcut"
28msgid "Pin shortcut"
29msgstr ""
29msgstr ""
30
30
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
32msgid "Unpin shortcut"
32msgid "Unpin shortcut"
33msgstr ""
33msgstr ""
34
34
@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
51msgstr[0] ""
51msgstr[0] ""
52msgstr[1] ""
52msgstr[1] ""
53
53
54−#: qml/Components/Dialogs.qml:74
54+#: qml/Components/Dialogs.qml:86
55msgid "Log out"
55msgid "Log out"
56msgstr ""
56msgstr ""
57
57
58−#: qml/Components/Dialogs.qml:75
58+#: qml/Components/Dialogs.qml:87
59msgid "Are you sure you want to log out?"
59msgid "Are you sure you want to log out?"
60msgstr ""
60msgstr ""
61
61
62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63−#: qml/Components/Dialogs.qml:126
63+#: qml/Components/Dialogs.qml:134
64msgid "No"
64msgid "No"
65msgstr ""
65msgstr ""
66
66
67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68−#: qml/Components/Dialogs.qml:133
68+#: qml/Components/Dialogs.qml:140
69msgid "Yes"
69msgid "Yes"
70msgstr ""
70msgstr ""
71
71
72−#: qml/Components/Dialogs.qml:98
72+#: qml/Components/Dialogs.qml:108
73msgid "Shut down"
73msgid "Shut down"
74msgstr ""
74msgstr ""
75
75
76−#: qml/Components/Dialogs.qml:99
76+#: qml/Components/Dialogs.qml:109
77msgid "Are you sure you want to shut down?"
77msgid "Are you sure you want to shut down?"
78msgstr ""
78msgstr ""
79
79
80−#: qml/Components/Dialogs.qml:123
80+#: qml/Components/Dialogs.qml:131
81msgid "Reboot"
81msgid "Reboot"
82msgstr ""
82msgstr ""
83
83
84−#: qml/Components/Dialogs.qml:124
84+#: qml/Components/Dialogs.qml:132
85msgid "Are you sure you want to reboot?"
85msgid "Are you sure you want to reboot?"
86msgstr ""
86msgstr ""
87
87
88−#: qml/Components/Dialogs.qml:148
88+#: qml/Components/Dialogs.qml:154
89msgid "Power"
89msgid "Power"
90msgstr ""
90msgstr ""
91
91
92−#: qml/Components/Dialogs.qml:149
92+#: qml/Components/Dialogs.qml:155
93msgid ""
93msgid ""
94"Are you sure you would like\n"
94"Are you sure you would like\n"
95"to power off?"
95"to power off?"
96msgstr ""
96msgstr ""
97
97
98−#: qml/Components/Dialogs.qml:151
98+#: qml/Components/Dialogs.qml:157
99msgid "Power off"
99msgid "Power off"
100msgstr ""
100msgstr ""
101
101
102−#: qml/Components/Dialogs.qml:161
102+#: qml/Components/Dialogs.qml:166
103msgid "Restart"
103msgid "Restart"
104msgstr ""
104msgstr ""
105
105
106−#: qml/Components/Dialogs.qml:171
106+#: qml/Components/Dialogs.qml:175
107msgid "Cancel"
107msgid "Cancel"
108msgstr ""
108msgstr ""
109
109
@@ -111,82 +111,86 @@ msgstr ""
111msgid "Skip intro"
111msgid "Skip intro"
112msgstr "Preskoči uvod"
112msgstr "Preskoči uvod"
113
113
114−#: qml/Components/EdgeDemo.qml:112
114+#: qml/Components/EdgeDemo.qml:125
115msgid "Right edge"
115msgid "Right edge"
116msgstr "Desna ivica"
116msgstr "Desna ivica"
117
117
118−#: qml/Components/EdgeDemo.qml:113
118+#: qml/Components/EdgeDemo.qml:126
119msgid "Try swiping from the right edge to unlock the phone"
119msgid "Try swiping from the right edge to unlock the phone"
120msgstr ""
120msgstr ""
121
121
122−#: qml/Components/EdgeDemo.qml:144
122+#: qml/Components/EdgeDemo.qml:157
123msgid "Top edge"
123msgid "Top edge"
124msgstr "Gornja ivica"
124msgstr "Gornja ivica"
125
125
126−#: qml/Components/EdgeDemo.qml:145
126+#: qml/Components/EdgeDemo.qml:158
127msgid "Try swiping from the top edge to access the indicators"
127msgid "Try swiping from the top edge to access the indicators"
128msgstr ""
128msgstr ""
129
129
130−#: qml/Components/EdgeDemo.qml:170
130+#: qml/Components/EdgeDemo.qml:183
131msgid "Close"
131msgid "Close"
132msgstr "Zatvori"
132msgstr "Zatvori"
133
133
134−#: qml/Components/EdgeDemo.qml:171
134+#: qml/Components/EdgeDemo.qml:184
135msgid "Swipe up again to close the settings screen"
135msgid "Swipe up again to close the settings screen"
136msgstr ""
136msgstr ""
137
137
138−#: qml/Components/EdgeDemo.qml:201
138+#: qml/Components/EdgeDemo.qml:214
139msgid "Left edge"
139msgid "Left edge"
140msgstr ""
140msgstr ""
141
141
142−#: qml/Components/EdgeDemo.qml:202
142+#: qml/Components/EdgeDemo.qml:215
143msgid "Swipe from the left to reveal the launcher for quick access to apps"
143msgid "Swipe from the left to reveal the launcher for quick access to apps"
144msgstr ""
144msgstr ""
145
145
146−#: qml/Components/EdgeDemo.qml:229
146+#: qml/Components/EdgeDemo.qml:242
147msgid "Well done"
147msgid "Well done"
148msgstr ""
148msgstr ""
149
149
150−#: qml/Components/EdgeDemo.qml:230
150+#: qml/Components/EdgeDemo.qml:243
151msgid ""
151msgid ""
152"You have now mastered the edge gestures and can start using the "
152"You have now mastered the edge gestures and can start using the "
153"phone<br><br>Tap on the screen to start"
153"phone<br><br>Tap on the screen to start"
154msgstr ""
154msgstr ""
155
155
156−#: qml/Components/Lockscreen.qml:223
156+#: qml/Components/Lockscreen.qml:238
157msgid "Return to Call"
157msgid "Return to Call"
158msgstr ""
158msgstr ""
159
159
160−#: qml/Components/Lockscreen.qml:223
160+#: qml/Components/Lockscreen.qml:238
161msgid "Emergency Call"
161msgid "Emergency Call"
162msgstr ""
162msgstr ""
163
163
164−#: qml/Components/Lockscreen.qml:255
164+#: qml/Components/Lockscreen.qml:270
165msgid "OK"
165msgid "OK"
166msgstr ""
166msgstr ""
167
167
168−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
169msgid "See less"
169msgid "See less"
170msgstr ""
170msgstr ""
171
171
172−#: qml/Dash/GenericScopeView.qml:434
172+#: qml/Dash/GenericScopeView.qml:485
173msgid "See all"
173msgid "See all"
174msgstr ""
174msgstr ""
175
175
176−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
177#: qml/Panel/SearchIndicator.qml:27
177#: qml/Panel/SearchIndicator.qml:27
178msgid "Search"
178msgid "Search"
179msgstr ""
179msgstr ""
180
180
181−#: qml/Dash/PageHeader.qml:268
181+#: qml/Dash/PageHeader.qml:267
182+msgid "Store"
183+msgstr ""
184+
185+#: qml/Dash/PageHeader.qml:284
182msgid "Settings"
186msgid "Settings"
183msgstr ""
187msgstr ""
184
188
185−#: qml/Dash/PageHeader.qml:275
189+#: qml/Dash/PageHeader.qml:291
186msgid "Remove from Favorites"
190msgid "Remove from Favorites"
187msgstr ""
191msgstr ""
188
192
189−#: qml/Dash/PageHeader.qml:275
193+#: qml/Dash/PageHeader.qml:291
190msgid "Add to Favorites"
194msgid "Add to Favorites"
191msgstr ""
195msgstr ""
192
196
@@ -218,31 +222,23 @@ msgstr ""
218msgid "Release to refresh…"
222msgid "Release to refresh…"
219msgstr ""
223msgstr ""
220
224
221−#: qml/Dash/ScopesOverview.qml:215
225+#: qml/Dash/ScopesList.qml:66
222−msgid "Manage Scopes"
226+msgid "Manage"
223−msgstr ""
224−
225−#: qml/Dash/ScopesOverview.qml:437
226−msgid "Done"
227−msgstr ""
228−
229−#: qml/Dash/ScopesOverview.qml:463
230−msgid "Store"
231msgstr ""
227msgstr ""
232
228
233−#: qml/Dash/ScopesOverviewTab.qml:36
229+#: qml/Dash/ScopesList.qml:112
234−msgid "Favorites"
230+msgid "Home"
235msgstr ""
231msgstr ""
236
232
237−#: qml/Dash/ScopesOverviewTab.qml:54
233+#: qml/Dash/ScopesList.qml:113
238−msgid "All"
234+msgid "Also installed"
239msgstr ""
235msgstr ""
240
236
241−#: qml/Greeter/Greeter.qml:174
237+#: qml/Greeter/Greeter.qml:133
242msgid "Unlock"
238msgid "Unlock"
243msgstr ""
239msgstr ""
244
240
245−#: qml/Notifications/NotificationMenuItemFactory.qml:116
241+#: qml/Notifications/NotificationMenuItemFactory.qml:128
246msgid "Show password"
242msgid "Show password"
247msgstr ""
243msgstr ""
248
244
@@ -282,6 +278,10 @@ msgstr ""
282msgid "Failed, tap to retry"
278msgid "Failed, tap to retry"
283msgstr ""
279msgstr ""
284
280
281+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
282+msgid "Reply"
283+msgstr ""
284+
285#: qml/Panel/Indicators/ModemInfoItem.qml:105
285#: qml/Panel/Indicators/ModemInfoItem.qml:105
286msgid "Unlock SIM"
286msgid "Unlock SIM"
287msgstr ""
287msgstr ""
@@ -290,56 +290,233 @@ msgstr ""
290msgid "Roaming"
290msgid "Roaming"
291msgstr ""
291msgstr ""
292
292
293−#: qml/Shell.qml:391
293+#: qml/Shell.qml:390
294+#, qt-format
295+msgid "Enter %1"
296+msgstr ""
297+
298+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
294msgid "Enter passphrase"
299msgid "Enter passphrase"
295msgstr ""
300msgstr ""
296
301
297#: qml/Shell.qml:392
302#: qml/Shell.qml:392
298−msgid "Sorry, incorrect passphrase"
303+msgid "Enter passcode"
299msgstr ""
304msgstr ""
300
305
301#: qml/Shell.qml:393
306#: qml/Shell.qml:393
302−msgid "Please re-enter"
307+#, qt-format
308+msgid "Sorry, incorrect %1"
309+msgstr ""
310+
311+#: qml/Shell.qml:394
312+msgid "Sorry, incorrect passphrase"
303msgstr ""
313msgstr ""
304
314
305#: qml/Shell.qml:395
315#: qml/Shell.qml:395
306−msgid "Enter passcode"
316+msgid "Please re-enter"
307msgstr ""
317msgstr ""
308
318
309#: qml/Shell.qml:396
319#: qml/Shell.qml:396
310msgid "Sorry, incorrect passcode"
320msgid "Sorry, incorrect passcode"
311msgstr ""
321msgstr ""
312
322
313−#: qml/Shell.qml:399
323+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
314−#, qt-format
315−msgid "Enter %1"
316−msgstr ""
317−
318−#: qml/Shell.qml:400
319−#, qt-format
320−msgid "Sorry, incorrect %1"
321−msgstr ""
322−
323−#: qml/Shell.qml:441
324msgid "Sorry, incorrect passphrase."
324msgid "Sorry, incorrect passphrase."
325msgstr ""
325msgstr ""
326
326
327−#: qml/Shell.qml:442
327+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
328msgid "Sorry, incorrect passcode."
328msgid "Sorry, incorrect passcode."
329msgstr ""
329msgstr ""
330
330
331−#: qml/Shell.qml:443
331+#: qml/Shell.qml:492
332msgid "This will be your last attempt."
332msgid "This will be your last attempt."
333msgstr ""
333msgstr ""
334
334
335−#: qml/Shell.qml:445
335+#: qml/Shell.qml:494
336msgid ""
336msgid ""
337"If passphrase is entered incorrectly, your phone will conduct a factory "
337"If passphrase is entered incorrectly, your phone will conduct a factory "
338"reset and all personal data will be deleted."
338"reset and all personal data will be deleted."
339msgstr ""
339msgstr ""
340
340
341−#: qml/Shell.qml:446
341+#: qml/Shell.qml:495
342msgid ""
342msgid ""
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"and all personal data will be deleted."
344"and all personal data will be deleted."
345msgstr ""
345msgstr ""
346+
347+#: qml/Wizard/Page.qml:89
348+msgid "Back"
349+msgstr ""
350+
351+#: qml/Wizard/Pages/10-welcome.qml:27
352+msgid "Hi!"
353+msgstr ""
354+
355+#: qml/Wizard/Pages/10-welcome.qml:44
356+msgid "Welcome to your Ubuntu phone."
357+msgstr ""
358+
359+#: qml/Wizard/Pages/10-welcome.qml:52
360+msgid "Let’s get started."
361+msgstr ""
362+
363+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
364+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
365+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
366+#: qml/Wizard/Pages/passwd-set.qml:90
367+msgid "Continue"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/20-sim.qml:25
371+msgid "Add a SIM card and restart your device"
372+msgstr ""
373+
374+#: qml/Wizard/Pages/20-sim.qml:55
375+msgid "Without it, you won’t be able to make calls or use text messaging."
376+msgstr ""
377+
378+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
379+msgid "Skip"
380+msgstr ""
381+
382+#: qml/Wizard/Pages/30-passwd-type.qml:39
383+msgid "Lock security"
384+msgstr ""
385+
386+#: qml/Wizard/Pages/30-passwd-type.qml:74
387+msgid "Please select how you’d like to unlock your phone."
388+msgstr ""
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:97
391+msgid "Swipe"
392+msgstr ""
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:98
395+msgid "No security"
396+msgstr ""
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:100
399+msgid "Passcode"
400+msgstr ""
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:101
403+msgid "4 digits only"
404+msgstr ""
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:103
407+msgid "Passphrase"
408+msgstr ""
409+
410+#: qml/Wizard/Pages/30-passwd-type.qml:104
411+msgid "Numbers and letters"
412+msgstr ""
413+
414+#: qml/Wizard/Pages/40-wifi.qml:28
415+msgid "Connect to Wi‑Fi"
416+msgstr ""
417+
418+#: qml/Wizard/Pages/40-wifi.qml:147
419+msgid "Available networks…"
420+msgstr ""
421+
422+#: qml/Wizard/Pages/40-wifi.qml:148
423+msgid "No available networks."
424+msgstr ""
425+
426+#: qml/Wizard/Pages/50-location.qml:27
427+msgid "Location"
428+msgstr ""
429+
430+#: qml/Wizard/Pages/50-location.qml:62
431+msgid "Let the phone detect your location:"
432+msgstr ""
433+
434+#: qml/Wizard/Pages/50-location.qml:69
435+msgid "Using GPS only (less accurate)"
436+msgstr ""
437+
438+#: qml/Wizard/Pages/50-location.qml:86
439+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
440+msgstr ""
441+
442+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
443+#: qml/Wizard/Pages/50-location.qml:103
444+msgid ""
445+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
446+"conditions</a>."
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:112
450+msgid "Not at all"
451+msgstr ""
452+
453+#: qml/Wizard/Pages/50-location.qml:124
454+msgid "You can change your mind later in <b>System Settings</b>."
455+msgstr ""
456+
457+#: qml/Wizard/Pages/60-reporting.qml:24
458+msgid "Improving your experience"
459+msgstr ""
460+
461+#: qml/Wizard/Pages/60-reporting.qml:36
462+msgid ""
463+"Your phone is set up to automatically report errors to Canonical and its "
464+"partners, the makers of the operating system."
465+msgstr ""
466+
467+#: qml/Wizard/Pages/60-reporting.qml:43
468+msgid ""
469+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
470+"Privacy</b>"
471+msgstr ""
472+
473+#: qml/Wizard/Pages/80-finished.qml:24
474+msgid "All done"
475+msgstr ""
476+
477+#: qml/Wizard/Pages/80-finished.qml:39
478+msgid "Nice work!"
479+msgstr ""
480+
481+#: qml/Wizard/Pages/80-finished.qml:46
482+msgid "Your phone is now ready to use."
483+msgstr ""
484+
485+#: qml/Wizard/Pages/80-finished.qml:53
486+msgid "Finish"
487+msgstr ""
488+
489+#: qml/Wizard/Pages/here-terms.qml:27
490+msgid "Terms & Conditions"
491+msgstr ""
492+
493+#: qml/Wizard/Pages/passwd-confirm.qml:49
494+msgid "Confirm passphrase"
495+msgstr ""
496+
497+#: qml/Wizard/Pages/passwd-confirm.qml:50
498+msgid "Confirm passcode"
499+msgstr ""
500+
501+#: qml/Wizard/Pages/passwd-confirm.qml:53
502+#: qml/Wizard/Pages/passwd-confirm.qml:54
503+msgid "Please try again."
504+msgstr ""
505+
506+#: qml/Wizard/Pages/passwd-set.qml:61
507+msgid "Choose your passcode"
508+msgstr ""
509+
510+#: qml/Wizard/Pages/passwd-set.qml:68
511+msgid "Passphrase must be 4 characters long"
512+msgstr ""
513+
514+#: qml/Wizard/StackButton.qml:39
515+#, qt-format
516+msgid "〈 %1"
517+msgstr ""
518+
519+#: qml/Wizard/StackButton.qml:42
520+#, qt-format
521+msgid "%1 〉"
522+msgstr ""
po/ca.po+278−80
@@ -7,27 +7,27 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-11-10 09:22+0000\n"
11+"PO-Revision-Date: 2015-01-28 08:52+0000\n"
12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
13"Language-Team: Catalan <ca@li.org>\n"
13"Language-Team: Catalan <ca@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-11 07:11+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-29 06:00+0000\n"
19−"X-Generator: Launchpad (build 17241)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Contrasenya: "
23msgstr "Contrasenya: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Enganxa la drecera"
28msgstr "Enganxa la drecera"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Desenganxa la drecera"
32msgstr "Desenganxa la drecera"
33
33
@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
54msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."
54msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."
55msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."
55msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."
56
56
57−#: qml/Components/Dialogs.qml:74
57+#: qml/Components/Dialogs.qml:86
58msgid "Log out"
58msgid "Log out"
59msgstr "Surt"
59msgstr "Surt"
60
60
61−#: qml/Components/Dialogs.qml:75
61+#: qml/Components/Dialogs.qml:87
62msgid "Are you sure you want to log out?"
62msgid "Are you sure you want to log out?"
63msgstr "Segur que voleu sortir?"
63msgstr "Segur que voleu sortir?"
64
64
65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
65+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66−#: qml/Components/Dialogs.qml:126
66+#: qml/Components/Dialogs.qml:134
67msgid "No"
67msgid "No"
68msgstr "No"
68msgstr "No"
69
69
70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
70+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71−#: qml/Components/Dialogs.qml:133
71+#: qml/Components/Dialogs.qml:140
72msgid "Yes"
72msgid "Yes"
73msgstr "Sí"
73msgstr "Sí"
74
74
75−#: qml/Components/Dialogs.qml:98
75+#: qml/Components/Dialogs.qml:108
76msgid "Shut down"
76msgid "Shut down"
77msgstr "Apaga"
77msgstr "Apaga"
78
78
79−#: qml/Components/Dialogs.qml:99
79+#: qml/Components/Dialogs.qml:109
80msgid "Are you sure you want to shut down?"
80msgid "Are you sure you want to shut down?"
81msgstr "Segur que voleu apagar?"
81msgstr "Segur que voleu apagar?"
82
82
83−#: qml/Components/Dialogs.qml:123
83+#: qml/Components/Dialogs.qml:131
84msgid "Reboot"
84msgid "Reboot"
85msgstr "Reinicia"
85msgstr "Reinicia"
86
86
87−#: qml/Components/Dialogs.qml:124
87+#: qml/Components/Dialogs.qml:132
88msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
89msgstr "Segur que voleu reiniciar?"
89msgstr "Segur que voleu reiniciar?"
90
90
91−#: qml/Components/Dialogs.qml:148
91+#: qml/Components/Dialogs.qml:154
92msgid "Power"
92msgid "Power"
93msgstr "Energia"
93msgstr "Energia"
94
94
95−#: qml/Components/Dialogs.qml:149
95+#: qml/Components/Dialogs.qml:155
96msgid ""
96msgid ""
97"Are you sure you would like\n"
97"Are you sure you would like\n"
98"to power off?"
98"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100"Segur que voleu\n"
100"Segur que voleu\n"
101"apagar?"
101"apagar?"
102
102
103−#: qml/Components/Dialogs.qml:151
103+#: qml/Components/Dialogs.qml:157
104msgid "Power off"
104msgid "Power off"
105msgstr "Apaga"
105msgstr "Apaga"
106
106
107−#: qml/Components/Dialogs.qml:161
107+#: qml/Components/Dialogs.qml:166
108msgid "Restart"
108msgid "Restart"
109msgstr "Reinicia"
109msgstr "Reinicia"
110
110
111−#: qml/Components/Dialogs.qml:171
111+#: qml/Components/Dialogs.qml:175
112msgid "Cancel"
112msgid "Cancel"
113msgstr "Cancel·la"
113msgstr "Cancel·la"
114
114
@@ -116,49 +116,49 @@ msgstr "Cancel·la"
116msgid "Skip intro"
116msgid "Skip intro"
117msgstr "Omet la introducció"
117msgstr "Omet la introducció"
118
118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120msgid "Right edge"
120msgid "Right edge"
121msgstr "Vora dreta"
121msgstr "Vora dreta"
122
122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124msgid "Try swiping from the right edge to unlock the phone"
124msgid "Try swiping from the right edge to unlock the phone"
125msgstr ""
125msgstr ""
126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
127
127
128−#: qml/Components/EdgeDemo.qml:144
128+#: qml/Components/EdgeDemo.qml:157
129msgid "Top edge"
129msgid "Top edge"
130msgstr "Vora superior"
130msgstr "Vora superior"
131
131
132−#: qml/Components/EdgeDemo.qml:145
132+#: qml/Components/EdgeDemo.qml:158
133msgid "Try swiping from the top edge to access the indicators"
133msgid "Try swiping from the top edge to access the indicators"
134msgstr ""
134msgstr ""
135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
136
136
137−#: qml/Components/EdgeDemo.qml:170
137+#: qml/Components/EdgeDemo.qml:183
138msgid "Close"
138msgid "Close"
139msgstr "Tanca"
139msgstr "Tanca"
140
140
141−#: qml/Components/EdgeDemo.qml:171
141+#: qml/Components/EdgeDemo.qml:184
142msgid "Swipe up again to close the settings screen"
142msgid "Swipe up again to close the settings screen"
143msgstr ""
143msgstr ""
144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
145"configuració"
145"configuració"
146
146
147−#: qml/Components/EdgeDemo.qml:201
147+#: qml/Components/EdgeDemo.qml:214
148msgid "Left edge"
148msgid "Left edge"
149msgstr "Vora esquerra"
149msgstr "Vora esquerra"
150
150
151−#: qml/Components/EdgeDemo.qml:202
151+#: qml/Components/EdgeDemo.qml:215
152msgid "Swipe from the left to reveal the launcher for quick access to apps"
152msgid "Swipe from the left to reveal the launcher for quick access to apps"
153msgstr ""
153msgstr ""
154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
155"ràpidament a les aplicacions"
155"ràpidament a les aplicacions"
156
156
157−#: qml/Components/EdgeDemo.qml:229
157+#: qml/Components/EdgeDemo.qml:242
158msgid "Well done"
158msgid "Well done"
159msgstr "Enhorabona!"
159msgstr "Enhorabona!"
160
160
161−#: qml/Components/EdgeDemo.qml:230
161+#: qml/Components/EdgeDemo.qml:243
162msgid ""
162msgid ""
163"You have now mastered the edge gestures and can start using the "
163"You have now mastered the edge gestures and can start using the "
164"phone<br><br>Tap on the screen to start"
164"phone<br><br>Tap on the screen to start"
@@ -166,40 +166,44 @@ msgstr ""
166"Ja heu après com utilitzar els gestos de les vores per fer servir el "
166"Ja heu après com utilitzar els gestos de les vores per fer servir el "
167"telèfon<br><br>Feu un toc a la pantalla per començar"
167"telèfon<br><br>Feu un toc a la pantalla per començar"
168
168
169−#: qml/Components/Lockscreen.qml:223
169+#: qml/Components/Lockscreen.qml:238
170msgid "Return to Call"
170msgid "Return to Call"
171msgstr "Torna a la trucada"
171msgstr "Torna a la trucada"
172
172
173−#: qml/Components/Lockscreen.qml:223
173+#: qml/Components/Lockscreen.qml:238
174msgid "Emergency Call"
174msgid "Emergency Call"
175msgstr "Trucada d'emergència"
175msgstr "Trucada d'emergència"
176
176
177−#: qml/Components/Lockscreen.qml:255
177+#: qml/Components/Lockscreen.qml:270
178msgid "OK"
178msgid "OK"
179msgstr "D'acord"
179msgstr "D'acord"
180
180
181−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
181+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
182msgid "See less"
182msgid "See less"
183msgstr "Mostra'n menys"
183msgstr "Mostra'n menys"
184
184
185−#: qml/Dash/GenericScopeView.qml:434
185+#: qml/Dash/GenericScopeView.qml:485
186msgid "See all"
186msgid "See all"
187msgstr "Mostra-ho tot"
187msgstr "Mostra-ho tot"
188
188
189−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
189+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
190#: qml/Panel/SearchIndicator.qml:27
190#: qml/Panel/SearchIndicator.qml:27
191msgid "Search"
191msgid "Search"
192msgstr "Cerca"
192msgstr "Cerca"
193
193
194−#: qml/Dash/PageHeader.qml:268
194+#: qml/Dash/PageHeader.qml:267
195+msgid "Store"
196+msgstr "Botiga"
197+
198+#: qml/Dash/PageHeader.qml:284
195msgid "Settings"
199msgid "Settings"
196msgstr "Paràmetres"
200msgstr "Paràmetres"
197
201
198−#: qml/Dash/PageHeader.qml:275
202+#: qml/Dash/PageHeader.qml:291
199msgid "Remove from Favorites"
203msgid "Remove from Favorites"
200msgstr "Suprimeix dels preferits"
204msgstr "Suprimeix dels preferits"
201
205
202−#: qml/Dash/PageHeader.qml:275
206+#: qml/Dash/PageHeader.qml:291
203msgid "Add to Favorites"
207msgid "Add to Favorites"
204msgstr "Afegeix als preferits"
208msgstr "Afegeix als preferits"
205
209
@@ -231,31 +235,23 @@ msgstr "Estireu per actualitzar..."
231msgid "Release to refresh…"
235msgid "Release to refresh…"
232msgstr "Deixeu anar per actualitzar..."
236msgstr "Deixeu anar per actualitzar..."
233
237
234−#: qml/Dash/ScopesOverview.qml:215
238+#: qml/Dash/ScopesList.qml:66
235−msgid "Manage Scopes"
239+msgid "Manage"
236−msgstr "Gestioneu les lents"
240+msgstr "Gestiona"
237−
238−#: qml/Dash/ScopesOverview.qml:437
239−msgid "Done"
240−msgstr "Fet"
241−
242−#: qml/Dash/ScopesOverview.qml:463
243−msgid "Store"
244−msgstr "Botiga"
245
241
246−#: qml/Dash/ScopesOverviewTab.qml:36
242+#: qml/Dash/ScopesList.qml:112
247−msgid "Favorites"
243+msgid "Home"
248−msgstr "Preferides"
244+msgstr "Inici"
249
245
250−#: qml/Dash/ScopesOverviewTab.qml:54
246+#: qml/Dash/ScopesList.qml:113
251−msgid "All"
247+msgid "Also installed"
252−msgstr "Totes"
248+msgstr "També instal·lat"
253
249
254−#: qml/Greeter/Greeter.qml:174
250+#: qml/Greeter/Greeter.qml:133
255msgid "Unlock"
251msgid "Unlock"
256msgstr "Desbloca"
252msgstr "Desbloca"
257
253
258−#: qml/Notifications/NotificationMenuItemFactory.qml:116
254+#: qml/Notifications/NotificationMenuItemFactory.qml:128
259msgid "Show password"
255msgid "Show password"
260msgstr "Mostra la contrasenya"
256msgstr "Mostra la contrasenya"
261
257
@@ -295,6 +291,10 @@ msgstr "S'ha finalitzat"
295msgid "Failed, tap to retry"
291msgid "Failed, tap to retry"
296msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
292msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
297
293
294+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
295+msgid "Reply"
296+msgstr "Respon"
297+
298#: qml/Panel/Indicators/ModemInfoItem.qml:105
298#: qml/Panel/Indicators/ModemInfoItem.qml:105
299msgid "Unlock SIM"
299msgid "Unlock SIM"
300msgstr "Desbloca la SIM"
300msgstr "Desbloca la SIM"
@@ -303,49 +303,49 @@ msgstr "Desbloca la SIM"
303msgid "Roaming"
303msgid "Roaming"
304msgstr "Itinerància"
304msgstr "Itinerància"
305
305
306−#: qml/Shell.qml:391
306+#: qml/Shell.qml:390
307+#, qt-format
308+msgid "Enter %1"
309+msgstr "Introduïu: %1"
310+
311+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
307msgid "Enter passphrase"
312msgid "Enter passphrase"
308msgstr "Introduïu la contrasenya"
313msgstr "Introduïu la contrasenya"
309
314
310#: qml/Shell.qml:392
315#: qml/Shell.qml:392
316+msgid "Enter passcode"
317+msgstr "Introduïu el codi d'accés"
318+
319+#: qml/Shell.qml:393
320+#, qt-format
321+msgid "Sorry, incorrect %1"
322+msgstr "Incorrecte (%1)"
323+
324+#: qml/Shell.qml:394
311msgid "Sorry, incorrect passphrase"
325msgid "Sorry, incorrect passphrase"
312msgstr "La contrasenya no és correcta"
326msgstr "La contrasenya no és correcta"
313
327
314−#: qml/Shell.qml:393
328+#: qml/Shell.qml:395
315msgid "Please re-enter"
329msgid "Please re-enter"
316msgstr "Torneu-ho a introduir"
330msgstr "Torneu-ho a introduir"
317
331
318−#: qml/Shell.qml:395
319−msgid "Enter passcode"
320−msgstr "Introduïu el codi d'accés"
321−
322#: qml/Shell.qml:396
332#: qml/Shell.qml:396
323msgid "Sorry, incorrect passcode"
333msgid "Sorry, incorrect passcode"
324msgstr "El codi d'accés no és correcte"
334msgstr "El codi d'accés no és correcte"
325
335
326−#: qml/Shell.qml:399
336+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
327−#, qt-format
328−msgid "Enter %1"
329−msgstr "Introduïu: %1"
330−
331−#: qml/Shell.qml:400
332−#, qt-format
333−msgid "Sorry, incorrect %1"
334−msgstr "Incorrecte (%1)"
335−
336−#: qml/Shell.qml:441
337msgid "Sorry, incorrect passphrase."
337msgid "Sorry, incorrect passphrase."
338msgstr "La contrasenya és incorrecta"
338msgstr "La contrasenya és incorrecta"
339
339
340−#: qml/Shell.qml:442
340+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
341msgid "Sorry, incorrect passcode."
341msgid "Sorry, incorrect passcode."
342msgstr "El codi d'accés no és correcte"
342msgstr "El codi d'accés no és correcte"
343
343
344−#: qml/Shell.qml:443
344+#: qml/Shell.qml:492
345msgid "This will be your last attempt."
345msgid "This will be your last attempt."
346msgstr "Aquest serà el darrer intent."
346msgstr "Aquest serà el darrer intent."
347
347
348−#: qml/Shell.qml:445
348+#: qml/Shell.qml:494
349msgid ""
349msgid ""
350"If passphrase is entered incorrectly, your phone will conduct a factory "
350"If passphrase is entered incorrectly, your phone will conduct a factory "
351"reset and all personal data will be deleted."
351"reset and all personal data will be deleted."
@@ -354,7 +354,7 @@ msgstr ""
354"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
354"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
355"personals."
355"personals."
356
356
357−#: qml/Shell.qml:446
357+#: qml/Shell.qml:495
358msgid ""
358msgid ""
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
360"and all personal data will be deleted."
360"and all personal data will be deleted."
@@ -363,6 +363,192 @@ msgstr ""
363"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
363"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
364"personals."
364"personals."
365
365
366+#: qml/Wizard/Page.qml:89
367+msgid "Back"
368+msgstr "Enrere"
369+
370+#: qml/Wizard/Pages/10-welcome.qml:27
371+msgid "Hi!"
372+msgstr "Hola!"
373+
374+#: qml/Wizard/Pages/10-welcome.qml:44
375+msgid "Welcome to your Ubuntu phone."
376+msgstr "Us donem la benvinguda al vostre telèfon Ubuntu."
377+
378+#: qml/Wizard/Pages/10-welcome.qml:52
379+msgid "Let’s get started."
380+msgstr "Comencem."
381+
382+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
383+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
384+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
385+#: qml/Wizard/Pages/passwd-set.qml:90
386+msgid "Continue"
387+msgstr "Continua"
388+
389+#: qml/Wizard/Pages/20-sim.qml:25
390+msgid "Add a SIM card and restart your device"
391+msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
392+
393+#: qml/Wizard/Pages/20-sim.qml:55
394+msgid "Without it, you won’t be able to make calls or use text messaging."
395+msgstr "Sense ella, no podreu fer trucades o enviar missatges de text."
396+
397+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
398+msgid "Skip"
399+msgstr "Omet"
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:39
402+msgid "Lock security"
403+msgstr "Seguretat del bloqueig"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:74
406+msgid "Please select how you’d like to unlock your phone."
407+msgstr "Seleccioneu com voleu desblocar el telèfon."
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:97
410+msgid "Swipe"
411+msgstr "Lliscament amb el dit"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:98
414+msgid "No security"
415+msgstr "Sense seguretat"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:100
418+msgid "Passcode"
419+msgstr "Codi d'accés"
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:101
422+msgid "4 digits only"
423+msgstr "Només 4 dígits"
424+
425+#: qml/Wizard/Pages/30-passwd-type.qml:103
426+msgid "Passphrase"
427+msgstr "Contrasenya"
428+
429+#: qml/Wizard/Pages/30-passwd-type.qml:104
430+msgid "Numbers and letters"
431+msgstr "Números i lletres"
432+
433+#: qml/Wizard/Pages/40-wifi.qml:28
434+msgid "Connect to Wi‑Fi"
435+msgstr "Connecta't a la Wi-Fi"
436+
437+#: qml/Wizard/Pages/40-wifi.qml:147
438+msgid "Available networks…"
439+msgstr "Xarxes disponibles..."
440+
441+#: qml/Wizard/Pages/40-wifi.qml:148
442+msgid "No available networks."
443+msgstr "No hi ha xarxes disponibles"
444+
445+#: qml/Wizard/Pages/50-location.qml:27
446+msgid "Location"
447+msgstr "Ubicació"
448+
449+#: qml/Wizard/Pages/50-location.qml:62
450+msgid "Let the phone detect your location:"
451+msgstr "Fes que el telèfon detecti la meva ubicació:"
452+
453+#: qml/Wizard/Pages/50-location.qml:69
454+msgid "Using GPS only (less accurate)"
455+msgstr "Utilitza només el GPS (menys precís)"
456+
457+#: qml/Wizard/Pages/50-location.qml:86
458+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
459+msgstr ""
460+"Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "
461+"(recomanat)"
462+
463+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
464+#: qml/Wizard/Pages/50-location.qml:103
465+msgid ""
466+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
467+"conditions</a>."
468+msgstr ""
469+"Si seleccioneu aquesta opció, accepteu <a href='#'>les condicions generals "
470+"del servei Nokia HERE</a>."
471+
472+#: qml/Wizard/Pages/50-location.qml:112
473+msgid "Not at all"
474+msgstr "No"
475+
476+#: qml/Wizard/Pages/50-location.qml:124
477+msgid "You can change your mind later in <b>System Settings</b>."
478+msgstr ""
479+"Podeu canviar-ho més endavant a l'aplicació <b>Paràmetres del sistema</b>"
480+
481+#: qml/Wizard/Pages/60-reporting.qml:24
482+msgid "Improving your experience"
483+msgstr "Millora de l'experiència"
484+
485+#: qml/Wizard/Pages/60-reporting.qml:36
486+msgid ""
487+"Your phone is set up to automatically report errors to Canonical and its "
488+"partners, the makers of the operating system."
489+msgstr ""
490+"Aquest telèfon està configurat per enviar errors de manera automàtica a "
491+"Canonical i associats, els creadors del sistema operatiu."
492+
493+#: qml/Wizard/Pages/60-reporting.qml:43
494+msgid ""
495+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
496+"Privacy</b>"
497+msgstr ""
498+"Podeu inhabilitar-ho a <b>Configuració del sistema</b>, a la secció "
499+"<b>Seguretat i privadesa</b>"
500+
501+#: qml/Wizard/Pages/80-finished.qml:24
502+msgid "All done"
503+msgstr "Tot fet"
504+
505+#: qml/Wizard/Pages/80-finished.qml:39
506+msgid "Nice work!"
507+msgstr "Bona feina!"
508+
509+#: qml/Wizard/Pages/80-finished.qml:46
510+msgid "Your phone is now ready to use."
511+msgstr "Ja podeu utilitzar el vostre telèfon."
512+
513+#: qml/Wizard/Pages/80-finished.qml:53
514+msgid "Finish"
515+msgstr "Finalitza"
516+
517+#: qml/Wizard/Pages/here-terms.qml:27
518+msgid "Terms & Conditions"
519+msgstr "Condicions generals"
520+
521+#: qml/Wizard/Pages/passwd-confirm.qml:49
522+msgid "Confirm passphrase"
523+msgstr "Confirmeu la contrasenya"
524+
525+#: qml/Wizard/Pages/passwd-confirm.qml:50
526+msgid "Confirm passcode"
527+msgstr "Confirmeu el codi d'accés"
528+
529+#: qml/Wizard/Pages/passwd-confirm.qml:53
530+#: qml/Wizard/Pages/passwd-confirm.qml:54
531+msgid "Please try again."
532+msgstr "Torneu-ho a intentar."
533+
534+#: qml/Wizard/Pages/passwd-set.qml:61
535+msgid "Choose your passcode"
536+msgstr "Trieu el codi d'accés"
537+
538+#: qml/Wizard/Pages/passwd-set.qml:68
539+msgid "Passphrase must be 4 characters long"
540+msgstr "La contrasenya ha de tenir 4 caràcters com a mínim"
541+
542+#: qml/Wizard/StackButton.qml:39
543+#, qt-format
544+msgid "〈 %1"
545+msgstr "〈 %1"
546+
547+#: qml/Wizard/StackButton.qml:42
548+#, qt-format
549+msgid "%1 〉"
550+msgstr "%1 〉"
551+
366#~ msgid "Confirm"
552#~ msgid "Confirm"
367#~ msgstr "Confirma"
553#~ msgstr "Confirma"
368
554
@@ -377,3 +563,15 @@ msgstr ""
377
563
378#~ msgid "Speaking..."
564#~ msgid "Speaking..."
379#~ msgstr "S'està parlant..."
565#~ msgstr "S'està parlant..."
566+
567+#~ msgid "Done"
568+#~ msgstr "Fet"
569+
570+#~ msgid "Favorites"
571+#~ msgstr "Preferides"
572+
573+#~ msgid "All"
574+#~ msgstr "Totes"
575+
576+#~ msgid "Manage Scopes"
577+#~ msgstr "Gestioneu les lents"
po/ca@valencia.po+277−88
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2014-11-23 07:17+0000\n"
11"PO-Revision-Date: 2014-11-23 07:17+0000\n"
12"Last-Translator: Pau Iranzo <Unknown>\n"
12"Last-Translator: Pau Iranzo <Unknown>\n"
13"Language-Team: Catalan <ca@li.org>\n"
13"Language-Team: Catalan <ca@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-24 06:20+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:31+0000\n"
19−"X-Generator: Launchpad (build 17252)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Contrasenya: "
23msgstr "Contrasenya: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Apega la drecera"
28msgstr "Apega la drecera"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Desenganxa la drecera"
32msgstr "Desenganxa la drecera"
33
33
@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
54msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."
54msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."
55msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."
55msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."
56
56
57−#: qml/Components/Dialogs.qml:74
57+#: qml/Components/Dialogs.qml:86
58msgid "Log out"
58msgid "Log out"
59msgstr "Ix"
59msgstr "Ix"
60
60
61−#: qml/Components/Dialogs.qml:75
61+#: qml/Components/Dialogs.qml:87
62msgid "Are you sure you want to log out?"
62msgid "Are you sure you want to log out?"
63msgstr "Segur que voleu eixir?"
63msgstr "Segur que voleu eixir?"
64
64
65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
65+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66−#: qml/Components/Dialogs.qml:126
66+#: qml/Components/Dialogs.qml:134
67msgid "No"
67msgid "No"
68msgstr "No"
68msgstr "No"
69
69
70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
70+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71−#: qml/Components/Dialogs.qml:133
71+#: qml/Components/Dialogs.qml:140
72msgid "Yes"
72msgid "Yes"
73msgstr "Sí"
73msgstr "Sí"
74
74
75−#: qml/Components/Dialogs.qml:98
75+#: qml/Components/Dialogs.qml:108
76msgid "Shut down"
76msgid "Shut down"
77msgstr "Apaga"
77msgstr "Apaga"
78
78
79−#: qml/Components/Dialogs.qml:99
79+#: qml/Components/Dialogs.qml:109
80msgid "Are you sure you want to shut down?"
80msgid "Are you sure you want to shut down?"
81msgstr "Segur que voleu apagar?"
81msgstr "Segur que voleu apagar?"
82
82
83−#: qml/Components/Dialogs.qml:123
83+#: qml/Components/Dialogs.qml:131
84msgid "Reboot"
84msgid "Reboot"
85msgstr "Reinicia"
85msgstr "Reinicia"
86
86
87−#: qml/Components/Dialogs.qml:124
87+#: qml/Components/Dialogs.qml:132
88msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
89msgstr "Segur que voleu reiniciar?"
89msgstr "Segur que voleu reiniciar?"
90
90
91−#: qml/Components/Dialogs.qml:148
91+#: qml/Components/Dialogs.qml:154
92msgid "Power"
92msgid "Power"
93msgstr "Energia"
93msgstr "Energia"
94
94
95−#: qml/Components/Dialogs.qml:149
95+#: qml/Components/Dialogs.qml:155
96msgid ""
96msgid ""
97"Are you sure you would like\n"
97"Are you sure you would like\n"
98"to power off?"
98"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100"Segur que voleu\n"
100"Segur que voleu\n"
101"apagar?"
101"apagar?"
102
102
103−#: qml/Components/Dialogs.qml:151
103+#: qml/Components/Dialogs.qml:157
104msgid "Power off"
104msgid "Power off"
105msgstr "Apaga"
105msgstr "Apaga"
106
106
107−#: qml/Components/Dialogs.qml:161
107+#: qml/Components/Dialogs.qml:166
108msgid "Restart"
108msgid "Restart"
109msgstr "Reinicia"
109msgstr "Reinicia"
110
110
111−#: qml/Components/Dialogs.qml:171
111+#: qml/Components/Dialogs.qml:175
112msgid "Cancel"
112msgid "Cancel"
113msgstr "Cancel·la"
113msgstr "Cancel·la"
114
114
@@ -116,49 +116,49 @@ msgstr "Cancel·la"
116msgid "Skip intro"
116msgid "Skip intro"
117msgstr "Omet la introducció"
117msgstr "Omet la introducció"
118
118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120msgid "Right edge"
120msgid "Right edge"
121msgstr "Vora dreta"
121msgstr "Vora dreta"
122
122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124msgid "Try swiping from the right edge to unlock the phone"
124msgid "Try swiping from the right edge to unlock the phone"
125msgstr ""
125msgstr ""
126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
127
127
128−#: qml/Components/EdgeDemo.qml:144
128+#: qml/Components/EdgeDemo.qml:157
129msgid "Top edge"
129msgid "Top edge"
130msgstr "Vora superior"
130msgstr "Vora superior"
131
131
132−#: qml/Components/EdgeDemo.qml:145
132+#: qml/Components/EdgeDemo.qml:158
133msgid "Try swiping from the top edge to access the indicators"
133msgid "Try swiping from the top edge to access the indicators"
134msgstr ""
134msgstr ""
135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
136
136
137−#: qml/Components/EdgeDemo.qml:170
137+#: qml/Components/EdgeDemo.qml:183
138msgid "Close"
138msgid "Close"
139msgstr "Tanca"
139msgstr "Tanca"
140
140
141−#: qml/Components/EdgeDemo.qml:171
141+#: qml/Components/EdgeDemo.qml:184
142msgid "Swipe up again to close the settings screen"
142msgid "Swipe up again to close the settings screen"
143msgstr ""
143msgstr ""
144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
145"configuració"
145"configuració"
146
146
147−#: qml/Components/EdgeDemo.qml:201
147+#: qml/Components/EdgeDemo.qml:214
148msgid "Left edge"
148msgid "Left edge"
149msgstr "Vora esquerra"
149msgstr "Vora esquerra"
150
150
151−#: qml/Components/EdgeDemo.qml:202
151+#: qml/Components/EdgeDemo.qml:215
152msgid "Swipe from the left to reveal the launcher for quick access to apps"
152msgid "Swipe from the left to reveal the launcher for quick access to apps"
153msgstr ""
153msgstr ""
154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
155"ràpidament a les aplicacions"
155"ràpidament a les aplicacions"
156
156
157−#: qml/Components/EdgeDemo.qml:229
157+#: qml/Components/EdgeDemo.qml:242
158msgid "Well done"
158msgid "Well done"
159msgstr "Enhorabona!"
159msgstr "Enhorabona!"
160
160
161−#: qml/Components/EdgeDemo.qml:230
161+#: qml/Components/EdgeDemo.qml:243
162msgid ""
162msgid ""
163"You have now mastered the edge gestures and can start using the "
163"You have now mastered the edge gestures and can start using the "
164"phone<br><br>Tap on the screen to start"
164"phone<br><br>Tap on the screen to start"
@@ -166,40 +166,44 @@ msgstr ""
166"Ja heu aprés com utilitzar els gestos de les vores per fer servir el "
166"Ja heu aprés com utilitzar els gestos de les vores per fer servir el "
167"telèfon<br><br>Feu un toc a la pantalla per començar"
167"telèfon<br><br>Feu un toc a la pantalla per començar"
168
168
169−#: qml/Components/Lockscreen.qml:223
169+#: qml/Components/Lockscreen.qml:238
170msgid "Return to Call"
170msgid "Return to Call"
171msgstr "Torna a la trucada"
171msgstr "Torna a la trucada"
172
172
173−#: qml/Components/Lockscreen.qml:223
173+#: qml/Components/Lockscreen.qml:238
174msgid "Emergency Call"
174msgid "Emergency Call"
175msgstr "Cridada d'emergència"
175msgstr "Cridada d'emergència"
176
176
177−#: qml/Components/Lockscreen.qml:255
177+#: qml/Components/Lockscreen.qml:270
178msgid "OK"
178msgid "OK"
179msgstr "D'acord"
179msgstr "D'acord"
180
180
181−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
181+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
182msgid "See less"
182msgid "See less"
183msgstr "Mostra'n menys"
183msgstr "Mostra'n menys"
184
184
185−#: qml/Dash/GenericScopeView.qml:434
185+#: qml/Dash/GenericScopeView.qml:485
186msgid "See all"
186msgid "See all"
187msgstr "Mostra-ho tot"
187msgstr "Mostra-ho tot"
188
188
189−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
189+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
190#: qml/Panel/SearchIndicator.qml:27
190#: qml/Panel/SearchIndicator.qml:27
191msgid "Search"
191msgid "Search"
192msgstr "Cerca"
192msgstr "Cerca"
193
193
194−#: qml/Dash/PageHeader.qml:268
194+#: qml/Dash/PageHeader.qml:267
195+msgid "Store"
196+msgstr "Botiga"
197+
198+#: qml/Dash/PageHeader.qml:284
195msgid "Settings"
199msgid "Settings"
196msgstr "Paràmetres"
200msgstr "Paràmetres"
197
201
198−#: qml/Dash/PageHeader.qml:275
202+#: qml/Dash/PageHeader.qml:291
199msgid "Remove from Favorites"
203msgid "Remove from Favorites"
200msgstr "Suprimeix dels preferits"
204msgstr "Suprimeix dels preferits"
201
205
202−#: qml/Dash/PageHeader.qml:275
206+#: qml/Dash/PageHeader.qml:291
203msgid "Add to Favorites"
207msgid "Add to Favorites"
204msgstr "Afig als preferits"
208msgstr "Afig als preferits"
205
209
@@ -231,31 +235,23 @@ msgstr "Estireu per actualitzar..."
231msgid "Release to refresh…"
235msgid "Release to refresh…"
232msgstr "Deixeu anar per actualitzar..."
236msgstr "Deixeu anar per actualitzar..."
233
237
234−#: qml/Dash/ScopesOverview.qml:215
238+#: qml/Dash/ScopesList.qml:66
235−msgid "Manage Scopes"
239+msgid "Manage"
236−msgstr "Gestioneu les lents"
240+msgstr ""
237−
238−#: qml/Dash/ScopesOverview.qml:437
239−msgid "Done"
240−msgstr "Fet"
241−
242−#: qml/Dash/ScopesOverview.qml:463
243−msgid "Store"
244−msgstr "Botiga"
245
241
246−#: qml/Dash/ScopesOverviewTab.qml:36
242+#: qml/Dash/ScopesList.qml:112
247−msgid "Favorites"
243+msgid "Home"
248−msgstr "Preferides"
244+msgstr ""
249
245
250−#: qml/Dash/ScopesOverviewTab.qml:54
246+#: qml/Dash/ScopesList.qml:113
251−msgid "All"
247+msgid "Also installed"
252−msgstr "Totes"
248+msgstr ""
253
249
254−#: qml/Greeter/Greeter.qml:174
250+#: qml/Greeter/Greeter.qml:133
255msgid "Unlock"
251msgid "Unlock"
256msgstr "Desbloca"
252msgstr "Desbloca"
257
253
258−#: qml/Notifications/NotificationMenuItemFactory.qml:116
254+#: qml/Notifications/NotificationMenuItemFactory.qml:128
259msgid "Show password"
255msgid "Show password"
260msgstr "Mostra la contrasenya"
256msgstr "Mostra la contrasenya"
261
257
@@ -267,34 +263,38 @@ msgstr "Feu un toc per tornar a la cridada..."
267msgid "Conference"
263msgid "Conference"
268msgstr "Conferència"
264msgstr "Conferència"
269
265
270−#: qml/Panel/Indicators/MenuItemFactory.qml:615
266+#: qml/Panel/Indicators/MenuItemFactory.qml:643
271msgid "Nothing is playing"
267msgid "Nothing is playing"
272msgstr "No s'està reproduint res"
268msgstr "No s'està reproduint res"
273
269
274−#: qml/Panel/Indicators/MenuItemFactory.qml:763
270+#: qml/Panel/Indicators/MenuItemFactory.qml:791
275msgid "In queue…"
271msgid "In queue…"
276msgstr "A la cua..."
272msgstr "A la cua..."
277
273
278−#: qml/Panel/Indicators/MenuItemFactory.qml:767
274+#: qml/Panel/Indicators/MenuItemFactory.qml:795
279msgid "Downloading"
275msgid "Downloading"
280msgstr "S'està baixant"
276msgstr "S'està baixant"
281
277
282−#: qml/Panel/Indicators/MenuItemFactory.qml:769
278+#: qml/Panel/Indicators/MenuItemFactory.qml:797
283msgid "Paused, tap to resume"
279msgid "Paused, tap to resume"
284msgstr "En pausa, feu un toc per continuar"
280msgstr "En pausa, feu un toc per continuar"
285
281
286−#: qml/Panel/Indicators/MenuItemFactory.qml:771
282+#: qml/Panel/Indicators/MenuItemFactory.qml:799
287msgid "Canceled"
283msgid "Canceled"
288msgstr "S'ha cancel·lat"
284msgstr "S'ha cancel·lat"
289
285
290−#: qml/Panel/Indicators/MenuItemFactory.qml:773
286+#: qml/Panel/Indicators/MenuItemFactory.qml:801
291msgid "Finished"
287msgid "Finished"
292msgstr "S'ha finalitzat"
288msgstr "S'ha finalitzat"
293
289
294−#: qml/Panel/Indicators/MenuItemFactory.qml:775
290+#: qml/Panel/Indicators/MenuItemFactory.qml:803
295msgid "Failed, tap to retry"
291msgid "Failed, tap to retry"
296msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
292msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
297
293
294+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
295+msgid "Reply"
296+msgstr ""
297+
298#: qml/Panel/Indicators/ModemInfoItem.qml:105
298#: qml/Panel/Indicators/ModemInfoItem.qml:105
299msgid "Unlock SIM"
299msgid "Unlock SIM"
300msgstr "Desbloca la SIM"
300msgstr "Desbloca la SIM"
@@ -303,49 +303,49 @@ msgstr "Desbloca la SIM"
303msgid "Roaming"
303msgid "Roaming"
304msgstr "Itinerància"
304msgstr "Itinerància"
305
305
306−#: qml/Shell.qml:381
306+#: qml/Shell.qml:390
307+#, qt-format
308+msgid "Enter %1"
309+msgstr "Introduïu: %1"
310+
311+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
307msgid "Enter passphrase"
312msgid "Enter passphrase"
308msgstr "Introduïu la contrasenya"
313msgstr "Introduïu la contrasenya"
309
314
310−#: qml/Shell.qml:382
315+#: qml/Shell.qml:392
316+msgid "Enter passcode"
317+msgstr "Introduïu el codi d'accés"
318+
319+#: qml/Shell.qml:393
320+#, qt-format
321+msgid "Sorry, incorrect %1"
322+msgstr "Incorrecte (%1)"
323+
324+#: qml/Shell.qml:394
311msgid "Sorry, incorrect passphrase"
325msgid "Sorry, incorrect passphrase"
312msgstr "La contrasenya no és correcta"
326msgstr "La contrasenya no és correcta"
313
327
314−#: qml/Shell.qml:383
328+#: qml/Shell.qml:395
315msgid "Please re-enter"
329msgid "Please re-enter"
316msgstr "Torneu-ho a introduir"
330msgstr "Torneu-ho a introduir"
317
331
318−#: qml/Shell.qml:385
332+#: qml/Shell.qml:396
319−msgid "Enter passcode"
320−msgstr "Introduïu el codi d'accés"
321−
322−#: qml/Shell.qml:386
323msgid "Sorry, incorrect passcode"
333msgid "Sorry, incorrect passcode"
324msgstr "El codi d'accés no és correcte"
334msgstr "El codi d'accés no és correcte"
325
335
326−#: qml/Shell.qml:389
336+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
327−#, qt-format
328−msgid "Enter %1"
329−msgstr "Introduïu: %1"
330−
331−#: qml/Shell.qml:390
332−#, qt-format
333−msgid "Sorry, incorrect %1"
334−msgstr "Incorrecte (%1)"
335−
336−#: qml/Shell.qml:431
337msgid "Sorry, incorrect passphrase."
337msgid "Sorry, incorrect passphrase."
338msgstr "La contrasenya és incorrecta"
338msgstr "La contrasenya és incorrecta"
339
339
340−#: qml/Shell.qml:432
340+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
341msgid "Sorry, incorrect passcode."
341msgid "Sorry, incorrect passcode."
342msgstr "El codi d'accés no és correcte"
342msgstr "El codi d'accés no és correcte"
343
343
344−#: qml/Shell.qml:433
344+#: qml/Shell.qml:492
345msgid "This will be your last attempt."
345msgid "This will be your last attempt."
346msgstr "Este serà el darrer intent."
346msgstr "Este serà el darrer intent."
347
347
348−#: qml/Shell.qml:435
348+#: qml/Shell.qml:494
349msgid ""
349msgid ""
350"If passphrase is entered incorrectly, your phone will conduct a factory "
350"If passphrase is entered incorrectly, your phone will conduct a factory "
351"reset and all personal data will be deleted."
351"reset and all personal data will be deleted."
@@ -354,7 +354,7 @@ msgstr ""
354"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
354"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
355"personals."
355"personals."
356
356
357−#: qml/Shell.qml:436
357+#: qml/Shell.qml:495
358msgid ""
358msgid ""
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
360"and all personal data will be deleted."
360"and all personal data will be deleted."
@@ -363,6 +363,195 @@ msgstr ""
363"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
363"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
364"personals."
364"personals."
365
365
366+#: qml/Wizard/Page.qml:89
367+msgid "Back"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/10-welcome.qml:27
371+msgid "Hi!"
372+msgstr ""
373+
374+#: qml/Wizard/Pages/10-welcome.qml:44
375+msgid "Welcome to your Ubuntu phone."
376+msgstr ""
377+
378+#: qml/Wizard/Pages/10-welcome.qml:52
379+msgid "Let’s get started."
380+msgstr ""
381+
382+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
383+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
384+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
385+#: qml/Wizard/Pages/passwd-set.qml:90
386+msgid "Continue"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/20-sim.qml:25
390+msgid "Add a SIM card and restart your device"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/20-sim.qml:55
394+msgid "Without it, you won’t be able to make calls or use text messaging."
395+msgstr ""
396+
397+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
398+msgid "Skip"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:39
402+msgid "Lock security"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:74
406+msgid "Please select how you’d like to unlock your phone."
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:97
410+msgid "Swipe"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:98
414+msgid "No security"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:100
418+msgid "Passcode"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:101
422+msgid "4 digits only"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/30-passwd-type.qml:103
426+msgid "Passphrase"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/30-passwd-type.qml:104
430+msgid "Numbers and letters"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/40-wifi.qml:28
434+msgid "Connect to Wi‑Fi"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/40-wifi.qml:147
438+msgid "Available networks…"
439+msgstr ""
440+
441+#: qml/Wizard/Pages/40-wifi.qml:148
442+msgid "No available networks."
443+msgstr ""
444+
445+#: qml/Wizard/Pages/50-location.qml:27
446+msgid "Location"
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:62
450+msgid "Let the phone detect your location:"
451+msgstr ""
452+
453+#: qml/Wizard/Pages/50-location.qml:69
454+msgid "Using GPS only (less accurate)"
455+msgstr ""
456+
457+#: qml/Wizard/Pages/50-location.qml:86
458+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
459+msgstr ""
460+
461+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
462+#: qml/Wizard/Pages/50-location.qml:103
463+msgid ""
464+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
465+"conditions</a>."
466+msgstr ""
467+
468+#: qml/Wizard/Pages/50-location.qml:112
469+msgid "Not at all"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/50-location.qml:124
473+msgid "You can change your mind later in <b>System Settings</b>."
474+msgstr ""
475+
476+#: qml/Wizard/Pages/60-reporting.qml:24
477+msgid "Improving your experience"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/60-reporting.qml:36
481+msgid ""
482+"Your phone is set up to automatically report errors to Canonical and its "
483+"partners, the makers of the operating system."
484+msgstr ""
485+
486+#: qml/Wizard/Pages/60-reporting.qml:43
487+msgid ""
488+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
489+"Privacy</b>"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/80-finished.qml:24
493+msgid "All done"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/80-finished.qml:39
497+msgid "Nice work!"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/80-finished.qml:46
501+msgid "Your phone is now ready to use."
502+msgstr ""
503+
504+#: qml/Wizard/Pages/80-finished.qml:53
505+msgid "Finish"
506+msgstr ""
507+
508+#: qml/Wizard/Pages/here-terms.qml:27
509+msgid "Terms & Conditions"
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-confirm.qml:49
513+msgid "Confirm passphrase"
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-confirm.qml:50
517+msgid "Confirm passcode"
518+msgstr ""
519+
520+#: qml/Wizard/Pages/passwd-confirm.qml:53
521+#: qml/Wizard/Pages/passwd-confirm.qml:54
522+msgid "Please try again."
523+msgstr ""
524+
525+#: qml/Wizard/Pages/passwd-set.qml:61
526+msgid "Choose your passcode"
527+msgstr ""
528+
529+#: qml/Wizard/Pages/passwd-set.qml:68
530+msgid "Passphrase must be 4 characters long"
531+msgstr ""
532+
533+#: qml/Wizard/StackButton.qml:39
534+#, qt-format
535+msgid "〈 %1"
536+msgstr ""
537+
538+#: qml/Wizard/StackButton.qml:42
539+#, qt-format
540+msgid "%1 〉"
541+msgstr ""
542+
543+#~ msgid "Manage Scopes"
544+#~ msgstr "Gestioneu les lents"
545+
546+#~ msgid "Done"
547+#~ msgstr "Fet"
548+
549+#~ msgid "Favorites"
550+#~ msgstr "Preferides"
551+
552+#~ msgid "All"
553+#~ msgstr "Totes"
554+
366#~ msgid "Confirm"
555#~ msgid "Confirm"
367#~ msgstr "Confirma"
556#~ msgstr "Confirma"
368
557
po/ckb.po+251−74
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2014-01-21 11:05+0000\n"
11"PO-Revision-Date: 2014-01-21 11:05+0000\n"
12"Last-Translator: Aras <aras.noori@gmail.com>\n"
12"Last-Translator: Aras <aras.noori@gmail.com>\n"
13"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"
13"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:31+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr ""
23msgstr ""
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr ""
28msgstr ""
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr ""
32msgstr ""
33
33
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] ""
50msgstr[0] ""
51msgstr[1] ""
51msgstr[1] ""
52
52
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
54msgid "Log out"
54msgid "Log out"
55msgstr ""
55msgstr ""
56
56
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr ""
59msgstr ""
60
60
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:134
63msgid "No"
63msgid "No"
64msgstr ""
64msgstr ""
65
65
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:140
68msgid "Yes"
68msgid "Yes"
69msgstr ""
69msgstr ""
70
70
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
72msgid "Shut down"
72msgid "Shut down"
73msgstr ""
73msgstr ""
74
74
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr ""
77msgstr ""
78
78
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
80msgid "Reboot"
80msgid "Reboot"
81msgstr ""
81msgstr ""
82
82
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr ""
85msgstr ""
86
86
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
88msgid "Power"
88msgid "Power"
89msgstr ""
89msgstr ""
90
90
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
95msgstr ""
95msgstr ""
96
96
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
98msgid "Power off"
98msgid "Power off"
99msgstr ""
99msgstr ""
100
100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102msgid "Restart"
102msgid "Restart"
103msgstr ""
103msgstr ""
104
104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106msgid "Cancel"
106msgid "Cancel"
107msgstr ""
107msgstr ""
108
108
@@ -110,82 +110,86 @@ msgstr ""
110msgid "Skip intro"
110msgid "Skip intro"
111msgstr "پێشەکیی بپەڕێنە"
111msgstr "پێشەکیی بپەڕێنە"
112
112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114msgid "Right edge"
114msgid "Right edge"
115msgstr "لێواری ڕاست"
115msgstr "لێواری ڕاست"
116
116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118msgid "Try swiping from the right edge to unlock the phone"
118msgid "Try swiping from the right edge to unlock the phone"
119msgstr "لێواری ڕاست ڕابکێشە بۆ کردنەوەی مۆبایلەکە"
119msgstr "لێواری ڕاست ڕابکێشە بۆ کردنەوەی مۆبایلەکە"
120
120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122msgid "Top edge"
122msgid "Top edge"
123msgstr "لێواری سەرەوە"
123msgstr "لێواری سەرەوە"
124
124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126msgid "Try swiping from the top edge to access the indicators"
126msgid "Try swiping from the top edge to access the indicators"
127msgstr "لێواری سەرەوە ڕابکێشە بۆ گەیشتن بە نیشاندەرەکان"
127msgstr "لێواری سەرەوە ڕابکێشە بۆ گەیشتن بە نیشاندەرەکان"
128
128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130msgid "Close"
130msgid "Close"
131msgstr "داخستن"
131msgstr "داخستن"
132
132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134msgid "Swipe up again to close the settings screen"
134msgid "Swipe up again to close the settings screen"
135msgstr "ڕایکێشەوە سەرەوە جارێکی تر بۆ داخستنی پەردەی ڕێکخستنەکان"
135msgstr "ڕایکێشەوە سەرەوە جارێکی تر بۆ داخستنی پەردەی ڕێکخستنەکان"
136
136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
138msgid "Left edge"
139msgstr "لێواری چەپ"
139msgstr "لێواری چەپ"
140
140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143msgstr "لە چەپەوە بچۆرەوە سەر دەستپێک بۆئەوەی بتوانی هەموو ئەپەکان ببینی"
143msgstr "لە چەپەوە بچۆرەوە سەر دەستپێک بۆئەوەی بتوانی هەموو ئەپەکان ببینی"
144
144
145−#: qml/Components/EdgeDemo.qml:229
145+#: qml/Components/EdgeDemo.qml:242
146msgid "Well done"
146msgid "Well done"
147msgstr "دەستخۆش"
147msgstr "دەستخۆش"
148
148
149−#: qml/Components/EdgeDemo.qml:230
149+#: qml/Components/EdgeDemo.qml:243
150msgid ""
150msgid ""
151"You have now mastered the edge gestures and can start using the "
151"You have now mastered the edge gestures and can start using the "
152"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
153msgstr ""
153msgstr ""
154
154
155−#: qml/Components/Lockscreen.qml:223
155+#: qml/Components/Lockscreen.qml:238
156msgid "Return to Call"
156msgid "Return to Call"
157msgstr ""
157msgstr ""
158
158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160msgid "Emergency Call"
160msgid "Emergency Call"
161msgstr "هێڵی فریاگوزاری"
161msgstr "هێڵی فریاگوزاری"
162
162
163−#: qml/Components/Lockscreen.qml:255
163+#: qml/Components/Lockscreen.qml:270
164msgid "OK"
164msgid "OK"
165msgstr ""
165msgstr ""
166
166
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
168msgid "See less"
168msgid "See less"
169msgstr ""
169msgstr ""
170
170
171−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:485
172msgid "See all"
172msgid "See all"
173msgstr ""
173msgstr ""
174
174
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
176#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
177msgid "Search"
178msgstr "گەڕان"
178msgstr "گەڕان"
179
179
180−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:267
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:284
181msgid "Settings"
185msgid "Settings"
182msgstr ""
186msgstr ""
183
187
184−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:291
185msgid "Remove from Favorites"
189msgid "Remove from Favorites"
186msgstr ""
190msgstr ""
187
191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189msgid "Add to Favorites"
193msgid "Add to Favorites"
190msgstr ""
194msgstr ""
191
195
@@ -217,31 +221,23 @@ msgstr ""
217msgid "Release to refresh…"
221msgid "Release to refresh…"
218msgstr ""
222msgstr ""
219
223
220−#: qml/Dash/ScopesOverview.qml:215
224+#: qml/Dash/ScopesList.qml:66
221−msgid "Manage Scopes"
225+msgid "Manage"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:437
225−msgid "Done"
226−msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:463
229−msgid "Store"
230msgstr ""
226msgstr ""
231
227
232−#: qml/Dash/ScopesOverviewTab.qml:36
228+#: qml/Dash/ScopesList.qml:112
233−msgid "Favorites"
229+msgid "Home"
234msgstr ""
230msgstr ""
235
231
236−#: qml/Dash/ScopesOverviewTab.qml:54
232+#: qml/Dash/ScopesList.qml:113
237−msgid "All"
233+msgid "Also installed"
238msgstr ""
234msgstr ""
239
235
240−#: qml/Greeter/Greeter.qml:174
236+#: qml/Greeter/Greeter.qml:133
241msgid "Unlock"
237msgid "Unlock"
242msgstr ""
238msgstr ""
243
239
244−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
245msgid "Show password"
241msgid "Show password"
246msgstr "تێپەڕەوشە پیشان بدە"
242msgstr "تێپەڕەوشە پیشان بدە"
247
243
@@ -281,6 +277,10 @@ msgstr ""
281msgid "Failed, tap to retry"
277msgid "Failed, tap to retry"
282msgstr ""
278msgstr ""
283
279
280+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
281+msgid "Reply"
282+msgstr ""
283+
284#: qml/Panel/Indicators/ModemInfoItem.qml:105
284#: qml/Panel/Indicators/ModemInfoItem.qml:105
285msgid "Unlock SIM"
285msgid "Unlock SIM"
286msgstr ""
286msgstr ""
@@ -289,60 +289,237 @@ msgstr ""
289msgid "Roaming"
289msgid "Roaming"
290msgstr ""
290msgstr ""
291
291
292−#: qml/Shell.qml:391
292+#: qml/Shell.qml:390
293+#, qt-format
294+msgid "Enter %1"
295+msgstr ""
296+
297+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
293msgid "Enter passphrase"
298msgid "Enter passphrase"
294msgstr ""
299msgstr ""
295
300
296#: qml/Shell.qml:392
301#: qml/Shell.qml:392
297−msgid "Sorry, incorrect passphrase"
302+msgid "Enter passcode"
298msgstr ""
303msgstr ""
299
304
300#: qml/Shell.qml:393
305#: qml/Shell.qml:393
301−msgid "Please re-enter"
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr ""
309+
310+#: qml/Shell.qml:394
311+msgid "Sorry, incorrect passphrase"
302msgstr ""
312msgstr ""
303
313
304#: qml/Shell.qml:395
314#: qml/Shell.qml:395
305−msgid "Enter passcode"
315+msgid "Please re-enter"
306msgstr ""
316msgstr ""
307
317
308#: qml/Shell.qml:396
318#: qml/Shell.qml:396
309msgid "Sorry, incorrect passcode"
319msgid "Sorry, incorrect passcode"
310msgstr ""
320msgstr ""
311
321
312−#: qml/Shell.qml:399
322+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
313−#, qt-format
314−msgid "Enter %1"
315−msgstr ""
316−
317−#: qml/Shell.qml:400
318−#, qt-format
319−msgid "Sorry, incorrect %1"
320−msgstr ""
321−
322−#: qml/Shell.qml:441
323msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Shell.qml:442
326+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
327msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Shell.qml:443
330+#: qml/Shell.qml:492
331msgid "This will be your last attempt."
331msgid "This will be your last attempt."
332msgstr ""
332msgstr ""
333
333
334−#: qml/Shell.qml:445
334+#: qml/Shell.qml:494
335msgid ""
335msgid ""
336"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
337"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
338msgstr ""
338msgstr ""
339
339
340−#: qml/Shell.qml:446
340+#: qml/Shell.qml:495
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
344msgstr ""
344msgstr ""
345
345
346+#: qml/Wizard/Page.qml:89
347+msgid "Back"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:27
351+msgid "Hi!"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:44
355+msgid "Welcome to your Ubuntu phone."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:52
359+msgid "Let’s get started."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
363+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
364+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365+#: qml/Wizard/Pages/passwd-set.qml:90
366+msgid "Continue"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:25
370+msgid "Add a SIM card and restart your device"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:55
374+msgid "Without it, you won’t be able to make calls or use text messaging."
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
378+msgid "Skip"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:39
382+msgid "Lock security"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:74
386+msgid "Please select how you’d like to unlock your phone."
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:97
390+msgid "Swipe"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:98
394+msgid "No security"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:100
398+msgid "Passcode"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:101
402+msgid "4 digits only"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:103
406+msgid "Passphrase"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:104
410+msgid "Numbers and letters"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:28
414+msgid "Connect to Wi‑Fi"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:147
418+msgid "Available networks…"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:148
422+msgid "No available networks."
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:27
426+msgid "Location"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:62
430+msgid "Let the phone detect your location:"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:69
434+msgid "Using GPS only (less accurate)"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:86
438+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
439+msgstr ""
440+
441+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
442+#: qml/Wizard/Pages/50-location.qml:103
443+msgid ""
444+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
445+"conditions</a>."
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:112
449+msgid "Not at all"
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:124
453+msgid "You can change your mind later in <b>System Settings</b>."
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:24
457+msgid "Improving your experience"
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:36
461+msgid ""
462+"Your phone is set up to automatically report errors to Canonical and its "
463+"partners, the makers of the operating system."
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:43
467+msgid ""
468+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
469+"Privacy</b>"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:24
473+msgid "All done"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:39
477+msgid "Nice work!"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:46
481+msgid "Your phone is now ready to use."
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:53
485+msgid "Finish"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/here-terms.qml:27
489+msgid "Terms & Conditions"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:49
493+msgid "Confirm passphrase"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:50
497+msgid "Confirm passcode"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:53
501+#: qml/Wizard/Pages/passwd-confirm.qml:54
502+msgid "Please try again."
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:61
506+msgid "Choose your passcode"
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:68
510+msgid "Passphrase must be 4 characters long"
511+msgstr ""
512+
513+#: qml/Wizard/StackButton.qml:39
514+#, qt-format
515+msgid "〈 %1"
516+msgstr ""
517+
518+#: qml/Wizard/StackButton.qml:42
519+#, qt-format
520+msgid "%1 〉"
521+msgstr ""
522+
346#~ msgid "Speaking..."
523#~ msgid "Speaking..."
347#~ msgstr "قسە دەکات..."
524#~ msgstr "قسە دەکات..."
348
525
po/cs.po+251−74
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2014-01-08 10:11+0000\n"
11"PO-Revision-Date: 2014-01-08 10:11+0000\n"
12"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
12"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
13"Language-Team: Czech <cs@li.org>\n"
13"Language-Team: Czech <cs@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
17"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr ""
23msgstr ""
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr ""
28msgstr ""
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr ""
32msgstr ""
33
33
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] ""
50msgstr[0] ""
51msgstr[1] ""
51msgstr[1] ""
52
52
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
54msgid "Log out"
54msgid "Log out"
55msgstr ""
55msgstr ""
56
56
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr ""
59msgstr ""
60
60
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:134
63msgid "No"
63msgid "No"
64msgstr ""
64msgstr ""
65
65
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:140
68msgid "Yes"
68msgid "Yes"
69msgstr ""
69msgstr ""
70
70
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
72msgid "Shut down"
72msgid "Shut down"
73msgstr ""
73msgstr ""
74
74
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr ""
77msgstr ""
78
78
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
80msgid "Reboot"
80msgid "Reboot"
81msgstr ""
81msgstr ""
82
82
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr ""
85msgstr ""
86
86
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
88msgid "Power"
88msgid "Power"
89msgstr ""
89msgstr ""
90
90
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
95msgstr ""
95msgstr ""
96
96
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
98msgid "Power off"
98msgid "Power off"
99msgstr ""
99msgstr ""
100
100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102msgid "Restart"
102msgid "Restart"
103msgstr ""
103msgstr ""
104
104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106msgid "Cancel"
106msgid "Cancel"
107msgstr ""
107msgstr ""
108
108
@@ -110,82 +110,86 @@ msgstr ""
110msgid "Skip intro"
110msgid "Skip intro"
111msgstr "Přeskočit intro"
111msgstr "Přeskočit intro"
112
112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114msgid "Right edge"
114msgid "Right edge"
115msgstr "Pravý okraj"
115msgstr "Pravý okraj"
116
116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118msgid "Try swiping from the right edge to unlock the phone"
118msgid "Try swiping from the right edge to unlock the phone"
119msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."
119msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."
120
120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122msgid "Top edge"
122msgid "Top edge"
123msgstr "Horní okraj"
123msgstr "Horní okraj"
124
124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126msgid "Try swiping from the top edge to access the indicators"
126msgid "Try swiping from the top edge to access the indicators"
127msgstr "Pokuste se zpřístupnit indikátory potažením prstu z horního okraje"
127msgstr "Pokuste se zpřístupnit indikátory potažením prstu z horního okraje"
128
128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130msgid "Close"
130msgid "Close"
131msgstr "Uzavřít"
131msgstr "Uzavřít"
132
132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134msgid "Swipe up again to close the settings screen"
134msgid "Swipe up again to close the settings screen"
135msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"
135msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"
136
136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
138msgid "Left edge"
139msgstr "Levý okraj"
139msgstr "Levý okraj"
140
140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143msgstr "Pro rychlý přístup k aplikacím potáhněte prst z levého okraje."
143msgstr "Pro rychlý přístup k aplikacím potáhněte prst z levého okraje."
144
144
145−#: qml/Components/EdgeDemo.qml:229
145+#: qml/Components/EdgeDemo.qml:242
146msgid "Well done"
146msgid "Well done"
147msgstr "Výborně"
147msgstr "Výborně"
148
148
149−#: qml/Components/EdgeDemo.qml:230
149+#: qml/Components/EdgeDemo.qml:243
150msgid ""
150msgid ""
151"You have now mastered the edge gestures and can start using the "
151"You have now mastered the edge gestures and can start using the "
152"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
153msgstr ""
153msgstr ""
154
154
155−#: qml/Components/Lockscreen.qml:223
155+#: qml/Components/Lockscreen.qml:238
156msgid "Return to Call"
156msgid "Return to Call"
157msgstr ""
157msgstr ""
158
158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160msgid "Emergency Call"
160msgid "Emergency Call"
161msgstr "Tísňové volání"
161msgstr "Tísňové volání"
162
162
163−#: qml/Components/Lockscreen.qml:255
163+#: qml/Components/Lockscreen.qml:270
164msgid "OK"
164msgid "OK"
165msgstr ""
165msgstr ""
166
166
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
168msgid "See less"
168msgid "See less"
169msgstr ""
169msgstr ""
170
170
171−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:485
172msgid "See all"
172msgid "See all"
173msgstr ""
173msgstr ""
174
174
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
176#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
177msgid "Search"
178msgstr "Hledat"
178msgstr "Hledat"
179
179
180−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:267
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:284
181msgid "Settings"
185msgid "Settings"
182msgstr ""
186msgstr ""
183
187
184−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:291
185msgid "Remove from Favorites"
189msgid "Remove from Favorites"
186msgstr ""
190msgstr ""
187
191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189msgid "Add to Favorites"
193msgid "Add to Favorites"
190msgstr ""
194msgstr ""
191
195
@@ -217,31 +221,23 @@ msgstr ""
217msgid "Release to refresh…"
221msgid "Release to refresh…"
218msgstr ""
222msgstr ""
219
223
220−#: qml/Dash/ScopesOverview.qml:215
224+#: qml/Dash/ScopesList.qml:66
221−msgid "Manage Scopes"
225+msgid "Manage"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:437
225−msgid "Done"
226−msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:463
229−msgid "Store"
230msgstr ""
226msgstr ""
231
227
232−#: qml/Dash/ScopesOverviewTab.qml:36
228+#: qml/Dash/ScopesList.qml:112
233−msgid "Favorites"
229+msgid "Home"
234msgstr ""
230msgstr ""
235
231
236−#: qml/Dash/ScopesOverviewTab.qml:54
232+#: qml/Dash/ScopesList.qml:113
237−msgid "All"
233+msgid "Also installed"
238msgstr ""
234msgstr ""
239
235
240−#: qml/Greeter/Greeter.qml:174
236+#: qml/Greeter/Greeter.qml:133
241msgid "Unlock"
237msgid "Unlock"
242msgstr ""
238msgstr ""
243
239
244−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
245msgid "Show password"
241msgid "Show password"
246msgstr "Zobrazit heslo"
242msgstr "Zobrazit heslo"
247
243
@@ -281,6 +277,10 @@ msgstr ""
281msgid "Failed, tap to retry"
277msgid "Failed, tap to retry"
282msgstr ""
278msgstr ""
283
279
280+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
281+msgid "Reply"
282+msgstr ""
283+
284#: qml/Panel/Indicators/ModemInfoItem.qml:105
284#: qml/Panel/Indicators/ModemInfoItem.qml:105
285msgid "Unlock SIM"
285msgid "Unlock SIM"
286msgstr ""
286msgstr ""
@@ -289,60 +289,237 @@ msgstr ""
289msgid "Roaming"
289msgid "Roaming"
290msgstr ""
290msgstr ""
291
291
292−#: qml/Shell.qml:391
292+#: qml/Shell.qml:390
293+#, qt-format
294+msgid "Enter %1"
295+msgstr ""
296+
297+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
293msgid "Enter passphrase"
298msgid "Enter passphrase"
294msgstr ""
299msgstr ""
295
300
296#: qml/Shell.qml:392
301#: qml/Shell.qml:392
297−msgid "Sorry, incorrect passphrase"
302+msgid "Enter passcode"
298msgstr ""
303msgstr ""
299
304
300#: qml/Shell.qml:393
305#: qml/Shell.qml:393
301−msgid "Please re-enter"
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr ""
309+
310+#: qml/Shell.qml:394
311+msgid "Sorry, incorrect passphrase"
302msgstr ""
312msgstr ""
303
313
304#: qml/Shell.qml:395
314#: qml/Shell.qml:395
305−msgid "Enter passcode"
315+msgid "Please re-enter"
306msgstr ""
316msgstr ""
307
317
308#: qml/Shell.qml:396
318#: qml/Shell.qml:396
309msgid "Sorry, incorrect passcode"
319msgid "Sorry, incorrect passcode"
310msgstr ""
320msgstr ""
311
321
312−#: qml/Shell.qml:399
322+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
313−#, qt-format
314−msgid "Enter %1"
315−msgstr ""
316−
317−#: qml/Shell.qml:400
318−#, qt-format
319−msgid "Sorry, incorrect %1"
320−msgstr ""
321−
322−#: qml/Shell.qml:441
323msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Shell.qml:442
326+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
327msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Shell.qml:443
330+#: qml/Shell.qml:492
331msgid "This will be your last attempt."
331msgid "This will be your last attempt."
332msgstr ""
332msgstr ""
333
333
334−#: qml/Shell.qml:445
334+#: qml/Shell.qml:494
335msgid ""
335msgid ""
336"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
337"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
338msgstr ""
338msgstr ""
339
339
340−#: qml/Shell.qml:446
340+#: qml/Shell.qml:495
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
344msgstr ""
344msgstr ""
345
345
346+#: qml/Wizard/Page.qml:89
347+msgid "Back"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:27
351+msgid "Hi!"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:44
355+msgid "Welcome to your Ubuntu phone."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:52
359+msgid "Let’s get started."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
363+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
364+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365+#: qml/Wizard/Pages/passwd-set.qml:90
366+msgid "Continue"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:25
370+msgid "Add a SIM card and restart your device"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:55
374+msgid "Without it, you won’t be able to make calls or use text messaging."
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
378+msgid "Skip"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:39
382+msgid "Lock security"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:74
386+msgid "Please select how you’d like to unlock your phone."
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:97
390+msgid "Swipe"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:98
394+msgid "No security"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:100
398+msgid "Passcode"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:101
402+msgid "4 digits only"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:103
406+msgid "Passphrase"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:104
410+msgid "Numbers and letters"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:28
414+msgid "Connect to Wi‑Fi"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:147
418+msgid "Available networks…"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:148
422+msgid "No available networks."
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:27
426+msgid "Location"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:62
430+msgid "Let the phone detect your location:"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:69
434+msgid "Using GPS only (less accurate)"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:86
438+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
439+msgstr ""
440+
441+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
442+#: qml/Wizard/Pages/50-location.qml:103
443+msgid ""
444+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
445+"conditions</a>."
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:112
449+msgid "Not at all"
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:124
453+msgid "You can change your mind later in <b>System Settings</b>."
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:24
457+msgid "Improving your experience"
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:36
461+msgid ""
462+"Your phone is set up to automatically report errors to Canonical and its "
463+"partners, the makers of the operating system."
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:43
467+msgid ""
468+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
469+"Privacy</b>"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:24
473+msgid "All done"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:39
477+msgid "Nice work!"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:46
481+msgid "Your phone is now ready to use."
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:53
485+msgid "Finish"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/here-terms.qml:27
489+msgid "Terms & Conditions"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:49
493+msgid "Confirm passphrase"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:50
497+msgid "Confirm passcode"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:53
501+#: qml/Wizard/Pages/passwd-confirm.qml:54
502+msgid "Please try again."
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:61
506+msgid "Choose your passcode"
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:68
510+msgid "Passphrase must be 4 characters long"
511+msgstr ""
512+
513+#: qml/Wizard/StackButton.qml:39
514+#, qt-format
515+msgid "〈 %1"
516+msgstr ""
517+
518+#: qml/Wizard/StackButton.qml:42
519+#, qt-format
520+msgid "%1 〉"
521+msgstr ""
522+
346#~ msgid "Loading. Please Wait..."
523#~ msgid "Loading. Please Wait..."
347#~ msgstr "Načítám. Čekejte prosím..."
524#~ msgstr "Načítám. Čekejte prosím..."
348
525
po/da.po+251−74
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
12"PO-Revision-Date: 2014-07-30 12:37+0000\n"
12"PO-Revision-Date: 2014-07-30 12:37+0000\n"
13"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
13"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -16,19 +16,19 @@ msgstr ""
16"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
17"Content-Transfer-Encoding: 8bit\n"
18"Plural-Forms: nplurals=2; plural=n != 1;\n"
18"Plural-Forms: nplurals=2; plural=n != 1;\n"
19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
20−"X-Generator: Launchpad (build 17231)\n"
20+"X-Generator: Launchpad (build 17306)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
23msgid "Password: "
23msgid "Password: "
24msgstr ""
24msgstr ""
25
25
26#: plugins/Unity/Launcher/launcheritem.cpp:45
26#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
28msgid "Pin shortcut"
28msgid "Pin shortcut"
29msgstr "Fastgør genvej"
29msgstr "Fastgør genvej"
30
30
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
32msgid "Unpin shortcut"
32msgid "Unpin shortcut"
33msgstr "Gør genvej flytbar"
33msgstr "Gør genvej flytbar"
34
34
@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
51msgstr[0] ""
51msgstr[0] ""
52msgstr[1] ""
52msgstr[1] ""
53
53
54−#: qml/Components/Dialogs.qml:74
54+#: qml/Components/Dialogs.qml:86
55msgid "Log out"
55msgid "Log out"
56msgstr ""
56msgstr ""
57
57
58−#: qml/Components/Dialogs.qml:75
58+#: qml/Components/Dialogs.qml:87
59msgid "Are you sure you want to log out?"
59msgid "Are you sure you want to log out?"
60msgstr ""
60msgstr ""
61
61
62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63−#: qml/Components/Dialogs.qml:126
63+#: qml/Components/Dialogs.qml:134
64msgid "No"
64msgid "No"
65msgstr ""
65msgstr ""
66
66
67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68−#: qml/Components/Dialogs.qml:133
68+#: qml/Components/Dialogs.qml:140
69msgid "Yes"
69msgid "Yes"
70msgstr ""
70msgstr ""
71
71
72−#: qml/Components/Dialogs.qml:98
72+#: qml/Components/Dialogs.qml:108
73msgid "Shut down"
73msgid "Shut down"
74msgstr ""
74msgstr ""
75
75
76−#: qml/Components/Dialogs.qml:99
76+#: qml/Components/Dialogs.qml:109
77msgid "Are you sure you want to shut down?"
77msgid "Are you sure you want to shut down?"
78msgstr ""
78msgstr ""
79
79
80−#: qml/Components/Dialogs.qml:123
80+#: qml/Components/Dialogs.qml:131
81msgid "Reboot"
81msgid "Reboot"
82msgstr ""
82msgstr ""
83
83
84−#: qml/Components/Dialogs.qml:124
84+#: qml/Components/Dialogs.qml:132
85msgid "Are you sure you want to reboot?"
85msgid "Are you sure you want to reboot?"
86msgstr ""
86msgstr ""
87
87
88−#: qml/Components/Dialogs.qml:148
88+#: qml/Components/Dialogs.qml:154
89msgid "Power"
89msgid "Power"
90msgstr ""
90msgstr ""
91
91
92−#: qml/Components/Dialogs.qml:149
92+#: qml/Components/Dialogs.qml:155
93msgid ""
93msgid ""
94"Are you sure you would like\n"
94"Are you sure you would like\n"
95"to power off?"
95"to power off?"
96msgstr ""
96msgstr ""
97
97
98−#: qml/Components/Dialogs.qml:151
98+#: qml/Components/Dialogs.qml:157
99msgid "Power off"
99msgid "Power off"
100msgstr ""
100msgstr ""
101
101
102−#: qml/Components/Dialogs.qml:161
102+#: qml/Components/Dialogs.qml:166
103msgid "Restart"
103msgid "Restart"
104msgstr ""
104msgstr ""
105
105
106−#: qml/Components/Dialogs.qml:171
106+#: qml/Components/Dialogs.qml:175
107msgid "Cancel"
107msgid "Cancel"
108msgstr ""
108msgstr ""
109
109
@@ -111,43 +111,43 @@ msgstr ""
111msgid "Skip intro"
111msgid "Skip intro"
112msgstr "Spring intro over"
112msgstr "Spring intro over"
113
113
114−#: qml/Components/EdgeDemo.qml:112
114+#: qml/Components/EdgeDemo.qml:125
115msgid "Right edge"
115msgid "Right edge"
116msgstr "Højre kant"
116msgstr "Højre kant"
117
117
118−#: qml/Components/EdgeDemo.qml:113
118+#: qml/Components/EdgeDemo.qml:126
119msgid "Try swiping from the right edge to unlock the phone"
119msgid "Try swiping from the right edge to unlock the phone"
120msgstr "Prøv at stryge fra højre kant for at låse telefonen op"
120msgstr "Prøv at stryge fra højre kant for at låse telefonen op"
121
121
122−#: qml/Components/EdgeDemo.qml:144
122+#: qml/Components/EdgeDemo.qml:157
123msgid "Top edge"
123msgid "Top edge"
124msgstr "Øvre kant"
124msgstr "Øvre kant"
125
125
126−#: qml/Components/EdgeDemo.qml:145
126+#: qml/Components/EdgeDemo.qml:158
127msgid "Try swiping from the top edge to access the indicators"
127msgid "Try swiping from the top edge to access the indicators"
128msgstr "Prøv at stryge fra den øvre kant for at tilgå indikatorerne"
128msgstr "Prøv at stryge fra den øvre kant for at tilgå indikatorerne"
129
129
130−#: qml/Components/EdgeDemo.qml:170
130+#: qml/Components/EdgeDemo.qml:183
131msgid "Close"
131msgid "Close"
132msgstr "Luk"
132msgstr "Luk"
133
133
134−#: qml/Components/EdgeDemo.qml:171
134+#: qml/Components/EdgeDemo.qml:184
135msgid "Swipe up again to close the settings screen"
135msgid "Swipe up again to close the settings screen"
136msgstr "Stryg op igen for at låse indstillingsskærmen"
136msgstr "Stryg op igen for at låse indstillingsskærmen"
137
137
138−#: qml/Components/EdgeDemo.qml:201
138+#: qml/Components/EdgeDemo.qml:214
139msgid "Left edge"
139msgid "Left edge"
140msgstr "Venstre kant"
140msgstr "Venstre kant"
141
141
142−#: qml/Components/EdgeDemo.qml:202
142+#: qml/Components/EdgeDemo.qml:215
143msgid "Swipe from the left to reveal the launcher for quick access to apps"
143msgid "Swipe from the left to reveal the launcher for quick access to apps"
144msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"
144msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"
145
145
146−#: qml/Components/EdgeDemo.qml:229
146+#: qml/Components/EdgeDemo.qml:242
147msgid "Well done"
147msgid "Well done"
148msgstr "Godt gjort"
148msgstr "Godt gjort"
149
149
150−#: qml/Components/EdgeDemo.qml:230
150+#: qml/Components/EdgeDemo.qml:243
151msgid ""
151msgid ""
152"You have now mastered the edge gestures and can start using the "
152"You have now mastered the edge gestures and can start using the "
153"phone<br><br>Tap on the screen to start"
153"phone<br><br>Tap on the screen to start"
@@ -155,40 +155,44 @@ msgstr ""
155"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
155"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
156"på skærmen for at starte"
156"på skærmen for at starte"
157
157
158−#: qml/Components/Lockscreen.qml:223
158+#: qml/Components/Lockscreen.qml:238
159msgid "Return to Call"
159msgid "Return to Call"
160msgstr ""
160msgstr ""
161
161
162−#: qml/Components/Lockscreen.qml:223
162+#: qml/Components/Lockscreen.qml:238
163msgid "Emergency Call"
163msgid "Emergency Call"
164msgstr "Nødopkald"
164msgstr "Nødopkald"
165
165
166−#: qml/Components/Lockscreen.qml:255
166+#: qml/Components/Lockscreen.qml:270
167msgid "OK"
167msgid "OK"
168msgstr "O.k."
168msgstr "O.k."
169
169
170−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
170+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
171msgid "See less"
171msgid "See less"
172msgstr "Vis mindre"
172msgstr "Vis mindre"
173
173
174−#: qml/Dash/GenericScopeView.qml:434
174+#: qml/Dash/GenericScopeView.qml:485
175msgid "See all"
175msgid "See all"
176msgstr "Se alle"
176msgstr "Se alle"
177
177
178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
178+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
179#: qml/Panel/SearchIndicator.qml:27
179#: qml/Panel/SearchIndicator.qml:27
180msgid "Search"
180msgid "Search"
181msgstr "Søg"
181msgstr "Søg"
182
182
183−#: qml/Dash/PageHeader.qml:268
183+#: qml/Dash/PageHeader.qml:267
184+msgid "Store"
185+msgstr ""
186+
187+#: qml/Dash/PageHeader.qml:284
184msgid "Settings"
188msgid "Settings"
185msgstr ""
189msgstr ""
186
190
187−#: qml/Dash/PageHeader.qml:275
191+#: qml/Dash/PageHeader.qml:291
188msgid "Remove from Favorites"
192msgid "Remove from Favorites"
189msgstr ""
193msgstr ""
190
194
191−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:291
192msgid "Add to Favorites"
196msgid "Add to Favorites"
193msgstr ""
197msgstr ""
194
198
@@ -220,31 +224,23 @@ msgstr ""
220msgid "Release to refresh…"
224msgid "Release to refresh…"
221msgstr ""
225msgstr ""
222
226
223−#: qml/Dash/ScopesOverview.qml:215
227+#: qml/Dash/ScopesList.qml:66
224−msgid "Manage Scopes"
228+msgid "Manage"
225−msgstr ""
226−
227−#: qml/Dash/ScopesOverview.qml:437
228−msgid "Done"
229−msgstr ""
230−
231−#: qml/Dash/ScopesOverview.qml:463
232−msgid "Store"
233msgstr ""
229msgstr ""
234
230
235−#: qml/Dash/ScopesOverviewTab.qml:36
231+#: qml/Dash/ScopesList.qml:112
236−msgid "Favorites"
232+msgid "Home"
237msgstr ""
233msgstr ""
238
234
239−#: qml/Dash/ScopesOverviewTab.qml:54
235+#: qml/Dash/ScopesList.qml:113
240−msgid "All"
236+msgid "Also installed"
241msgstr ""
237msgstr ""
242
238
243−#: qml/Greeter/Greeter.qml:174
239+#: qml/Greeter/Greeter.qml:133
244msgid "Unlock"
240msgid "Unlock"
245msgstr ""
241msgstr ""
246
242
247−#: qml/Notifications/NotificationMenuItemFactory.qml:116
243+#: qml/Notifications/NotificationMenuItemFactory.qml:128
248msgid "Show password"
244msgid "Show password"
249msgstr "Vis adgangskode"
245msgstr "Vis adgangskode"
250
246
@@ -284,6 +280,10 @@ msgstr "Færdig"
284msgid "Failed, tap to retry"
280msgid "Failed, tap to retry"
285msgstr "Mislykkedes; tryk for at prøve igen"
281msgstr "Mislykkedes; tryk for at prøve igen"
286
282
283+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
284+msgid "Reply"
285+msgstr ""
286+
287#: qml/Panel/Indicators/ModemInfoItem.qml:105
287#: qml/Panel/Indicators/ModemInfoItem.qml:105
288msgid "Unlock SIM"
288msgid "Unlock SIM"
289msgstr ""
289msgstr ""
@@ -292,60 +292,237 @@ msgstr ""
292msgid "Roaming"
292msgid "Roaming"
293msgstr ""
293msgstr ""
294
294
295−#: qml/Shell.qml:391
295+#: qml/Shell.qml:390
296+#, qt-format
297+msgid "Enter %1"
298+msgstr ""
299+
300+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
296msgid "Enter passphrase"
301msgid "Enter passphrase"
297msgstr ""
302msgstr ""
298
303
299#: qml/Shell.qml:392
304#: qml/Shell.qml:392
300−msgid "Sorry, incorrect passphrase"
305+msgid "Enter passcode"
301msgstr ""
306msgstr ""
302
307
303#: qml/Shell.qml:393
308#: qml/Shell.qml:393
304−msgid "Please re-enter"
309+#, qt-format
310+msgid "Sorry, incorrect %1"
311+msgstr ""
312+
313+#: qml/Shell.qml:394
314+msgid "Sorry, incorrect passphrase"
305msgstr ""
315msgstr ""
306
316
307#: qml/Shell.qml:395
317#: qml/Shell.qml:395
308−msgid "Enter passcode"
318+msgid "Please re-enter"
309msgstr ""
319msgstr ""
310
320
311#: qml/Shell.qml:396
321#: qml/Shell.qml:396
312msgid "Sorry, incorrect passcode"
322msgid "Sorry, incorrect passcode"
313msgstr ""
323msgstr ""
314
324
315−#: qml/Shell.qml:399
325+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
316−#, qt-format
317−msgid "Enter %1"
318−msgstr ""
319−
320−#: qml/Shell.qml:400
321−#, qt-format
322−msgid "Sorry, incorrect %1"
323−msgstr ""
324−
325−#: qml/Shell.qml:441
326msgid "Sorry, incorrect passphrase."
326msgid "Sorry, incorrect passphrase."
327msgstr ""
327msgstr ""
328
328
329−#: qml/Shell.qml:442
329+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
330msgid "Sorry, incorrect passcode."
330msgid "Sorry, incorrect passcode."
331msgstr ""
331msgstr ""
332
332
333−#: qml/Shell.qml:443
333+#: qml/Shell.qml:492
334msgid "This will be your last attempt."
334msgid "This will be your last attempt."
335msgstr ""
335msgstr ""
336
336
337−#: qml/Shell.qml:445
337+#: qml/Shell.qml:494
338msgid ""
338msgid ""
339"If passphrase is entered incorrectly, your phone will conduct a factory "
339"If passphrase is entered incorrectly, your phone will conduct a factory "
340"reset and all personal data will be deleted."
340"reset and all personal data will be deleted."
341msgstr ""
341msgstr ""
342
342
343−#: qml/Shell.qml:446
343+#: qml/Shell.qml:495
344msgid ""
344msgid ""
345"If passcode is entered incorrectly, your phone will conduct a factory reset "
345"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"and all personal data will be deleted."
346"and all personal data will be deleted."
347msgstr ""
347msgstr ""
348
348
349+#: qml/Wizard/Page.qml:89
350+msgid "Back"
351+msgstr ""
352+
353+#: qml/Wizard/Pages/10-welcome.qml:27
354+msgid "Hi!"
355+msgstr ""
356+
357+#: qml/Wizard/Pages/10-welcome.qml:44
358+msgid "Welcome to your Ubuntu phone."
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:52
362+msgid "Let’s get started."
363+msgstr ""
364+
365+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
366+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
367+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
368+#: qml/Wizard/Pages/passwd-set.qml:90
369+msgid "Continue"
370+msgstr ""
371+
372+#: qml/Wizard/Pages/20-sim.qml:25
373+msgid "Add a SIM card and restart your device"
374+msgstr ""
375+
376+#: qml/Wizard/Pages/20-sim.qml:55
377+msgid "Without it, you won’t be able to make calls or use text messaging."
378+msgstr ""
379+
380+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
381+msgid "Skip"
382+msgstr ""
383+
384+#: qml/Wizard/Pages/30-passwd-type.qml:39
385+msgid "Lock security"
386+msgstr ""
387+
388+#: qml/Wizard/Pages/30-passwd-type.qml:74
389+msgid "Please select how you’d like to unlock your phone."
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:97
393+msgid "Swipe"
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:98
397+msgid "No security"
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:100
401+msgid "Passcode"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:101
405+msgid "4 digits only"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:103
409+msgid "Passphrase"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:104
413+msgid "Numbers and letters"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/40-wifi.qml:28
417+msgid "Connect to Wi‑Fi"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/40-wifi.qml:147
421+msgid "Available networks…"
422+msgstr ""
423+
424+#: qml/Wizard/Pages/40-wifi.qml:148
425+msgid "No available networks."
426+msgstr ""
427+
428+#: qml/Wizard/Pages/50-location.qml:27
429+msgid "Location"
430+msgstr ""
431+
432+#: qml/Wizard/Pages/50-location.qml:62
433+msgid "Let the phone detect your location:"
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:69
437+msgid "Using GPS only (less accurate)"
438+msgstr ""
439+
440+#: qml/Wizard/Pages/50-location.qml:86
441+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
442+msgstr ""
443+
444+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
445+#: qml/Wizard/Pages/50-location.qml:103
446+msgid ""
447+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
448+"conditions</a>."
449+msgstr ""
450+
451+#: qml/Wizard/Pages/50-location.qml:112
452+msgid "Not at all"
453+msgstr ""
454+
455+#: qml/Wizard/Pages/50-location.qml:124
456+msgid "You can change your mind later in <b>System Settings</b>."
457+msgstr ""
458+
459+#: qml/Wizard/Pages/60-reporting.qml:24
460+msgid "Improving your experience"
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:36
464+msgid ""
465+"Your phone is set up to automatically report errors to Canonical and its "
466+"partners, the makers of the operating system."
467+msgstr ""
468+
469+#: qml/Wizard/Pages/60-reporting.qml:43
470+msgid ""
471+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
472+"Privacy</b>"
473+msgstr ""
474+
475+#: qml/Wizard/Pages/80-finished.qml:24
476+msgid "All done"
477+msgstr ""
478+
479+#: qml/Wizard/Pages/80-finished.qml:39
480+msgid "Nice work!"
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:46
484+msgid "Your phone is now ready to use."
485+msgstr ""
486+
487+#: qml/Wizard/Pages/80-finished.qml:53
488+msgid "Finish"
489+msgstr ""
490+
491+#: qml/Wizard/Pages/here-terms.qml:27
492+msgid "Terms & Conditions"
493+msgstr ""
494+
495+#: qml/Wizard/Pages/passwd-confirm.qml:49
496+msgid "Confirm passphrase"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/passwd-confirm.qml:50
500+msgid "Confirm passcode"
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:53
504+#: qml/Wizard/Pages/passwd-confirm.qml:54
505+msgid "Please try again."
506+msgstr ""
507+
508+#: qml/Wizard/Pages/passwd-set.qml:61
509+msgid "Choose your passcode"
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-set.qml:68
513+msgid "Passphrase must be 4 characters long"
514+msgstr ""
515+
516+#: qml/Wizard/StackButton.qml:39
517+#, qt-format
518+msgid "〈 %1"
519+msgstr ""
520+
521+#: qml/Wizard/StackButton.qml:42
522+#, qt-format
523+msgid "%1 〉"
524+msgstr ""
525+
349#~ msgid "Speaking..."
526#~ msgid "Speaking..."
350#~ msgstr "Taler..."
527#~ msgstr "Taler..."
351
528
po/de.po+279−82
@@ -7,27 +7,27 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-10-21 11:26+0000\n"
11+"PO-Revision-Date: 2015-01-29 21:52+0000\n"
12−"Last-Translator: Alexander Dobetsberger <Unknown>\n"
12+"Last-Translator: Niklas Wenzel <nikwen.developer@gmail.com>\n"
13"Language-Team: German <de@li.org>\n"
13"Language-Team: German <de@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-30 07:08+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Passwort: "
23msgstr "Passwort: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Verknüpfung anheften"
28msgstr "Verknüpfung anheften"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Verknüpfung entfernen"
32msgstr "Verknüpfung entfernen"
33
33
@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
54msgstr[0] "Bitte warten Sie %1 Minute und versuchen Sie es dann erneut..."
54msgstr[0] "Bitte warten Sie %1 Minute und versuchen Sie es dann erneut..."
55msgstr[1] "Bitte warten Sie %1 Minuten und versuchen Sie es dann erneut..."
55msgstr[1] "Bitte warten Sie %1 Minuten und versuchen Sie es dann erneut..."
56
56
57−#: qml/Components/Dialogs.qml:74
57+#: qml/Components/Dialogs.qml:86
58msgid "Log out"
58msgid "Log out"
59msgstr "Abmelden"
59msgstr "Abmelden"
60
60
61−#: qml/Components/Dialogs.qml:75
61+#: qml/Components/Dialogs.qml:87
62msgid "Are you sure you want to log out?"
62msgid "Are you sure you want to log out?"
63msgstr "Sind Sie sicher, dass Sie sich abmelden wollen?"
63msgstr "Sind Sie sicher, dass Sie sich abmelden wollen?"
64
64
65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
65+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66−#: qml/Components/Dialogs.qml:126
66+#: qml/Components/Dialogs.qml:134
67msgid "No"
67msgid "No"
68msgstr "Nein"
68msgstr "Nein"
69
69
70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
70+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71−#: qml/Components/Dialogs.qml:133
71+#: qml/Components/Dialogs.qml:140
72msgid "Yes"
72msgid "Yes"
73msgstr "Ja"
73msgstr "Ja"
74
74
75−#: qml/Components/Dialogs.qml:98
75+#: qml/Components/Dialogs.qml:108
76msgid "Shut down"
76msgid "Shut down"
77msgstr "Herunterfahren"
77msgstr "Herunterfahren"
78
78
79−#: qml/Components/Dialogs.qml:99
79+#: qml/Components/Dialogs.qml:109
80msgid "Are you sure you want to shut down?"
80msgid "Are you sure you want to shut down?"
81msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"
81msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"
82
82
83−#: qml/Components/Dialogs.qml:123
83+#: qml/Components/Dialogs.qml:131
84msgid "Reboot"
84msgid "Reboot"
85msgstr "Neustart"
85msgstr "Neustart"
86
86
87−#: qml/Components/Dialogs.qml:124
87+#: qml/Components/Dialogs.qml:132
88msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
89msgstr "Sind Sie sicher, dass Sie neu starten wollen?"
89msgstr "Sind Sie sicher, dass Sie neu starten wollen?"
90
90
91−#: qml/Components/Dialogs.qml:148
91+#: qml/Components/Dialogs.qml:154
92msgid "Power"
92msgid "Power"
93msgstr "Energie"
93msgstr "Energie"
94
94
95−#: qml/Components/Dialogs.qml:149
95+#: qml/Components/Dialogs.qml:155
96msgid ""
96msgid ""
97"Are you sure you would like\n"
97"Are you sure you would like\n"
98"to power off?"
98"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100"Sind Sie sicher, dass Sie das\n"
100"Sind Sie sicher, dass Sie das\n"
101"Gerät ausschalten wollen?"
101"Gerät ausschalten wollen?"
102
102
103−#: qml/Components/Dialogs.qml:151
103+#: qml/Components/Dialogs.qml:157
104msgid "Power off"
104msgid "Power off"
105msgstr "Ausschalten"
105msgstr "Ausschalten"
106
106
107−#: qml/Components/Dialogs.qml:161
107+#: qml/Components/Dialogs.qml:166
108msgid "Restart"
108msgid "Restart"
109msgstr "Neustarten"
109msgstr "Neustarten"
110
110
111−#: qml/Components/Dialogs.qml:171
111+#: qml/Components/Dialogs.qml:175
112msgid "Cancel"
112msgid "Cancel"
113msgstr "Abbrechen"
113msgstr "Abbrechen"
114
114
@@ -116,46 +116,46 @@ msgstr "Abbrechen"
116msgid "Skip intro"
116msgid "Skip intro"
117msgstr "Einführung überspringen"
117msgstr "Einführung überspringen"
118
118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120msgid "Right edge"
120msgid "Right edge"
121msgstr "Rechter Bildschirmrand"
121msgstr "Rechter Bildschirmrand"
122
122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124msgid "Try swiping from the right edge to unlock the phone"
124msgid "Try swiping from the right edge to unlock the phone"
125msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"
125msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"
126
126
127−#: qml/Components/EdgeDemo.qml:144
127+#: qml/Components/EdgeDemo.qml:157
128msgid "Top edge"
128msgid "Top edge"
129msgstr "Oberer Bildschirmrand"
129msgstr "Oberer Bildschirmrand"
130
130
131−#: qml/Components/EdgeDemo.qml:145
131+#: qml/Components/EdgeDemo.qml:158
132msgid "Try swiping from the top edge to access the indicators"
132msgid "Try swiping from the top edge to access the indicators"
133msgstr ""
133msgstr ""
134"Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"
134"Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"
135
135
136−#: qml/Components/EdgeDemo.qml:170
136+#: qml/Components/EdgeDemo.qml:183
137msgid "Close"
137msgid "Close"
138msgstr "Schließen"
138msgstr "Schließen"
139
139
140−#: qml/Components/EdgeDemo.qml:171
140+#: qml/Components/EdgeDemo.qml:184
141msgid "Swipe up again to close the settings screen"
141msgid "Swipe up again to close the settings screen"
142msgstr "Wischen Sie erneut nach oben, um das Einstellungsmenü zu schließen"
142msgstr "Wischen Sie erneut nach oben, um das Einstellungsmenü zu schließen"
143
143
144−#: qml/Components/EdgeDemo.qml:201
144+#: qml/Components/EdgeDemo.qml:214
145msgid "Left edge"
145msgid "Left edge"
146msgstr "Linker Rand"
146msgstr "Linker Rand"
147
147
148−#: qml/Components/EdgeDemo.qml:202
148+#: qml/Components/EdgeDemo.qml:215
149msgid "Swipe from the left to reveal the launcher for quick access to apps"
149msgid "Swipe from the left to reveal the launcher for quick access to apps"
150msgstr ""
150msgstr ""
151"Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"
151"Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"
152"Schnellzugriff aufzurufen"
152"Schnellzugriff aufzurufen"
153
153
154−#: qml/Components/EdgeDemo.qml:229
154+#: qml/Components/EdgeDemo.qml:242
155msgid "Well done"
155msgid "Well done"
156msgstr "Gut gemacht"
156msgstr "Gut gemacht"
157
157
158−#: qml/Components/EdgeDemo.qml:230
158+#: qml/Components/EdgeDemo.qml:243
159msgid ""
159msgid ""
160"You have now mastered the edge gestures and can start using the "
160"You have now mastered the edge gestures and can start using the "
161"phone<br><br>Tap on the screen to start"
161"phone<br><br>Tap on the screen to start"
@@ -163,40 +163,44 @@ msgstr ""
163"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
163"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
164"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
164"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
165
165
166−#: qml/Components/Lockscreen.qml:223
166+#: qml/Components/Lockscreen.qml:238
167msgid "Return to Call"
167msgid "Return to Call"
168−msgstr ""
168+msgstr "Zu Anruf zurückkehren"
169
169
170−#: qml/Components/Lockscreen.qml:223
170+#: qml/Components/Lockscreen.qml:238
171msgid "Emergency Call"
171msgid "Emergency Call"
172msgstr "Notruf"
172msgstr "Notruf"
173
173
174−#: qml/Components/Lockscreen.qml:255
174+#: qml/Components/Lockscreen.qml:270
175msgid "OK"
175msgid "OK"
176msgstr "OK"
176msgstr "OK"
177
177
178−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
178+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
179msgid "See less"
179msgid "See less"
180msgstr "Weniger ansehen"
180msgstr "Weniger ansehen"
181
181
182−#: qml/Dash/GenericScopeView.qml:434
182+#: qml/Dash/GenericScopeView.qml:485
183msgid "See all"
183msgid "See all"
184msgstr "Alle anzeigen"
184msgstr "Alle anzeigen"
185
185
186−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
186+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
187#: qml/Panel/SearchIndicator.qml:27
187#: qml/Panel/SearchIndicator.qml:27
188msgid "Search"
188msgid "Search"
189msgstr "Suchen"
189msgstr "Suchen"
190
190
191−#: qml/Dash/PageHeader.qml:268
191+#: qml/Dash/PageHeader.qml:267
192+msgid "Store"
193+msgstr "Store"
194+
195+#: qml/Dash/PageHeader.qml:284
192msgid "Settings"
196msgid "Settings"
193msgstr "Einstellungen"
197msgstr "Einstellungen"
194
198
195−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:291
196msgid "Remove from Favorites"
200msgid "Remove from Favorites"
197msgstr "Aus den Favoriten entfernen"
201msgstr "Aus den Favoriten entfernen"
198
202
199−#: qml/Dash/PageHeader.qml:275
203+#: qml/Dash/PageHeader.qml:291
200msgid "Add to Favorites"
204msgid "Add to Favorites"
201msgstr "Zu Favoriten hinzufügen"
205msgstr "Zu Favoriten hinzufügen"
202
206
@@ -228,31 +232,23 @@ msgstr "Zum Aktualisieren ziehen …"
228msgid "Release to refresh…"
232msgid "Release to refresh…"
229msgstr "Zum Aktualisieren loslassen …"
233msgstr "Zum Aktualisieren loslassen …"
230
234
231−#: qml/Dash/ScopesOverview.qml:215
235+#: qml/Dash/ScopesList.qml:66
232−msgid "Manage Scopes"
236+msgid "Manage"
233−msgstr "Filter verwalten"
237+msgstr "Verwalten"
234−
235−#: qml/Dash/ScopesOverview.qml:437
236−msgid "Done"
237−msgstr "Erledigt"
238−
239−#: qml/Dash/ScopesOverview.qml:463
240−msgid "Store"
241−msgstr "Store"
242
238
243−#: qml/Dash/ScopesOverviewTab.qml:36
239+#: qml/Dash/ScopesList.qml:112
244−msgid "Favorites"
240+msgid "Home"
245−msgstr "Favoriten"
241+msgstr "Startseite"
246
242
247−#: qml/Dash/ScopesOverviewTab.qml:54
243+#: qml/Dash/ScopesList.qml:113
248−msgid "All"
244+msgid "Also installed"
249−msgstr "Alle"
245+msgstr "Ebenfalls installiert"
250
246
251−#: qml/Greeter/Greeter.qml:174
247+#: qml/Greeter/Greeter.qml:133
252msgid "Unlock"
248msgid "Unlock"
253msgstr "Entsperren"
249msgstr "Entsperren"
254
250
255−#: qml/Notifications/NotificationMenuItemFactory.qml:116
251+#: qml/Notifications/NotificationMenuItemFactory.qml:128
256msgid "Show password"
252msgid "Show password"
257msgstr "Passwort anzeigen"
253msgstr "Passwort anzeigen"
258
254
@@ -292,6 +288,10 @@ msgstr "Erledigt"
292msgid "Failed, tap to retry"
288msgid "Failed, tap to retry"
293msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
289msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
294
290
291+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
292+msgid "Reply"
293+msgstr "Antworten"
294+
295#: qml/Panel/Indicators/ModemInfoItem.qml:105
295#: qml/Panel/Indicators/ModemInfoItem.qml:105
296msgid "Unlock SIM"
296msgid "Unlock SIM"
297msgstr "SIM-Karte entsperren"
297msgstr "SIM-Karte entsperren"
@@ -300,49 +300,49 @@ msgstr "SIM-Karte entsperren"
300msgid "Roaming"
300msgid "Roaming"
301msgstr "Roaming"
301msgstr "Roaming"
302
302
303−#: qml/Shell.qml:391
303+#: qml/Shell.qml:390
304+#, qt-format
305+msgid "Enter %1"
306+msgstr "%1 eingeben"
307+
308+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
304msgid "Enter passphrase"
309msgid "Enter passphrase"
305msgstr "Passwort eingeben"
310msgstr "Passwort eingeben"
306
311
307#: qml/Shell.qml:392
312#: qml/Shell.qml:392
313+msgid "Enter passcode"
314+msgstr "PIN eingeben"
315+
316+#: qml/Shell.qml:393
317+#, qt-format
318+msgid "Sorry, incorrect %1"
319+msgstr "%1 falsch"
320+
321+#: qml/Shell.qml:394
308msgid "Sorry, incorrect passphrase"
322msgid "Sorry, incorrect passphrase"
309msgstr "Das Passwort ist nicht korrekt"
323msgstr "Das Passwort ist nicht korrekt"
310
324
311−#: qml/Shell.qml:393
325+#: qml/Shell.qml:395
312msgid "Please re-enter"
326msgid "Please re-enter"
313msgstr "Bitte erneut eingeben"
327msgstr "Bitte erneut eingeben"
314
328
315−#: qml/Shell.qml:395
316−msgid "Enter passcode"
317−msgstr "PIN eingeben"
318−
319#: qml/Shell.qml:396
329#: qml/Shell.qml:396
320msgid "Sorry, incorrect passcode"
330msgid "Sorry, incorrect passcode"
321msgstr "Falsches Passwort"
331msgstr "Falsches Passwort"
322
332
323−#: qml/Shell.qml:399
333+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
324−#, qt-format
325−msgid "Enter %1"
326−msgstr "%1 eingeben"
327−
328−#: qml/Shell.qml:400
329−#, qt-format
330−msgid "Sorry, incorrect %1"
331−msgstr "%1 falsch"
332−
333−#: qml/Shell.qml:441
334msgid "Sorry, incorrect passphrase."
334msgid "Sorry, incorrect passphrase."
335msgstr "Entschuldigung, falsches Passwort."
335msgstr "Entschuldigung, falsches Passwort."
336
336
337−#: qml/Shell.qml:442
337+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
338msgid "Sorry, incorrect passcode."
338msgid "Sorry, incorrect passcode."
339msgstr "Falsche PIN"
339msgstr "Falsche PIN"
340
340
341−#: qml/Shell.qml:443
341+#: qml/Shell.qml:492
342msgid "This will be your last attempt."
342msgid "This will be your last attempt."
343msgstr "Dies ist Ihr letzter Versuch."
343msgstr "Dies ist Ihr letzter Versuch."
344
344
345−#: qml/Shell.qml:445
345+#: qml/Shell.qml:494
346msgid ""
346msgid ""
347"If passphrase is entered incorrectly, your phone will conduct a factory "
347"If passphrase is entered incorrectly, your phone will conduct a factory "
348"reset and all personal data will be deleted."
348"reset and all personal data will be deleted."
@@ -350,7 +350,7 @@ msgstr ""
350"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
350"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
351"zurückgesetzt und alle Daten werden gelöscht."
351"zurückgesetzt und alle Daten werden gelöscht."
352
352
353−#: qml/Shell.qml:446
353+#: qml/Shell.qml:495
354msgid ""
354msgid ""
355"If passcode is entered incorrectly, your phone will conduct a factory reset "
355"If passcode is entered incorrectly, your phone will conduct a factory reset "
356"and all personal data will be deleted."
356"and all personal data will be deleted."
@@ -358,6 +358,191 @@ msgstr ""
358"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
358"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
359"zurückgesetzt und alle Daten werden gelöscht."
359"zurückgesetzt und alle Daten werden gelöscht."
360
360
361+#: qml/Wizard/Page.qml:89
362+msgid "Back"
363+msgstr "Zurück"
364+
365+#: qml/Wizard/Pages/10-welcome.qml:27
366+msgid "Hi!"
367+msgstr "Hallo!"
368+
369+#: qml/Wizard/Pages/10-welcome.qml:44
370+msgid "Welcome to your Ubuntu phone."
371+msgstr "Willkommen zu Ihrem Ubuntu-Telefon."
372+
373+#: qml/Wizard/Pages/10-welcome.qml:52
374+msgid "Let’s get started."
375+msgstr "Fangen wir an!"
376+
377+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
378+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
379+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
380+#: qml/Wizard/Pages/passwd-set.qml:90
381+msgid "Continue"
382+msgstr "Weiter"
383+
384+#: qml/Wizard/Pages/20-sim.qml:25
385+msgid "Add a SIM card and restart your device"
386+msgstr "SIM-Karte einlegen und Gerät neustarten"
387+
388+#: qml/Wizard/Pages/20-sim.qml:55
389+msgid "Without it, you won’t be able to make calls or use text messaging."
390+msgstr "Ohne SIM funktionieren Anrufe und Nachrichten nicht."
391+
392+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
393+msgid "Skip"
394+msgstr "Überspringen"
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:39
397+msgid "Lock security"
398+msgstr "Sicherheit nach dem Sperren"
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:74
401+msgid "Please select how you’d like to unlock your phone."
402+msgstr "Bitte wählen Sie aus, wie Sie Ihr Telefon entsperren wollen."
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:97
405+msgid "Swipe"
406+msgstr "Wischgeste"
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:98
409+msgid "No security"
410+msgstr "Keine Sicherheitssperre"
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:100
413+msgid "Passcode"
414+msgstr "PIN"
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:101
417+msgid "4 digits only"
418+msgstr "Nur 4 Ziffern"
419+
420+#: qml/Wizard/Pages/30-passwd-type.qml:103
421+msgid "Passphrase"
422+msgstr "Passwort"
423+
424+#: qml/Wizard/Pages/30-passwd-type.qml:104
425+msgid "Numbers and letters"
426+msgstr "Ziffern und Buchstaben"
427+
428+#: qml/Wizard/Pages/40-wifi.qml:28
429+msgid "Connect to Wi‑Fi"
430+msgstr "Mit WLAN verbinden"
431+
432+#: qml/Wizard/Pages/40-wifi.qml:147
433+msgid "Available networks…"
434+msgstr "Verfügbare Netzwerke …"
435+
436+#: qml/Wizard/Pages/40-wifi.qml:148
437+msgid "No available networks."
438+msgstr "Keine verfügbaren Netzwerke."
439+
440+#: qml/Wizard/Pages/50-location.qml:27
441+msgid "Location"
442+msgstr "Position"
443+
444+#: qml/Wizard/Pages/50-location.qml:62
445+msgid "Let the phone detect your location:"
446+msgstr "Dem Telefon erlauben, Ihre Position zu bestimmen:"
447+
448+#: qml/Wizard/Pages/50-location.qml:69
449+msgid "Using GPS only (less accurate)"
450+msgstr "Nur durch GPS (ungenauer)"
451+
452+#: qml/Wizard/Pages/50-location.qml:86
453+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
454+msgstr ""
455+"Durch GPS sowie anonymisierte WLAN- und Mobilfunknetz-Daten (empfohlen)"
456+
457+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
458+#: qml/Wizard/Pages/50-location.qml:103
459+msgid ""
460+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
461+"conditions</a>."
462+msgstr ""
463+"Mit dem Auswählen dieser Option stimmen Sie den Nokia HERE <a "
464+"href='#'>allgemeinen Geschäftsbedingungen</a> zu."
465+
466+#: qml/Wizard/Pages/50-location.qml:112
467+msgid "Not at all"
468+msgstr "Gar nicht"
469+
470+#: qml/Wizard/Pages/50-location.qml:124
471+msgid "You can change your mind later in <b>System Settings</b>."
472+msgstr ""
473+"Sie können Ihre Meinung später in den <b>Systemeinstellungen</b> ändern."
474+
475+#: qml/Wizard/Pages/60-reporting.qml:24
476+msgid "Improving your experience"
477+msgstr "Verbessert Ihre Erfahrung mit diesem Produkt"
478+
479+#: qml/Wizard/Pages/60-reporting.qml:36
480+msgid ""
481+"Your phone is set up to automatically report errors to Canonical and its "
482+"partners, the makers of the operating system."
483+msgstr ""
484+"Ihr Telefon ist so eingestellt, dass es automatisch Fehlerberichte an "
485+"Canonical und seine Partner, die Hersteller des Betriebssystems, sendet."
486+
487+#: qml/Wizard/Pages/60-reporting.qml:43
488+msgid ""
489+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
490+"Privacy</b>"
491+msgstr ""
492+"Dies kann in den <b>Systemeinstellungen</b> unter <b>Sicherheit &amp; "
493+"Datenschutz</b> deaktiviert werden"
494+
495+#: qml/Wizard/Pages/80-finished.qml:24
496+msgid "All done"
497+msgstr "Alles erledigt"
498+
499+#: qml/Wizard/Pages/80-finished.qml:39
500+msgid "Nice work!"
501+msgstr "Gute Arbeit!"
502+
503+#: qml/Wizard/Pages/80-finished.qml:46
504+msgid "Your phone is now ready to use."
505+msgstr "Ihr Telefon ist nun einsatzbereit."
506+
507+#: qml/Wizard/Pages/80-finished.qml:53
508+msgid "Finish"
509+msgstr "Beenden"
510+
511+#: qml/Wizard/Pages/here-terms.qml:27
512+msgid "Terms & Conditions"
513+msgstr "Nutzungsbedingungen"
514+
515+#: qml/Wizard/Pages/passwd-confirm.qml:49
516+msgid "Confirm passphrase"
517+msgstr "Passwort bestätigen"
518+
519+#: qml/Wizard/Pages/passwd-confirm.qml:50
520+msgid "Confirm passcode"
521+msgstr "PIN bestätigen"
522+
523+#: qml/Wizard/Pages/passwd-confirm.qml:53
524+#: qml/Wizard/Pages/passwd-confirm.qml:54
525+msgid "Please try again."
526+msgstr "Bitte versuchen Sie es erneut."
527+
528+#: qml/Wizard/Pages/passwd-set.qml:61
529+msgid "Choose your passcode"
530+msgstr "Wählen Sie Ihre PIN"
531+
532+#: qml/Wizard/Pages/passwd-set.qml:68
533+msgid "Passphrase must be 4 characters long"
534+msgstr "Passwörter müssen 4 Buchstaben lang sein"
535+
536+#: qml/Wizard/StackButton.qml:39
537+#, qt-format
538+msgid "〈 %1"
539+msgstr "〈 %1"
540+
541+#: qml/Wizard/StackButton.qml:42
542+#, qt-format
543+msgid "%1 〉"
544+msgstr "%1 〉"
545+
361#~ msgid "Confirm"
546#~ msgid "Confirm"
362#~ msgstr "Bestätigen"
547#~ msgstr "Bestätigen"
363
548
@@ -372,3 +557,15 @@ msgstr ""
372
557
373#~ msgid "Speaking..."
558#~ msgid "Speaking..."
374#~ msgstr "Sprechen Sie …"
559#~ msgstr "Sprechen Sie …"
560+
561+#~ msgid "All"
562+#~ msgstr "Alle"
563+
564+#~ msgid "Done"
565+#~ msgstr "Erledigt"
566+
567+#~ msgid "Favorites"
568+#~ msgstr "Favoriten"
569+
570+#~ msgid "Manage Scopes"
571+#~ msgstr "Filter verwalten"
po/el.po+265−79
@@ -7,27 +7,27 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2014-11-08 18:38+0000\n"
11"PO-Revision-Date: 2014-11-08 18:38+0000\n"
12−"Last-Translator: Stathis Iosifidis <Unknown>\n"
12+"Last-Translator: Efstathios Iosifidis <Unknown>\n"
13"Language-Team: Greek <el@li.org>\n"
13"Language-Team: Greek <el@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Κωδικός πρόσβασης: "
23msgstr "Κωδικός πρόσβασης: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Καρφίτσωμα συντόμευσης"
28msgstr "Καρφίτσωμα συντόμευσης"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Ξεκαρφίτσωμα συντόμευσης"
32msgstr "Ξεκαρφίτσωμα συντόμευσης"
33
33
@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
54msgstr[0] "Παρακαλώ περιμένετε %1 λεπτό και δοκιμάστε ξανά..."
54msgstr[0] "Παρακαλώ περιμένετε %1 λεπτό και δοκιμάστε ξανά..."
55msgstr[1] "Παρακαλώ περιμένετε %1 λεπτά και δοκιμάστε ξανά..."
55msgstr[1] "Παρακαλώ περιμένετε %1 λεπτά και δοκιμάστε ξανά..."
56
56
57−#: qml/Components/Dialogs.qml:74
57+#: qml/Components/Dialogs.qml:86
58msgid "Log out"
58msgid "Log out"
59msgstr "Αποσύνδεση"
59msgstr "Αποσύνδεση"
60
60
61−#: qml/Components/Dialogs.qml:75
61+#: qml/Components/Dialogs.qml:87
62msgid "Are you sure you want to log out?"
62msgid "Are you sure you want to log out?"
63msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε;"
63msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε;"
64
64
65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
65+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66−#: qml/Components/Dialogs.qml:126
66+#: qml/Components/Dialogs.qml:134
67msgid "No"
67msgid "No"
68msgstr "Όχι"
68msgstr "Όχι"
69
69
70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
70+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71−#: qml/Components/Dialogs.qml:133
71+#: qml/Components/Dialogs.qml:140
72msgid "Yes"
72msgid "Yes"
73msgstr "Ναι"
73msgstr "Ναι"
74
74
75−#: qml/Components/Dialogs.qml:98
75+#: qml/Components/Dialogs.qml:108
76msgid "Shut down"
76msgid "Shut down"
77msgstr "Τερματισμός λειτουργίας"
77msgstr "Τερματισμός λειτουργίας"
78
78
79−#: qml/Components/Dialogs.qml:99
79+#: qml/Components/Dialogs.qml:109
80msgid "Are you sure you want to shut down?"
80msgid "Are you sure you want to shut down?"
81msgstr "Επιθυμείτε σίγουρα τερματισμό;"
81msgstr "Επιθυμείτε σίγουρα τερματισμό;"
82
82
83−#: qml/Components/Dialogs.qml:123
83+#: qml/Components/Dialogs.qml:131
84msgid "Reboot"
84msgid "Reboot"
85msgstr "Επανεκκίνηση"
85msgstr "Επανεκκίνηση"
86
86
87−#: qml/Components/Dialogs.qml:124
87+#: qml/Components/Dialogs.qml:132
88msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
89msgstr "Επιθυμείτε σίγουρα επανεκκίνηση;"
89msgstr "Επιθυμείτε σίγουρα επανεκκίνηση;"
90
90
91−#: qml/Components/Dialogs.qml:148
91+#: qml/Components/Dialogs.qml:154
92msgid "Power"
92msgid "Power"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Dialogs.qml:149
95+#: qml/Components/Dialogs.qml:155
96msgid ""
96msgid ""
97"Are you sure you would like\n"
97"Are you sure you would like\n"
98"to power off?"
98"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100"Επιθυμείτε σίγουρα τον\n"
100"Επιθυμείτε σίγουρα τον\n"
101"τερματισμό λειτουργίας;"
101"τερματισμό λειτουργίας;"
102
102
103−#: qml/Components/Dialogs.qml:151
103+#: qml/Components/Dialogs.qml:157
104msgid "Power off"
104msgid "Power off"
105msgstr "Τερματισμός"
105msgstr "Τερματισμός"
106
106
107−#: qml/Components/Dialogs.qml:161
107+#: qml/Components/Dialogs.qml:166
108msgid "Restart"
108msgid "Restart"
109msgstr "Επανεκκίνηση"
109msgstr "Επανεκκίνηση"
110
110
111−#: qml/Components/Dialogs.qml:171
111+#: qml/Components/Dialogs.qml:175
112msgid "Cancel"
112msgid "Cancel"
113msgstr "Ακύρωση"
113msgstr "Ακύρωση"
114
114
@@ -116,45 +116,45 @@ msgstr "Ακύρωση"
116msgid "Skip intro"
116msgid "Skip intro"
117msgstr "Παράλειψη εισαγωγής"
117msgstr "Παράλειψη εισαγωγής"
118
118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120msgid "Right edge"
120msgid "Right edge"
121msgstr "Δεξί άκρο"
121msgstr "Δεξί άκρο"
122
122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124msgid "Try swiping from the right edge to unlock the phone"
124msgid "Try swiping from the right edge to unlock the phone"
125msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"
125msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"
126
126
127−#: qml/Components/EdgeDemo.qml:144
127+#: qml/Components/EdgeDemo.qml:157
128msgid "Top edge"
128msgid "Top edge"
129msgstr "Πάνω άκρο"
129msgstr "Πάνω άκρο"
130
130
131−#: qml/Components/EdgeDemo.qml:145
131+#: qml/Components/EdgeDemo.qml:158
132msgid "Try swiping from the top edge to access the indicators"
132msgid "Try swiping from the top edge to access the indicators"
133msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"
133msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"
134
134
135−#: qml/Components/EdgeDemo.qml:170
135+#: qml/Components/EdgeDemo.qml:183
136msgid "Close"
136msgid "Close"
137msgstr "Κλείσιμο"
137msgstr "Κλείσιμο"
138
138
139−#: qml/Components/EdgeDemo.qml:171
139+#: qml/Components/EdgeDemo.qml:184
140msgid "Swipe up again to close the settings screen"
140msgid "Swipe up again to close the settings screen"
141msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"
141msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"
142
142
143−#: qml/Components/EdgeDemo.qml:201
143+#: qml/Components/EdgeDemo.qml:214
144msgid "Left edge"
144msgid "Left edge"
145msgstr "Αριστερό άκρο"
145msgstr "Αριστερό άκρο"
146
146
147−#: qml/Components/EdgeDemo.qml:202
147+#: qml/Components/EdgeDemo.qml:215
148msgid "Swipe from the left to reveal the launcher for quick access to apps"
148msgid "Swipe from the left to reveal the launcher for quick access to apps"
149msgstr ""
149msgstr ""
150"Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "
150"Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "
151"στις εφαρμογές"
151"στις εφαρμογές"
152
152
153−#: qml/Components/EdgeDemo.qml:229
153+#: qml/Components/EdgeDemo.qml:242
154msgid "Well done"
154msgid "Well done"
155msgstr "Συγχαρητήρια"
155msgstr "Συγχαρητήρια"
156
156
157−#: qml/Components/EdgeDemo.qml:230
157+#: qml/Components/EdgeDemo.qml:243
158msgid ""
158msgid ""
159"You have now mastered the edge gestures and can start using the "
159"You have now mastered the edge gestures and can start using the "
160"phone<br><br>Tap on the screen to start"
160"phone<br><br>Tap on the screen to start"
@@ -162,40 +162,44 @@ msgstr ""
162"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
162"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
163"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
163"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
164
164
165−#: qml/Components/Lockscreen.qml:223
165+#: qml/Components/Lockscreen.qml:238
166msgid "Return to Call"
166msgid "Return to Call"
167msgstr "Επιστροφή στην κλήση"
167msgstr "Επιστροφή στην κλήση"
168
168
169−#: qml/Components/Lockscreen.qml:223
169+#: qml/Components/Lockscreen.qml:238
170msgid "Emergency Call"
170msgid "Emergency Call"
171msgstr "Κλήση έκτακτης ανάγκης"
171msgstr "Κλήση έκτακτης ανάγκης"
172
172
173−#: qml/Components/Lockscreen.qml:255
173+#: qml/Components/Lockscreen.qml:270
174msgid "OK"
174msgid "OK"
175msgstr "OK"
175msgstr "OK"
176
176
177−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
177+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
178msgid "See less"
178msgid "See less"
179msgstr "Λιγότερα"
179msgstr "Λιγότερα"
180
180
181−#: qml/Dash/GenericScopeView.qml:434
181+#: qml/Dash/GenericScopeView.qml:485
182msgid "See all"
182msgid "See all"
183msgstr "Εμφάνιση όλων"
183msgstr "Εμφάνιση όλων"
184
184
185−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
185+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
186#: qml/Panel/SearchIndicator.qml:27
186#: qml/Panel/SearchIndicator.qml:27
187msgid "Search"
187msgid "Search"
188msgstr "Αναζήτηση"
188msgstr "Αναζήτηση"
189
189
190−#: qml/Dash/PageHeader.qml:268
190+#: qml/Dash/PageHeader.qml:267
191+msgid "Store"
192+msgstr "Κατάστημα"
193+
194+#: qml/Dash/PageHeader.qml:284
191msgid "Settings"
195msgid "Settings"
192msgstr "Ρυθμίσεις"
196msgstr "Ρυθμίσεις"
193
197
194−#: qml/Dash/PageHeader.qml:275
198+#: qml/Dash/PageHeader.qml:291
195msgid "Remove from Favorites"
199msgid "Remove from Favorites"
196msgstr "Αφαίρεση από τα αγαπημένα"
200msgstr "Αφαίρεση από τα αγαπημένα"
197
201
198−#: qml/Dash/PageHeader.qml:275
202+#: qml/Dash/PageHeader.qml:291
199msgid "Add to Favorites"
203msgid "Add to Favorites"
200msgstr "Προσθήκη στα αγαπημένα"
204msgstr "Προσθήκη στα αγαπημένα"
201
205
@@ -227,31 +231,23 @@ msgstr ""
227msgid "Release to refresh…"
231msgid "Release to refresh…"
228msgstr ""
232msgstr ""
229
233
230−#: qml/Dash/ScopesOverview.qml:215
234+#: qml/Dash/ScopesList.qml:66
231−msgid "Manage Scopes"
235+msgid "Manage"
232msgstr ""
236msgstr ""
233
237
234−#: qml/Dash/ScopesOverview.qml:437
238+#: qml/Dash/ScopesList.qml:112
235−msgid "Done"
236−msgstr "Ολοκληρώθηκε"
237−
238−#: qml/Dash/ScopesOverview.qml:463
239−msgid "Store"
240−msgstr "Κατάστημα"
241−
242−#: qml/Dash/ScopesOverviewTab.qml:36
243−msgid "Favorites"
239+msgid "Home"
244−msgstr "Αγαπημένα"
240+msgstr ""
245
241
246−#: qml/Dash/ScopesOverviewTab.qml:54
242+#: qml/Dash/ScopesList.qml:113
247−msgid "All"
243+msgid "Also installed"
248−msgstr "Όλα"
244+msgstr ""
249
245
250−#: qml/Greeter/Greeter.qml:174
246+#: qml/Greeter/Greeter.qml:133
251msgid "Unlock"
247msgid "Unlock"
252msgstr "Ξεκλείδωμα"
248msgstr "Ξεκλείδωμα"
253
249
254−#: qml/Notifications/NotificationMenuItemFactory.qml:116
250+#: qml/Notifications/NotificationMenuItemFactory.qml:128
255msgid "Show password"
251msgid "Show password"
256msgstr "Εμφάνιση κωδικού"
252msgstr "Εμφάνιση κωδικού"
257
253
@@ -291,6 +287,10 @@ msgstr "Ολοκληρώθηκε"
291msgid "Failed, tap to retry"
287msgid "Failed, tap to retry"
292msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσετε"
288msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσετε"
293
289
290+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
291+msgid "Reply"
292+msgstr ""
293+
294#: qml/Panel/Indicators/ModemInfoItem.qml:105
294#: qml/Panel/Indicators/ModemInfoItem.qml:105
295msgid "Unlock SIM"
295msgid "Unlock SIM"
296msgstr "Ξεκλείδωμα SIM"
296msgstr "Ξεκλείδωμα SIM"
@@ -299,60 +299,237 @@ msgstr "Ξεκλείδωμα SIM"
299msgid "Roaming"
299msgid "Roaming"
300msgstr "Περιαγωγή"
300msgstr "Περιαγωγή"
301
301
302−#: qml/Shell.qml:391
302+#: qml/Shell.qml:390
303+#, qt-format
304+msgid "Enter %1"
305+msgstr "Εισάγετε %1"
306+
307+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
303msgid "Enter passphrase"
308msgid "Enter passphrase"
304msgstr "Εισαγωγή συνθηματικού"
309msgstr "Εισαγωγή συνθηματικού"
305
310
306#: qml/Shell.qml:392
311#: qml/Shell.qml:392
312+msgid "Enter passcode"
313+msgstr "Εισαγωγή κωδικού"
314+
315+#: qml/Shell.qml:393
316+#, qt-format
317+msgid "Sorry, incorrect %1"
318+msgstr "Συγνώμη, μη έγκυρο %1"
319+
320+#: qml/Shell.qml:394
307msgid "Sorry, incorrect passphrase"
321msgid "Sorry, incorrect passphrase"
308msgstr "Συγνώμη, μη έγκυρο συνθηματικό"
322msgstr "Συγνώμη, μη έγκυρο συνθηματικό"
309
323
310−#: qml/Shell.qml:393
324+#: qml/Shell.qml:395
311msgid "Please re-enter"
325msgid "Please re-enter"
312msgstr "Παρακαλώ πληκτρολογήστε ξανά"
326msgstr "Παρακαλώ πληκτρολογήστε ξανά"
313
327
314−#: qml/Shell.qml:395
315−msgid "Enter passcode"
316−msgstr "Εισαγωγή κωδικού"
317−
318#: qml/Shell.qml:396
328#: qml/Shell.qml:396
319msgid "Sorry, incorrect passcode"
329msgid "Sorry, incorrect passcode"
320msgstr ""
330msgstr ""
321
331
322−#: qml/Shell.qml:399
332+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
323−#, qt-format
324−msgid "Enter %1"
325−msgstr "Εισάγετε %1"
326−
327−#: qml/Shell.qml:400
328−#, qt-format
329−msgid "Sorry, incorrect %1"
330−msgstr "Συγνώμη, μη έγκυρο %1"
331−
332−#: qml/Shell.qml:441
333msgid "Sorry, incorrect passphrase."
333msgid "Sorry, incorrect passphrase."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Shell.qml:442
336+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
337msgid "Sorry, incorrect passcode."
337msgid "Sorry, incorrect passcode."
338msgstr ""
338msgstr ""
339
339
340−#: qml/Shell.qml:443
340+#: qml/Shell.qml:492
341msgid "This will be your last attempt."
341msgid "This will be your last attempt."
342msgstr ""
342msgstr ""
343
343
344−#: qml/Shell.qml:445
344+#: qml/Shell.qml:494
345msgid ""
345msgid ""
346"If passphrase is entered incorrectly, your phone will conduct a factory "
346"If passphrase is entered incorrectly, your phone will conduct a factory "
347"reset and all personal data will be deleted."
347"reset and all personal data will be deleted."
348msgstr ""
348msgstr ""
349
349
350−#: qml/Shell.qml:446
350+#: qml/Shell.qml:495
351msgid ""
351msgid ""
352"If passcode is entered incorrectly, your phone will conduct a factory reset "
352"If passcode is entered incorrectly, your phone will conduct a factory reset "
353"and all personal data will be deleted."
353"and all personal data will be deleted."
354msgstr ""
354msgstr ""
355
355
356+#: qml/Wizard/Page.qml:89
357+msgid "Back"
358+msgstr ""
359+
360+#: qml/Wizard/Pages/10-welcome.qml:27
361+msgid "Hi!"
362+msgstr ""
363+
364+#: qml/Wizard/Pages/10-welcome.qml:44
365+msgid "Welcome to your Ubuntu phone."
366+msgstr ""
367+
368+#: qml/Wizard/Pages/10-welcome.qml:52
369+msgid "Let’s get started."
370+msgstr ""
371+
372+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
373+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
374+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
375+#: qml/Wizard/Pages/passwd-set.qml:90
376+msgid "Continue"
377+msgstr ""
378+
379+#: qml/Wizard/Pages/20-sim.qml:25
380+msgid "Add a SIM card and restart your device"
381+msgstr ""
382+
383+#: qml/Wizard/Pages/20-sim.qml:55
384+msgid "Without it, you won’t be able to make calls or use text messaging."
385+msgstr ""
386+
387+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
388+msgid "Skip"
389+msgstr ""
390+
391+#: qml/Wizard/Pages/30-passwd-type.qml:39
392+msgid "Lock security"
393+msgstr ""
394+
395+#: qml/Wizard/Pages/30-passwd-type.qml:74
396+msgid "Please select how you’d like to unlock your phone."
397+msgstr ""
398+
399+#: qml/Wizard/Pages/30-passwd-type.qml:97
400+msgid "Swipe"
401+msgstr ""
402+
403+#: qml/Wizard/Pages/30-passwd-type.qml:98
404+msgid "No security"
405+msgstr ""
406+
407+#: qml/Wizard/Pages/30-passwd-type.qml:100
408+msgid "Passcode"
409+msgstr ""
410+
411+#: qml/Wizard/Pages/30-passwd-type.qml:101
412+msgid "4 digits only"
413+msgstr ""
414+
415+#: qml/Wizard/Pages/30-passwd-type.qml:103
416+msgid "Passphrase"
417+msgstr ""
418+
419+#: qml/Wizard/Pages/30-passwd-type.qml:104
420+msgid "Numbers and letters"
421+msgstr ""
422+
423+#: qml/Wizard/Pages/40-wifi.qml:28
424+msgid "Connect to Wi‑Fi"
425+msgstr ""
426+
427+#: qml/Wizard/Pages/40-wifi.qml:147
428+msgid "Available networks…"
429+msgstr ""
430+
431+#: qml/Wizard/Pages/40-wifi.qml:148
432+msgid "No available networks."
433+msgstr ""
434+
435+#: qml/Wizard/Pages/50-location.qml:27
436+msgid "Location"
437+msgstr ""
438+
439+#: qml/Wizard/Pages/50-location.qml:62
440+msgid "Let the phone detect your location:"
441+msgstr ""
442+
443+#: qml/Wizard/Pages/50-location.qml:69
444+msgid "Using GPS only (less accurate)"
445+msgstr ""
446+
447+#: qml/Wizard/Pages/50-location.qml:86
448+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
449+msgstr ""
450+
451+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
452+#: qml/Wizard/Pages/50-location.qml:103
453+msgid ""
454+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
455+"conditions</a>."
456+msgstr ""
457+
458+#: qml/Wizard/Pages/50-location.qml:112
459+msgid "Not at all"
460+msgstr ""
461+
462+#: qml/Wizard/Pages/50-location.qml:124
463+msgid "You can change your mind later in <b>System Settings</b>."
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:24
467+msgid "Improving your experience"
468+msgstr ""
469+
470+#: qml/Wizard/Pages/60-reporting.qml:36
471+msgid ""
472+"Your phone is set up to automatically report errors to Canonical and its "
473+"partners, the makers of the operating system."
474+msgstr ""
475+
476+#: qml/Wizard/Pages/60-reporting.qml:43
477+msgid ""
478+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
479+"Privacy</b>"
480+msgstr ""
481+
482+#: qml/Wizard/Pages/80-finished.qml:24
483+msgid "All done"
484+msgstr ""
485+
486+#: qml/Wizard/Pages/80-finished.qml:39
487+msgid "Nice work!"
488+msgstr ""
489+
490+#: qml/Wizard/Pages/80-finished.qml:46
491+msgid "Your phone is now ready to use."
492+msgstr ""
493+
494+#: qml/Wizard/Pages/80-finished.qml:53
495+msgid "Finish"
496+msgstr ""
497+
498+#: qml/Wizard/Pages/here-terms.qml:27
499+msgid "Terms & Conditions"
500+msgstr ""
501+
502+#: qml/Wizard/Pages/passwd-confirm.qml:49
503+msgid "Confirm passphrase"
504+msgstr ""
505+
506+#: qml/Wizard/Pages/passwd-confirm.qml:50
507+msgid "Confirm passcode"
508+msgstr ""
509+
510+#: qml/Wizard/Pages/passwd-confirm.qml:53
511+#: qml/Wizard/Pages/passwd-confirm.qml:54
512+msgid "Please try again."
513+msgstr ""
514+
515+#: qml/Wizard/Pages/passwd-set.qml:61
516+msgid "Choose your passcode"
517+msgstr ""
518+
519+#: qml/Wizard/Pages/passwd-set.qml:68
520+msgid "Passphrase must be 4 characters long"
521+msgstr ""
522+
523+#: qml/Wizard/StackButton.qml:39
524+#, qt-format
525+msgid "〈 %1"
526+msgstr ""
527+
528+#: qml/Wizard/StackButton.qml:42
529+#, qt-format
530+msgid "%1 〉"
531+msgstr ""
532+
356#~ msgid "Confirm"
533#~ msgid "Confirm"
357#~ msgstr "Επιβεβαίωση"
534#~ msgstr "Επιβεβαίωση"
358
535
@@ -367,3 +544,12 @@ msgstr ""
367
544
368#~ msgid "Loading. Please Wait..."
545#~ msgid "Loading. Please Wait..."
369#~ msgstr "Γίνεται φόρτωση. Παρακαλώ περιμένετε..."
546#~ msgstr "Γίνεται φόρτωση. Παρακαλώ περιμένετε..."
547+
548+#~ msgid "All"
549+#~ msgstr "Όλα"
550+
551+#~ msgid "Favorites"
552+#~ msgstr "Αγαπημένα"
553+
554+#~ msgid "Done"
555+#~ msgstr "Ολοκληρώθηκε"
po/en_AU.po+276−81
@@ -7,27 +7,27 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-10-12 09:41+0000\n"
11+"PO-Revision-Date: 2015-01-29 01:35+0000\n"
12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
13"Language-Team: English (Australia) <en_AU@li.org>\n"
13"Language-Team: English (Australia) <en_AU@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-30 07:08+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Password: "
23msgstr "Password: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Pin shortcut"
28msgstr "Pin shortcut"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Unpin shortcut"
32msgstr "Unpin shortcut"
33
33
@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] "Please wait %1 minute and then try again…"
50msgstr[0] "Please wait %1 minute and then try again…"
51msgstr[1] "Please wait %1 minutes and then try again…"
51msgstr[1] "Please wait %1 minutes and then try again…"
52
52
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
54msgid "Log out"
54msgid "Log out"
55msgstr "Log out"
55msgstr "Log out"
56
56
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr "Are you sure you want to log out?"
59msgstr "Are you sure you want to log out?"
60
60
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:134
63msgid "No"
63msgid "No"
64msgstr "No"
64msgstr "No"
65
65
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:140
68msgid "Yes"
68msgid "Yes"
69msgstr "Yes"
69msgstr "Yes"
70
70
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
72msgid "Shut down"
72msgid "Shut down"
73msgstr "Shut down"
73msgstr "Shut down"
74
74
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr "Are you sure you want to shut down?"
77msgstr "Are you sure you want to shut down?"
78
78
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
80msgid "Reboot"
80msgid "Reboot"
81msgstr "Reboot"
81msgstr "Reboot"
82
82
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr "Are you sure you want to reboot?"
85msgstr "Are you sure you want to reboot?"
86
86
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
88msgid "Power"
88msgid "Power"
89msgstr "Power"
89msgstr "Power"
90
90
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
96"Are you sure you would like\n"
96"Are you sure you would like\n"
97"to power off?"
97"to power off?"
98
98
99−#: qml/Components/Dialogs.qml:151
99+#: qml/Components/Dialogs.qml:157
100msgid "Power off"
100msgid "Power off"
101msgstr "Power off"
101msgstr "Power off"
102
102
103−#: qml/Components/Dialogs.qml:161
103+#: qml/Components/Dialogs.qml:166
104msgid "Restart"
104msgid "Restart"
105msgstr "Restart"
105msgstr "Restart"
106
106
107−#: qml/Components/Dialogs.qml:171
107+#: qml/Components/Dialogs.qml:175
108msgid "Cancel"
108msgid "Cancel"
109msgstr "Cancel"
109msgstr "Cancel"
110
110
@@ -112,43 +112,43 @@ msgstr "Cancel"
112msgid "Skip intro"
112msgid "Skip intro"
113msgstr "Skip intro"
113msgstr "Skip intro"
114
114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116msgid "Right edge"
116msgid "Right edge"
117msgstr "Right edge"
117msgstr "Right edge"
118
118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120msgid "Try swiping from the right edge to unlock the phone"
120msgid "Try swiping from the right edge to unlock the phone"
121msgstr "Try swiping from the right edge to unlock the phone"
121msgstr "Try swiping from the right edge to unlock the phone"
122
122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124msgid "Top edge"
124msgid "Top edge"
125msgstr "Top edge"
125msgstr "Top edge"
126
126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128msgid "Try swiping from the top edge to access the indicators"
128msgid "Try swiping from the top edge to access the indicators"
129msgstr "Try swiping from the top edge to access the indicators"
129msgstr "Try swiping from the top edge to access the indicators"
130
130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132msgid "Close"
132msgid "Close"
133msgstr "Close"
133msgstr "Close"
134
134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136msgid "Swipe up again to close the settings screen"
136msgid "Swipe up again to close the settings screen"
137msgstr "Swipe up again to close the settings screen"
137msgstr "Swipe up again to close the settings screen"
138
138
139−#: qml/Components/EdgeDemo.qml:201
139+#: qml/Components/EdgeDemo.qml:214
140msgid "Left edge"
140msgid "Left edge"
141msgstr "Left edge"
141msgstr "Left edge"
142
142
143−#: qml/Components/EdgeDemo.qml:202
143+#: qml/Components/EdgeDemo.qml:215
144msgid "Swipe from the left to reveal the launcher for quick access to apps"
144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145msgstr "Swipe from the left to reveal the launcher for quick access to apps"
145msgstr "Swipe from the left to reveal the launcher for quick access to apps"
146
146
147−#: qml/Components/EdgeDemo.qml:229
147+#: qml/Components/EdgeDemo.qml:242
148msgid "Well done"
148msgid "Well done"
149msgstr "Well done"
149msgstr "Well done"
150
150
151−#: qml/Components/EdgeDemo.qml:230
151+#: qml/Components/EdgeDemo.qml:243
152msgid ""
152msgid ""
153"You have now mastered the edge gestures and can start using the "
153"You have now mastered the edge gestures and can start using the "
154"phone<br><br>Tap on the screen to start"
154"phone<br><br>Tap on the screen to start"
@@ -156,40 +156,44 @@ msgstr ""
156"You have now mastered the edge gestures and can start using the "
156"You have now mastered the edge gestures and can start using the "
157"phone<br><br>Tap on the screen to start"
157"phone<br><br>Tap on the screen to start"
158
158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160msgid "Return to Call"
160msgid "Return to Call"
161−msgstr ""
161+msgstr "Return to Call"
162
162
163−#: qml/Components/Lockscreen.qml:223
163+#: qml/Components/Lockscreen.qml:238
164msgid "Emergency Call"
164msgid "Emergency Call"
165msgstr "Emergency Call"
165msgstr "Emergency Call"
166
166
167−#: qml/Components/Lockscreen.qml:255
167+#: qml/Components/Lockscreen.qml:270
168msgid "OK"
168msgid "OK"
169msgstr "OK"
169msgstr "OK"
170
170
171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
172msgid "See less"
172msgid "See less"
173msgstr "See less"
173msgstr "See less"
174
174
175−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:485
176msgid "See all"
176msgid "See all"
177msgstr "See all"
177msgstr "See all"
178
178
179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
181msgid "Search"
181msgid "Search"
182msgstr "Search"
182msgstr "Search"
183
183
184−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:267
185+msgid "Store"
186+msgstr "Store"
187+
188+#: qml/Dash/PageHeader.qml:284
185msgid "Settings"
189msgid "Settings"
186msgstr "Settings"
190msgstr "Settings"
187
191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189msgid "Remove from Favorites"
193msgid "Remove from Favorites"
190msgstr "Remove from Favourites"
194msgstr "Remove from Favourites"
191
195
192−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:291
193msgid "Add to Favorites"
197msgid "Add to Favorites"
194msgstr "Add to Favourites"
198msgstr "Add to Favourites"
195
199
@@ -221,31 +225,23 @@ msgstr "Pull to refresh…"
221msgid "Release to refresh…"
225msgid "Release to refresh…"
222msgstr "Release to refresh…"
226msgstr "Release to refresh…"
223
227
224−#: qml/Dash/ScopesOverview.qml:215
228+#: qml/Dash/ScopesList.qml:66
225−msgid "Manage Scopes"
229+msgid "Manage"
226−msgstr "Manage Scopes"
230+msgstr "Manage"
227
231
228−#: qml/Dash/ScopesOverview.qml:437
232+#: qml/Dash/ScopesList.qml:112
229−msgid "Done"
233+msgid "Home"
230−msgstr "Done"
234+msgstr "Home"
231
235
232−#: qml/Dash/ScopesOverview.qml:463
236+#: qml/Dash/ScopesList.qml:113
233−msgid "Store"
237+msgid "Also installed"
234−msgstr "Store"
238+msgstr "Also installed"
235
239
236−#: qml/Dash/ScopesOverviewTab.qml:36
237−msgid "Favorites"
238−msgstr "Favourites"
239−
240−#: qml/Dash/ScopesOverviewTab.qml:54
241−msgid "All"
242−msgstr "All"
243−
244−#: qml/Greeter/Greeter.qml:174
240+#: qml/Greeter/Greeter.qml:133
245msgid "Unlock"
241msgid "Unlock"
246msgstr "Unlock"
242msgstr "Unlock"
247
243
248−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
249msgid "Show password"
245msgid "Show password"
250msgstr "Show password"
246msgstr "Show password"
251
247
@@ -285,6 +281,10 @@ msgstr "Finished"
285msgid "Failed, tap to retry"
281msgid "Failed, tap to retry"
286msgstr "Failed, tap to retry"
282msgstr "Failed, tap to retry"
287
283
284+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
285+msgid "Reply"
286+msgstr "Reply"
287+
288#: qml/Panel/Indicators/ModemInfoItem.qml:105
288#: qml/Panel/Indicators/ModemInfoItem.qml:105
289msgid "Unlock SIM"
289msgid "Unlock SIM"
290msgstr "Unlock SIM"
290msgstr "Unlock SIM"
@@ -293,49 +293,49 @@ msgstr "Unlock SIM"
293msgid "Roaming"
293msgid "Roaming"
294msgstr "Roaming"
294msgstr "Roaming"
295
295
296−#: qml/Shell.qml:391
296+#: qml/Shell.qml:390
297+#, qt-format
298+msgid "Enter %1"
299+msgstr "Enter %1"
300+
301+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
297msgid "Enter passphrase"
302msgid "Enter passphrase"
298msgstr "Enter passphrase"
303msgstr "Enter passphrase"
299
304
300#: qml/Shell.qml:392
305#: qml/Shell.qml:392
306+msgid "Enter passcode"
307+msgstr "Enter passcode"
308+
309+#: qml/Shell.qml:393
310+#, qt-format
311+msgid "Sorry, incorrect %1"
312+msgstr "Sorry, incorrect %1"
313+
314+#: qml/Shell.qml:394
301msgid "Sorry, incorrect passphrase"
315msgid "Sorry, incorrect passphrase"
302msgstr "Sorry, incorrect passphrase"
316msgstr "Sorry, incorrect passphrase"
303
317
304−#: qml/Shell.qml:393
318+#: qml/Shell.qml:395
305msgid "Please re-enter"
319msgid "Please re-enter"
306msgstr "Please re-enter"
320msgstr "Please re-enter"
307
321
308−#: qml/Shell.qml:395
309−msgid "Enter passcode"
310−msgstr "Enter passcode"
311−
312#: qml/Shell.qml:396
322#: qml/Shell.qml:396
313msgid "Sorry, incorrect passcode"
323msgid "Sorry, incorrect passcode"
314msgstr "Sorry, incorrect passcode"
324msgstr "Sorry, incorrect passcode"
315
325
316−#: qml/Shell.qml:399
326+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
317−#, qt-format
318−msgid "Enter %1"
319−msgstr "Enter %1"
320−
321−#: qml/Shell.qml:400
322−#, qt-format
323−msgid "Sorry, incorrect %1"
324−msgstr "Sorry, incorrect %1"
325−
326−#: qml/Shell.qml:441
327msgid "Sorry, incorrect passphrase."
327msgid "Sorry, incorrect passphrase."
328msgstr "Sorry, incorrect passphrase."
328msgstr "Sorry, incorrect passphrase."
329
329
330−#: qml/Shell.qml:442
330+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331msgid "Sorry, incorrect passcode."
331msgid "Sorry, incorrect passcode."
332msgstr "Sorry, incorrect passcode."
332msgstr "Sorry, incorrect passcode."
333
333
334−#: qml/Shell.qml:443
334+#: qml/Shell.qml:492
335msgid "This will be your last attempt."
335msgid "This will be your last attempt."
336msgstr "This will be your last attempt."
336msgstr "This will be your last attempt."
337
337
338−#: qml/Shell.qml:445
338+#: qml/Shell.qml:494
339msgid ""
339msgid ""
340"If passphrase is entered incorrectly, your phone will conduct a factory "
340"If passphrase is entered incorrectly, your phone will conduct a factory "
341"reset and all personal data will be deleted."
341"reset and all personal data will be deleted."
@@ -343,7 +343,7 @@ msgstr ""
343"If passphrase is entered incorrectly, your phone will conduct a factory "
343"If passphrase is entered incorrectly, your phone will conduct a factory "
344"reset and all personal data will be deleted."
344"reset and all personal data will be deleted."
345
345
346−#: qml/Shell.qml:446
346+#: qml/Shell.qml:495
347msgid ""
347msgid ""
348"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"If passcode is entered incorrectly, your phone will conduct a factory reset "
349"and all personal data will be deleted."
349"and all personal data will be deleted."
@@ -351,6 +351,189 @@ msgstr ""
351"If passcode is entered incorrectly, your phone will conduct a factory reset "
351"If passcode is entered incorrectly, your phone will conduct a factory reset "
352"and all personal data will be deleted."
352"and all personal data will be deleted."
353
353
354+#: qml/Wizard/Page.qml:89
355+msgid "Back"
356+msgstr "Back"
357+
358+#: qml/Wizard/Pages/10-welcome.qml:27
359+msgid "Hi!"
360+msgstr "Hi!"
361+
362+#: qml/Wizard/Pages/10-welcome.qml:44
363+msgid "Welcome to your Ubuntu phone."
364+msgstr "Welcome to your Ubuntu phone."
365+
366+#: qml/Wizard/Pages/10-welcome.qml:52
367+msgid "Let’s get started."
368+msgstr "Let’s get started."
369+
370+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
371+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
372+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373+#: qml/Wizard/Pages/passwd-set.qml:90
374+msgid "Continue"
375+msgstr "Continue"
376+
377+#: qml/Wizard/Pages/20-sim.qml:25
378+msgid "Add a SIM card and restart your device"
379+msgstr "Add a SIM card and restart your device"
380+
381+#: qml/Wizard/Pages/20-sim.qml:55
382+msgid "Without it, you won’t be able to make calls or use text messaging."
383+msgstr "Without it, you won’t be able to make calls or use text messaging."
384+
385+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
386+msgid "Skip"
387+msgstr "Skip"
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:39
390+msgid "Lock security"
391+msgstr "Lock security"
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:74
394+msgid "Please select how you’d like to unlock your phone."
395+msgstr "Please select how you’d like to unlock your phone."
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:97
398+msgid "Swipe"
399+msgstr "Swipe"
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:98
402+msgid "No security"
403+msgstr "No security"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:100
406+msgid "Passcode"
407+msgstr "Passcode"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:101
410+msgid "4 digits only"
411+msgstr "4 digits only"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:103
414+msgid "Passphrase"
415+msgstr "Passphrase"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:104
418+msgid "Numbers and letters"
419+msgstr "Numbers and letters"
420+
421+#: qml/Wizard/Pages/40-wifi.qml:28
422+msgid "Connect to Wi‑Fi"
423+msgstr "Connect to Wi‑Fi"
424+
425+#: qml/Wizard/Pages/40-wifi.qml:147
426+msgid "Available networks…"
427+msgstr "Available networks…"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:148
430+msgid "No available networks."
431+msgstr "No available networks."
432+
433+#: qml/Wizard/Pages/50-location.qml:27
434+msgid "Location"
435+msgstr "Location"
436+
437+#: qml/Wizard/Pages/50-location.qml:62
438+msgid "Let the phone detect your location:"
439+msgstr "Let the phone detect your location:"
440+
441+#: qml/Wizard/Pages/50-location.qml:69
442+msgid "Using GPS only (less accurate)"
443+msgstr "Using GPS only (less accurate)"
444+
445+#: qml/Wizard/Pages/50-location.qml:86
446+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
447+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"
448+
449+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
450+#: qml/Wizard/Pages/50-location.qml:103
451+msgid ""
452+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
453+"conditions</a>."
454+msgstr ""
455+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
456+"conditions</a>."
457+
458+#: qml/Wizard/Pages/50-location.qml:112
459+msgid "Not at all"
460+msgstr "Not at all"
461+
462+#: qml/Wizard/Pages/50-location.qml:124
463+msgid "You can change your mind later in <b>System Settings</b>."
464+msgstr "You can change your mind later in <b>System Settings</b>."
465+
466+#: qml/Wizard/Pages/60-reporting.qml:24
467+msgid "Improving your experience"
468+msgstr "Improving your experience"
469+
470+#: qml/Wizard/Pages/60-reporting.qml:36
471+msgid ""
472+"Your phone is set up to automatically report errors to Canonical and its "
473+"partners, the makers of the operating system."
474+msgstr ""
475+"Your phone is set up to automatically report errors to Canonical and its "
476+"partners, the makers of the operating system."
477+
478+#: qml/Wizard/Pages/60-reporting.qml:43
479+msgid ""
480+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
481+"Privacy</b>"
482+msgstr ""
483+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
484+"Privacy</b>"
485+
486+#: qml/Wizard/Pages/80-finished.qml:24
487+msgid "All done"
488+msgstr "All done"
489+
490+#: qml/Wizard/Pages/80-finished.qml:39
491+msgid "Nice work!"
492+msgstr "Nice work!"
493+
494+#: qml/Wizard/Pages/80-finished.qml:46
495+msgid "Your phone is now ready to use."
496+msgstr "Your phone is now ready to use."
497+
498+#: qml/Wizard/Pages/80-finished.qml:53
499+msgid "Finish"
500+msgstr "Finish"
501+
502+#: qml/Wizard/Pages/here-terms.qml:27
503+msgid "Terms & Conditions"
504+msgstr "Terms & Conditions"
505+
506+#: qml/Wizard/Pages/passwd-confirm.qml:49
507+msgid "Confirm passphrase"
508+msgstr "Confirm passphrase"
509+
510+#: qml/Wizard/Pages/passwd-confirm.qml:50
511+msgid "Confirm passcode"
512+msgstr "Confirm passcode"
513+
514+#: qml/Wizard/Pages/passwd-confirm.qml:53
515+#: qml/Wizard/Pages/passwd-confirm.qml:54
516+msgid "Please try again."
517+msgstr "Please try again."
518+
519+#: qml/Wizard/Pages/passwd-set.qml:61
520+msgid "Choose your passcode"
521+msgstr "Choose your passcode"
522+
523+#: qml/Wizard/Pages/passwd-set.qml:68
524+msgid "Passphrase must be 4 characters long"
525+msgstr "Passphrase must be 4 characters long"
526+
527+#: qml/Wizard/StackButton.qml:39
528+#, qt-format
529+msgid "〈 %1"
530+msgstr "〈 %1"
531+
532+#: qml/Wizard/StackButton.qml:42
533+#, qt-format
534+msgid "%1 〉"
535+msgstr "%1 〉"
536+
354#~ msgid "Confirm"
537#~ msgid "Confirm"
355#~ msgstr "Confirm"
538#~ msgstr "Confirm"
356
539
@@ -365,3 +548,15 @@ msgstr ""
365
548
366#~ msgid "Speaking..."
549#~ msgid "Speaking..."
367#~ msgstr "Speaking..."
550#~ msgstr "Speaking..."
551+
552+#~ msgid "All"
553+#~ msgstr "All"
554+
555+#~ msgid "Favorites"
556+#~ msgstr "Favourites"
557+
558+#~ msgid "Done"
559+#~ msgstr "Done"
560+
561+#~ msgid "Manage Scopes"
562+#~ msgstr "Manage Scopes"
po/en_GB.po+275−80
@@ -7,27 +7,27 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-11-05 18:59+0000\n"
11+"PO-Revision-Date: 2015-01-22 12:14+0000\n"
12"Last-Translator: Andi Chandler <Unknown>\n"
12"Last-Translator: Andi Chandler <Unknown>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:31+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Password: "
23msgstr "Password: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Pin shortcut"
28msgstr "Pin shortcut"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Unpin shortcut"
32msgstr "Unpin shortcut"
33
33
@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] "Please wait %1 minute and then try again…"
50msgstr[0] "Please wait %1 minute and then try again…"
51msgstr[1] "Please wait %1 minutes and then try again…"
51msgstr[1] "Please wait %1 minutes and then try again…"
52
52
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
54msgid "Log out"
54msgid "Log out"
55msgstr "Log out"
55msgstr "Log out"
56
56
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr "Are you sure you want to log out?"
59msgstr "Are you sure you want to log out?"
60
60
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:134
63msgid "No"
63msgid "No"
64msgstr "No"
64msgstr "No"
65
65
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:140
68msgid "Yes"
68msgid "Yes"
69msgstr "Yes"
69msgstr "Yes"
70
70
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
72msgid "Shut down"
72msgid "Shut down"
73msgstr "Shut down"
73msgstr "Shut down"
74
74
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr "Are you sure you want to shut down?"
77msgstr "Are you sure you want to shut down?"
78
78
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
80msgid "Reboot"
80msgid "Reboot"
81msgstr "Reboot"
81msgstr "Reboot"
82
82
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr "Are you sure you want to reboot?"
85msgstr "Are you sure you want to reboot?"
86
86
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
88msgid "Power"
88msgid "Power"
89msgstr "Power"
89msgstr "Power"
90
90
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
96"Are you sure you would like\n"
96"Are you sure you would like\n"
97"to power off?"
97"to power off?"
98
98
99−#: qml/Components/Dialogs.qml:151
99+#: qml/Components/Dialogs.qml:157
100msgid "Power off"
100msgid "Power off"
101msgstr "Power off"
101msgstr "Power off"
102
102
103−#: qml/Components/Dialogs.qml:161
103+#: qml/Components/Dialogs.qml:166
104msgid "Restart"
104msgid "Restart"
105msgstr "Restart"
105msgstr "Restart"
106
106
107−#: qml/Components/Dialogs.qml:171
107+#: qml/Components/Dialogs.qml:175
108msgid "Cancel"
108msgid "Cancel"
109msgstr "Cancel"
109msgstr "Cancel"
110
110
@@ -112,43 +112,43 @@ msgstr "Cancel"
112msgid "Skip intro"
112msgid "Skip intro"
113msgstr "Skip intro"
113msgstr "Skip intro"
114
114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116msgid "Right edge"
116msgid "Right edge"
117msgstr "Right edge"
117msgstr "Right edge"
118
118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120msgid "Try swiping from the right edge to unlock the phone"
120msgid "Try swiping from the right edge to unlock the phone"
121msgstr "Try swiping from the right edge to unlock the phone"
121msgstr "Try swiping from the right edge to unlock the phone"
122
122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124msgid "Top edge"
124msgid "Top edge"
125msgstr "Top edge"
125msgstr "Top edge"
126
126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128msgid "Try swiping from the top edge to access the indicators"
128msgid "Try swiping from the top edge to access the indicators"
129msgstr "Try swiping from the top edge to access the indicators"
129msgstr "Try swiping from the top edge to access the indicators"
130
130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132msgid "Close"
132msgid "Close"
133msgstr "Close"
133msgstr "Close"
134
134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136msgid "Swipe up again to close the settings screen"
136msgid "Swipe up again to close the settings screen"
137msgstr "Swipe up again to close the settings screen"
137msgstr "Swipe up again to close the settings screen"
138
138
139−#: qml/Components/EdgeDemo.qml:201
139+#: qml/Components/EdgeDemo.qml:214
140msgid "Left edge"
140msgid "Left edge"
141msgstr "Left edge"
141msgstr "Left edge"
142
142
143−#: qml/Components/EdgeDemo.qml:202
143+#: qml/Components/EdgeDemo.qml:215
144msgid "Swipe from the left to reveal the launcher for quick access to apps"
144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145msgstr "Swipe from the left to reveal the launcher for quick access to apps"
145msgstr "Swipe from the left to reveal the launcher for quick access to apps"
146
146
147−#: qml/Components/EdgeDemo.qml:229
147+#: qml/Components/EdgeDemo.qml:242
148msgid "Well done"
148msgid "Well done"
149msgstr "Well done"
149msgstr "Well done"
150
150
151−#: qml/Components/EdgeDemo.qml:230
151+#: qml/Components/EdgeDemo.qml:243
152msgid ""
152msgid ""
153"You have now mastered the edge gestures and can start using the "
153"You have now mastered the edge gestures and can start using the "
154"phone<br><br>Tap on the screen to start"
154"phone<br><br>Tap on the screen to start"
@@ -156,40 +156,44 @@ msgstr ""
156"You have now mastered the edge gestures and can start using the "
156"You have now mastered the edge gestures and can start using the "
157"phone<br><br>Tap on the screen to start"
157"phone<br><br>Tap on the screen to start"
158
158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160msgid "Return to Call"
160msgid "Return to Call"
161msgstr "Return to Call"
161msgstr "Return to Call"
162
162
163−#: qml/Components/Lockscreen.qml:223
163+#: qml/Components/Lockscreen.qml:238
164msgid "Emergency Call"
164msgid "Emergency Call"
165msgstr "Emergency Call"
165msgstr "Emergency Call"
166
166
167−#: qml/Components/Lockscreen.qml:255
167+#: qml/Components/Lockscreen.qml:270
168msgid "OK"
168msgid "OK"
169msgstr "OK"
169msgstr "OK"
170
170
171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
172msgid "See less"
172msgid "See less"
173msgstr "See less"
173msgstr "See less"
174
174
175−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:485
176msgid "See all"
176msgid "See all"
177msgstr "See all"
177msgstr "See all"
178
178
179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
181msgid "Search"
181msgid "Search"
182msgstr "Search"
182msgstr "Search"
183
183
184−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:267
185+msgid "Store"
186+msgstr "Store"
187+
188+#: qml/Dash/PageHeader.qml:284
185msgid "Settings"
189msgid "Settings"
186msgstr "Settings"
190msgstr "Settings"
187
191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189msgid "Remove from Favorites"
193msgid "Remove from Favorites"
190msgstr "Remove from Favourites"
194msgstr "Remove from Favourites"
191
195
192−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:291
193msgid "Add to Favorites"
197msgid "Add to Favorites"
194msgstr "Add to Favourites"
198msgstr "Add to Favourites"
195
199
@@ -221,31 +225,23 @@ msgstr "Pull to refresh…"
221msgid "Release to refresh…"
225msgid "Release to refresh…"
222msgstr "Release to refresh…"
226msgstr "Release to refresh…"
223
227
224−#: qml/Dash/ScopesOverview.qml:215
228+#: qml/Dash/ScopesList.qml:66
225−msgid "Manage Scopes"
229+msgid "Manage"
226−msgstr "Manage Scopes"
230+msgstr "Manage"
227
231
228−#: qml/Dash/ScopesOverview.qml:437
232+#: qml/Dash/ScopesList.qml:112
229−msgid "Done"
233+msgid "Home"
230−msgstr "Done"
234+msgstr "Home"
231−
232−#: qml/Dash/ScopesOverview.qml:463
233−msgid "Store"
234−msgstr "Store"
235
235
236−#: qml/Dash/ScopesOverviewTab.qml:36
236+#: qml/Dash/ScopesList.qml:113
237−msgid "Favorites"
237+msgid "Also installed"
238−msgstr "Favourites"
238+msgstr "Also installed"
239
239
240−#: qml/Dash/ScopesOverviewTab.qml:54
241−msgid "All"
242−msgstr "All"
243−
244−#: qml/Greeter/Greeter.qml:174
240+#: qml/Greeter/Greeter.qml:133
245msgid "Unlock"
241msgid "Unlock"
246msgstr "Unlock"
242msgstr "Unlock"
247
243
248−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
249msgid "Show password"
245msgid "Show password"
250msgstr "Show password"
246msgstr "Show password"
251
247
@@ -285,6 +281,10 @@ msgstr "Finished"
285msgid "Failed, tap to retry"
281msgid "Failed, tap to retry"
286msgstr "Failed, tap to retry"
282msgstr "Failed, tap to retry"
287
283
284+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
285+msgid "Reply"
286+msgstr ""
287+
288#: qml/Panel/Indicators/ModemInfoItem.qml:105
288#: qml/Panel/Indicators/ModemInfoItem.qml:105
289msgid "Unlock SIM"
289msgid "Unlock SIM"
290msgstr "Unlock SIM"
290msgstr "Unlock SIM"
@@ -293,49 +293,49 @@ msgstr "Unlock SIM"
293msgid "Roaming"
293msgid "Roaming"
294msgstr "Roaming"
294msgstr "Roaming"
295
295
296−#: qml/Shell.qml:391
296+#: qml/Shell.qml:390
297+#, qt-format
298+msgid "Enter %1"
299+msgstr "Enter %1"
300+
301+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
297msgid "Enter passphrase"
302msgid "Enter passphrase"
298msgstr "Enter passphrase"
303msgstr "Enter passphrase"
299
304
300#: qml/Shell.qml:392
305#: qml/Shell.qml:392
306+msgid "Enter passcode"
307+msgstr "Enter passcode"
308+
309+#: qml/Shell.qml:393
310+#, qt-format
311+msgid "Sorry, incorrect %1"
312+msgstr "Sorry, incorrect %1"
313+
314+#: qml/Shell.qml:394
301msgid "Sorry, incorrect passphrase"
315msgid "Sorry, incorrect passphrase"
302msgstr "Sorry, incorrect passphrase"
316msgstr "Sorry, incorrect passphrase"
303
317
304−#: qml/Shell.qml:393
318+#: qml/Shell.qml:395
305msgid "Please re-enter"
319msgid "Please re-enter"
306msgstr "Please re-enter"
320msgstr "Please re-enter"
307
321
308−#: qml/Shell.qml:395
309−msgid "Enter passcode"
310−msgstr "Enter passcode"
311−
312#: qml/Shell.qml:396
322#: qml/Shell.qml:396
313msgid "Sorry, incorrect passcode"
323msgid "Sorry, incorrect passcode"
314msgstr "Sorry, incorrect passcode"
324msgstr "Sorry, incorrect passcode"
315
325
316−#: qml/Shell.qml:399
326+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
317−#, qt-format
318−msgid "Enter %1"
319−msgstr "Enter %1"
320−
321−#: qml/Shell.qml:400
322−#, qt-format
323−msgid "Sorry, incorrect %1"
324−msgstr "Sorry, incorrect %1"
325−
326−#: qml/Shell.qml:441
327msgid "Sorry, incorrect passphrase."
327msgid "Sorry, incorrect passphrase."
328msgstr "Sorry, incorrect passphrase."
328msgstr "Sorry, incorrect passphrase."
329
329
330−#: qml/Shell.qml:442
330+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331msgid "Sorry, incorrect passcode."
331msgid "Sorry, incorrect passcode."
332msgstr "Sorry, incorrect passcode."
332msgstr "Sorry, incorrect passcode."
333
333
334−#: qml/Shell.qml:443
334+#: qml/Shell.qml:492
335msgid "This will be your last attempt."
335msgid "This will be your last attempt."
336msgstr "This will be your last attempt."
336msgstr "This will be your last attempt."
337
337
338−#: qml/Shell.qml:445
338+#: qml/Shell.qml:494
339msgid ""
339msgid ""
340"If passphrase is entered incorrectly, your phone will conduct a factory "
340"If passphrase is entered incorrectly, your phone will conduct a factory "
341"reset and all personal data will be deleted."
341"reset and all personal data will be deleted."
@@ -343,7 +343,7 @@ msgstr ""
343"If passphrase is entered incorrectly, your phone will conduct a factory "
343"If passphrase is entered incorrectly, your phone will conduct a factory "
344"reset and all personal data will be deleted."
344"reset and all personal data will be deleted."
345
345
346−#: qml/Shell.qml:446
346+#: qml/Shell.qml:495
347msgid ""
347msgid ""
348"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"If passcode is entered incorrectly, your phone will conduct a factory reset "
349"and all personal data will be deleted."
349"and all personal data will be deleted."
@@ -351,6 +351,189 @@ msgstr ""
351"If passcode is entered incorrectly, your phone will conduct a factory reset "
351"If passcode is entered incorrectly, your phone will conduct a factory reset "
352"and all personal data will be deleted."
352"and all personal data will be deleted."
353
353
354+#: qml/Wizard/Page.qml:89
355+msgid "Back"
356+msgstr "Back"
357+
358+#: qml/Wizard/Pages/10-welcome.qml:27
359+msgid "Hi!"
360+msgstr "Hi!"
361+
362+#: qml/Wizard/Pages/10-welcome.qml:44
363+msgid "Welcome to your Ubuntu phone."
364+msgstr "Welcome to your Ubuntu phone."
365+
366+#: qml/Wizard/Pages/10-welcome.qml:52
367+msgid "Let’s get started."
368+msgstr "Let’s get started."
369+
370+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
371+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
372+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373+#: qml/Wizard/Pages/passwd-set.qml:90
374+msgid "Continue"
375+msgstr "Continue"
376+
377+#: qml/Wizard/Pages/20-sim.qml:25
378+msgid "Add a SIM card and restart your device"
379+msgstr "Add a SIM card and restart your device"
380+
381+#: qml/Wizard/Pages/20-sim.qml:55
382+msgid "Without it, you won’t be able to make calls or use text messaging."
383+msgstr "Without it, you won’t be able to make calls or use text messaging."
384+
385+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
386+msgid "Skip"
387+msgstr "Skip"
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:39
390+msgid "Lock security"
391+msgstr "Lock security"
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:74
394+msgid "Please select how you’d like to unlock your phone."
395+msgstr "Please select how you’d like to unlock your phone."
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:97
398+msgid "Swipe"
399+msgstr "Swipe"
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:98
402+msgid "No security"
403+msgstr "No security"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:100
406+msgid "Passcode"
407+msgstr "Passcode"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:101
410+msgid "4 digits only"
411+msgstr "4 digits only"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:103
414+msgid "Passphrase"
415+msgstr "Passphrase"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:104
418+msgid "Numbers and letters"
419+msgstr "Numbers and letters"
420+
421+#: qml/Wizard/Pages/40-wifi.qml:28
422+msgid "Connect to Wi‑Fi"
423+msgstr "Connect to Wi‑Fi"
424+
425+#: qml/Wizard/Pages/40-wifi.qml:147
426+msgid "Available networks…"
427+msgstr "Available networks…"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:148
430+msgid "No available networks."
431+msgstr "No available networks."
432+
433+#: qml/Wizard/Pages/50-location.qml:27
434+msgid "Location"
435+msgstr "Location"
436+
437+#: qml/Wizard/Pages/50-location.qml:62
438+msgid "Let the phone detect your location:"
439+msgstr "Let the phone detect your location:"
440+
441+#: qml/Wizard/Pages/50-location.qml:69
442+msgid "Using GPS only (less accurate)"
443+msgstr "Using GPS only (less accurate)"
444+
445+#: qml/Wizard/Pages/50-location.qml:86
446+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
447+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"
448+
449+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
450+#: qml/Wizard/Pages/50-location.qml:103
451+msgid ""
452+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
453+"conditions</a>."
454+msgstr ""
455+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
456+"conditions</a>."
457+
458+#: qml/Wizard/Pages/50-location.qml:112
459+msgid "Not at all"
460+msgstr "Not at all"
461+
462+#: qml/Wizard/Pages/50-location.qml:124
463+msgid "You can change your mind later in <b>System Settings</b>."
464+msgstr "You can change your mind later in <b>System Settings</b>."
465+
466+#: qml/Wizard/Pages/60-reporting.qml:24
467+msgid "Improving your experience"
468+msgstr "Improving your experience"
469+
470+#: qml/Wizard/Pages/60-reporting.qml:36
471+msgid ""
472+"Your phone is set up to automatically report errors to Canonical and its "
473+"partners, the makers of the operating system."
474+msgstr ""
475+"Your phone is set up to automatically report errors to Canonical and its "
476+"partners, the makers of the operating system."
477+
478+#: qml/Wizard/Pages/60-reporting.qml:43
479+msgid ""
480+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
481+"Privacy</b>"
482+msgstr ""
483+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
484+"Privacy</b>"
485+
486+#: qml/Wizard/Pages/80-finished.qml:24
487+msgid "All done"
488+msgstr "All done"
489+
490+#: qml/Wizard/Pages/80-finished.qml:39
491+msgid "Nice work!"
492+msgstr "Nice work!"
493+
494+#: qml/Wizard/Pages/80-finished.qml:46
495+msgid "Your phone is now ready to use."
496+msgstr "Your phone is now ready to use."
497+
498+#: qml/Wizard/Pages/80-finished.qml:53
499+msgid "Finish"
500+msgstr "Finish"
501+
502+#: qml/Wizard/Pages/here-terms.qml:27
503+msgid "Terms & Conditions"
504+msgstr "Terms & Conditions"
505+
506+#: qml/Wizard/Pages/passwd-confirm.qml:49
507+msgid "Confirm passphrase"
508+msgstr "Confirm passphrase"
509+
510+#: qml/Wizard/Pages/passwd-confirm.qml:50
511+msgid "Confirm passcode"
512+msgstr "Confirm passcode"
513+
514+#: qml/Wizard/Pages/passwd-confirm.qml:53
515+#: qml/Wizard/Pages/passwd-confirm.qml:54
516+msgid "Please try again."
517+msgstr "Please try again."
518+
519+#: qml/Wizard/Pages/passwd-set.qml:61
520+msgid "Choose your passcode"
521+msgstr "Choose your passcode"
522+
523+#: qml/Wizard/Pages/passwd-set.qml:68
524+msgid "Passphrase must be 4 characters long"
525+msgstr "Passphrase must be 4 characters long"
526+
527+#: qml/Wizard/StackButton.qml:39
528+#, qt-format
529+msgid "〈 %1"
530+msgstr "〈 %1"
531+
532+#: qml/Wizard/StackButton.qml:42
533+#, qt-format
534+msgid "%1 〉"
535+msgstr "%1 〉"
536+
354#~ msgid "Confirm"
537#~ msgid "Confirm"
355#~ msgstr "Confirm"
538#~ msgstr "Confirm"
356
539
@@ -365,3 +548,15 @@ msgstr ""
365
548
366#~ msgid "Speaking..."
549#~ msgid "Speaking..."
367#~ msgstr "Speaking..."
550#~ msgstr "Speaking..."
551+
552+#~ msgid "All"
553+#~ msgstr "All"
554+
555+#~ msgid "Favorites"
556+#~ msgstr "Favourites"
557+
558+#~ msgid "Done"
559+#~ msgstr "Done"
560+
561+#~ msgid "Manage Scopes"
562+#~ msgstr "Manage Scopes"
po/eo.po+251−74
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2013-06-26 22:35+0000\n"
11"PO-Revision-Date: 2013-06-26 22:35+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Esperanto <eo@li.org>\n"
13"Language-Team: Esperanto <eo@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr ""
23msgstr ""
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr ""
28msgstr ""
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr ""
32msgstr ""
33
33
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] ""
50msgstr[0] ""
51msgstr[1] ""
51msgstr[1] ""
52
52
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
54msgid "Log out"
54msgid "Log out"
55msgstr ""
55msgstr ""
56
56
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr ""
59msgstr ""
60
60
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:134
63msgid "No"
63msgid "No"
64msgstr ""
64msgstr ""
65
65
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:140
68msgid "Yes"
68msgid "Yes"
69msgstr ""
69msgstr ""
70
70
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
72msgid "Shut down"
72msgid "Shut down"
73msgstr ""
73msgstr ""
74
74
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr ""
77msgstr ""
78
78
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
80msgid "Reboot"
80msgid "Reboot"
81msgstr ""
81msgstr ""
82
82
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr ""
85msgstr ""
86
86
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
88msgid "Power"
88msgid "Power"
89msgstr ""
89msgstr ""
90
90
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
95msgstr ""
95msgstr ""
96
96
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
98msgid "Power off"
98msgid "Power off"
99msgstr ""
99msgstr ""
100
100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102msgid "Restart"
102msgid "Restart"
103msgstr ""
103msgstr ""
104
104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106msgid "Cancel"
106msgid "Cancel"
107msgstr ""
107msgstr ""
108
108
@@ -110,82 +110,86 @@ msgstr ""
110msgid "Skip intro"
110msgid "Skip intro"
111msgstr ""
111msgstr ""
112
112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114msgid "Right edge"
114msgid "Right edge"
115msgstr ""
115msgstr ""
116
116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118msgid "Try swiping from the right edge to unlock the phone"
118msgid "Try swiping from the right edge to unlock the phone"
119msgstr ""
119msgstr ""
120
120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122msgid "Top edge"
122msgid "Top edge"
123msgstr ""
123msgstr ""
124
124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126msgid "Try swiping from the top edge to access the indicators"
126msgid "Try swiping from the top edge to access the indicators"
127msgstr ""
127msgstr ""
128
128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130msgid "Close"
130msgid "Close"
131msgstr ""
131msgstr ""
132
132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134msgid "Swipe up again to close the settings screen"
134msgid "Swipe up again to close the settings screen"
135msgstr ""
135msgstr ""
136
136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
138msgid "Left edge"
139msgstr ""
139msgstr ""
140
140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143msgstr ""
143msgstr ""
144
144
145−#: qml/Components/EdgeDemo.qml:229
145+#: qml/Components/EdgeDemo.qml:242
146msgid "Well done"
146msgid "Well done"
147msgstr ""
147msgstr ""
148
148
149−#: qml/Components/EdgeDemo.qml:230
149+#: qml/Components/EdgeDemo.qml:243
150msgid ""
150msgid ""
151"You have now mastered the edge gestures and can start using the "
151"You have now mastered the edge gestures and can start using the "
152"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
153msgstr ""
153msgstr ""
154
154
155−#: qml/Components/Lockscreen.qml:223
155+#: qml/Components/Lockscreen.qml:238
156msgid "Return to Call"
156msgid "Return to Call"
157msgstr ""
157msgstr ""
158
158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160msgid "Emergency Call"
160msgid "Emergency Call"
161msgstr ""
161msgstr ""
162
162
163−#: qml/Components/Lockscreen.qml:255
163+#: qml/Components/Lockscreen.qml:270
164msgid "OK"
164msgid "OK"
165msgstr ""
165msgstr ""
166
166
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
168msgid "See less"
168msgid "See less"
169msgstr ""
169msgstr ""
170
170
171−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:485
172msgid "See all"
172msgid "See all"
173msgstr ""
173msgstr ""
174
174
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
176#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
177msgid "Search"
178msgstr ""
178msgstr ""
179
179
180−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:267
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:284
181msgid "Settings"
185msgid "Settings"
182msgstr ""
186msgstr ""
183
187
184−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:291
185msgid "Remove from Favorites"
189msgid "Remove from Favorites"
186msgstr ""
190msgstr ""
187
191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189msgid "Add to Favorites"
193msgid "Add to Favorites"
190msgstr ""
194msgstr ""
191
195
@@ -217,31 +221,23 @@ msgstr ""
217msgid "Release to refresh…"
221msgid "Release to refresh…"
218msgstr ""
222msgstr ""
219
223
220−#: qml/Dash/ScopesOverview.qml:215
224+#: qml/Dash/ScopesList.qml:66
221−msgid "Manage Scopes"
225+msgid "Manage"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:437
225−msgid "Done"
226−msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:463
229−msgid "Store"
230msgstr ""
226msgstr ""
231
227
232−#: qml/Dash/ScopesOverviewTab.qml:36
228+#: qml/Dash/ScopesList.qml:112
233−msgid "Favorites"
229+msgid "Home"
234msgstr ""
230msgstr ""
235
231
236−#: qml/Dash/ScopesOverviewTab.qml:54
232+#: qml/Dash/ScopesList.qml:113
237−msgid "All"
233+msgid "Also installed"
238msgstr ""
234msgstr ""
239
235
240−#: qml/Greeter/Greeter.qml:174
236+#: qml/Greeter/Greeter.qml:133
241msgid "Unlock"
237msgid "Unlock"
242msgstr ""
238msgstr ""
243
239
244−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
245msgid "Show password"
241msgid "Show password"
246msgstr ""
242msgstr ""
247
243
@@ -281,6 +277,10 @@ msgstr ""
281msgid "Failed, tap to retry"
277msgid "Failed, tap to retry"
282msgstr ""
278msgstr ""
283
279
280+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
281+msgid "Reply"
282+msgstr ""
283+
284#: qml/Panel/Indicators/ModemInfoItem.qml:105
284#: qml/Panel/Indicators/ModemInfoItem.qml:105
285msgid "Unlock SIM"
285msgid "Unlock SIM"
286msgstr ""
286msgstr ""
@@ -289,56 +289,233 @@ msgstr ""
289msgid "Roaming"
289msgid "Roaming"
290msgstr ""
290msgstr ""
291
291
292−#: qml/Shell.qml:391
292+#: qml/Shell.qml:390
293+#, qt-format
294+msgid "Enter %1"
295+msgstr ""
296+
297+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
293msgid "Enter passphrase"
298msgid "Enter passphrase"
294msgstr ""
299msgstr ""
295
300
296#: qml/Shell.qml:392
301#: qml/Shell.qml:392
297−msgid "Sorry, incorrect passphrase"
302+msgid "Enter passcode"
298msgstr ""
303msgstr ""
299
304
300#: qml/Shell.qml:393
305#: qml/Shell.qml:393
301−msgid "Please re-enter"
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr ""
309+
310+#: qml/Shell.qml:394
311+msgid "Sorry, incorrect passphrase"
302msgstr ""
312msgstr ""
303
313
304#: qml/Shell.qml:395
314#: qml/Shell.qml:395
305−msgid "Enter passcode"
315+msgid "Please re-enter"
306msgstr ""
316msgstr ""
307
317
308#: qml/Shell.qml:396
318#: qml/Shell.qml:396
309msgid "Sorry, incorrect passcode"
319msgid "Sorry, incorrect passcode"
310msgstr ""
320msgstr ""
311
321
312−#: qml/Shell.qml:399
322+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
313−#, qt-format
314−msgid "Enter %1"
315−msgstr ""
316−
317−#: qml/Shell.qml:400
318−#, qt-format
319−msgid "Sorry, incorrect %1"
320−msgstr ""
321−
322−#: qml/Shell.qml:441
323msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Shell.qml:442
326+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
327msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Shell.qml:443
330+#: qml/Shell.qml:492
331msgid "This will be your last attempt."
331msgid "This will be your last attempt."
332msgstr ""
332msgstr ""
333
333
334−#: qml/Shell.qml:445
334+#: qml/Shell.qml:494
335msgid ""
335msgid ""
336"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
337"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
338msgstr ""
338msgstr ""
339
339
340−#: qml/Shell.qml:446
340+#: qml/Shell.qml:495
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
344msgstr ""
344msgstr ""
345+
346+#: qml/Wizard/Page.qml:89
347+msgid "Back"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:27
351+msgid "Hi!"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:44
355+msgid "Welcome to your Ubuntu phone."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:52
359+msgid "Let’s get started."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
363+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
364+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365+#: qml/Wizard/Pages/passwd-set.qml:90
366+msgid "Continue"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:25
370+msgid "Add a SIM card and restart your device"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:55
374+msgid "Without it, you won’t be able to make calls or use text messaging."
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
378+msgid "Skip"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:39
382+msgid "Lock security"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:74
386+msgid "Please select how you’d like to unlock your phone."
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:97
390+msgid "Swipe"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:98
394+msgid "No security"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:100
398+msgid "Passcode"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:101
402+msgid "4 digits only"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:103
406+msgid "Passphrase"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:104
410+msgid "Numbers and letters"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:28
414+msgid "Connect to Wi‑Fi"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:147
418+msgid "Available networks…"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:148
422+msgid "No available networks."
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:27
426+msgid "Location"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:62
430+msgid "Let the phone detect your location:"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:69
434+msgid "Using GPS only (less accurate)"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:86
438+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
439+msgstr ""
440+
441+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
442+#: qml/Wizard/Pages/50-location.qml:103
443+msgid ""
444+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
445+"conditions</a>."
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:112
449+msgid "Not at all"
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:124
453+msgid "You can change your mind later in <b>System Settings</b>."
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:24
457+msgid "Improving your experience"
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:36
461+msgid ""
462+"Your phone is set up to automatically report errors to Canonical and its "
463+"partners, the makers of the operating system."
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:43
467+msgid ""
468+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
469+"Privacy</b>"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:24
473+msgid "All done"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:39
477+msgid "Nice work!"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:46
481+msgid "Your phone is now ready to use."
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:53
485+msgid "Finish"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/here-terms.qml:27
489+msgid "Terms & Conditions"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:49
493+msgid "Confirm passphrase"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:50
497+msgid "Confirm passcode"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:53
501+#: qml/Wizard/Pages/passwd-confirm.qml:54
502+msgid "Please try again."
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:61
506+msgid "Choose your passcode"
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:68
510+msgid "Passphrase must be 4 characters long"
511+msgstr ""
512+
513+#: qml/Wizard/StackButton.qml:39
514+#, qt-format
515+msgid "〈 %1"
516+msgstr ""
517+
518+#: qml/Wizard/StackButton.qml:42
519+#, qt-format
520+msgid "%1 〉"
521+msgstr ""
po/es.po+276−81
@@ -7,27 +7,27 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-11-08 08:01+0000\n"
11+"PO-Revision-Date: 2015-02-01 03:20+0000\n"
12−"Last-Translator: Paco Molinero <paco@byasl.com>\n"
12+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
13"Language-Team: Spanish <es@li.org>\n"
13"Language-Team: Spanish <es@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-02-02 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Contraseña: "
23msgstr "Contraseña: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Anclar"
28msgstr "Anclar"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Desanclar"
32msgstr "Desanclar"
33
33
@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
54msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."
54msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."
55msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."
55msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."
56
56
57−#: qml/Components/Dialogs.qml:74
57+#: qml/Components/Dialogs.qml:86
58msgid "Log out"
58msgid "Log out"
59msgstr "Cerrar la sesión"
59msgstr "Cerrar la sesión"
60
60
61−#: qml/Components/Dialogs.qml:75
61+#: qml/Components/Dialogs.qml:87
62msgid "Are you sure you want to log out?"
62msgid "Are you sure you want to log out?"
63msgstr "̉¿Está seguro de que quiere cerrar la sesión?"
63msgstr "̉¿Está seguro de que quiere cerrar la sesión?"
64
64
65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
65+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66−#: qml/Components/Dialogs.qml:126
66+#: qml/Components/Dialogs.qml:134
67msgid "No"
67msgid "No"
68msgstr "No"
68msgstr "No"
69
69
70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
70+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71−#: qml/Components/Dialogs.qml:133
71+#: qml/Components/Dialogs.qml:140
72msgid "Yes"
72msgid "Yes"
73msgstr "Sí"
73msgstr "Sí"
74
74
75−#: qml/Components/Dialogs.qml:98
75+#: qml/Components/Dialogs.qml:108
76msgid "Shut down"
76msgid "Shut down"
77msgstr "Apagar"
77msgstr "Apagar"
78
78
79−#: qml/Components/Dialogs.qml:99
79+#: qml/Components/Dialogs.qml:109
80msgid "Are you sure you want to shut down?"
80msgid "Are you sure you want to shut down?"
81msgstr "¿Está seguro de que quiere apagar?"
81msgstr "¿Está seguro de que quiere apagar?"
82
82
83−#: qml/Components/Dialogs.qml:123
83+#: qml/Components/Dialogs.qml:131
84msgid "Reboot"
84msgid "Reboot"
85msgstr "Reiniciar"
85msgstr "Reiniciar"
86
86
87−#: qml/Components/Dialogs.qml:124
87+#: qml/Components/Dialogs.qml:132
88msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
89msgstr "¿Esta seguro de que quiere reiniciar?"
89msgstr "¿Esta seguro de que quiere reiniciar?"
90
90
91−#: qml/Components/Dialogs.qml:148
91+#: qml/Components/Dialogs.qml:154
92msgid "Power"
92msgid "Power"
93msgstr "Apagar"
93msgstr "Apagar"
94
94
95−#: qml/Components/Dialogs.qml:149
95+#: qml/Components/Dialogs.qml:155
96msgid ""
96msgid ""
97"Are you sure you would like\n"
97"Are you sure you would like\n"
98"to power off?"
98"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100"¿Está seguro de que quiere\n"
100"¿Está seguro de que quiere\n"
101"apagar?"
101"apagar?"
102
102
103−#: qml/Components/Dialogs.qml:151
103+#: qml/Components/Dialogs.qml:157
104msgid "Power off"
104msgid "Power off"
105msgstr "Apagar"
105msgstr "Apagar"
106
106
107−#: qml/Components/Dialogs.qml:161
107+#: qml/Components/Dialogs.qml:166
108msgid "Restart"
108msgid "Restart"
109msgstr "Reiniciar"
109msgstr "Reiniciar"
110
110
111−#: qml/Components/Dialogs.qml:171
111+#: qml/Components/Dialogs.qml:175
112msgid "Cancel"
112msgid "Cancel"
113msgstr "Cancelar"
113msgstr "Cancelar"
114
114
@@ -116,46 +116,46 @@ msgstr "Cancelar"
116msgid "Skip intro"
116msgid "Skip intro"
117msgstr "Omitir la introducción"
117msgstr "Omitir la introducción"
118
118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120msgid "Right edge"
120msgid "Right edge"
121msgstr "Borde derecho"
121msgstr "Borde derecho"
122
122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124msgid "Try swiping from the right edge to unlock the phone"
124msgid "Try swiping from the right edge to unlock the phone"
125msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"
125msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"
126
126
127−#: qml/Components/EdgeDemo.qml:144
127+#: qml/Components/EdgeDemo.qml:157
128msgid "Top edge"
128msgid "Top edge"
129msgstr "Borde superior"
129msgstr "Borde superior"
130
130
131−#: qml/Components/EdgeDemo.qml:145
131+#: qml/Components/EdgeDemo.qml:158
132msgid "Try swiping from the top edge to access the indicators"
132msgid "Try swiping from the top edge to access the indicators"
133msgstr ""
133msgstr ""
134"Deslice el dedo desde el borde superior para acceder a los indicadores"
134"Deslice el dedo desde el borde superior para acceder a los indicadores"
135
135
136−#: qml/Components/EdgeDemo.qml:170
136+#: qml/Components/EdgeDemo.qml:183
137msgid "Close"
137msgid "Close"
138msgstr "Cerrar"
138msgstr "Cerrar"
139
139
140−#: qml/Components/EdgeDemo.qml:171
140+#: qml/Components/EdgeDemo.qml:184
141msgid "Swipe up again to close the settings screen"
141msgid "Swipe up again to close the settings screen"
142msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"
142msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"
143
143
144−#: qml/Components/EdgeDemo.qml:201
144+#: qml/Components/EdgeDemo.qml:214
145msgid "Left edge"
145msgid "Left edge"
146msgstr "Borde izquierdo"
146msgstr "Borde izquierdo"
147
147
148−#: qml/Components/EdgeDemo.qml:202
148+#: qml/Components/EdgeDemo.qml:215
149msgid "Swipe from the left to reveal the launcher for quick access to apps"
149msgid "Swipe from the left to reveal the launcher for quick access to apps"
150msgstr ""
150msgstr ""
151"Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "
151"Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "
152"rápidamente a las aplicaciones"
152"rápidamente a las aplicaciones"
153
153
154−#: qml/Components/EdgeDemo.qml:229
154+#: qml/Components/EdgeDemo.qml:242
155msgid "Well done"
155msgid "Well done"
156msgstr "Bien hecho"
156msgstr "Bien hecho"
157
157
158−#: qml/Components/EdgeDemo.qml:230
158+#: qml/Components/EdgeDemo.qml:243
159msgid ""
159msgid ""
160"You have now mastered the edge gestures and can start using the "
160"You have now mastered the edge gestures and can start using the "
161"phone<br><br>Tap on the screen to start"
161"phone<br><br>Tap on the screen to start"
@@ -163,40 +163,44 @@ msgstr ""
163"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
163"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
164"la pantalla para comenzar"
164"la pantalla para comenzar"
165
165
166−#: qml/Components/Lockscreen.qml:223
166+#: qml/Components/Lockscreen.qml:238
167msgid "Return to Call"
167msgid "Return to Call"
168msgstr "Volver a la llamada"
168msgstr "Volver a la llamada"
169
169
170−#: qml/Components/Lockscreen.qml:223
170+#: qml/Components/Lockscreen.qml:238
171msgid "Emergency Call"
171msgid "Emergency Call"
172msgstr "Llamada de emergencia"
172msgstr "Llamada de emergencia"
173
173
174−#: qml/Components/Lockscreen.qml:255
174+#: qml/Components/Lockscreen.qml:270
175msgid "OK"
175msgid "OK"
176msgstr "Aceptar"
176msgstr "Aceptar"
177
177
178−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
178+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
179msgid "See less"
179msgid "See less"
180msgstr "Ver menos"
180msgstr "Ver menos"
181
181
182−#: qml/Dash/GenericScopeView.qml:434
182+#: qml/Dash/GenericScopeView.qml:485
183msgid "See all"
183msgid "See all"
184msgstr "Ver todo"
184msgstr "Ver todo"
185
185
186−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
186+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
187#: qml/Panel/SearchIndicator.qml:27
187#: qml/Panel/SearchIndicator.qml:27
188msgid "Search"
188msgid "Search"
189msgstr "Buscar"
189msgstr "Buscar"
190
190
191−#: qml/Dash/PageHeader.qml:268
191+#: qml/Dash/PageHeader.qml:267
192+msgid "Store"
193+msgstr "Tienda"
194+
195+#: qml/Dash/PageHeader.qml:284
192msgid "Settings"
196msgid "Settings"
193msgstr "Configuración"
197msgstr "Configuración"
194
198
195−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:291
196msgid "Remove from Favorites"
200msgid "Remove from Favorites"
197msgstr "Quitar de favoritos"
201msgstr "Quitar de favoritos"
198
202
199−#: qml/Dash/PageHeader.qml:275
203+#: qml/Dash/PageHeader.qml:291
200msgid "Add to Favorites"
204msgid "Add to Favorites"
201msgstr "Añadir a favoritos"
205msgstr "Añadir a favoritos"
202
206
@@ -228,31 +232,23 @@ msgstr "Deslice para actualizar…"
228msgid "Release to refresh…"
232msgid "Release to refresh…"
229msgstr "Suelte para actualizar…"
233msgstr "Suelte para actualizar…"
230
234
231−#: qml/Dash/ScopesOverview.qml:215
235+#: qml/Dash/ScopesList.qml:66
232−msgid "Manage Scopes"
236+msgid "Manage"
233−msgstr "Administrar Scopes"
237+msgstr "Administrar"
234−
235−#: qml/Dash/ScopesOverview.qml:437
236−msgid "Done"
237−msgstr "Hecho"
238−
239−#: qml/Dash/ScopesOverview.qml:463
240−msgid "Store"
241−msgstr "Tienda"
242
238
243−#: qml/Dash/ScopesOverviewTab.qml:36
239+#: qml/Dash/ScopesList.qml:112
244−msgid "Favorites"
240+msgid "Home"
245−msgstr "Favoritos"
241+msgstr "Inicio"
246
242
247−#: qml/Dash/ScopesOverviewTab.qml:54
243+#: qml/Dash/ScopesList.qml:113
248−msgid "All"
244+msgid "Also installed"
249−msgstr "Todo"
245+msgstr "También instalados"
250
246
251−#: qml/Greeter/Greeter.qml:174
247+#: qml/Greeter/Greeter.qml:133
252msgid "Unlock"
248msgid "Unlock"
253msgstr "Desbloquear"
249msgstr "Desbloquear"
254
250
255−#: qml/Notifications/NotificationMenuItemFactory.qml:116
251+#: qml/Notifications/NotificationMenuItemFactory.qml:128
256msgid "Show password"
252msgid "Show password"
257msgstr "Mostrar contraseña"
253msgstr "Mostrar contraseña"
258
254
@@ -292,6 +288,10 @@ msgstr "Finalizado"
292msgid "Failed, tap to retry"
288msgid "Failed, tap to retry"
293msgstr "Falló, toque para reintentar"
289msgstr "Falló, toque para reintentar"
294
290
291+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
292+msgid "Reply"
293+msgstr "Responder"
294+
295#: qml/Panel/Indicators/ModemInfoItem.qml:105
295#: qml/Panel/Indicators/ModemInfoItem.qml:105
296msgid "Unlock SIM"
296msgid "Unlock SIM"
297msgstr "Desbloquear SIM"
297msgstr "Desbloquear SIM"
@@ -300,49 +300,49 @@ msgstr "Desbloquear SIM"
300msgid "Roaming"
300msgid "Roaming"
301msgstr "Itinerancia"
301msgstr "Itinerancia"
302
302
303−#: qml/Shell.qml:391
303+#: qml/Shell.qml:390
304+#, qt-format
305+msgid "Enter %1"
306+msgstr "Introduzca %1"
307+
308+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
304msgid "Enter passphrase"
309msgid "Enter passphrase"
305msgstr "Introduzca la contraseña"
310msgstr "Introduzca la contraseña"
306
311
307#: qml/Shell.qml:392
312#: qml/Shell.qml:392
313+msgid "Enter passcode"
314+msgstr "Introduzca el código"
315+
316+#: qml/Shell.qml:393
317+#, qt-format
318+msgid "Sorry, incorrect %1"
319+msgstr "Incorrecto (%1)"
320+
321+#: qml/Shell.qml:394
308msgid "Sorry, incorrect passphrase"
322msgid "Sorry, incorrect passphrase"
309msgstr "La contraseña es incorrecta"
323msgstr "La contraseña es incorrecta"
310
324
311−#: qml/Shell.qml:393
325+#: qml/Shell.qml:395
312msgid "Please re-enter"
326msgid "Please re-enter"
313msgstr "Reintroduzca"
327msgstr "Reintroduzca"
314
328
315−#: qml/Shell.qml:395
316−msgid "Enter passcode"
317−msgstr "Introduzca el código"
318−
319#: qml/Shell.qml:396
329#: qml/Shell.qml:396
320msgid "Sorry, incorrect passcode"
330msgid "Sorry, incorrect passcode"
321msgstr "El código es incorrecto"
331msgstr "El código es incorrecto"
322
332
323−#: qml/Shell.qml:399
333+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
324−#, qt-format
325−msgid "Enter %1"
326−msgstr "Introduzca %1"
327−
328−#: qml/Shell.qml:400
329−#, qt-format
330−msgid "Sorry, incorrect %1"
331−msgstr "Incorrecto (%1)"
332−
333−#: qml/Shell.qml:441
334msgid "Sorry, incorrect passphrase."
334msgid "Sorry, incorrect passphrase."
335msgstr "La contraseña es incorrecta."
335msgstr "La contraseña es incorrecta."
336
336
337−#: qml/Shell.qml:442
337+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
338msgid "Sorry, incorrect passcode."
338msgid "Sorry, incorrect passcode."
339msgstr "Código de acceso incorrecto."
339msgstr "Código de acceso incorrecto."
340
340
341−#: qml/Shell.qml:443
341+#: qml/Shell.qml:492
342msgid "This will be your last attempt."
342msgid "This will be your last attempt."
343msgstr "Este será su último intento."
343msgstr "Este será su último intento."
344
344
345−#: qml/Shell.qml:445
345+#: qml/Shell.qml:494
346msgid ""
346msgid ""
347"If passphrase is entered incorrectly, your phone will conduct a factory "
347"If passphrase is entered incorrectly, your phone will conduct a factory "
348"reset and all personal data will be deleted."
348"reset and all personal data will be deleted."
@@ -350,7 +350,7 @@ msgstr ""
350"Si se introduce la frase incorrectamente, el teléfono volverá a la "
350"Si se introduce la frase incorrectamente, el teléfono volverá a la "
351"configuración de fábrica y se perderán todos los datos personales."
351"configuración de fábrica y se perderán todos los datos personales."
352
352
353−#: qml/Shell.qml:446
353+#: qml/Shell.qml:495
354msgid ""
354msgid ""
355"If passcode is entered incorrectly, your phone will conduct a factory reset "
355"If passcode is entered incorrectly, your phone will conduct a factory reset "
356"and all personal data will be deleted."
356"and all personal data will be deleted."
@@ -358,6 +358,189 @@ msgstr ""
358"Si se introduce el código incorrectamente, el teléfono volverá a la "
358"Si se introduce el código incorrectamente, el teléfono volverá a la "
359"configuración de fábrica y se perderán todos los datos personales."
359"configuración de fábrica y se perderán todos los datos personales."
360
360
361+#: qml/Wizard/Page.qml:89
362+msgid "Back"
363+msgstr "Atrás"
364+
365+#: qml/Wizard/Pages/10-welcome.qml:27
366+msgid "Hi!"
367+msgstr "¡Hola!"
368+
369+#: qml/Wizard/Pages/10-welcome.qml:44
370+msgid "Welcome to your Ubuntu phone."
371+msgstr "Bienvenido a su teléfono Ubuntu."
372+
373+#: qml/Wizard/Pages/10-welcome.qml:52
374+msgid "Let’s get started."
375+msgstr "Comencemos."
376+
377+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
378+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
379+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
380+#: qml/Wizard/Pages/passwd-set.qml:90
381+msgid "Continue"
382+msgstr "Continuar"
383+
384+#: qml/Wizard/Pages/20-sim.qml:25
385+msgid "Add a SIM card and restart your device"
386+msgstr "Inserte una tarjeta SIM y reinicie el dispositivo"
387+
388+#: qml/Wizard/Pages/20-sim.qml:55
389+msgid "Without it, you won’t be able to make calls or use text messaging."
390+msgstr "Sin ella, no podrá hacer llamadas ni enviar mensajes."
391+
392+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
393+msgid "Skip"
394+msgstr "Omitir"
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:39
397+msgid "Lock security"
398+msgstr "Seguridad de bloqueo"
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:74
401+msgid "Please select how you’d like to unlock your phone."
402+msgstr "Seleccione el método de desbloqueo del teléfono."
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:97
405+msgid "Swipe"
406+msgstr "Deslizar"
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:98
409+msgid "No security"
410+msgstr "Sin seguridad"
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:100
413+msgid "Passcode"
414+msgstr "Código"
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:101
417+msgid "4 digits only"
418+msgstr "Solo 4 dígitos"
419+
420+#: qml/Wizard/Pages/30-passwd-type.qml:103
421+msgid "Passphrase"
422+msgstr "Contraseña"
423+
424+#: qml/Wizard/Pages/30-passwd-type.qml:104
425+msgid "Numbers and letters"
426+msgstr "Números y letras"
427+
428+#: qml/Wizard/Pages/40-wifi.qml:28
429+msgid "Connect to Wi‑Fi"
430+msgstr "Conectar con wifi"
431+
432+#: qml/Wizard/Pages/40-wifi.qml:147
433+msgid "Available networks…"
434+msgstr "Redes disponibles…"
435+
436+#: qml/Wizard/Pages/40-wifi.qml:148
437+msgid "No available networks."
438+msgstr "No hay redes disponibles."
439+
440+#: qml/Wizard/Pages/50-location.qml:27
441+msgid "Location"
442+msgstr "Ubicación"
443+
444+#: qml/Wizard/Pages/50-location.qml:62
445+msgid "Let the phone detect your location:"
446+msgstr "Permitir que el teléfono detecte su ubicación:"
447+
448+#: qml/Wizard/Pages/50-location.qml:69
449+msgid "Using GPS only (less accurate)"
450+msgstr "Usando solo GPS (poco preciso)"
451+
452+#: qml/Wizard/Pages/50-location.qml:86
453+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
454+msgstr "Usando GPS, wifi anonimizado y red de datos móviles (recomendado)"
455+
456+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
457+#: qml/Wizard/Pages/50-location.qml:103
458+msgid ""
459+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
460+"conditions</a>."
461+msgstr ""
462+"Al seleccionar esta opción acepta los <a href='#'>términos y condiciones</a> "
463+"de Nokia HERE."
464+
465+#: qml/Wizard/Pages/50-location.qml:112
466+msgid "Not at all"
467+msgstr "De ningún modo"
468+
469+#: qml/Wizard/Pages/50-location.qml:124
470+msgid "You can change your mind later in <b>System Settings</b>."
471+msgstr "Si cambia de opinión, vaya a <b>Configuración del sistema</b>."
472+
473+#: qml/Wizard/Pages/60-reporting.qml:24
474+msgid "Improving your experience"
475+msgstr "Mejorar la experiencia"
476+
477+#: qml/Wizard/Pages/60-reporting.qml:36
478+msgid ""
479+"Your phone is set up to automatically report errors to Canonical and its "
480+"partners, the makers of the operating system."
481+msgstr ""
482+"El teléfono está configurado para enviar automáticamente informes de error a "
483+"Canonical y sus socios, los creadores del sistema operativo."
484+
485+#: qml/Wizard/Pages/60-reporting.qml:43
486+msgid ""
487+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
488+"Privacy</b>"
489+msgstr ""
490+"Esto se puede desactivar en <b>Configuración del sistema</b> &gt; "
491+"<b>Seguridad y privacidad</b>."
492+
493+#: qml/Wizard/Pages/80-finished.qml:24
494+msgid "All done"
495+msgstr "Hecho"
496+
497+#: qml/Wizard/Pages/80-finished.qml:39
498+msgid "Nice work!"
499+msgstr "¡Buen trabajo!"
500+
501+#: qml/Wizard/Pages/80-finished.qml:46
502+msgid "Your phone is now ready to use."
503+msgstr "El teléfono ya está listo para usarse."
504+
505+#: qml/Wizard/Pages/80-finished.qml:53
506+msgid "Finish"
507+msgstr "Finalizar"
508+
509+#: qml/Wizard/Pages/here-terms.qml:27
510+msgid "Terms & Conditions"
511+msgstr "Términos y condiciones"
512+
513+#: qml/Wizard/Pages/passwd-confirm.qml:49
514+msgid "Confirm passphrase"
515+msgstr "Confirme la contraseña"
516+
517+#: qml/Wizard/Pages/passwd-confirm.qml:50
518+msgid "Confirm passcode"
519+msgstr "Confirme el código"
520+
521+#: qml/Wizard/Pages/passwd-confirm.qml:53
522+#: qml/Wizard/Pages/passwd-confirm.qml:54
523+msgid "Please try again."
524+msgstr "Inténtelo de nuevo."
525+
526+#: qml/Wizard/Pages/passwd-set.qml:61
527+msgid "Choose your passcode"
528+msgstr "Elija su código"
529+
530+#: qml/Wizard/Pages/passwd-set.qml:68
531+msgid "Passphrase must be 4 characters long"
532+msgstr "El código debe tener 4 caracteres"
533+
534+#: qml/Wizard/StackButton.qml:39
535+#, qt-format
536+msgid "〈 %1"
537+msgstr "〈 %1"
538+
539+#: qml/Wizard/StackButton.qml:42
540+#, qt-format
541+msgid "%1 〉"
542+msgstr "%1 〉"
543+
361#~ msgid "Confirm"
544#~ msgid "Confirm"
362#~ msgstr "Confirmar"
545#~ msgstr "Confirmar"
363
546
@@ -372,3 +555,15 @@ msgstr ""
372
555
373#~ msgid "Speaking..."
556#~ msgid "Speaking..."
374#~ msgstr "Hablando…"
557#~ msgstr "Hablando…"
558+
559+#~ msgid "All"
560+#~ msgstr "Todo"
561+
562+#~ msgid "Favorites"
563+#~ msgstr "Favoritos"
564+
565+#~ msgid "Done"
566+#~ msgstr "Hecho"
567+
568+#~ msgid "Manage Scopes"
569+#~ msgstr "Administrar Scopes"
po/eu.po+277−80
@@ -7,27 +7,27 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-11-08 14:44+0000\n"
11+"PO-Revision-Date: 2015-01-22 21:40+0000\n"
12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
13"Language-Team: Basque <eu@li.org>\n"
13"Language-Team: Basque <eu@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Pasahitza: "
23msgstr "Pasahitza: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Ainguratu lasterbidea"
28msgstr "Ainguratu lasterbidea"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Askatu lasterbidea"
32msgstr "Askatu lasterbidea"
33
33
@@ -53,59 +53,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
53msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"
53msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"
54msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"
54msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"
55
55
56−#: qml/Components/Dialogs.qml:74
56+#: qml/Components/Dialogs.qml:86
57msgid "Log out"
57msgid "Log out"
58msgstr "Amaitu saioa"
58msgstr "Amaitu saioa"
59
59
60−#: qml/Components/Dialogs.qml:75
60+#: qml/Components/Dialogs.qml:87
61msgid "Are you sure you want to log out?"
61msgid "Are you sure you want to log out?"
62msgstr "Ziur saioa amaitu nahi duzula?"
62msgstr "Ziur saioa amaitu nahi duzula?"
63
63
64−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
64+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
65−#: qml/Components/Dialogs.qml:126
65+#: qml/Components/Dialogs.qml:134
66msgid "No"
66msgid "No"
67msgstr "Ez"
67msgstr "Ez"
68
68
69−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
69+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
70−#: qml/Components/Dialogs.qml:133
70+#: qml/Components/Dialogs.qml:140
71msgid "Yes"
71msgid "Yes"
72msgstr "Bai"
72msgstr "Bai"
73
73
74−#: qml/Components/Dialogs.qml:98
74+#: qml/Components/Dialogs.qml:108
75msgid "Shut down"
75msgid "Shut down"
76msgstr "Itzali"
76msgstr "Itzali"
77
77
78−#: qml/Components/Dialogs.qml:99
78+#: qml/Components/Dialogs.qml:109
79msgid "Are you sure you want to shut down?"
79msgid "Are you sure you want to shut down?"
80msgstr "Ziur itzali nahi duzula?"
80msgstr "Ziur itzali nahi duzula?"
81
81
82−#: qml/Components/Dialogs.qml:123
82+#: qml/Components/Dialogs.qml:131
83msgid "Reboot"
83msgid "Reboot"
84msgstr "Berrabiarazi"
84msgstr "Berrabiarazi"
85
85
86−#: qml/Components/Dialogs.qml:124
86+#: qml/Components/Dialogs.qml:132
87msgid "Are you sure you want to reboot?"
87msgid "Are you sure you want to reboot?"
88msgstr "Ziur berrabiarazi nahi duzula?"
88msgstr "Ziur berrabiarazi nahi duzula?"
89
89
90−#: qml/Components/Dialogs.qml:148
90+#: qml/Components/Dialogs.qml:154
91msgid "Power"
91msgid "Power"
92msgstr "Piztu/itzali"
92msgstr "Piztu/itzali"
93
93
94−#: qml/Components/Dialogs.qml:149
94+#: qml/Components/Dialogs.qml:155
95msgid ""
95msgid ""
96"Are you sure you would like\n"
96"Are you sure you would like\n"
97"to power off?"
97"to power off?"
98msgstr "Ziur itzali nahi duzula?"
98msgstr "Ziur itzali nahi duzula?"
99
99
100−#: qml/Components/Dialogs.qml:151
100+#: qml/Components/Dialogs.qml:157
101msgid "Power off"
101msgid "Power off"
102msgstr "Itzali"
102msgstr "Itzali"
103
103
104−#: qml/Components/Dialogs.qml:161
104+#: qml/Components/Dialogs.qml:166
105msgid "Restart"
105msgid "Restart"
106msgstr "Berrabiarazi"
106msgstr "Berrabiarazi"
107
107
108−#: qml/Components/Dialogs.qml:171
108+#: qml/Components/Dialogs.qml:175
109msgid "Cancel"
109msgid "Cancel"
110msgstr "Utzi"
110msgstr "Utzi"
111
111
@@ -113,46 +113,46 @@ msgstr "Utzi"
113msgid "Skip intro"
113msgid "Skip intro"
114msgstr "Saltatu aurkezpena"
114msgstr "Saltatu aurkezpena"
115
115
116−#: qml/Components/EdgeDemo.qml:112
116+#: qml/Components/EdgeDemo.qml:125
117msgid "Right edge"
117msgid "Right edge"
118msgstr "Eskuineko ertza"
118msgstr "Eskuineko ertza"
119
119
120−#: qml/Components/EdgeDemo.qml:113
120+#: qml/Components/EdgeDemo.qml:126
121msgid "Try swiping from the right edge to unlock the phone"
121msgid "Try swiping from the right edge to unlock the phone"
122msgstr ""
122msgstr ""
123"Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"
123"Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"
124
124
125−#: qml/Components/EdgeDemo.qml:144
125+#: qml/Components/EdgeDemo.qml:157
126msgid "Top edge"
126msgid "Top edge"
127msgstr "Goiko ertza"
127msgstr "Goiko ertza"
128
128
129−#: qml/Components/EdgeDemo.qml:145
129+#: qml/Components/EdgeDemo.qml:158
130msgid "Try swiping from the top edge to access the indicators"
130msgid "Try swiping from the top edge to access the indicators"
131msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"
131msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"
132
132
133−#: qml/Components/EdgeDemo.qml:170
133+#: qml/Components/EdgeDemo.qml:183
134msgid "Close"
134msgid "Close"
135msgstr "Itxi"
135msgstr "Itxi"
136
136
137−#: qml/Components/EdgeDemo.qml:171
137+#: qml/Components/EdgeDemo.qml:184
138msgid "Swipe up again to close the settings screen"
138msgid "Swipe up again to close the settings screen"
139msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"
139msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"
140
140
141−#: qml/Components/EdgeDemo.qml:201
141+#: qml/Components/EdgeDemo.qml:214
142msgid "Left edge"
142msgid "Left edge"
143msgstr "Ezkerreko ertza"
143msgstr "Ezkerreko ertza"
144
144
145−#: qml/Components/EdgeDemo.qml:202
145+#: qml/Components/EdgeDemo.qml:215
146msgid "Swipe from the left to reveal the launcher for quick access to apps"
146msgid "Swipe from the left to reveal the launcher for quick access to apps"
147msgstr ""
147msgstr ""
148"Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak berehala eskura "
148"Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak berehala eskura "
149"izateko"
149"izateko"
150
150
151−#: qml/Components/EdgeDemo.qml:229
151+#: qml/Components/EdgeDemo.qml:242
152msgid "Well done"
152msgid "Well done"
153msgstr "Bikain"
153msgstr "Bikain"
154
154
155−#: qml/Components/EdgeDemo.qml:230
155+#: qml/Components/EdgeDemo.qml:243
156msgid ""
156msgid ""
157"You have now mastered the edge gestures and can start using the "
157"You have now mastered the edge gestures and can start using the "
158"phone<br><br>Tap on the screen to start"
158"phone<br><br>Tap on the screen to start"
@@ -160,40 +160,44 @@ msgstr ""
160"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
160"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
161"zaitezke<br><br>Sakatu pantailan hasteko"
161"zaitezke<br><br>Sakatu pantailan hasteko"
162
162
163−#: qml/Components/Lockscreen.qml:223
163+#: qml/Components/Lockscreen.qml:238
164msgid "Return to Call"
164msgid "Return to Call"
165msgstr "Itzuli deira"
165msgstr "Itzuli deira"
166
166
167−#: qml/Components/Lockscreen.qml:223
167+#: qml/Components/Lockscreen.qml:238
168msgid "Emergency Call"
168msgid "Emergency Call"
169msgstr "Larrialdi-deia"
169msgstr "Larrialdi-deia"
170
170
171−#: qml/Components/Lockscreen.qml:255
171+#: qml/Components/Lockscreen.qml:270
172msgid "OK"
172msgid "OK"
173msgstr "Ados"
173msgstr "Ados"
174
174
175−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
175+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
176msgid "See less"
176msgid "See less"
177msgstr "Ikusi gutxiago"
177msgstr "Ikusi gutxiago"
178
178
179−#: qml/Dash/GenericScopeView.qml:434
179+#: qml/Dash/GenericScopeView.qml:485
180msgid "See all"
180msgid "See all"
181msgstr "Ikusi guztiak"
181msgstr "Ikusi guztiak"
182
182
183−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
183+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
184#: qml/Panel/SearchIndicator.qml:27
184#: qml/Panel/SearchIndicator.qml:27
185msgid "Search"
185msgid "Search"
186msgstr "Bilatu"
186msgstr "Bilatu"
187
187
188−#: qml/Dash/PageHeader.qml:268
188+#: qml/Dash/PageHeader.qml:267
189+msgid "Store"
190+msgstr "Denda"
191+
192+#: qml/Dash/PageHeader.qml:284
189msgid "Settings"
193msgid "Settings"
190msgstr "Ezarpenak"
194msgstr "Ezarpenak"
191
195
192−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:291
193msgid "Remove from Favorites"
197msgid "Remove from Favorites"
194msgstr "Kendu gogokoetatik"
198msgstr "Kendu gogokoetatik"
195
199
196−#: qml/Dash/PageHeader.qml:275
200+#: qml/Dash/PageHeader.qml:291
197msgid "Add to Favorites"
201msgid "Add to Favorites"
198msgstr "Gehitu gogokoetara"
202msgstr "Gehitu gogokoetara"
199
203
@@ -225,31 +229,23 @@ msgstr "Tiratu freskatzeko…"
225msgid "Release to refresh…"
229msgid "Release to refresh…"
226msgstr "Askatu freskatzeko…"
230msgstr "Askatu freskatzeko…"
227
231
228−#: qml/Dash/ScopesOverview.qml:215
232+#: qml/Dash/ScopesList.qml:66
229−msgid "Manage Scopes"
233+msgid "Manage"
230−msgstr "Kudeatu eremuak"
234+msgstr "Kudeatu"
231−
232−#: qml/Dash/ScopesOverview.qml:437
233−msgid "Done"
234−msgstr "Eginda"
235−
236−#: qml/Dash/ScopesOverview.qml:463
237−msgid "Store"
238−msgstr "Denda"
239
235
240−#: qml/Dash/ScopesOverviewTab.qml:36
236+#: qml/Dash/ScopesList.qml:112
241−msgid "Favorites"
237+msgid "Home"
242−msgstr "Gogokoak"
238+msgstr "Hasiera"
243
239
244−#: qml/Dash/ScopesOverviewTab.qml:54
240+#: qml/Dash/ScopesList.qml:113
245−msgid "All"
241+msgid "Also installed"
246−msgstr "Guztiak"
242+msgstr "Hau ere instalatuta"
247
243
248−#: qml/Greeter/Greeter.qml:174
244+#: qml/Greeter/Greeter.qml:133
249msgid "Unlock"
245msgid "Unlock"
250msgstr "Desblokeatu"
246msgstr "Desblokeatu"
251
247
252−#: qml/Notifications/NotificationMenuItemFactory.qml:116
248+#: qml/Notifications/NotificationMenuItemFactory.qml:128
253msgid "Show password"
249msgid "Show password"
254msgstr "Erakutsi pasahitza"
250msgstr "Erakutsi pasahitza"
255
251
@@ -289,6 +285,10 @@ msgstr "Amaituta"
289msgid "Failed, tap to retry"
285msgid "Failed, tap to retry"
290msgstr "Huts egin du, sakatu berriro saiatzeko"
286msgstr "Huts egin du, sakatu berriro saiatzeko"
291
287
288+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
289+msgid "Reply"
290+msgstr ""
291+
292#: qml/Panel/Indicators/ModemInfoItem.qml:105
292#: qml/Panel/Indicators/ModemInfoItem.qml:105
293msgid "Unlock SIM"
293msgid "Unlock SIM"
294msgstr "Desblokeatu SIMa"
294msgstr "Desblokeatu SIMa"
@@ -297,49 +297,49 @@ msgstr "Desblokeatu SIMa"
297msgid "Roaming"
297msgid "Roaming"
298msgstr "Ibiltaritza"
298msgstr "Ibiltaritza"
299
299
300−#: qml/Shell.qml:391
300+#: qml/Shell.qml:390
301+#, qt-format
302+msgid "Enter %1"
303+msgstr "Sartu %1"
304+
305+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
301msgid "Enter passphrase"
306msgid "Enter passphrase"
302msgstr "Sartu pasaesaldia"
307msgstr "Sartu pasaesaldia"
303
308
304#: qml/Shell.qml:392
309#: qml/Shell.qml:392
310+msgid "Enter passcode"
311+msgstr "Sartu pasakodea"
312+
313+#: qml/Shell.qml:393
314+#, qt-format
315+msgid "Sorry, incorrect %1"
316+msgstr "Sentitzen dugu, %1 okerra da"
317+
318+#: qml/Shell.qml:394
305msgid "Sorry, incorrect passphrase"
319msgid "Sorry, incorrect passphrase"
306msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"
320msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"
307
321
308−#: qml/Shell.qml:393
322+#: qml/Shell.qml:395
309msgid "Please re-enter"
323msgid "Please re-enter"
310msgstr "Errepikatu"
324msgstr "Errepikatu"
311
325
312−#: qml/Shell.qml:395
313−msgid "Enter passcode"
314−msgstr "Sartu pasakodea"
315−
316#: qml/Shell.qml:396
326#: qml/Shell.qml:396
317msgid "Sorry, incorrect passcode"
327msgid "Sorry, incorrect passcode"
318msgstr "Sentitzen dugu, pasakodea okerra da"
328msgstr "Sentitzen dugu, pasakodea okerra da"
319
329
320−#: qml/Shell.qml:399
330+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
321−#, qt-format
322−msgid "Enter %1"
323−msgstr "Sartu %1"
324−
325−#: qml/Shell.qml:400
326−#, qt-format
327−msgid "Sorry, incorrect %1"
328−msgstr "Sentitzen dugu, %1 okerra da"
329−
330−#: qml/Shell.qml:441
331msgid "Sorry, incorrect passphrase."
331msgid "Sorry, incorrect passphrase."
332msgstr "Sentitzen dugu, pasaesaldia okerra da."
332msgstr "Sentitzen dugu, pasaesaldia okerra da."
333
333
334−#: qml/Shell.qml:442
334+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
335msgid "Sorry, incorrect passcode."
335msgid "Sorry, incorrect passcode."
336msgstr "Sentitzen dugu, pasakodea okerra da."
336msgstr "Sentitzen dugu, pasakodea okerra da."
337
337
338−#: qml/Shell.qml:443
338+#: qml/Shell.qml:492
339msgid "This will be your last attempt."
339msgid "This will be your last attempt."
340msgstr "Hau duzu azken saiakera."
340msgstr "Hau duzu azken saiakera."
341
341
342−#: qml/Shell.qml:445
342+#: qml/Shell.qml:494
343msgid ""
343msgid ""
344"If passphrase is entered incorrectly, your phone will conduct a factory "
344"If passphrase is entered incorrectly, your phone will conduct a factory "
345"reset and all personal data will be deleted."
345"reset and all personal data will be deleted."
@@ -347,7 +347,7 @@ msgstr ""
347"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "
347"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "
348"berrezarri eta datu pertsonal guztiak ezabatuko dira."
348"berrezarri eta datu pertsonal guztiak ezabatuko dira."
349
349
350−#: qml/Shell.qml:446
350+#: qml/Shell.qml:495
351msgid ""
351msgid ""
352"If passcode is entered incorrectly, your phone will conduct a factory reset "
352"If passcode is entered incorrectly, your phone will conduct a factory reset "
353"and all personal data will be deleted."
353"and all personal data will be deleted."
@@ -355,6 +355,191 @@ msgstr ""
355"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "
355"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "
356"berrezarri eta datu pertsonal guztiak ezabatuko dira."
356"berrezarri eta datu pertsonal guztiak ezabatuko dira."
357
357
358+#: qml/Wizard/Page.qml:89
359+msgid "Back"
360+msgstr "Atzera"
361+
362+#: qml/Wizard/Pages/10-welcome.qml:27
363+msgid "Hi!"
364+msgstr "Epa!"
365+
366+#: qml/Wizard/Pages/10-welcome.qml:44
367+msgid "Welcome to your Ubuntu phone."
368+msgstr "Ongi etorri zure Ubuntu telefonora."
369+
370+#: qml/Wizard/Pages/10-welcome.qml:52
371+msgid "Let’s get started."
372+msgstr "Has gaitezen."
373+
374+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
375+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
376+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
377+#: qml/Wizard/Pages/passwd-set.qml:90
378+msgid "Continue"
379+msgstr "Jarraitu"
380+
381+#: qml/Wizard/Pages/20-sim.qml:25
382+msgid "Add a SIM card and restart your device"
383+msgstr "Gehitu SIM txartel bat eta berrabiarazi zure gailua"
384+
385+#: qml/Wizard/Pages/20-sim.qml:55
386+msgid "Without it, you won’t be able to make calls or use text messaging."
387+msgstr "Hura gabe, ezingo duzu deirik egin edo testu-mezularitza erabili."
388+
389+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
390+msgid "Skip"
391+msgstr "Saltatu"
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:39
394+msgid "Lock security"
395+msgstr "Blokeo-segurtasuna"
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:74
398+msgid "Please select how you’d like to unlock your phone."
399+msgstr "Aukeratu telefonoa nola desblokeatu nahi duzun."
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:97
402+msgid "Swipe"
403+msgstr "Pasatu hatza"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:98
406+msgid "No security"
407+msgstr "Segurtasunik gabe"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:100
410+msgid "Passcode"
411+msgstr "Pasakodea"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:101
414+msgid "4 digits only"
415+msgstr "4 digitu soilik"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:103
418+msgid "Passphrase"
419+msgstr "Pasaesaldia"
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:104
422+msgid "Numbers and letters"
423+msgstr "Zenbakiak eta hizkiak"
424+
425+#: qml/Wizard/Pages/40-wifi.qml:28
426+msgid "Connect to Wi‑Fi"
427+msgstr "Konektatu wifira"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:147
430+msgid "Available networks…"
431+msgstr "Sare erabilgarriak…"
432+
433+#: qml/Wizard/Pages/40-wifi.qml:148
434+msgid "No available networks."
435+msgstr "Ez dago sare erabilgarririk."
436+
437+#: qml/Wizard/Pages/50-location.qml:27
438+msgid "Location"
439+msgstr "Kokalekua"
440+
441+#: qml/Wizard/Pages/50-location.qml:62
442+msgid "Let the phone detect your location:"
443+msgstr "Utzi telefonoari zure kokalekua detektatzen:"
444+
445+#: qml/Wizard/Pages/50-location.qml:69
446+msgid "Using GPS only (less accurate)"
447+msgstr "GPSa soilik erabiltzen (zehaztasun gutxiago)"
448+
449+#: qml/Wizard/Pages/50-location.qml:86
450+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
451+msgstr ""
452+"GPSa, wifi anonimotua eta sare mugikorraren informazioa erabiltzen "
453+"(gomendatua)"
454+
455+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
456+#: qml/Wizard/Pages/50-location.qml:103
457+msgid ""
458+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
459+"conditions</a>."
460+msgstr ""
461+"Aukera hau hautatuz, Nokia HERE(r)en <a href='#'>baldintzak</a> onartzeko "
462+"dituzu."
463+
464+#: qml/Wizard/Pages/50-location.qml:112
465+msgid "Not at all"
466+msgstr "Bat ere ez"
467+
468+#: qml/Wizard/Pages/50-location.qml:124
469+msgid "You can change your mind later in <b>System Settings</b>."
470+msgstr "Geroago ere alda dezakezu <b>Sistemaren ezarpenetan</b>."
471+
472+#: qml/Wizard/Pages/60-reporting.qml:24
473+msgid "Improving your experience"
474+msgstr "Zure esperientzia hobetuz"
475+
476+#: qml/Wizard/Pages/60-reporting.qml:36
477+msgid ""
478+"Your phone is set up to automatically report errors to Canonical and its "
479+"partners, the makers of the operating system."
480+msgstr ""
481+"Telefonoa erroreen berria automatikoki Canonical-i eta honen bazkideei "
482+"emateko konfiguratuta dago, sistema eragilearen egileei."
483+
484+#: qml/Wizard/Pages/60-reporting.qml:43
485+msgid ""
486+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
487+"Privacy</b>"
488+msgstr ""
489+"Hau <b>Sistemaren ezarpenetatik</b> desgaitu daiteke, <b>Segurtasuna eta "
490+"pribatutasuna</b> atalean"
491+
492+#: qml/Wizard/Pages/80-finished.qml:24
493+msgid "All done"
494+msgstr "Eginda"
495+
496+#: qml/Wizard/Pages/80-finished.qml:39
497+msgid "Nice work!"
498+msgstr "Bikain!"
499+
500+#: qml/Wizard/Pages/80-finished.qml:46
501+msgid "Your phone is now ready to use."
502+msgstr "Zure telefonoa erabiltzeko prest dago."
503+
504+#: qml/Wizard/Pages/80-finished.qml:53
505+msgid "Finish"
506+msgstr "Amaitu"
507+
508+#: qml/Wizard/Pages/here-terms.qml:27
509+msgid "Terms & Conditions"
510+msgstr "Baldintzak"
511+
512+#: qml/Wizard/Pages/passwd-confirm.qml:49
513+msgid "Confirm passphrase"
514+msgstr "Berretsi pasaesaldia"
515+
516+#: qml/Wizard/Pages/passwd-confirm.qml:50
517+msgid "Confirm passcode"
518+msgstr "Berretsi pasakodea"
519+
520+#: qml/Wizard/Pages/passwd-confirm.qml:53
521+#: qml/Wizard/Pages/passwd-confirm.qml:54
522+msgid "Please try again."
523+msgstr "Saiatu berriro."
524+
525+#: qml/Wizard/Pages/passwd-set.qml:61
526+msgid "Choose your passcode"
527+msgstr "Aukeratu zure pasakodea"
528+
529+#: qml/Wizard/Pages/passwd-set.qml:68
530+msgid "Passphrase must be 4 characters long"
531+msgstr "Pasaesaldiak 4 karaktereko luzera izan behar du"
532+
533+#: qml/Wizard/StackButton.qml:39
534+#, qt-format
535+msgid "〈 %1"
536+msgstr "〈 %1"
537+
538+#: qml/Wizard/StackButton.qml:42
539+#, qt-format
540+msgid "%1 〉"
541+msgstr "%1 〉"
542+
358#~ msgid "Type or say a command"
543#~ msgid "Type or say a command"
359#~ msgstr "Idatzi edo esan agindu bat"
544#~ msgstr "Idatzi edo esan agindu bat"
360
545
@@ -367,5 +552,17 @@ msgstr ""
367#~ msgid "Speaking..."
552#~ msgid "Speaking..."
368#~ msgstr "Hitz egiten..."
553#~ msgstr "Hitz egiten..."
369
554
555+#~ msgid "Done"
556+#~ msgstr "Eginda"
557+
558+#~ msgid "All"
559+#~ msgstr "Guztiak"
560+
561+#~ msgid "Favorites"
562+#~ msgstr "Gogokoak"
563+
370#~ msgid "Confirm"
564#~ msgid "Confirm"
371#~ msgstr "Berretsi"
565#~ msgstr "Berretsi"
566+
567+#~ msgid "Manage Scopes"
568+#~ msgstr "Kudeatu eremuak"
po/fa.po+277−80
@@ -7,27 +7,27 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-11-07 12:53+0000\n"
11+"PO-Revision-Date: 2015-02-04 01:20+0000\n"
12"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
12"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
13"Language-Team: Persian <fa@li.org>\n"
13"Language-Team: Persian <fa@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-02-05 07:41+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17331)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "گذرواژه: "
23msgstr "گذرواژه: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "سنجاق کردن میانبر"
28msgstr "سنجاق کردن میانبر"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "برداشتن سنجاق میانبر"
32msgstr "برداشتن سنجاق میانبر"
33
33
@@ -50,45 +50,45 @@ msgid "Please wait %1 minute and then try again…"
50msgid_plural "Please wait %1 minutes and then try again…"
50msgid_plural "Please wait %1 minutes and then try again…"
51msgstr[0] "لطفاُ %1 دقیقه صبر نموده و سپس مجدّداً تلاش نمایید…"
51msgstr[0] "لطفاُ %1 دقیقه صبر نموده و سپس مجدّداً تلاش نمایید…"
52
52
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
54msgid "Log out"
54msgid "Log out"
55msgstr "خروج از حساب"
55msgstr "خروج از حساب"
56
56
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr "مطمئنید که می‌خواهید از حساب خارج شوید"
59msgstr "مطمئنید که می‌خواهید از حساب خارج شوید"
60
60
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:134
63msgid "No"
63msgid "No"
64msgstr "خیر"
64msgstr "خیر"
65
65
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:140
68msgid "Yes"
68msgid "Yes"
69msgstr "بله"
69msgstr "بله"
70
70
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
72msgid "Shut down"
72msgid "Shut down"
73msgstr "خاموش کردن"
73msgstr "خاموش کردن"
74
74
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr "مطمئنید که می‌خواهید خاموش کنید؟"
77msgstr "مطمئنید که می‌خواهید خاموش کنید؟"
78
78
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
80msgid "Reboot"
80msgid "Reboot"
81msgstr "راه‌اندازی مجدّد"
81msgstr "راه‌اندازی مجدّد"
82
82
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr "مطمئنید که می‌خواهید مجدّداً راه‌اندازی کنسد؟"
85msgstr "مطمئنید که می‌خواهید مجدّداً راه‌اندازی کنسد؟"
86
86
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
88msgid "Power"
88msgid "Power"
89msgstr "توان"
89msgstr "توان"
90
90
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
96"آیا مطمئن هستید که\n"
96"آیا مطمئن هستید که\n"
97"می‌خواهید خاموش کنید؟"
97"می‌خواهید خاموش کنید؟"
98
98
99−#: qml/Components/Dialogs.qml:151
99+#: qml/Components/Dialogs.qml:157
100msgid "Power off"
100msgid "Power off"
101msgstr "خاموش کردن"
101msgstr "خاموش کردن"
102
102
103−#: qml/Components/Dialogs.qml:161
103+#: qml/Components/Dialogs.qml:166
104msgid "Restart"
104msgid "Restart"
105msgstr "شروع مجدّد"
105msgstr "شروع مجدّد"
106
106
107−#: qml/Components/Dialogs.qml:171
107+#: qml/Components/Dialogs.qml:175
108msgid "Cancel"
108msgid "Cancel"
109msgstr "لغو"
109msgstr "لغو"
110
110
@@ -112,43 +112,43 @@ msgstr "لغو"
112msgid "Skip intro"
112msgid "Skip intro"
113msgstr "پرش از مقدّمه"
113msgstr "پرش از مقدّمه"
114
114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116msgid "Right edge"
116msgid "Right edge"
117msgstr "لبه‌ی راست"
117msgstr "لبه‌ی راست"
118
118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120msgid "Try swiping from the right edge to unlock the phone"
120msgid "Try swiping from the right edge to unlock the phone"
121msgstr "برای باز کردن قفل تلفن، از لبه‌ی راست بکشید"
121msgstr "برای باز کردن قفل تلفن، از لبه‌ی راست بکشید"
122
122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124msgid "Top edge"
124msgid "Top edge"
125msgstr "لبه‌ی بالا"
125msgstr "لبه‌ی بالا"
126
126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128msgid "Try swiping from the top edge to access the indicators"
128msgid "Try swiping from the top edge to access the indicators"
129msgstr "برای دست‌رسی به نشانگرها، از لبه‌ی بالا بکشید"
129msgstr "برای دست‌رسی به نشانگرها، از لبه‌ی بالا بکشید"
130
130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132msgid "Close"
132msgid "Close"
133msgstr "بستن"
133msgstr "بستن"
134
134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136msgid "Swipe up again to close the settings screen"
136msgid "Swipe up again to close the settings screen"
137msgstr "برای بستن صفحه‌ی تنظیمات، دوباره به بالا بکشپد"
137msgstr "برای بستن صفحه‌ی تنظیمات، دوباره به بالا بکشپد"
138
138
139−#: qml/Components/EdgeDemo.qml:201
139+#: qml/Components/EdgeDemo.qml:214
140msgid "Left edge"
140msgid "Left edge"
141msgstr "لبه‌ی چپ"
141msgstr "لبه‌ی چپ"
142
142
143−#: qml/Components/EdgeDemo.qml:202
143+#: qml/Components/EdgeDemo.qml:215
144msgid "Swipe from the left to reveal the launcher for quick access to apps"
144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145msgstr "برای آشکار شدن اجراگر به منظور دست‌رسی سریع به اپ‌ها از سمت چپ بکشید"
145msgstr "برای آشکار شدن اجراگر به منظور دست‌رسی سریع به اپ‌ها از سمت چپ بکشید"
146
146
147−#: qml/Components/EdgeDemo.qml:229
147+#: qml/Components/EdgeDemo.qml:242
148msgid "Well done"
148msgid "Well done"
149msgstr "عالی بود"
149msgstr "عالی بود"
150
150
151−#: qml/Components/EdgeDemo.qml:230
151+#: qml/Components/EdgeDemo.qml:243
152msgid ""
152msgid ""
153"You have now mastered the edge gestures and can start using the "
153"You have now mastered the edge gestures and can start using the "
154"phone<br><br>Tap on the screen to start"
154"phone<br><br>Tap on the screen to start"
@@ -156,40 +156,44 @@ msgstr ""
156"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
156"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
157"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
157"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
158
158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160msgid "Return to Call"
160msgid "Return to Call"
161msgstr "بازگشت به تماس"
161msgstr "بازگشت به تماس"
162
162
163−#: qml/Components/Lockscreen.qml:223
163+#: qml/Components/Lockscreen.qml:238
164msgid "Emergency Call"
164msgid "Emergency Call"
165msgstr "تماس اضطراری"
165msgstr "تماس اضطراری"
166
166
167−#: qml/Components/Lockscreen.qml:255
167+#: qml/Components/Lockscreen.qml:270
168msgid "OK"
168msgid "OK"
169msgstr "قبول"
169msgstr "قبول"
170
170
171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
172msgid "See less"
172msgid "See less"
173msgstr "کم‌تر ببینید"
173msgstr "کم‌تر ببینید"
174
174
175−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:485
176msgid "See all"
176msgid "See all"
177msgstr "دیدن همه"
177msgstr "دیدن همه"
178
178
179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
181msgid "Search"
181msgid "Search"
182msgstr "جست‌وجو"
182msgstr "جست‌وجو"
183
183
184−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:267
185+msgid "Store"
186+msgstr "فروشگاه"
187+
188+#: qml/Dash/PageHeader.qml:284
185msgid "Settings"
189msgid "Settings"
186msgstr "تنظیمات"
190msgstr "تنظیمات"
187
191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189msgid "Remove from Favorites"
193msgid "Remove from Favorites"
190msgstr "برداشتن از برگزیده‌ها"
194msgstr "برداشتن از برگزیده‌ها"
191
195
192−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:291
193msgid "Add to Favorites"
197msgid "Add to Favorites"
194msgstr "افزودن به برگزیده‌ها"
198msgstr "افزودن به برگزیده‌ها"
195
199
@@ -221,31 +225,23 @@ msgstr "برای تازه‌سازی بکشید…"
221msgid "Release to refresh…"
225msgid "Release to refresh…"
222msgstr "برای تازه‌سازی رها کنید…"
226msgstr "برای تازه‌سازی رها کنید…"
223
227
224−#: qml/Dash/ScopesOverview.qml:215
228+#: qml/Dash/ScopesList.qml:66
225−msgid "Manage Scopes"
229+msgid "Manage"
226−msgstr "مدیریت حوزه‌ها"
230+msgstr "مدیریت"
227−
228−#: qml/Dash/ScopesOverview.qml:437
229−msgid "Done"
230−msgstr "انجام شد"
231−
232−#: qml/Dash/ScopesOverview.qml:463
233−msgid "Store"
234−msgstr "فروشگاه"
235
231
236−#: qml/Dash/ScopesOverviewTab.qml:36
232+#: qml/Dash/ScopesList.qml:112
237−msgid "Favorites"
233+msgid "Home"
238−msgstr "برگزیده‌ها"
234+msgstr "خانه"
239
235
240−#: qml/Dash/ScopesOverviewTab.qml:54
236+#: qml/Dash/ScopesList.qml:113
241−msgid "All"
237+msgid "Also installed"
242−msgstr "همه"
238+msgstr "هم‌چنین نصب شده"
243
239
244−#: qml/Greeter/Greeter.qml:174
240+#: qml/Greeter/Greeter.qml:133
245msgid "Unlock"
241msgid "Unlock"
246msgstr "بازکردن قفل"
242msgstr "بازکردن قفل"
247
243
248−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
249msgid "Show password"
245msgid "Show password"
250msgstr "نمایش گذرواژه"
246msgstr "نمایش گذرواژه"
251
247
@@ -285,6 +281,10 @@ msgstr "پایان یافت"
285msgid "Failed, tap to retry"
281msgid "Failed, tap to retry"
286msgstr "شکست خورد، برای تلاش دوباره ضربه بزنید"
282msgstr "شکست خورد، برای تلاش دوباره ضربه بزنید"
287
283
284+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
285+msgid "Reply"
286+msgstr "پاسخ"
287+
288#: qml/Panel/Indicators/ModemInfoItem.qml:105
288#: qml/Panel/Indicators/ModemInfoItem.qml:105
289msgid "Unlock SIM"
289msgid "Unlock SIM"
290msgstr "باز کردن قفل سیم‌کارت"
290msgstr "باز کردن قفل سیم‌کارت"
@@ -293,49 +293,49 @@ msgstr "باز کردن قفل سیم‌کارت"
293msgid "Roaming"
293msgid "Roaming"
294msgstr "رومینگ"
294msgstr "رومینگ"
295
295
296−#: qml/Shell.qml:391
296+#: qml/Shell.qml:390
297+#, qt-format
298+msgid "Enter %1"
299+msgstr "%1 را وارد کنید"
300+
301+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
297msgid "Enter passphrase"
302msgid "Enter passphrase"
298msgstr "عبارت‌عبور را وارد کنید"
303msgstr "عبارت‌عبور را وارد کنید"
299
304
300#: qml/Shell.qml:392
305#: qml/Shell.qml:392
306+msgid "Enter passcode"
307+msgstr "رمزعبور را وارد کنید"
308+
309+#: qml/Shell.qml:393
310+#, qt-format
311+msgid "Sorry, incorrect %1"
312+msgstr "متأسّفیم، %1 نادرست بود"
313+
314+#: qml/Shell.qml:394
301msgid "Sorry, incorrect passphrase"
315msgid "Sorry, incorrect passphrase"
302msgstr "متأسّفیم، عبارت‌عبور نادرست بود"
316msgstr "متأسّفیم، عبارت‌عبور نادرست بود"
303
317
304−#: qml/Shell.qml:393
318+#: qml/Shell.qml:395
305msgid "Please re-enter"
319msgid "Please re-enter"
306msgstr "لطفاً دوباره وارد کنید"
320msgstr "لطفاً دوباره وارد کنید"
307
321
308−#: qml/Shell.qml:395
309−msgid "Enter passcode"
310−msgstr "رمزعبور را وارد کنید"
311−
312#: qml/Shell.qml:396
322#: qml/Shell.qml:396
313msgid "Sorry, incorrect passcode"
323msgid "Sorry, incorrect passcode"
314msgstr "متأسّفیم، رمزعبور نادرست بود"
324msgstr "متأسّفیم، رمزعبور نادرست بود"
315
325
316−#: qml/Shell.qml:399
326+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
317−#, qt-format
318−msgid "Enter %1"
319−msgstr "%1 را وارد کنید"
320−
321−#: qml/Shell.qml:400
322−#, qt-format
323−msgid "Sorry, incorrect %1"
324−msgstr "متأسّفیم، %1 نادرست بود"
325−
326−#: qml/Shell.qml:441
327msgid "Sorry, incorrect passphrase."
327msgid "Sorry, incorrect passphrase."
328msgstr "متأسّفیم، عبارت‌عبور نادرست است."
328msgstr "متأسّفیم، عبارت‌عبور نادرست است."
329
329
330−#: qml/Shell.qml:442
330+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331msgid "Sorry, incorrect passcode."
331msgid "Sorry, incorrect passcode."
332msgstr "متأسّفیم، رمزعبور نادرست است."
332msgstr "متأسّفیم، رمزعبور نادرست است."
333
333
334−#: qml/Shell.qml:443
334+#: qml/Shell.qml:492
335msgid "This will be your last attempt."
335msgid "This will be your last attempt."
336msgstr "این آخرین تلاش شما خواهد بود."
336msgstr "این آخرین تلاش شما خواهد بود."
337
337
338−#: qml/Shell.qml:445
338+#: qml/Shell.qml:494
339msgid ""
339msgid ""
340"If passphrase is entered incorrectly, your phone will conduct a factory "
340"If passphrase is entered incorrectly, your phone will conduct a factory "
341"reset and all personal data will be deleted."
341"reset and all personal data will be deleted."
@@ -343,7 +343,7 @@ msgstr ""
343"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
343"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
344"اطّلاعات شخصی حذف خواهند شد."
344"اطّلاعات شخصی حذف خواهند شد."
345
345
346−#: qml/Shell.qml:446
346+#: qml/Shell.qml:495
347msgid ""
347msgid ""
348"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"If passcode is entered incorrectly, your phone will conduct a factory reset "
349"and all personal data will be deleted."
349"and all personal data will be deleted."
@@ -351,6 +351,191 @@ msgstr ""
351"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
351"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
352"اطّلاعات شخصی حذف خواهند شد."
352"اطّلاعات شخصی حذف خواهند شد."
353
353
354+#: qml/Wizard/Page.qml:89
355+msgid "Back"
356+msgstr "بازگشت"
357+
358+#: qml/Wizard/Pages/10-welcome.qml:27
359+msgid "Hi!"
360+msgstr "سلام!"
361+
362+#: qml/Wizard/Pages/10-welcome.qml:44
363+msgid "Welcome to your Ubuntu phone."
364+msgstr "به تلفن اوبونتوی خودتان خوش آمدید."
365+
366+#: qml/Wizard/Pages/10-welcome.qml:52
367+msgid "Let’s get started."
368+msgstr "بیایید شروع کینم."
369+
370+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
371+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
372+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373+#: qml/Wizard/Pages/passwd-set.qml:90
374+msgid "Continue"
375+msgstr "ادامه"
376+
377+#: qml/Wizard/Pages/20-sim.qml:25
378+msgid "Add a SIM card and restart your device"
379+msgstr "سیم‌کارتی افزوده و دستگاهتان را شروع مجدّد کنید"
380+
381+#: qml/Wizard/Pages/20-sim.qml:55
382+msgid "Without it, you won’t be able to make calls or use text messaging."
383+msgstr ""
384+"بدون آن، نخواهید توانست تماس گرفته با از پیام‌رسانی متنی استفاده کنید."
385+
386+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
387+msgid "Skip"
388+msgstr "پرش"
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:39
391+msgid "Lock security"
392+msgstr "امنیت قفل"
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:74
395+msgid "Please select how you’d like to unlock your phone."
396+msgstr "لطفاً برگزینید که می‌خواهید چگونه قفل تلفنتان را باز کنید."
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:97
399+msgid "Swipe"
400+msgstr "لغزش"
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:98
403+msgid "No security"
404+msgstr "بدون امنیت"
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:100
407+msgid "Passcode"
408+msgstr "رمزعبور"
409+
410+#: qml/Wizard/Pages/30-passwd-type.qml:101
411+msgid "4 digits only"
412+msgstr "فقط ۴ رقم"
413+
414+#: qml/Wizard/Pages/30-passwd-type.qml:103
415+msgid "Passphrase"
416+msgstr "عبارت‌عبور"
417+
418+#: qml/Wizard/Pages/30-passwd-type.qml:104
419+msgid "Numbers and letters"
420+msgstr "اعداد و حروف"
421+
422+#: qml/Wizard/Pages/40-wifi.qml:28
423+msgid "Connect to Wi‑Fi"
424+msgstr "اتّصال به بی‌سیم"
425+
426+#: qml/Wizard/Pages/40-wifi.qml:147
427+msgid "Available networks…"
428+msgstr "شبکه‌های موجود…"
429+
430+#: qml/Wizard/Pages/40-wifi.qml:148
431+msgid "No available networks."
432+msgstr "هیچ شبکه‌ای موجود نیست."
433+
434+#: qml/Wizard/Pages/50-location.qml:27
435+msgid "Location"
436+msgstr "موقعیت"
437+
438+#: qml/Wizard/Pages/50-location.qml:62
439+msgid "Let the phone detect your location:"
440+msgstr "اجازه به تلفن برای تشخیص موقعیّتتان:"
441+
442+#: qml/Wizard/Pages/50-location.qml:69
443+msgid "Using GPS only (less accurate)"
444+msgstr "فقط با استفاده از جی‌پی‌اس (دقّت کم‌تر)"
445+
446+#: qml/Wizard/Pages/50-location.qml:86
447+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
448+msgstr ""
449+"با استفاده از جی‌پی‌اس، بی‌سیم ناشناس و اطّلاعات شبکه‌ی سلّولی (پیشنهاد شده)"
450+
451+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
452+#: qml/Wizard/Pages/50-location.qml:103
453+msgid ""
454+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
455+"conditions</a>."
456+msgstr ""
457+"با انتخاب این گزینه، با <a href='#'>شرایط و ضوابط</a> HERE نوکیا موافقت "
458+"می‌کنید."
459+
460+#: qml/Wizard/Pages/50-location.qml:112
461+msgid "Not at all"
462+msgstr "به هیچ وجه"
463+
464+#: qml/Wizard/Pages/50-location.qml:124
465+msgid "You can change your mind later in <b>System Settings</b>."
466+msgstr "می‌توانید بعدها نظرتان را در <b>تنظیمات سامانه</b> تغییر دهید."
467+
468+#: qml/Wizard/Pages/60-reporting.qml:24
469+msgid "Improving your experience"
470+msgstr "ارتقای تجربه‌ی شما"
471+
472+#: qml/Wizard/Pages/60-reporting.qml:36
473+msgid ""
474+"Your phone is set up to automatically report errors to Canonical and its "
475+"partners, the makers of the operating system."
476+msgstr ""
477+"تلفن شما تنظیم شده تا خطاها را به صورت خودکار به سازندگان سیستم‌عامل یعنی "
478+"شرکت کنونیکال و شرکایش گزارش دهد."
479+
480+#: qml/Wizard/Pages/60-reporting.qml:43
481+msgid ""
482+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
483+"Privacy</b>"
484+msgstr ""
485+"این می‌تواند در <b>تنظیمات سامانه</b> ذیل <b>امنیت و محرمانگی</b> غیرفعَال "
486+"شود"
487+
488+#: qml/Wizard/Pages/80-finished.qml:24
489+msgid "All done"
490+msgstr "همه‌چیز انجام شد"
491+
492+#: qml/Wizard/Pages/80-finished.qml:39
493+msgid "Nice work!"
494+msgstr "عالی بود!"
495+
496+#: qml/Wizard/Pages/80-finished.qml:46
497+msgid "Your phone is now ready to use."
498+msgstr "هم‌اکنون تلفن شما آماده‌ی استفاده است."
499+
500+#: qml/Wizard/Pages/80-finished.qml:53
501+msgid "Finish"
502+msgstr "پایان"
503+
504+#: qml/Wizard/Pages/here-terms.qml:27
505+msgid "Terms & Conditions"
506+msgstr "شرایط و ضوابط"
507+
508+#: qml/Wizard/Pages/passwd-confirm.qml:49
509+msgid "Confirm passphrase"
510+msgstr "تأیید عبارت‌عبور"
511+
512+#: qml/Wizard/Pages/passwd-confirm.qml:50
513+msgid "Confirm passcode"
514+msgstr "تأیید رمزعبور"
515+
516+#: qml/Wizard/Pages/passwd-confirm.qml:53
517+#: qml/Wizard/Pages/passwd-confirm.qml:54
518+msgid "Please try again."
519+msgstr "لطفاً دوباره سعی کنید."
520+
521+#: qml/Wizard/Pages/passwd-set.qml:61
522+msgid "Choose your passcode"
523+msgstr "رمزعبور خود را انتخاب کنید"
524+
525+#: qml/Wizard/Pages/passwd-set.qml:68
526+msgid "Passphrase must be 4 characters long"
527+msgstr "عبارت‌عبور باید ۴ نویسه طول داشته باشد"
528+
529+#: qml/Wizard/StackButton.qml:39
530+#, qt-format
531+msgid "〈 %1"
532+msgstr "〈 %1"
533+
534+#: qml/Wizard/StackButton.qml:42
535+#, qt-format
536+msgid "%1 〉"
537+msgstr "%1 〉"
538+
354#~ msgid "Type or say a command"
539#~ msgid "Type or say a command"
355#~ msgstr "دستوری را بنویسید یا بگویید"
540#~ msgstr "دستوری را بنویسید یا بگویید"
356
541
@@ -365,3 +550,15 @@ msgstr ""
365
550
366#~ msgid "Speak Now..."
551#~ msgid "Speak Now..."
367#~ msgstr "اکنون صحبت کنید…"
552#~ msgstr "اکنون صحبت کنید…"
553+
554+#~ msgid "All"
555+#~ msgstr "همه"
556+
557+#~ msgid "Favorites"
558+#~ msgstr "برگزیده‌ها"
559+
560+#~ msgid "Done"
561+#~ msgstr "انجام شد"
562+
563+#~ msgid "Manage Scopes"
564+#~ msgstr "مدیریت حوزه‌ها"
po/fi.po+276−80
@@ -7,27 +7,27 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-11-05 11:49+0000\n"
11+"PO-Revision-Date: 2015-01-29 09:21+0000\n"
12"Last-Translator: Jiri Grönroos <Unknown>\n"
12"Last-Translator: Jiri Grönroos <Unknown>\n"
13"Language-Team: Finnish <fi@li.org>\n"
13"Language-Team: Finnish <fi@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-30 07:08+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Salasana: "
23msgstr "Salasana: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Kiinnitä pikakuvake"
28msgstr "Kiinnitä pikakuvake"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Poista pikakuvakkeen kiinnitys"
32msgstr "Poista pikakuvakkeen kiinnitys"
33
33
@@ -52,45 +52,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
52msgstr[0] "Odota %1 minuutti ja yritä sitten uudelleen…"
52msgstr[0] "Odota %1 minuutti ja yritä sitten uudelleen…"
53msgstr[1] "Odota %1 minuuttia ja yritä sitten uudelleen…"
53msgstr[1] "Odota %1 minuuttia ja yritä sitten uudelleen…"
54
54
55−#: qml/Components/Dialogs.qml:74
55+#: qml/Components/Dialogs.qml:86
56msgid "Log out"
56msgid "Log out"
57msgstr "Kirjaudu ulos"
57msgstr "Kirjaudu ulos"
58
58
59−#: qml/Components/Dialogs.qml:75
59+#: qml/Components/Dialogs.qml:87
60msgid "Are you sure you want to log out?"
60msgid "Are you sure you want to log out?"
61msgstr "Haluatko varmasti kirjautua ulos?"
61msgstr "Haluatko varmasti kirjautua ulos?"
62
62
63−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
63+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
64−#: qml/Components/Dialogs.qml:126
64+#: qml/Components/Dialogs.qml:134
65msgid "No"
65msgid "No"
66msgstr "Ei"
66msgstr "Ei"
67
67
68−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
68+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
69−#: qml/Components/Dialogs.qml:133
69+#: qml/Components/Dialogs.qml:140
70msgid "Yes"
70msgid "Yes"
71msgstr "Kyllä"
71msgstr "Kyllä"
72
72
73−#: qml/Components/Dialogs.qml:98
73+#: qml/Components/Dialogs.qml:108
74msgid "Shut down"
74msgid "Shut down"
75msgstr "Sammuta"
75msgstr "Sammuta"
76
76
77−#: qml/Components/Dialogs.qml:99
77+#: qml/Components/Dialogs.qml:109
78msgid "Are you sure you want to shut down?"
78msgid "Are you sure you want to shut down?"
79msgstr "Haluatko varmasti sammuttaa laitteen?"
79msgstr "Haluatko varmasti sammuttaa laitteen?"
80
80
81−#: qml/Components/Dialogs.qml:123
81+#: qml/Components/Dialogs.qml:131
82msgid "Reboot"
82msgid "Reboot"
83msgstr "Käynnistä uudelleen"
83msgstr "Käynnistä uudelleen"
84
84
85−#: qml/Components/Dialogs.qml:124
85+#: qml/Components/Dialogs.qml:132
86msgid "Are you sure you want to reboot?"
86msgid "Are you sure you want to reboot?"
87msgstr "Haluatko varmasti käynnistää laitteen uudelleen?"
87msgstr "Haluatko varmasti käynnistää laitteen uudelleen?"
88
88
89−#: qml/Components/Dialogs.qml:148
89+#: qml/Components/Dialogs.qml:154
90msgid "Power"
90msgid "Power"
91msgstr "Virran katkaisu"
91msgstr "Virran katkaisu"
92
92
93−#: qml/Components/Dialogs.qml:149
93+#: qml/Components/Dialogs.qml:155
94msgid ""
94msgid ""
95"Are you sure you would like\n"
95"Are you sure you would like\n"
96"to power off?"
96"to power off?"
@@ -98,15 +98,15 @@ msgstr ""
98"Haluatko varmasti\n"
98"Haluatko varmasti\n"
99"sammuttaa laitteen?"
99"sammuttaa laitteen?"
100
100
101−#: qml/Components/Dialogs.qml:151
101+#: qml/Components/Dialogs.qml:157
102msgid "Power off"
102msgid "Power off"
103msgstr "Sammuta"
103msgstr "Sammuta"
104
104
105−#: qml/Components/Dialogs.qml:161
105+#: qml/Components/Dialogs.qml:166
106msgid "Restart"
106msgid "Restart"
107msgstr "Käynnistä uudelleen"
107msgstr "Käynnistä uudelleen"
108
108
109−#: qml/Components/Dialogs.qml:171
109+#: qml/Components/Dialogs.qml:175
110msgid "Cancel"
110msgid "Cancel"
111msgstr "Peru"
111msgstr "Peru"
112
112
@@ -114,43 +114,43 @@ msgstr "Peru"
114msgid "Skip intro"
114msgid "Skip intro"
115msgstr "Ohita esittely"
115msgstr "Ohita esittely"
116
116
117−#: qml/Components/EdgeDemo.qml:112
117+#: qml/Components/EdgeDemo.qml:125
118msgid "Right edge"
118msgid "Right edge"
119msgstr "Oikea reuna"
119msgstr "Oikea reuna"
120
120
121−#: qml/Components/EdgeDemo.qml:113
121+#: qml/Components/EdgeDemo.qml:126
122msgid "Try swiping from the right edge to unlock the phone"
122msgid "Try swiping from the right edge to unlock the phone"
123msgstr "Vedä oikealta avataksesi puhelimen lukituksen"
123msgstr "Vedä oikealta avataksesi puhelimen lukituksen"
124
124
125−#: qml/Components/EdgeDemo.qml:144
125+#: qml/Components/EdgeDemo.qml:157
126msgid "Top edge"
126msgid "Top edge"
127msgstr "Yläreuna"
127msgstr "Yläreuna"
128
128
129−#: qml/Components/EdgeDemo.qml:145
129+#: qml/Components/EdgeDemo.qml:158
130msgid "Try swiping from the top edge to access the indicators"
130msgid "Try swiping from the top edge to access the indicators"
131msgstr "Vedä yläreunasta käyttääksesi ilmaisimia"
131msgstr "Vedä yläreunasta käyttääksesi ilmaisimia"
132
132
133−#: qml/Components/EdgeDemo.qml:170
133+#: qml/Components/EdgeDemo.qml:183
134msgid "Close"
134msgid "Close"
135msgstr "Sulje"
135msgstr "Sulje"
136
136
137−#: qml/Components/EdgeDemo.qml:171
137+#: qml/Components/EdgeDemo.qml:184
138msgid "Swipe up again to close the settings screen"
138msgid "Swipe up again to close the settings screen"
139msgstr "Vedä uudestaan sulkeaksesi asetusnäkymän"
139msgstr "Vedä uudestaan sulkeaksesi asetusnäkymän"
140
140
141−#: qml/Components/EdgeDemo.qml:201
141+#: qml/Components/EdgeDemo.qml:214
142msgid "Left edge"
142msgid "Left edge"
143msgstr "Vasen reuna"
143msgstr "Vasen reuna"
144
144
145−#: qml/Components/EdgeDemo.qml:202
145+#: qml/Components/EdgeDemo.qml:215
146msgid "Swipe from the left to reveal the launcher for quick access to apps"
146msgid "Swipe from the left to reveal the launcher for quick access to apps"
147msgstr "Vedä vasemmalta saattaaksesi sovellusten käynnistimen esiin"
147msgstr "Vedä vasemmalta saattaaksesi sovellusten käynnistimen esiin"
148
148
149−#: qml/Components/EdgeDemo.qml:229
149+#: qml/Components/EdgeDemo.qml:242
150msgid "Well done"
150msgid "Well done"
151msgstr "Hyvin tehty"
151msgstr "Hyvin tehty"
152
152
153−#: qml/Components/EdgeDemo.qml:230
153+#: qml/Components/EdgeDemo.qml:243
154msgid ""
154msgid ""
155"You have now mastered the edge gestures and can start using the "
155"You have now mastered the edge gestures and can start using the "
156"phone<br><br>Tap on the screen to start"
156"phone<br><br>Tap on the screen to start"
@@ -158,40 +158,44 @@ msgstr ""
158"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
158"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
159"käytön<br><br>Napauta näyttöä aloittaaksesi"
159"käytön<br><br>Napauta näyttöä aloittaaksesi"
160
160
161−#: qml/Components/Lockscreen.qml:223
161+#: qml/Components/Lockscreen.qml:238
162msgid "Return to Call"
162msgid "Return to Call"
163msgstr "Palaa puheluun"
163msgstr "Palaa puheluun"
164
164
165−#: qml/Components/Lockscreen.qml:223
165+#: qml/Components/Lockscreen.qml:238
166msgid "Emergency Call"
166msgid "Emergency Call"
167msgstr "Hätäpuhelu"
167msgstr "Hätäpuhelu"
168
168
169−#: qml/Components/Lockscreen.qml:255
169+#: qml/Components/Lockscreen.qml:270
170msgid "OK"
170msgid "OK"
171msgstr "OK"
171msgstr "OK"
172
172
173−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
173+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
174msgid "See less"
174msgid "See less"
175msgstr "Näytä vähemmän"
175msgstr "Näytä vähemmän"
176
176
177−#: qml/Dash/GenericScopeView.qml:434
177+#: qml/Dash/GenericScopeView.qml:485
178msgid "See all"
178msgid "See all"
179msgstr "Näytä kaikki"
179msgstr "Näytä kaikki"
180
180
181−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
181+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
182#: qml/Panel/SearchIndicator.qml:27
182#: qml/Panel/SearchIndicator.qml:27
183msgid "Search"
183msgid "Search"
184msgstr "Hae"
184msgstr "Hae"
185
185
186−#: qml/Dash/PageHeader.qml:268
186+#: qml/Dash/PageHeader.qml:267
187+msgid "Store"
188+msgstr "Kauppa"
189+
190+#: qml/Dash/PageHeader.qml:284
187msgid "Settings"
191msgid "Settings"
188msgstr "Asetukset"
192msgstr "Asetukset"
189
193
190−#: qml/Dash/PageHeader.qml:275
194+#: qml/Dash/PageHeader.qml:291
191msgid "Remove from Favorites"
195msgid "Remove from Favorites"
192msgstr "Poista suosikeista"
196msgstr "Poista suosikeista"
193
197
194−#: qml/Dash/PageHeader.qml:275
198+#: qml/Dash/PageHeader.qml:291
195msgid "Add to Favorites"
199msgid "Add to Favorites"
196msgstr "Lisää suosikkeihin"
200msgstr "Lisää suosikkeihin"
197
201
@@ -223,31 +227,23 @@ msgstr "Vedä päivittääksesi…"
223msgid "Release to refresh…"
227msgid "Release to refresh…"
224msgstr "Vapauta päivittääksesi…"
228msgstr "Vapauta päivittääksesi…"
225
229
226−#: qml/Dash/ScopesOverview.qml:215
230+#: qml/Dash/ScopesList.qml:66
227−msgid "Manage Scopes"
231+msgid "Manage"
228−msgstr "Näkymien hallinta"
232+msgstr "Hallitse"
229−
230−#: qml/Dash/ScopesOverview.qml:437
231−msgid "Done"
232−msgstr "Valmis"
233−
234−#: qml/Dash/ScopesOverview.qml:463
235−msgid "Store"
236−msgstr "Kauppa"
237
233
238−#: qml/Dash/ScopesOverviewTab.qml:36
234+#: qml/Dash/ScopesList.qml:112
239−msgid "Favorites"
235+msgid "Home"
240−msgstr "Suosikit"
236+msgstr "Koti"
241
237
242−#: qml/Dash/ScopesOverviewTab.qml:54
238+#: qml/Dash/ScopesList.qml:113
243−msgid "All"
239+msgid "Also installed"
244−msgstr "Kaikki"
240+msgstr "Myös asennettu"
245
241
246−#: qml/Greeter/Greeter.qml:174
242+#: qml/Greeter/Greeter.qml:133
247msgid "Unlock"
243msgid "Unlock"
248msgstr "Avaa lukitus"
244msgstr "Avaa lukitus"
249
245
250−#: qml/Notifications/NotificationMenuItemFactory.qml:116
246+#: qml/Notifications/NotificationMenuItemFactory.qml:128
251msgid "Show password"
247msgid "Show password"
252msgstr "Näytä salasana"
248msgstr "Näytä salasana"
253
249
@@ -287,6 +283,10 @@ msgstr "Valmistunut"
287msgid "Failed, tap to retry"
283msgid "Failed, tap to retry"
288msgstr "Epäonnistunut, napauta yrittääksesi uudelleen"
284msgstr "Epäonnistunut, napauta yrittääksesi uudelleen"
289
285
286+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
287+msgid "Reply"
288+msgstr "Vastaa"
289+
290#: qml/Panel/Indicators/ModemInfoItem.qml:105
290#: qml/Panel/Indicators/ModemInfoItem.qml:105
291msgid "Unlock SIM"
291msgid "Unlock SIM"
292msgstr "Avaa SIM-kortin lukitus"
292msgstr "Avaa SIM-kortin lukitus"
@@ -295,49 +295,49 @@ msgstr "Avaa SIM-kortin lukitus"
295msgid "Roaming"
295msgid "Roaming"
296msgstr "Verkkovierailu"
296msgstr "Verkkovierailu"
297
297
298−#: qml/Shell.qml:391
298+#: qml/Shell.qml:390
299+#, qt-format
300+msgid "Enter %1"
301+msgstr "Anna %1"
302+
303+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
299msgid "Enter passphrase"
304msgid "Enter passphrase"
300msgstr "Anna tunnuslause"
305msgstr "Anna tunnuslause"
301
306
302#: qml/Shell.qml:392
307#: qml/Shell.qml:392
308+msgid "Enter passcode"
309+msgstr "Anna suojakoodi"
310+
311+#: qml/Shell.qml:393
312+#, qt-format
313+msgid "Sorry, incorrect %1"
314+msgstr "Väärä %1"
315+
316+#: qml/Shell.qml:394
303msgid "Sorry, incorrect passphrase"
317msgid "Sorry, incorrect passphrase"
304msgstr "Virheellinen tunnuslause"
318msgstr "Virheellinen tunnuslause"
305
319
306−#: qml/Shell.qml:393
320+#: qml/Shell.qml:395
307msgid "Please re-enter"
321msgid "Please re-enter"
308msgstr "Anna uudelleen"
322msgstr "Anna uudelleen"
309
323
310−#: qml/Shell.qml:395
311−msgid "Enter passcode"
312−msgstr "Anna suojakoodi"
313−
314#: qml/Shell.qml:396
324#: qml/Shell.qml:396
315msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
316msgstr "Väärä suojakoodi"
326msgstr "Väärä suojakoodi"
317
327
318−#: qml/Shell.qml:399
328+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
319−#, qt-format
320−msgid "Enter %1"
321−msgstr "Anna %1"
322−
323−#: qml/Shell.qml:400
324−#, qt-format
325−msgid "Sorry, incorrect %1"
326−msgstr "Väärä %1"
327−
328−#: qml/Shell.qml:441
329msgid "Sorry, incorrect passphrase."
329msgid "Sorry, incorrect passphrase."
330msgstr "Virheellinen tunnuslause."
330msgstr "Virheellinen tunnuslause."
331
331
332−#: qml/Shell.qml:442
332+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
333msgid "Sorry, incorrect passcode."
333msgid "Sorry, incorrect passcode."
334msgstr "Virheellinen suojakoodi."
334msgstr "Virheellinen suojakoodi."
335
335
336−#: qml/Shell.qml:443
336+#: qml/Shell.qml:492
337msgid "This will be your last attempt."
337msgid "This will be your last attempt."
338msgstr "Tämä on viimeinen yritys."
338msgstr "Tämä on viimeinen yritys."
339
339
340−#: qml/Shell.qml:445
340+#: qml/Shell.qml:494
341msgid ""
341msgid ""
342"If passphrase is entered incorrectly, your phone will conduct a factory "
342"If passphrase is entered incorrectly, your phone will conduct a factory "
343"reset and all personal data will be deleted."
343"reset and all personal data will be deleted."
@@ -345,7 +345,7 @@ msgstr ""
345"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
345"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
346"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
346"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
347
347
348−#: qml/Shell.qml:446
348+#: qml/Shell.qml:495
349msgid ""
349msgid ""
350"If passcode is entered incorrectly, your phone will conduct a factory reset "
350"If passcode is entered incorrectly, your phone will conduct a factory reset "
351"and all personal data will be deleted."
351"and all personal data will be deleted."
@@ -353,6 +353,190 @@ msgstr ""
353"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "
353"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "
354"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
354"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
355
355
356+#: qml/Wizard/Page.qml:89
357+msgid "Back"
358+msgstr "Takaisin"
359+
360+#: qml/Wizard/Pages/10-welcome.qml:27
361+msgid "Hi!"
362+msgstr "Hei!"
363+
364+#: qml/Wizard/Pages/10-welcome.qml:44
365+msgid "Welcome to your Ubuntu phone."
366+msgstr "Tervetuloa Ubuntu-puhelimen pariin."
367+
368+#: qml/Wizard/Pages/10-welcome.qml:52
369+msgid "Let’s get started."
370+msgstr "Aloitetaanpa."
371+
372+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
373+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
374+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
375+#: qml/Wizard/Pages/passwd-set.qml:90
376+msgid "Continue"
377+msgstr "Jatka"
378+
379+#: qml/Wizard/Pages/20-sim.qml:25
380+msgid "Add a SIM card and restart your device"
381+msgstr "Lisää SIM-kortti ja käynnistä laite uudelleen"
382+
383+#: qml/Wizard/Pages/20-sim.qml:55
384+msgid "Without it, you won’t be able to make calls or use text messaging."
385+msgstr ""
386+"Ilman sitä et voi soittaa tai vastaanottaa puheluja tai käyttää "
387+"tekstiviestejä."
388+
389+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
390+msgid "Skip"
391+msgstr "Ohita"
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:39
394+msgid "Lock security"
395+msgstr "Lukitusturva"
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:74
398+msgid "Please select how you’d like to unlock your phone."
399+msgstr "Valitse puhelimen lukituksen avaustapa."
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:97
402+msgid "Swipe"
403+msgstr "Pyyhkäisy"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:98
406+msgid "No security"
407+msgstr "Ei suojausta"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:100
410+msgid "Passcode"
411+msgstr "Suojakoodi"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:101
414+msgid "4 digits only"
415+msgstr "Vain 4 numeroa"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:103
418+msgid "Passphrase"
419+msgstr "Salasana"
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:104
422+msgid "Numbers and letters"
423+msgstr "Numerot ja kirjaimet"
424+
425+#: qml/Wizard/Pages/40-wifi.qml:28
426+msgid "Connect to Wi‑Fi"
427+msgstr "Yhdistä wifi-verkkoon"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:147
430+msgid "Available networks…"
431+msgstr "Käytettävissä olevat verkot…"
432+
433+#: qml/Wizard/Pages/40-wifi.qml:148
434+msgid "No available networks."
435+msgstr "Ei käytettävissä olevia verkkoja."
436+
437+#: qml/Wizard/Pages/50-location.qml:27
438+msgid "Location"
439+msgstr "Sijainti"
440+
441+#: qml/Wizard/Pages/50-location.qml:62
442+msgid "Let the phone detect your location:"
443+msgstr "Salli puhelimen havaita sijaintisi:"
444+
445+#: qml/Wizard/Pages/50-location.qml:69
446+msgid "Using GPS only (less accurate)"
447+msgstr "Vain GPS:llä (epätarkempi)"
448+
449+#: qml/Wizard/Pages/50-location.qml:86
450+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
451+msgstr "GPS:llä, wifi- ja matkapuhelinverkon tiedoin (suositeltu)"
452+
453+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
454+#: qml/Wizard/Pages/50-location.qml:103
455+msgid ""
456+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
457+"conditions</a>."
458+msgstr ""
459+"Valitsemalla tämän hyväksyt Nokia HERE -palvelun <a href='#'>käyttöehdot</a>."
460+
461+#: qml/Wizard/Pages/50-location.qml:112
462+msgid "Not at all"
463+msgstr "Ei mitään"
464+
465+#: qml/Wizard/Pages/50-location.qml:124
466+msgid "You can change your mind later in <b>System Settings</b>."
467+msgstr "Voit vaihtaa valintaasi myöhemmin <b>Järjestelmän asetuksissa</b>."
468+
469+#: qml/Wizard/Pages/60-reporting.qml:24
470+msgid "Improving your experience"
471+msgstr "Käyttökokemuksen parantaminen"
472+
473+#: qml/Wizard/Pages/60-reporting.qml:36
474+msgid ""
475+"Your phone is set up to automatically report errors to Canonical and its "
476+"partners, the makers of the operating system."
477+msgstr ""
478+"Puhelimesi on asetettu ilmoittamaan virheistä automaattisesti Canonicalille "
479+"ja partnereille, eli käyttöjärjestelmän kehittäjille."
480+
481+#: qml/Wizard/Pages/60-reporting.qml:43
482+msgid ""
483+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
484+"Privacy</b>"
485+msgstr ""
486+"Tämä on mahdollista poistaa käytöstä <b>Järjestelmän asetukset</b> -osion "
487+"kohdasta <b>Turvallisuus ja yksityisyys</b>"
488+
489+#: qml/Wizard/Pages/80-finished.qml:24
490+msgid "All done"
491+msgstr "Kaikki valmiina"
492+
493+#: qml/Wizard/Pages/80-finished.qml:39
494+msgid "Nice work!"
495+msgstr "Hyvä!"
496+
497+#: qml/Wizard/Pages/80-finished.qml:46
498+msgid "Your phone is now ready to use."
499+msgstr "Puhelimesi on nyt valmis käytettäväksi."
500+
501+#: qml/Wizard/Pages/80-finished.qml:53
502+msgid "Finish"
503+msgstr "Valmis"
504+
505+#: qml/Wizard/Pages/here-terms.qml:27
506+msgid "Terms & Conditions"
507+msgstr "Käyttöehdot"
508+
509+#: qml/Wizard/Pages/passwd-confirm.qml:49
510+msgid "Confirm passphrase"
511+msgstr "Vahvista salasana"
512+
513+#: qml/Wizard/Pages/passwd-confirm.qml:50
514+msgid "Confirm passcode"
515+msgstr "Vahvista suojakoodi"
516+
517+#: qml/Wizard/Pages/passwd-confirm.qml:53
518+#: qml/Wizard/Pages/passwd-confirm.qml:54
519+msgid "Please try again."
520+msgstr "Yritä uudelleen."
521+
522+#: qml/Wizard/Pages/passwd-set.qml:61
523+msgid "Choose your passcode"
524+msgstr "Valitse suojakoodi"
525+
526+#: qml/Wizard/Pages/passwd-set.qml:68
527+msgid "Passphrase must be 4 characters long"
528+msgstr "Salasanan tulee olla neljä merkkiä pitkä"
529+
530+#: qml/Wizard/StackButton.qml:39
531+#, qt-format
532+msgid "〈 %1"
533+msgstr "〈 %1"
534+
535+#: qml/Wizard/StackButton.qml:42
536+#, qt-format
537+msgid "%1 〉"
538+msgstr "%1 〉"
539+
356#~ msgid "Confirm"
540#~ msgid "Confirm"
357#~ msgstr "Hyväksy"
541#~ msgstr "Hyväksy"
358
542
@@ -367,3 +551,15 @@ msgstr ""
367
551
368#~ msgid "Loading. Please Wait..."
552#~ msgid "Loading. Please Wait..."
369#~ msgstr "Ladataan, pieni hetki..."
553#~ msgstr "Ladataan, pieni hetki..."
554+
555+#~ msgid "All"
556+#~ msgstr "Kaikki"
557+
558+#~ msgid "Favorites"
559+#~ msgstr "Suosikit"
560+
561+#~ msgid "Done"
562+#~ msgstr "Valmis"
563+
564+#~ msgid "Manage Scopes"
565+#~ msgstr "Näkymien hallinta"
po/fo.po+251−74
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2014-01-14 20:08+0000\n"
11"PO-Revision-Date: 2014-01-14 20:08+0000\n"
12"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"
12"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"
13"Language-Team: Faroese <fo@li.org>\n"
13"Language-Team: Faroese <fo@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr ""
23msgstr ""
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr ""
28msgstr ""
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr ""
32msgstr ""
33
33
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] ""
50msgstr[0] ""
51msgstr[1] ""
51msgstr[1] ""
52
52
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
54msgid "Log out"
54msgid "Log out"
55msgstr ""
55msgstr ""
56
56
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr ""
59msgstr ""
60
60
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:134
63msgid "No"
63msgid "No"
64msgstr ""
64msgstr ""
65
65
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:140
68msgid "Yes"
68msgid "Yes"
69msgstr ""
69msgstr ""
70
70
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
72msgid "Shut down"
72msgid "Shut down"
73msgstr ""
73msgstr ""
74
74
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr ""
77msgstr ""
78
78
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
80msgid "Reboot"
80msgid "Reboot"
81msgstr ""
81msgstr ""
82
82
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr ""
85msgstr ""
86
86
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
88msgid "Power"
88msgid "Power"
89msgstr ""
89msgstr ""
90
90
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
95msgstr ""
95msgstr ""
96
96
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
98msgid "Power off"
98msgid "Power off"
99msgstr ""
99msgstr ""
100
100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102msgid "Restart"
102msgid "Restart"
103msgstr ""
103msgstr ""
104
104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106msgid "Cancel"
106msgid "Cancel"
107msgstr ""
107msgstr ""
108
108
@@ -110,82 +110,86 @@ msgstr ""
110msgid "Skip intro"
110msgid "Skip intro"
111msgstr ""
111msgstr ""
112
112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114msgid "Right edge"
114msgid "Right edge"
115msgstr "Høgra kant"
115msgstr "Høgra kant"
116
116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118msgid "Try swiping from the right edge to unlock the phone"
118msgid "Try swiping from the right edge to unlock the phone"
119msgstr ""
119msgstr ""
120
120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122msgid "Top edge"
122msgid "Top edge"
123msgstr "Topp kantur"
123msgstr "Topp kantur"
124
124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126msgid "Try swiping from the top edge to access the indicators"
126msgid "Try swiping from the top edge to access the indicators"
127msgstr ""
127msgstr ""
128
128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130msgid "Close"
130msgid "Close"
131msgstr ""
131msgstr ""
132
132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134msgid "Swipe up again to close the settings screen"
134msgid "Swipe up again to close the settings screen"
135msgstr ""
135msgstr ""
136
136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
138msgid "Left edge"
139msgstr ""
139msgstr ""
140
140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143msgstr ""
143msgstr ""
144
144
145−#: qml/Components/EdgeDemo.qml:229
145+#: qml/Components/EdgeDemo.qml:242
146msgid "Well done"
146msgid "Well done"
147msgstr ""
147msgstr ""
148
148
149−#: qml/Components/EdgeDemo.qml:230
149+#: qml/Components/EdgeDemo.qml:243
150msgid ""
150msgid ""
151"You have now mastered the edge gestures and can start using the "
151"You have now mastered the edge gestures and can start using the "
152"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
153msgstr ""
153msgstr ""
154
154
155−#: qml/Components/Lockscreen.qml:223
155+#: qml/Components/Lockscreen.qml:238
156msgid "Return to Call"
156msgid "Return to Call"
157msgstr ""
157msgstr ""
158
158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160msgid "Emergency Call"
160msgid "Emergency Call"
161msgstr ""
161msgstr ""
162
162
163−#: qml/Components/Lockscreen.qml:255
163+#: qml/Components/Lockscreen.qml:270
164msgid "OK"
164msgid "OK"
165msgstr ""
165msgstr ""
166
166
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
168msgid "See less"
168msgid "See less"
169msgstr ""
169msgstr ""
170
170
171−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:485
172msgid "See all"
172msgid "See all"
173msgstr ""
173msgstr ""
174
174
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
176#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
177msgid "Search"
178msgstr "Leita"
178msgstr "Leita"
179
179
180−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:267
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:284
181msgid "Settings"
185msgid "Settings"
182msgstr ""
186msgstr ""
183
187
184−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:291
185msgid "Remove from Favorites"
189msgid "Remove from Favorites"
186msgstr ""
190msgstr ""
187
191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189msgid "Add to Favorites"
193msgid "Add to Favorites"
190msgstr ""
194msgstr ""
191
195
@@ -217,31 +221,23 @@ msgstr ""
217msgid "Release to refresh…"
221msgid "Release to refresh…"
218msgstr ""
222msgstr ""
219
223
220−#: qml/Dash/ScopesOverview.qml:215
224+#: qml/Dash/ScopesList.qml:66
221−msgid "Manage Scopes"
225+msgid "Manage"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:437
225−msgid "Done"
226−msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:463
229−msgid "Store"
230msgstr ""
226msgstr ""
231
227
232−#: qml/Dash/ScopesOverviewTab.qml:36
228+#: qml/Dash/ScopesList.qml:112
233−msgid "Favorites"
229+msgid "Home"
234msgstr ""
230msgstr ""
235
231
236−#: qml/Dash/ScopesOverviewTab.qml:54
232+#: qml/Dash/ScopesList.qml:113
237−msgid "All"
233+msgid "Also installed"
238msgstr ""
234msgstr ""
239
235
240−#: qml/Greeter/Greeter.qml:174
236+#: qml/Greeter/Greeter.qml:133
241msgid "Unlock"
237msgid "Unlock"
242msgstr ""
238msgstr ""
243
239
244−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
245msgid "Show password"
241msgid "Show password"
246msgstr ""
242msgstr ""
247
243
@@ -281,6 +277,10 @@ msgstr ""
281msgid "Failed, tap to retry"
277msgid "Failed, tap to retry"
282msgstr ""
278msgstr ""
283
279
280+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
281+msgid "Reply"
282+msgstr ""
283+
284#: qml/Panel/Indicators/ModemInfoItem.qml:105
284#: qml/Panel/Indicators/ModemInfoItem.qml:105
285msgid "Unlock SIM"
285msgid "Unlock SIM"
286msgstr ""
286msgstr ""
@@ -289,60 +289,237 @@ msgstr ""
289msgid "Roaming"
289msgid "Roaming"
290msgstr ""
290msgstr ""
291
291
292−#: qml/Shell.qml:391
292+#: qml/Shell.qml:390
293+#, qt-format
294+msgid "Enter %1"
295+msgstr ""
296+
297+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
293msgid "Enter passphrase"
298msgid "Enter passphrase"
294msgstr ""
299msgstr ""
295
300
296#: qml/Shell.qml:392
301#: qml/Shell.qml:392
297−msgid "Sorry, incorrect passphrase"
302+msgid "Enter passcode"
298msgstr ""
303msgstr ""
299
304
300#: qml/Shell.qml:393
305#: qml/Shell.qml:393
301−msgid "Please re-enter"
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr ""
309+
310+#: qml/Shell.qml:394
311+msgid "Sorry, incorrect passphrase"
302msgstr ""
312msgstr ""
303
313
304#: qml/Shell.qml:395
314#: qml/Shell.qml:395
305−msgid "Enter passcode"
315+msgid "Please re-enter"
306msgstr ""
316msgstr ""
307
317
308#: qml/Shell.qml:396
318#: qml/Shell.qml:396
309msgid "Sorry, incorrect passcode"
319msgid "Sorry, incorrect passcode"
310msgstr ""
320msgstr ""
311
321
312−#: qml/Shell.qml:399
322+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
313−#, qt-format
314−msgid "Enter %1"
315−msgstr ""
316−
317−#: qml/Shell.qml:400
318−#, qt-format
319−msgid "Sorry, incorrect %1"
320−msgstr ""
321−
322−#: qml/Shell.qml:441
323msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Shell.qml:442
326+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
327msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Shell.qml:443
330+#: qml/Shell.qml:492
331msgid "This will be your last attempt."
331msgid "This will be your last attempt."
332msgstr ""
332msgstr ""
333
333
334−#: qml/Shell.qml:445
334+#: qml/Shell.qml:494
335msgid ""
335msgid ""
336"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
337"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
338msgstr ""
338msgstr ""
339
339
340−#: qml/Shell.qml:446
340+#: qml/Shell.qml:495
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
344msgstr ""
344msgstr ""
345
345
346+#: qml/Wizard/Page.qml:89
347+msgid "Back"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:27
351+msgid "Hi!"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:44
355+msgid "Welcome to your Ubuntu phone."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:52
359+msgid "Let’s get started."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
363+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
364+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365+#: qml/Wizard/Pages/passwd-set.qml:90
366+msgid "Continue"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:25
370+msgid "Add a SIM card and restart your device"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:55
374+msgid "Without it, you won’t be able to make calls or use text messaging."
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
378+msgid "Skip"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:39
382+msgid "Lock security"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:74
386+msgid "Please select how you’d like to unlock your phone."
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:97
390+msgid "Swipe"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:98
394+msgid "No security"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:100
398+msgid "Passcode"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:101
402+msgid "4 digits only"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:103
406+msgid "Passphrase"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:104
410+msgid "Numbers and letters"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:28
414+msgid "Connect to Wi‑Fi"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:147
418+msgid "Available networks…"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:148
422+msgid "No available networks."
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:27
426+msgid "Location"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:62
430+msgid "Let the phone detect your location:"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:69
434+msgid "Using GPS only (less accurate)"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:86
438+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
439+msgstr ""
440+
441+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
442+#: qml/Wizard/Pages/50-location.qml:103
443+msgid ""
444+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
445+"conditions</a>."
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:112
449+msgid "Not at all"
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:124
453+msgid "You can change your mind later in <b>System Settings</b>."
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:24
457+msgid "Improving your experience"
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:36
461+msgid ""
462+"Your phone is set up to automatically report errors to Canonical and its "
463+"partners, the makers of the operating system."
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:43
467+msgid ""
468+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
469+"Privacy</b>"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:24
473+msgid "All done"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:39
477+msgid "Nice work!"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:46
481+msgid "Your phone is now ready to use."
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:53
485+msgid "Finish"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/here-terms.qml:27
489+msgid "Terms & Conditions"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:49
493+msgid "Confirm passphrase"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:50
497+msgid "Confirm passcode"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:53
501+#: qml/Wizard/Pages/passwd-confirm.qml:54
502+msgid "Please try again."
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:61
506+msgid "Choose your passcode"
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:68
510+msgid "Passphrase must be 4 characters long"
511+msgstr ""
512+
513+#: qml/Wizard/StackButton.qml:39
514+#, qt-format
515+msgid "〈 %1"
516+msgstr ""
517+
518+#: qml/Wizard/StackButton.qml:42
519+#, qt-format
520+msgid "%1 〉"
521+msgstr ""
522+
346#~ msgid "Confirm"
523#~ msgid "Confirm"
347#~ msgstr "Vátta"
524#~ msgstr "Vátta"
348
525
po/fr.po+282−81
@@ -7,27 +7,27 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-11-05 17:30+0000\n"
11+"PO-Revision-Date: 2015-02-03 20:11+0000\n"
12−"Last-Translator: Sébastien Maes <nautilussebastien@gmail.com>\n"
12+"Last-Translator: Jean Marc <Unknown>\n"
13"Language-Team: French <fr@li.org>\n"
13"Language-Team: French <fr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-02-04 07:13+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17331)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Mot de passe : "
23msgstr "Mot de passe : "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Épingler le raccourci"
28msgstr "Épingler le raccourci"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Détacher le raccourci"
32msgstr "Détacher le raccourci"
33
33
@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
54msgstr[0] "Veuillez patienter %1 minute et réessayer..."
54msgstr[0] "Veuillez patienter %1 minute et réessayer..."
55msgstr[1] "Veuillez patienter %1 minutes et réessayer..."
55msgstr[1] "Veuillez patienter %1 minutes et réessayer..."
56
56
57−#: qml/Components/Dialogs.qml:74
57+#: qml/Components/Dialogs.qml:86
58msgid "Log out"
58msgid "Log out"
59msgstr "Se déconnecter"
59msgstr "Se déconnecter"
60
60
61−#: qml/Components/Dialogs.qml:75
61+#: qml/Components/Dialogs.qml:87
62msgid "Are you sure you want to log out?"
62msgid "Are you sure you want to log out?"
63msgstr "Êtes-vous sûr de vouloir vous déconnecter ?"
63msgstr "Êtes-vous sûr de vouloir vous déconnecter ?"
64
64
65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
65+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66−#: qml/Components/Dialogs.qml:126
66+#: qml/Components/Dialogs.qml:134
67msgid "No"
67msgid "No"
68msgstr "Non"
68msgstr "Non"
69
69
70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
70+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71−#: qml/Components/Dialogs.qml:133
71+#: qml/Components/Dialogs.qml:140
72msgid "Yes"
72msgid "Yes"
73msgstr "Oui"
73msgstr "Oui"
74
74
75−#: qml/Components/Dialogs.qml:98
75+#: qml/Components/Dialogs.qml:108
76msgid "Shut down"
76msgid "Shut down"
77msgstr "Éteindre"
77msgstr "Éteindre"
78
78
79−#: qml/Components/Dialogs.qml:99
79+#: qml/Components/Dialogs.qml:109
80msgid "Are you sure you want to shut down?"
80msgid "Are you sure you want to shut down?"
81msgstr "Êtes-vous sûr de vouloir éteindre ?"
81msgstr "Êtes-vous sûr de vouloir éteindre ?"
82
82
83−#: qml/Components/Dialogs.qml:123
83+#: qml/Components/Dialogs.qml:131
84msgid "Reboot"
84msgid "Reboot"
85msgstr "Redémarrer"
85msgstr "Redémarrer"
86
86
87−#: qml/Components/Dialogs.qml:124
87+#: qml/Components/Dialogs.qml:132
88msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
89msgstr "Êtes-vous sûr de vouloir redémarrer ?"
89msgstr "Êtes-vous sûr de vouloir redémarrer ?"
90
90
91−#: qml/Components/Dialogs.qml:148
91+#: qml/Components/Dialogs.qml:154
92msgid "Power"
92msgid "Power"
93msgstr "Alimentation"
93msgstr "Alimentation"
94
94
95−#: qml/Components/Dialogs.qml:149
95+#: qml/Components/Dialogs.qml:155
96msgid ""
96msgid ""
97"Are you sure you would like\n"
97"Are you sure you would like\n"
98"to power off?"
98"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100"Êtes-vous sûr de vouloir\n"
100"Êtes-vous sûr de vouloir\n"
101"couper l'alimentation ?"
101"couper l'alimentation ?"
102
102
103−#: qml/Components/Dialogs.qml:151
103+#: qml/Components/Dialogs.qml:157
104msgid "Power off"
104msgid "Power off"
105msgstr "Éteindre"
105msgstr "Éteindre"
106
106
107−#: qml/Components/Dialogs.qml:161
107+#: qml/Components/Dialogs.qml:166
108msgid "Restart"
108msgid "Restart"
109msgstr "Redémarrer"
109msgstr "Redémarrer"
110
110
111−#: qml/Components/Dialogs.qml:171
111+#: qml/Components/Dialogs.qml:175
112msgid "Cancel"
112msgid "Cancel"
113msgstr "Annuler"
113msgstr "Annuler"
114
114
@@ -116,50 +116,50 @@ msgstr "Annuler"
116msgid "Skip intro"
116msgid "Skip intro"
117msgstr "Passer l'intro"
117msgstr "Passer l'intro"
118
118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120msgid "Right edge"
120msgid "Right edge"
121msgstr "Bord droit"
121msgstr "Bord droit"
122
122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124msgid "Try swiping from the right edge to unlock the phone"
124msgid "Try swiping from the right edge to unlock the phone"
125msgstr ""
125msgstr ""
126"Faites glisser votre doigt à partir du bord droit pour déverrouiller."
126"Faites glisser votre doigt à partir du bord droit pour déverrouiller."
127
127
128−#: qml/Components/EdgeDemo.qml:144
128+#: qml/Components/EdgeDemo.qml:157
129msgid "Top edge"
129msgid "Top edge"
130msgstr "Bord supérieur"
130msgstr "Bord supérieur"
131
131
132−#: qml/Components/EdgeDemo.qml:145
132+#: qml/Components/EdgeDemo.qml:158
133msgid "Try swiping from the top edge to access the indicators"
133msgid "Try swiping from the top edge to access the indicators"
134msgstr ""
134msgstr ""
135"Faites glisser votre doigt à partir du bord supérieur pour accéder aux "
135"Faites glisser votre doigt à partir du bord supérieur pour accéder aux "
136"indicateurs."
136"indicateurs."
137
137
138−#: qml/Components/EdgeDemo.qml:170
138+#: qml/Components/EdgeDemo.qml:183
139msgid "Close"
139msgid "Close"
140msgstr "Fermer"
140msgstr "Fermer"
141
141
142−#: qml/Components/EdgeDemo.qml:171
142+#: qml/Components/EdgeDemo.qml:184
143msgid "Swipe up again to close the settings screen"
143msgid "Swipe up again to close the settings screen"
144msgstr ""
144msgstr ""
145"Faites glisser à nouveau votre doigt vers le bord supérieur pour fermer "
145"Faites glisser à nouveau votre doigt vers le bord supérieur pour fermer "
146"l'écran des paramètres"
146"l'écran des paramètres"
147
147
148−#: qml/Components/EdgeDemo.qml:201
148+#: qml/Components/EdgeDemo.qml:214
149msgid "Left edge"
149msgid "Left edge"
150msgstr "Bord gauche"
150msgstr "Bord gauche"
151
151
152−#: qml/Components/EdgeDemo.qml:202
152+#: qml/Components/EdgeDemo.qml:215
153msgid "Swipe from the left to reveal the launcher for quick access to apps"
153msgid "Swipe from the left to reveal the launcher for quick access to apps"
154msgstr ""
154msgstr ""
155"Faites glisser votre doigt à partir du bord gauche pour afficher le lanceur "
155"Faites glisser votre doigt à partir du bord gauche pour afficher le lanceur "
156"d'applications."
156"d'applications."
157
157
158−#: qml/Components/EdgeDemo.qml:229
158+#: qml/Components/EdgeDemo.qml:242
159msgid "Well done"
159msgid "Well done"
160msgstr "Félicitations"
160msgstr "Félicitations"
161
161
162−#: qml/Components/EdgeDemo.qml:230
162+#: qml/Components/EdgeDemo.qml:243
163msgid ""
163msgid ""
164"You have now mastered the edge gestures and can start using the "
164"You have now mastered the edge gestures and can start using the "
165"phone<br><br>Tap on the screen to start"
165"phone<br><br>Tap on the screen to start"
@@ -167,40 +167,44 @@ msgstr ""
167"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
167"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
168"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
168"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
169
169
170−#: qml/Components/Lockscreen.qml:223
170+#: qml/Components/Lockscreen.qml:238
171msgid "Return to Call"
171msgid "Return to Call"
172msgstr "Retourner à l'appel"
172msgstr "Retourner à l'appel"
173
173
174−#: qml/Components/Lockscreen.qml:223
174+#: qml/Components/Lockscreen.qml:238
175msgid "Emergency Call"
175msgid "Emergency Call"
176msgstr "Appel d'urgence"
176msgstr "Appel d'urgence"
177
177
178−#: qml/Components/Lockscreen.qml:255
178+#: qml/Components/Lockscreen.qml:270
179msgid "OK"
179msgid "OK"
180msgstr "OK"
180msgstr "OK"
181
181
182−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
182+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
183msgid "See less"
183msgid "See less"
184msgstr "Voir moins"
184msgstr "Voir moins"
185
185
186−#: qml/Dash/GenericScopeView.qml:434
186+#: qml/Dash/GenericScopeView.qml:485
187msgid "See all"
187msgid "See all"
188msgstr "Tout voir"
188msgstr "Tout voir"
189
189
190−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
190+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
191#: qml/Panel/SearchIndicator.qml:27
191#: qml/Panel/SearchIndicator.qml:27
192msgid "Search"
192msgid "Search"
193msgstr "Rechercher"
193msgstr "Rechercher"
194
194
195−#: qml/Dash/PageHeader.qml:268
195+#: qml/Dash/PageHeader.qml:267
196+msgid "Store"
197+msgstr "Logithèque"
198+
199+#: qml/Dash/PageHeader.qml:284
196msgid "Settings"
200msgid "Settings"
197msgstr "Paramètres"
201msgstr "Paramètres"
198
202
199−#: qml/Dash/PageHeader.qml:275
203+#: qml/Dash/PageHeader.qml:291
200msgid "Remove from Favorites"
204msgid "Remove from Favorites"
201msgstr "Retirer des favoris"
205msgstr "Retirer des favoris"
202
206
203−#: qml/Dash/PageHeader.qml:275
207+#: qml/Dash/PageHeader.qml:291
204msgid "Add to Favorites"
208msgid "Add to Favorites"
205msgstr "Ajouter aux favoris"
209msgstr "Ajouter aux favoris"
206
210
@@ -232,31 +236,23 @@ msgstr "Tirer pour actualiser..."
232msgid "Release to refresh…"
236msgid "Release to refresh…"
233msgstr "Relâcher pour actualiser..."
237msgstr "Relâcher pour actualiser..."
234
238
235−#: qml/Dash/ScopesOverview.qml:215
239+#: qml/Dash/ScopesList.qml:66
236−msgid "Manage Scopes"
240+msgid "Manage"
237−msgstr "Gérer les moteurs de recherche"
241+msgstr "Gérer"
238−
239−#: qml/Dash/ScopesOverview.qml:437
240−msgid "Done"
241−msgstr "Terminé"
242−
243−#: qml/Dash/ScopesOverview.qml:463
244−msgid "Store"
245−msgstr "Logithèque"
246
242
247−#: qml/Dash/ScopesOverviewTab.qml:36
243+#: qml/Dash/ScopesList.qml:112
248−msgid "Favorites"
244+msgid "Home"
249−msgstr "Favorites"
245+msgstr "Accueil"
250
246
251−#: qml/Dash/ScopesOverviewTab.qml:54
247+#: qml/Dash/ScopesList.qml:113
252−msgid "All"
248+msgid "Also installed"
253−msgstr "Toutes"
249+msgstr "Également installées"
254
250
255−#: qml/Greeter/Greeter.qml:174
251+#: qml/Greeter/Greeter.qml:133
256msgid "Unlock"
252msgid "Unlock"
257msgstr "Déverrouiller"
253msgstr "Déverrouiller"
258
254
259−#: qml/Notifications/NotificationMenuItemFactory.qml:116
255+#: qml/Notifications/NotificationMenuItemFactory.qml:128
260msgid "Show password"
256msgid "Show password"
261msgstr "Afficher le mot de passe"
257msgstr "Afficher le mot de passe"
262
258
@@ -296,6 +292,10 @@ msgstr "Terminé"
296msgid "Failed, tap to retry"
292msgid "Failed, tap to retry"
297msgstr "Échec, appuyez pour réessayer"
293msgstr "Échec, appuyez pour réessayer"
298
294
295+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
296+msgid "Reply"
297+msgstr "Répondre"
298+
299#: qml/Panel/Indicators/ModemInfoItem.qml:105
299#: qml/Panel/Indicators/ModemInfoItem.qml:105
300msgid "Unlock SIM"
300msgid "Unlock SIM"
301msgstr "Déverrouiller la carte SIM"
301msgstr "Déverrouiller la carte SIM"
@@ -304,49 +304,49 @@ msgstr "Déverrouiller la carte SIM"
304msgid "Roaming"
304msgid "Roaming"
305msgstr "Roaming"
305msgstr "Roaming"
306
306
307−#: qml/Shell.qml:391
307+#: qml/Shell.qml:390
308+#, qt-format
309+msgid "Enter %1"
310+msgstr "Saisissez %1"
311+
312+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
308msgid "Enter passphrase"
313msgid "Enter passphrase"
309msgstr "Saisissez la phrase de passe"
314msgstr "Saisissez la phrase de passe"
310
315
311#: qml/Shell.qml:392
316#: qml/Shell.qml:392
317+msgid "Enter passcode"
318+msgstr "Saisissez le mot de passe"
319+
320+#: qml/Shell.qml:393
321+#, qt-format
322+msgid "Sorry, incorrect %1"
323+msgstr "Désolé, %1 incorrect"
324+
325+#: qml/Shell.qml:394
312msgid "Sorry, incorrect passphrase"
326msgid "Sorry, incorrect passphrase"
313msgstr "Désolé, phrase secrète incorrecte"
327msgstr "Désolé, phrase secrète incorrecte"
314
328
315−#: qml/Shell.qml:393
329+#: qml/Shell.qml:395
316msgid "Please re-enter"
330msgid "Please re-enter"
317msgstr "Veuillez ressaisir"
331msgstr "Veuillez ressaisir"
318
332
319−#: qml/Shell.qml:395
320−msgid "Enter passcode"
321−msgstr "Saisissez le mot de passe"
322−
323#: qml/Shell.qml:396
333#: qml/Shell.qml:396
324msgid "Sorry, incorrect passcode"
334msgid "Sorry, incorrect passcode"
325msgstr "Désolé, code incorrect"
335msgstr "Désolé, code incorrect"
326
336
327−#: qml/Shell.qml:399
337+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
328−#, qt-format
329−msgid "Enter %1"
330−msgstr "Saisissez %1"
331−
332−#: qml/Shell.qml:400
333−#, qt-format
334−msgid "Sorry, incorrect %1"
335−msgstr "Désolé, %1 incorrect"
336−
337−#: qml/Shell.qml:441
338msgid "Sorry, incorrect passphrase."
338msgid "Sorry, incorrect passphrase."
339msgstr "Désolé, phrase secrète incorrecte."
339msgstr "Désolé, phrase secrète incorrecte."
340
340
341−#: qml/Shell.qml:442
341+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
342msgid "Sorry, incorrect passcode."
342msgid "Sorry, incorrect passcode."
343msgstr "Désolé, code incorrect."
343msgstr "Désolé, code incorrect."
344
344
345−#: qml/Shell.qml:443
345+#: qml/Shell.qml:492
346msgid "This will be your last attempt."
346msgid "This will be your last attempt."
347msgstr "Ceci sera votre dernière tentative."
347msgstr "Ceci sera votre dernière tentative."
348
348
349−#: qml/Shell.qml:445
349+#: qml/Shell.qml:494
350msgid ""
350msgid ""
351"If passphrase is entered incorrectly, your phone will conduct a factory "
351"If passphrase is entered incorrectly, your phone will conduct a factory "
352"reset and all personal data will be deleted."
352"reset and all personal data will be deleted."
@@ -355,7 +355,7 @@ msgstr ""
355"effectuera une réinitialisation aux paramètres d'usine et toutes les données "
355"effectuera une réinitialisation aux paramètres d'usine et toutes les données "
356"personnelles seront supprimées."
356"personnelles seront supprimées."
357
357
358−#: qml/Shell.qml:446
358+#: qml/Shell.qml:495
359msgid ""
359msgid ""
360"If passcode is entered incorrectly, your phone will conduct a factory reset "
360"If passcode is entered incorrectly, your phone will conduct a factory reset "
361"and all personal data will be deleted."
361"and all personal data will be deleted."
@@ -364,6 +364,195 @@ msgstr ""
364"réinitialisation aux paramètres d'usine et toutes les données personnelles "
364"réinitialisation aux paramètres d'usine et toutes les données personnelles "
365"seront supprimées."
365"seront supprimées."
366
366
367+#: qml/Wizard/Page.qml:89
368+msgid "Back"
369+msgstr "Retour"
370+
371+#: qml/Wizard/Pages/10-welcome.qml:27
372+msgid "Hi!"
373+msgstr "Salut !"
374+
375+#: qml/Wizard/Pages/10-welcome.qml:44
376+msgid "Welcome to your Ubuntu phone."
377+msgstr "Bienvenue sur votre téléphone Ubuntu."
378+
379+#: qml/Wizard/Pages/10-welcome.qml:52
380+msgid "Let’s get started."
381+msgstr "Commençons."
382+
383+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
384+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
385+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
386+#: qml/Wizard/Pages/passwd-set.qml:90
387+msgid "Continue"
388+msgstr "Continuer"
389+
390+#: qml/Wizard/Pages/20-sim.qml:25
391+msgid "Add a SIM card and restart your device"
392+msgstr "Ajoutez une carte SIM et redémarrez votre appareil"
393+
394+#: qml/Wizard/Pages/20-sim.qml:55
395+msgid "Without it, you won’t be able to make calls or use text messaging."
396+msgstr ""
397+"Sans elle, vous ne serez pas en mesure de passer des appels ou d'envoyer des "
398+"SMS."
399+
400+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
401+msgid "Skip"
402+msgstr "Passer"
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:39
405+msgid "Lock security"
406+msgstr "Sécurité de verrouillage"
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:74
409+msgid "Please select how you’d like to unlock your phone."
410+msgstr ""
411+"Veuillez sélectionner comment vous souhaitez déverrouiller votre téléphone."
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:97
414+msgid "Swipe"
415+msgstr "Glissement"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:98
418+msgid "No security"
419+msgstr "Aucune sécurité"
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:100
422+msgid "Passcode"
423+msgstr "Code"
424+
425+#: qml/Wizard/Pages/30-passwd-type.qml:101
426+msgid "4 digits only"
427+msgstr "4 chiffres seulement"
428+
429+#: qml/Wizard/Pages/30-passwd-type.qml:103
430+msgid "Passphrase"
431+msgstr "Phrase de passe"
432+
433+#: qml/Wizard/Pages/30-passwd-type.qml:104
434+msgid "Numbers and letters"
435+msgstr "Chiffres et lettres"
436+
437+#: qml/Wizard/Pages/40-wifi.qml:28
438+msgid "Connect to Wi‑Fi"
439+msgstr "Se connecter au Wi-Fi"
440+
441+#: qml/Wizard/Pages/40-wifi.qml:147
442+msgid "Available networks…"
443+msgstr "Réseaux disponibles..."
444+
445+#: qml/Wizard/Pages/40-wifi.qml:148
446+msgid "No available networks."
447+msgstr "Aucun réseau disponible."
448+
449+#: qml/Wizard/Pages/50-location.qml:27
450+msgid "Location"
451+msgstr "Position"
452+
453+#: qml/Wizard/Pages/50-location.qml:62
454+msgid "Let the phone detect your location:"
455+msgstr "Laisser le téléphone détecter votre position :"
456+
457+#: qml/Wizard/Pages/50-location.qml:69
458+msgid "Using GPS only (less accurate)"
459+msgstr "Utilisation du GPS seulement (moins précis)"
460+
461+#: qml/Wizard/Pages/50-location.qml:86
462+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
463+msgstr ""
464+"Utilisation des informations du GPS, du Wi-Fi anonymisé et du réseau "
465+"cellulaire (recommandé)"
466+
467+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
468+#: qml/Wizard/Pages/50-location.qml:103
469+msgid ""
470+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
471+"conditions</a>."
472+msgstr ""
473+"En sélectionnant cette option, vous acceptez les <a href='#'>conditions "
474+"générales d'utilisation</a> de Nokia HERE."
475+
476+#: qml/Wizard/Pages/50-location.qml:112
477+msgid "Not at all"
478+msgstr "Pas du tout"
479+
480+#: qml/Wizard/Pages/50-location.qml:124
481+msgid "You can change your mind later in <b>System Settings</b>."
482+msgstr ""
483+"Vous pouvez changer d'avis plus tard dans les <b>Paramètres Système</b>."
484+
485+#: qml/Wizard/Pages/60-reporting.qml:24
486+msgid "Improving your experience"
487+msgstr "Amélioration de votre expérience"
488+
489+#: qml/Wizard/Pages/60-reporting.qml:36
490+msgid ""
491+"Your phone is set up to automatically report errors to Canonical and its "
492+"partners, the makers of the operating system."
493+msgstr ""
494+"Votre téléphone est réglé pour envoyer automatiquement des rapports d'erreur "
495+"à Canonical et à ses partenaires, les fabricants du système d'exploitation."
496+
497+#: qml/Wizard/Pages/60-reporting.qml:43
498+msgid ""
499+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
500+"Privacy</b>"
501+msgstr ""
502+"Ceci peut être désactivé dans les <b>Paramètres système</b> sous <b>Sécurité "
503+"&amp; vie privée</b>"
504+
505+#: qml/Wizard/Pages/80-finished.qml:24
506+msgid "All done"
507+msgstr "Ça y est"
508+
509+#: qml/Wizard/Pages/80-finished.qml:39
510+msgid "Nice work!"
511+msgstr "Beau travail !"
512+
513+#: qml/Wizard/Pages/80-finished.qml:46
514+msgid "Your phone is now ready to use."
515+msgstr "Votre téléphone est maintenant prêt à être utilisé."
516+
517+#: qml/Wizard/Pages/80-finished.qml:53
518+msgid "Finish"
519+msgstr "Terminer"
520+
521+#: qml/Wizard/Pages/here-terms.qml:27
522+msgid "Terms & Conditions"
523+msgstr "Conditions générales d'utilisation"
524+
525+#: qml/Wizard/Pages/passwd-confirm.qml:49
526+msgid "Confirm passphrase"
527+msgstr "Confirmez votre phrase de passe"
528+
529+#: qml/Wizard/Pages/passwd-confirm.qml:50
530+msgid "Confirm passcode"
531+msgstr "Confirmez votre code"
532+
533+#: qml/Wizard/Pages/passwd-confirm.qml:53
534+#: qml/Wizard/Pages/passwd-confirm.qml:54
535+msgid "Please try again."
536+msgstr "Veuillez réessayer."
537+
538+#: qml/Wizard/Pages/passwd-set.qml:61
539+msgid "Choose your passcode"
540+msgstr "Choisissez votre code"
541+
542+#: qml/Wizard/Pages/passwd-set.qml:68
543+msgid "Passphrase must be 4 characters long"
544+msgstr "La phrase de passe doit comporter 4 caractères"
545+
546+#: qml/Wizard/StackButton.qml:39
547+#, qt-format
548+msgid "〈 %1"
549+msgstr "〈 %1"
550+
551+#: qml/Wizard/StackButton.qml:42
552+#, qt-format
553+msgid "%1 〉"
554+msgstr "%1 〉"
555+
367#~ msgid "Speaking..."
556#~ msgid "Speaking..."
368#~ msgstr "En cours d'écoute..."
557#~ msgstr "En cours d'écoute..."
369
558
@@ -378,3 +567,15 @@ msgstr ""
378
567
379#~ msgid "Speak Now..."
568#~ msgid "Speak Now..."
380#~ msgstr "Parlez maintenant…"
569#~ msgstr "Parlez maintenant…"
570+
571+#~ msgid "All"
572+#~ msgstr "Toutes"
573+
574+#~ msgid "Done"
575+#~ msgstr "Terminé"
576+
577+#~ msgid "Favorites"
578+#~ msgstr "Favorites"
579+
580+#~ msgid "Manage Scopes"
581+#~ msgstr "Gérer les moteurs de recherche"
po/gd.po+268−79
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2014-11-09 08:18+0000\n"
11"PO-Revision-Date: 2014-11-09 08:18+0000\n"
12"Last-Translator: GunChleoc <Unknown>\n"
12"Last-Translator: GunChleoc <Unknown>\n"
13"Language-Team: Fòram na Gàidhlig\n"
13"Language-Team: Fòram na Gàidhlig\n"
@@ -16,8 +16,8 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
17"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
18"(n > 2 && n < 20) ? 2 : 3;\n"
18"(n > 2 && n < 20) ? 2 : 3;\n"
19−"X-Launchpad-Export-Date: 2014-11-10 06:09+0000\n"
19+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
20−"X-Generator: Launchpad (build 17231)\n"
20+"X-Generator: Launchpad (build 17306)\n"
21"Language: gd\n"
21"Language: gd\n"
22
22
23#: plugins/LightDM/Greeter.cpp:130
23#: plugins/LightDM/Greeter.cpp:130
@@ -25,11 +25,11 @@ msgid "Password: "
25msgstr "Facal-faire: "
25msgstr "Facal-faire: "
26
26
27#: plugins/Unity/Launcher/launcheritem.cpp:45
27#: plugins/Unity/Launcher/launcheritem.cpp:45
28−#: plugins/Unity/Launcher/launcheritem.cpp:91
28+#: plugins/Unity/Launcher/launcheritem.cpp:100
29msgid "Pin shortcut"
29msgid "Pin shortcut"
30msgstr "Prìnich ath-ghoirid"
30msgstr "Prìnich ath-ghoirid"
31
31
32−#: plugins/Unity/Launcher/launcheritem.cpp:91
32+#: plugins/Unity/Launcher/launcheritem.cpp:100
33msgid "Unpin shortcut"
33msgid "Unpin shortcut"
34msgstr "Neo-phrìnich an ath-ghoirid"
34msgstr "Neo-phrìnich an ath-ghoirid"
35
35
@@ -58,45 +58,45 @@ msgstr[1] "Fuirich ort %1 dhiog 's feuch ris a-rithist an uairsin…"
58msgstr[2] "Fuirich ort %1 diogan 's feuch ris a-rithist an uairsin…"
58msgstr[2] "Fuirich ort %1 diogan 's feuch ris a-rithist an uairsin…"
59msgstr[3] "Fuirich ort %1 diog 's feuch ris a-rithist an uairsin…"
59msgstr[3] "Fuirich ort %1 diog 's feuch ris a-rithist an uairsin…"
60
60
61−#: qml/Components/Dialogs.qml:74
61+#: qml/Components/Dialogs.qml:86
62msgid "Log out"
62msgid "Log out"
63msgstr "Clàraich a-mach"
63msgstr "Clàraich a-mach"
64
64
65−#: qml/Components/Dialogs.qml:75
65+#: qml/Components/Dialogs.qml:87
66msgid "Are you sure you want to log out?"
66msgid "Are you sure you want to log out?"
67msgstr "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?"
67msgstr "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?"
68
68
69−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
69+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
70−#: qml/Components/Dialogs.qml:126
70+#: qml/Components/Dialogs.qml:134
71msgid "No"
71msgid "No"
72msgstr "Chan eil"
72msgstr "Chan eil"
73
73
74−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
74+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
75−#: qml/Components/Dialogs.qml:133
75+#: qml/Components/Dialogs.qml:140
76msgid "Yes"
76msgid "Yes"
77msgstr "Tha"
77msgstr "Tha"
78
78
79−#: qml/Components/Dialogs.qml:98
79+#: qml/Components/Dialogs.qml:108
80msgid "Shut down"
80msgid "Shut down"
81msgstr "Dùin sìos"
81msgstr "Dùin sìos"
82
82
83−#: qml/Components/Dialogs.qml:99
83+#: qml/Components/Dialogs.qml:109
84msgid "Are you sure you want to shut down?"
84msgid "Are you sure you want to shut down?"
85msgstr "A bheil thu cinnteach gu bheil thu airson a dhùnadh sìos?"
85msgstr "A bheil thu cinnteach gu bheil thu airson a dhùnadh sìos?"
86
86
87−#: qml/Components/Dialogs.qml:123
87+#: qml/Components/Dialogs.qml:131
88msgid "Reboot"
88msgid "Reboot"
89msgstr "Ath-thòisich an siostam"
89msgstr "Ath-thòisich an siostam"
90
90
91−#: qml/Components/Dialogs.qml:124
91+#: qml/Components/Dialogs.qml:132
92msgid "Are you sure you want to reboot?"
92msgid "Are you sure you want to reboot?"
93msgstr "A bheil thu cinnteach gu bheil thu airson tòiseachadh às ùr?"
93msgstr "A bheil thu cinnteach gu bheil thu airson tòiseachadh às ùr?"
94
94
95−#: qml/Components/Dialogs.qml:148
95+#: qml/Components/Dialogs.qml:154
96msgid "Power"
96msgid "Power"
97msgstr "Cumhachd"
97msgstr "Cumhachd"
98
98
99−#: qml/Components/Dialogs.qml:149
99+#: qml/Components/Dialogs.qml:155
100msgid ""
100msgid ""
101"Are you sure you would like\n"
101"Are you sure you would like\n"
102"to power off?"
102"to power off?"
@@ -104,15 +104,15 @@ msgstr ""
104"A bheil thu cinnteach gu bheil thu\n"
104"A bheil thu cinnteach gu bheil thu\n"
105"airson a' chumhachd a chur dheth?"
105"airson a' chumhachd a chur dheth?"
106
106
107−#: qml/Components/Dialogs.qml:151
107+#: qml/Components/Dialogs.qml:157
108msgid "Power off"
108msgid "Power off"
109msgstr "Cuir a' chumhachd dheth"
109msgstr "Cuir a' chumhachd dheth"
110
110
111−#: qml/Components/Dialogs.qml:161
111+#: qml/Components/Dialogs.qml:166
112msgid "Restart"
112msgid "Restart"
113msgstr "Ath-thòisich"
113msgstr "Ath-thòisich"
114
114
115−#: qml/Components/Dialogs.qml:171
115+#: qml/Components/Dialogs.qml:175
116msgid "Cancel"
116msgid "Cancel"
117msgstr "Sguir dheth"
117msgstr "Sguir dheth"
118
118
@@ -120,49 +120,49 @@ msgstr "Sguir dheth"
120msgid "Skip intro"
120msgid "Skip intro"
121msgstr "Gearr leum thairis air an ro-ràdh"
121msgstr "Gearr leum thairis air an ro-ràdh"
122
122
123−#: qml/Components/EdgeDemo.qml:112
123+#: qml/Components/EdgeDemo.qml:125
124msgid "Right edge"
124msgid "Right edge"
125msgstr "An oir dheas"
125msgstr "An oir dheas"
126
126
127−#: qml/Components/EdgeDemo.qml:113
127+#: qml/Components/EdgeDemo.qml:126
128msgid "Try swiping from the right edge to unlock the phone"
128msgid "Try swiping from the right edge to unlock the phone"
129msgstr ""
129msgstr ""
130"Feuch is dèan grad-shlaighdeadh a-steach on oir dheas gus a' ghlas a thoirt "
130"Feuch is dèan grad-shlaighdeadh a-steach on oir dheas gus a' ghlas a thoirt "
131"far an fhòn"
131"far an fhòn"
132
132
133−#: qml/Components/EdgeDemo.qml:144
133+#: qml/Components/EdgeDemo.qml:157
134msgid "Top edge"
134msgid "Top edge"
135msgstr "An oir aig a' bharr"
135msgstr "An oir aig a' bharr"
136
136
137−#: qml/Components/EdgeDemo.qml:145
137+#: qml/Components/EdgeDemo.qml:158
138msgid "Try swiping from the top edge to access the indicators"
138msgid "Try swiping from the top edge to access the indicators"
139msgstr ""
139msgstr ""
140"Feuch is dèan grad-shlaighdeadh a-steach on oir aig a' bharr gus greim "
140"Feuch is dèan grad-shlaighdeadh a-steach on oir aig a' bharr gus greim "
141"fhaighinn air na taisbeanairean"
141"fhaighinn air na taisbeanairean"
142
142
143−#: qml/Components/EdgeDemo.qml:170
143+#: qml/Components/EdgeDemo.qml:183
144msgid "Close"
144msgid "Close"
145msgstr "Dùin"
145msgstr "Dùin"
146
146
147−#: qml/Components/EdgeDemo.qml:171
147+#: qml/Components/EdgeDemo.qml:184
148msgid "Swipe up again to close the settings screen"
148msgid "Swipe up again to close the settings screen"
149msgstr "Dèan grad-shlaighdeadh a-nìos gus sgrìn nan roghainnean a dhùnadh"
149msgstr "Dèan grad-shlaighdeadh a-nìos gus sgrìn nan roghainnean a dhùnadh"
150
150
151−#: qml/Components/EdgeDemo.qml:201
151+#: qml/Components/EdgeDemo.qml:214
152msgid "Left edge"
152msgid "Left edge"
153msgstr "An oir chlì"
153msgstr "An oir chlì"
154
154
155−#: qml/Components/EdgeDemo.qml:202
155+#: qml/Components/EdgeDemo.qml:215
156msgid "Swipe from the left to reveal the launcher for quick access to apps"
156msgid "Swipe from the left to reveal the launcher for quick access to apps"
157msgstr ""
157msgstr ""
158"Dèan grad-shlaighdeadh on oir chlì air an lòinseir a bheir dhut cothrom "
158"Dèan grad-shlaighdeadh on oir chlì air an lòinseir a bheir dhut cothrom "
159"luath air na h-aplacaidean"
159"luath air na h-aplacaidean"
160
160
161−#: qml/Components/EdgeDemo.qml:229
161+#: qml/Components/EdgeDemo.qml:242
162msgid "Well done"
162msgid "Well done"
163msgstr "Gasta!"
163msgstr "Gasta!"
164
164
165−#: qml/Components/EdgeDemo.qml:230
165+#: qml/Components/EdgeDemo.qml:243
166msgid ""
166msgid ""
167"You have now mastered the edge gestures and can start using the "
167"You have now mastered the edge gestures and can start using the "
168"phone<br><br>Tap on the screen to start"
168"phone<br><br>Tap on the screen to start"
@@ -170,40 +170,44 @@ msgstr ""
170"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "
170"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "
171"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"
171"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"
172
172
173−#: qml/Components/Lockscreen.qml:223
173+#: qml/Components/Lockscreen.qml:238
174msgid "Return to Call"
174msgid "Return to Call"
175msgstr "Till dhan ghairm"
175msgstr "Till dhan ghairm"
176
176
177−#: qml/Components/Lockscreen.qml:223
177+#: qml/Components/Lockscreen.qml:238
178msgid "Emergency Call"
178msgid "Emergency Call"
179msgstr "Gairm èiginn"
179msgstr "Gairm èiginn"
180
180
181−#: qml/Components/Lockscreen.qml:255
181+#: qml/Components/Lockscreen.qml:270
182msgid "OK"
182msgid "OK"
183msgstr "Ceart ma-thà"
183msgstr "Ceart ma-thà"
184
184
185−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
185+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
186msgid "See less"
186msgid "See less"
187msgstr "Seall nas lugha"
187msgstr "Seall nas lugha"
188
188
189−#: qml/Dash/GenericScopeView.qml:434
189+#: qml/Dash/GenericScopeView.qml:485
190msgid "See all"
190msgid "See all"
191msgstr "Seall na h-uile"
191msgstr "Seall na h-uile"
192
192
193−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
193+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
194#: qml/Panel/SearchIndicator.qml:27
194#: qml/Panel/SearchIndicator.qml:27
195msgid "Search"
195msgid "Search"
196msgstr "Lorg"
196msgstr "Lorg"
197
197
198−#: qml/Dash/PageHeader.qml:268
198+#: qml/Dash/PageHeader.qml:267
199+msgid "Store"
200+msgstr "Am bùth"
201+
202+#: qml/Dash/PageHeader.qml:284
199msgid "Settings"
203msgid "Settings"
200msgstr "Roghainnean"
204msgstr "Roghainnean"
201
205
202−#: qml/Dash/PageHeader.qml:275
206+#: qml/Dash/PageHeader.qml:291
203msgid "Remove from Favorites"
207msgid "Remove from Favorites"
204msgstr "Thoir air falbh o na h-annsachdan"
208msgstr "Thoir air falbh o na h-annsachdan"
205
209
206−#: qml/Dash/PageHeader.qml:275
210+#: qml/Dash/PageHeader.qml:291
207msgid "Add to Favorites"
211msgid "Add to Favorites"
208msgstr "Cuir ris na h-annsachdan"
212msgstr "Cuir ris na h-annsachdan"
209
213
@@ -235,31 +239,23 @@ msgstr "Tarraing airson ath-nuadhachadh…"
235msgid "Release to refresh…"
239msgid "Release to refresh…"
236msgstr "Leig às airson ath-nuadhachadh…"
240msgstr "Leig às airson ath-nuadhachadh…"
237
241
238−#: qml/Dash/ScopesOverview.qml:215
242+#: qml/Dash/ScopesList.qml:66
239−msgid "Manage Scopes"
243+msgid "Manage"
240−msgstr "Stiùirich na sgòpaichean"
244+msgstr ""
241−
242−#: qml/Dash/ScopesOverview.qml:437
243−msgid "Done"
244−msgstr "Deiseil"
245−
246−#: qml/Dash/ScopesOverview.qml:463
247−msgid "Store"
248−msgstr "Am bùth"
249
245
250−#: qml/Dash/ScopesOverviewTab.qml:36
246+#: qml/Dash/ScopesList.qml:112
251−msgid "Favorites"
247+msgid "Home"
252−msgstr "Annsachdan"
248+msgstr ""
253
249
254−#: qml/Dash/ScopesOverviewTab.qml:54
250+#: qml/Dash/ScopesList.qml:113
255−msgid "All"
251+msgid "Also installed"
256−msgstr "Na h-uile"
252+msgstr ""
257
253
258−#: qml/Greeter/Greeter.qml:174
254+#: qml/Greeter/Greeter.qml:133
259msgid "Unlock"
255msgid "Unlock"
260msgstr "Thoir a' ghlas dheth"
256msgstr "Thoir a' ghlas dheth"
261
257
262−#: qml/Notifications/NotificationMenuItemFactory.qml:116
258+#: qml/Notifications/NotificationMenuItemFactory.qml:128
263msgid "Show password"
259msgid "Show password"
264msgstr "Seall am facal-faire"
260msgstr "Seall am facal-faire"
265
261
@@ -299,6 +295,10 @@ msgstr "Coileanta"
299msgid "Failed, tap to retry"
295msgid "Failed, tap to retry"
300msgstr "Dh'fhàillig leis, thoir gnogag gus feuchainn a-rithist"
296msgstr "Dh'fhàillig leis, thoir gnogag gus feuchainn a-rithist"
301
297
298+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
299+msgid "Reply"
300+msgstr ""
301+
302#: qml/Panel/Indicators/ModemInfoItem.qml:105
302#: qml/Panel/Indicators/ModemInfoItem.qml:105
303msgid "Unlock SIM"
303msgid "Unlock SIM"
304msgstr "Thoir a' ghlas far an SIM"
304msgstr "Thoir a' ghlas far an SIM"
@@ -307,49 +307,49 @@ msgstr "Thoir a' ghlas far an SIM"
307msgid "Roaming"
307msgid "Roaming"
308msgstr "Air fàrsan"
308msgstr "Air fàrsan"
309
309
310−#: qml/Shell.qml:391
310+#: qml/Shell.qml:390
311+#, qt-format
312+msgid "Enter %1"
313+msgstr "Cuir a-steach %1"
314+
315+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
311msgid "Enter passphrase"
316msgid "Enter passphrase"
312msgstr "Cuir abairt-fhaire a-steach"
317msgstr "Cuir abairt-fhaire a-steach"
313
318
314#: qml/Shell.qml:392
319#: qml/Shell.qml:392
320+msgid "Enter passcode"
321+msgstr "Cuir còd-faire a-steach"
322+
323+#: qml/Shell.qml:393
324+#, qt-format
325+msgid "Sorry, incorrect %1"
326+msgstr "Duilich ach tha a' %1 cearr"
327+
328+#: qml/Shell.qml:394
315msgid "Sorry, incorrect passphrase"
329msgid "Sorry, incorrect passphrase"
316msgstr "Duilich ach tha an abairt-fhaire cearr"
330msgstr "Duilich ach tha an abairt-fhaire cearr"
317
331
318−#: qml/Shell.qml:393
332+#: qml/Shell.qml:395
319msgid "Please re-enter"
333msgid "Please re-enter"
320msgstr "Cuir a-steach e a-rithist"
334msgstr "Cuir a-steach e a-rithist"
321
335
322−#: qml/Shell.qml:395
323−msgid "Enter passcode"
324−msgstr "Cuir còd-faire a-steach"
325−
326#: qml/Shell.qml:396
336#: qml/Shell.qml:396
327msgid "Sorry, incorrect passcode"
337msgid "Sorry, incorrect passcode"
328msgstr "Duilich ach tha an còd-faire cearr"
338msgstr "Duilich ach tha an còd-faire cearr"
329
339
330−#: qml/Shell.qml:399
340+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
331−#, qt-format
332−msgid "Enter %1"
333−msgstr "Cuir a-steach %1"
334−
335−#: qml/Shell.qml:400
336−#, qt-format
337−msgid "Sorry, incorrect %1"
338−msgstr "Duilich ach tha a' %1 cearr"
339−
340−#: qml/Shell.qml:441
341msgid "Sorry, incorrect passphrase."
341msgid "Sorry, incorrect passphrase."
342msgstr "Duilich ach tha an abairt-fhaire cearr."
342msgstr "Duilich ach tha an abairt-fhaire cearr."
343
343
344−#: qml/Shell.qml:442
344+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
345msgid "Sorry, incorrect passcode."
345msgid "Sorry, incorrect passcode."
346msgstr "Duilich ach tha an còd-faire cearr."
346msgstr "Duilich ach tha an còd-faire cearr."
347
347
348−#: qml/Shell.qml:443
348+#: qml/Shell.qml:492
349msgid "This will be your last attempt."
349msgid "This will be your last attempt."
350msgstr "Seo an oidhirp mu dheireadh agad."
350msgstr "Seo an oidhirp mu dheireadh agad."
351
351
352−#: qml/Shell.qml:445
352+#: qml/Shell.qml:494
353msgid ""
353msgid ""
354"If passphrase is entered incorrectly, your phone will conduct a factory "
354"If passphrase is entered incorrectly, your phone will conduct a factory "
355"reset and all personal data will be deleted."
355"reset and all personal data will be deleted."
@@ -358,7 +358,7 @@ msgstr ""
358"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "
358"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "
359"pearsanta a sguabadh às."
359"pearsanta a sguabadh às."
360
360
361−#: qml/Shell.qml:446
361+#: qml/Shell.qml:495
362msgid ""
362msgid ""
363"If passcode is entered incorrectly, your phone will conduct a factory reset "
363"If passcode is entered incorrectly, your phone will conduct a factory reset "
364"and all personal data will be deleted."
364"and all personal data will be deleted."
@@ -367,6 +367,183 @@ msgstr ""
367"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "
367"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "
368"a sguabadh às."
368"a sguabadh às."
369
369
370+#: qml/Wizard/Page.qml:89
371+msgid "Back"
372+msgstr ""
373+
374+#: qml/Wizard/Pages/10-welcome.qml:27
375+msgid "Hi!"
376+msgstr ""
377+
378+#: qml/Wizard/Pages/10-welcome.qml:44
379+msgid "Welcome to your Ubuntu phone."
380+msgstr ""
381+
382+#: qml/Wizard/Pages/10-welcome.qml:52
383+msgid "Let’s get started."
384+msgstr ""
385+
386+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
387+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
388+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
389+#: qml/Wizard/Pages/passwd-set.qml:90
390+msgid "Continue"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/20-sim.qml:25
394+msgid "Add a SIM card and restart your device"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/20-sim.qml:55
398+msgid "Without it, you won’t be able to make calls or use text messaging."
399+msgstr ""
400+
401+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
402+msgid "Skip"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:39
406+msgid "Lock security"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:74
410+msgid "Please select how you’d like to unlock your phone."
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:97
414+msgid "Swipe"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:98
418+msgid "No security"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:100
422+msgid "Passcode"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/30-passwd-type.qml:101
426+msgid "4 digits only"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/30-passwd-type.qml:103
430+msgid "Passphrase"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/30-passwd-type.qml:104
434+msgid "Numbers and letters"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/40-wifi.qml:28
438+msgid "Connect to Wi‑Fi"
439+msgstr ""
440+
441+#: qml/Wizard/Pages/40-wifi.qml:147
442+msgid "Available networks…"
443+msgstr ""
444+
445+#: qml/Wizard/Pages/40-wifi.qml:148
446+msgid "No available networks."
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:27
450+msgid "Location"
451+msgstr ""
452+
453+#: qml/Wizard/Pages/50-location.qml:62
454+msgid "Let the phone detect your location:"
455+msgstr ""
456+
457+#: qml/Wizard/Pages/50-location.qml:69
458+msgid "Using GPS only (less accurate)"
459+msgstr ""
460+
461+#: qml/Wizard/Pages/50-location.qml:86
462+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
463+msgstr ""
464+
465+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
466+#: qml/Wizard/Pages/50-location.qml:103
467+msgid ""
468+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
469+"conditions</a>."
470+msgstr ""
471+
472+#: qml/Wizard/Pages/50-location.qml:112
473+msgid "Not at all"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/50-location.qml:124
477+msgid "You can change your mind later in <b>System Settings</b>."
478+msgstr ""
479+
480+#: qml/Wizard/Pages/60-reporting.qml:24
481+msgid "Improving your experience"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/60-reporting.qml:36
485+msgid ""
486+"Your phone is set up to automatically report errors to Canonical and its "
487+"partners, the makers of the operating system."
488+msgstr ""
489+
490+#: qml/Wizard/Pages/60-reporting.qml:43
491+msgid ""
492+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
493+"Privacy</b>"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/80-finished.qml:24
497+msgid "All done"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/80-finished.qml:39
501+msgid "Nice work!"
502+msgstr ""
503+
504+#: qml/Wizard/Pages/80-finished.qml:46
505+msgid "Your phone is now ready to use."
506+msgstr ""
507+
508+#: qml/Wizard/Pages/80-finished.qml:53
509+msgid "Finish"
510+msgstr ""
511+
512+#: qml/Wizard/Pages/here-terms.qml:27
513+msgid "Terms & Conditions"
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-confirm.qml:49
517+msgid "Confirm passphrase"
518+msgstr ""
519+
520+#: qml/Wizard/Pages/passwd-confirm.qml:50
521+msgid "Confirm passcode"
522+msgstr ""
523+
524+#: qml/Wizard/Pages/passwd-confirm.qml:53
525+#: qml/Wizard/Pages/passwd-confirm.qml:54
526+msgid "Please try again."
527+msgstr ""
528+
529+#: qml/Wizard/Pages/passwd-set.qml:61
530+msgid "Choose your passcode"
531+msgstr ""
532+
533+#: qml/Wizard/Pages/passwd-set.qml:68
534+msgid "Passphrase must be 4 characters long"
535+msgstr ""
536+
537+#: qml/Wizard/StackButton.qml:39
538+#, qt-format
539+msgid "〈 %1"
540+msgstr ""
541+
542+#: qml/Wizard/StackButton.qml:42
543+#, qt-format
544+msgid "%1 〉"
545+msgstr ""
546+
370#~ msgid "Confirm"
547#~ msgid "Confirm"
371#~ msgstr "Dearbhaich"
548#~ msgstr "Dearbhaich"
372
549
@@ -381,3 +558,15 @@ msgstr ""
381
558
382#~ msgid "Speak Now..."
559#~ msgid "Speak Now..."
383#~ msgstr "Can rud a-nis..."
560#~ msgstr "Can rud a-nis..."
561+
562+#~ msgid "All"
563+#~ msgstr "Na h-uile"
564+
565+#~ msgid "Favorites"
566+#~ msgstr "Annsachdan"
567+
568+#~ msgid "Done"
569+#~ msgstr "Deiseil"
570+
571+#~ msgid "Manage Scopes"
572+#~ msgstr "Stiùirich na sgòpaichean"
po/gl.po+276−80
@@ -7,27 +7,27 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-11-06 13:30+0000\n"
11+"PO-Revision-Date: 2015-01-28 10:25+0000\n"
12"Last-Translator: Marcos Lans <Unknown>\n"
12"Last-Translator: Marcos Lans <Unknown>\n"
13"Language-Team: Galician <gl@li.org>\n"
13"Language-Team: Galician <gl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-29 06:00+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Contrasinal : "
23msgstr "Contrasinal : "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Fixar o atallo"
28msgstr "Fixar o atallo"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Eliminar o atallo"
32msgstr "Eliminar o atallo"
33
33
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] "Agarde %1 minuto e ténteo de novo…"
50msgstr[0] "Agarde %1 minuto e ténteo de novo…"
51msgstr[1] "Agarde %1 minutos e ténteo de novo…"
51msgstr[1] "Agarde %1 minutos e ténteo de novo…"
52
52
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
54msgid "Log out"
54msgid "Log out"
55msgstr "Saír da sesión"
55msgstr "Saír da sesión"
56
56
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr "Está seguro de querer pechar a sesión?"
59msgstr "Está seguro de querer pechar a sesión?"
60
60
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:134
63msgid "No"
63msgid "No"
64msgstr "Non"
64msgstr "Non"
65
65
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:140
68msgid "Yes"
68msgid "Yes"
69msgstr "Si"
69msgstr "Si"
70
70
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
72msgid "Shut down"
72msgid "Shut down"
73msgstr "Apagar"
73msgstr "Apagar"
74
74
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr "Está seguro de querer apagar?"
77msgstr "Está seguro de querer apagar?"
78
78
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
80msgid "Reboot"
80msgid "Reboot"
81msgstr "Reiniciar"
81msgstr "Reiniciar"
82
82
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr "Está seguro de querer reiniciar?"
85msgstr "Está seguro de querer reiniciar?"
86
86
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
88msgid "Power"
88msgid "Power"
89msgstr "Enerxía"
89msgstr "Enerxía"
90
90
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
95msgstr "Está seguro de querer apagar?"
95msgstr "Está seguro de querer apagar?"
96
96
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
98msgid "Power off"
98msgid "Power off"
99msgstr "Apagar"
99msgstr "Apagar"
100
100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102msgid "Restart"
102msgid "Restart"
103msgstr "Reiniciar"
103msgstr "Reiniciar"
104
104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106msgid "Cancel"
106msgid "Cancel"
107msgstr "Cancelar"
107msgstr "Cancelar"
108
108
@@ -110,45 +110,45 @@ msgstr "Cancelar"
110msgid "Skip intro"
110msgid "Skip intro"
111msgstr "Saltar introdución"
111msgstr "Saltar introdución"
112
112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114msgid "Right edge"
114msgid "Right edge"
115msgstr "Bordo dereito"
115msgstr "Bordo dereito"
116
116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118msgid "Try swiping from the right edge to unlock the phone"
118msgid "Try swiping from the right edge to unlock the phone"
119msgstr "Esvare o dedo desde o bordo dereito para desbloquear o teléfono"
119msgstr "Esvare o dedo desde o bordo dereito para desbloquear o teléfono"
120
120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122msgid "Top edge"
122msgid "Top edge"
123msgstr "Bordo superior"
123msgstr "Bordo superior"
124
124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126msgid "Try swiping from the top edge to access the indicators"
126msgid "Try swiping from the top edge to access the indicators"
127msgstr "Esvare o dedo desde o bordo superior para acceder aos indicadores."
127msgstr "Esvare o dedo desde o bordo superior para acceder aos indicadores."
128
128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130msgid "Close"
130msgid "Close"
131msgstr "Pechar"
131msgstr "Pechar"
132
132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134msgid "Swipe up again to close the settings screen"
134msgid "Swipe up again to close the settings screen"
135msgstr "Esvare o dedo de novo cara a arriba para pechar os axustes"
135msgstr "Esvare o dedo de novo cara a arriba para pechar os axustes"
136
136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
138msgid "Left edge"
139msgstr "Bordo esquerdo"
139msgstr "Bordo esquerdo"
140
140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143msgstr ""
143msgstr ""
144"Esvare o dedo desde a esquerda para mostrar o iniciador rápido dos "
144"Esvare o dedo desde a esquerda para mostrar o iniciador rápido dos "
145"aplicativos"
145"aplicativos"
146
146
147−#: qml/Components/EdgeDemo.qml:229
147+#: qml/Components/EdgeDemo.qml:242
148msgid "Well done"
148msgid "Well done"
149msgstr "Ben feito!"
149msgstr "Ben feito!"
150
150
151−#: qml/Components/EdgeDemo.qml:230
151+#: qml/Components/EdgeDemo.qml:243
152msgid ""
152msgid ""
153"You have now mastered the edge gestures and can start using the "
153"You have now mastered the edge gestures and can start using the "
154"phone<br><br>Tap on the screen to start"
154"phone<br><br>Tap on the screen to start"
@@ -156,40 +156,44 @@ msgstr ""
156"Agora xa domina os xestos dos bordos e pode comezar a usar o "
156"Agora xa domina os xestos dos bordos e pode comezar a usar o "
157"teléfono<br><br>Toque na pantalla para comezar"
157"teléfono<br><br>Toque na pantalla para comezar"
158
158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160msgid "Return to Call"
160msgid "Return to Call"
161msgstr "Volver á chamada"
161msgstr "Volver á chamada"
162
162
163−#: qml/Components/Lockscreen.qml:223
163+#: qml/Components/Lockscreen.qml:238
164msgid "Emergency Call"
164msgid "Emergency Call"
165msgstr "Chamada de emerxencia"
165msgstr "Chamada de emerxencia"
166
166
167−#: qml/Components/Lockscreen.qml:255
167+#: qml/Components/Lockscreen.qml:270
168msgid "OK"
168msgid "OK"
169msgstr "Aceptar"
169msgstr "Aceptar"
170
170
171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
172msgid "See less"
172msgid "See less"
173msgstr "Ver menos"
173msgstr "Ver menos"
174
174
175−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:485
176msgid "See all"
176msgid "See all"
177msgstr "Ver todo"
177msgstr "Ver todo"
178
178
179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
181msgid "Search"
181msgid "Search"
182msgstr "Buscar"
182msgstr "Buscar"
183
183
184−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:267
185+msgid "Store"
186+msgstr "Tenda"
187+
188+#: qml/Dash/PageHeader.qml:284
185msgid "Settings"
189msgid "Settings"
186msgstr "Axustes"
190msgstr "Axustes"
187
191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189msgid "Remove from Favorites"
193msgid "Remove from Favorites"
190msgstr "Eliminar dos favoritos"
194msgstr "Eliminar dos favoritos"
191
195
192−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:291
193msgid "Add to Favorites"
197msgid "Add to Favorites"
194msgstr "Engadir aos favoritos"
198msgstr "Engadir aos favoritos"
195
199
@@ -221,31 +225,23 @@ msgstr "Tirar para actualizar..."
221msgid "Release to refresh…"
225msgid "Release to refresh…"
222msgstr "Soltar para actualizar"
226msgstr "Soltar para actualizar"
223
227
224−#: qml/Dash/ScopesOverview.qml:215
228+#: qml/Dash/ScopesList.qml:66
225−msgid "Manage Scopes"
229+msgid "Manage"
226−msgstr "Xestionar os Ámbitos"
230+msgstr "Xestionar"
227−
228−#: qml/Dash/ScopesOverview.qml:437
229−msgid "Done"
230−msgstr "Feito"
231−
232−#: qml/Dash/ScopesOverview.qml:463
233−msgid "Store"
234−msgstr "Tenda"
235
231
236−#: qml/Dash/ScopesOverviewTab.qml:36
232+#: qml/Dash/ScopesList.qml:112
237−msgid "Favorites"
233+msgid "Home"
238−msgstr "Favoritos"
234+msgstr "Inicio"
239
235
240−#: qml/Dash/ScopesOverviewTab.qml:54
236+#: qml/Dash/ScopesList.qml:113
241−msgid "All"
237+msgid "Also installed"
242−msgstr "Todos"
238+msgstr "Tamén instalado"
243
239
244−#: qml/Greeter/Greeter.qml:174
240+#: qml/Greeter/Greeter.qml:133
245msgid "Unlock"
241msgid "Unlock"
246msgstr "Desbloquear"
242msgstr "Desbloquear"
247
243
248−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
249msgid "Show password"
245msgid "Show password"
250msgstr "Mostrar contrasinal"
246msgstr "Mostrar contrasinal"
251
247
@@ -285,6 +281,10 @@ msgstr "Rematado"
285msgid "Failed, tap to retry"
281msgid "Failed, tap to retry"
286msgstr "Fallou, toque para reintentar"
282msgstr "Fallou, toque para reintentar"
287
283
284+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
285+msgid "Reply"
286+msgstr "Responder"
287+
288#: qml/Panel/Indicators/ModemInfoItem.qml:105
288#: qml/Panel/Indicators/ModemInfoItem.qml:105
289msgid "Unlock SIM"
289msgid "Unlock SIM"
290msgstr "Desbloquear a SIM"
290msgstr "Desbloquear a SIM"
@@ -293,49 +293,49 @@ msgstr "Desbloquear a SIM"
293msgid "Roaming"
293msgid "Roaming"
294msgstr "Itinerancia"
294msgstr "Itinerancia"
295
295
296−#: qml/Shell.qml:391
296+#: qml/Shell.qml:390
297+#, qt-format
298+msgid "Enter %1"
299+msgstr "Introducir %1"
300+
301+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
297msgid "Enter passphrase"
302msgid "Enter passphrase"
298msgstr "Introduza a frase secreta"
303msgstr "Introduza a frase secreta"
299
304
300#: qml/Shell.qml:392
305#: qml/Shell.qml:392
306+msgid "Enter passcode"
307+msgstr "Introduza a clave"
308+
309+#: qml/Shell.qml:393
310+#, qt-format
311+msgid "Sorry, incorrect %1"
312+msgstr "Sentímolo, %1 non coincide"
313+
314+#: qml/Shell.qml:394
301msgid "Sorry, incorrect passphrase"
315msgid "Sorry, incorrect passphrase"
302msgstr "Sentímolo a frase é incorrecta"
316msgstr "Sentímolo a frase é incorrecta"
303
317
304−#: qml/Shell.qml:393
318+#: qml/Shell.qml:395
305msgid "Please re-enter"
319msgid "Please re-enter"
306msgstr "Introducir de novo"
320msgstr "Introducir de novo"
307
321
308−#: qml/Shell.qml:395
309−msgid "Enter passcode"
310−msgstr "Introduza a clave"
311−
312#: qml/Shell.qml:396
322#: qml/Shell.qml:396
313msgid "Sorry, incorrect passcode"
323msgid "Sorry, incorrect passcode"
314msgstr "Sentímolo, a clave é incorrecta"
324msgstr "Sentímolo, a clave é incorrecta"
315
325
316−#: qml/Shell.qml:399
326+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
317−#, qt-format
318−msgid "Enter %1"
319−msgstr "Introducir %1"
320−
321−#: qml/Shell.qml:400
322−#, qt-format
323−msgid "Sorry, incorrect %1"
324−msgstr "Sentímolo, %1 non coincide"
325−
326−#: qml/Shell.qml:441
327msgid "Sorry, incorrect passphrase."
327msgid "Sorry, incorrect passphrase."
328msgstr "Sentímolo a frase é incorrecta."
328msgstr "Sentímolo a frase é incorrecta."
329
329
330−#: qml/Shell.qml:442
330+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331msgid "Sorry, incorrect passcode."
331msgid "Sorry, incorrect passcode."
332msgstr "Sentímolo, a clave é incorrecta."
332msgstr "Sentímolo, a clave é incorrecta."
333
333
334−#: qml/Shell.qml:443
334+#: qml/Shell.qml:492
335msgid "This will be your last attempt."
335msgid "This will be your last attempt."
336msgstr "Este será o seu último intento."
336msgstr "Este será o seu último intento."
337
337
338−#: qml/Shell.qml:445
338+#: qml/Shell.qml:494
339msgid ""
339msgid ""
340"If passphrase is entered incorrectly, your phone will conduct a factory "
340"If passphrase is entered incorrectly, your phone will conduct a factory "
341"reset and all personal data will be deleted."
341"reset and all personal data will be deleted."
@@ -343,7 +343,7 @@ msgstr ""
343"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "
343"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "
344"valores de fábrica e perderá todos os datos persoais."
344"valores de fábrica e perderá todos os datos persoais."
345
345
346−#: qml/Shell.qml:446
346+#: qml/Shell.qml:495
347msgid ""
347msgid ""
348"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"If passcode is entered incorrectly, your phone will conduct a factory reset "
349"and all personal data will be deleted."
349"and all personal data will be deleted."
@@ -351,6 +351,190 @@ msgstr ""
351"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "
351"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "
352"fábrica e perderá todos os datos persoais."
352"fábrica e perderá todos os datos persoais."
353
353
354+#: qml/Wizard/Page.qml:89
355+msgid "Back"
356+msgstr "Volver"
357+
358+#: qml/Wizard/Pages/10-welcome.qml:27
359+msgid "Hi!"
360+msgstr "Boas!"
361+
362+#: qml/Wizard/Pages/10-welcome.qml:44
363+msgid "Welcome to your Ubuntu phone."
364+msgstr "Benvido/a ao seu teléfono Ubuntu."
365+
366+#: qml/Wizard/Pages/10-welcome.qml:52
367+msgid "Let’s get started."
368+msgstr "Comezamos."
369+
370+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
371+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
372+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373+#: qml/Wizard/Pages/passwd-set.qml:90
374+msgid "Continue"
375+msgstr "Continuar"
376+
377+#: qml/Wizard/Pages/20-sim.qml:25
378+msgid "Add a SIM card and restart your device"
379+msgstr "Engada unha tarxeta SIM e reinicie o dispositivo"
380+
381+#: qml/Wizard/Pages/20-sim.qml:55
382+msgid "Without it, you won’t be able to make calls or use text messaging."
383+msgstr ""
384+"Sen ela, non poderá realizar chamadas nin usar a mensaxería de texto."
385+
386+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
387+msgid "Skip"
388+msgstr "Saltar"
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:39
391+msgid "Lock security"
392+msgstr "Seguranza do bloqueo"
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:74
395+msgid "Please select how you’d like to unlock your phone."
396+msgstr "Por favor, seleccione a forma de desbloquear o teléfono."
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:97
399+msgid "Swipe"
400+msgstr "Esvarar o dedo"
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:98
403+msgid "No security"
404+msgstr "Sen seguranza"
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:100
407+msgid "Passcode"
408+msgstr "Clave"
409+
410+#: qml/Wizard/Pages/30-passwd-type.qml:101
411+msgid "4 digits only"
412+msgstr "Só 4 díxitos"
413+
414+#: qml/Wizard/Pages/30-passwd-type.qml:103
415+msgid "Passphrase"
416+msgstr "Frase secreta"
417+
418+#: qml/Wizard/Pages/30-passwd-type.qml:104
419+msgid "Numbers and letters"
420+msgstr "Números e letras"
421+
422+#: qml/Wizard/Pages/40-wifi.qml:28
423+msgid "Connect to Wi‑Fi"
424+msgstr "Conectar a unha wifi"
425+
426+#: qml/Wizard/Pages/40-wifi.qml:147
427+msgid "Available networks…"
428+msgstr "Redes dispoñíbeis..."
429+
430+#: qml/Wizard/Pages/40-wifi.qml:148
431+msgid "No available networks."
432+msgstr "Non hai redes dispoñíbeis."
433+
434+#: qml/Wizard/Pages/50-location.qml:27
435+msgid "Location"
436+msgstr "Localización"
437+
438+#: qml/Wizard/Pages/50-location.qml:62
439+msgid "Let the phone detect your location:"
440+msgstr "Permitir ao teléfono detectar a localizacón:"
441+
442+#: qml/Wizard/Pages/50-location.qml:69
443+msgid "Using GPS only (less accurate)"
444+msgstr "Usar só GPS (menos exacta)"
445+
446+#: qml/Wizard/Pages/50-location.qml:86
447+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
448+msgstr "Usar GPS, wifi anónimo e información da rede móbil (recomendado)"
449+
450+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
451+#: qml/Wizard/Pages/50-location.qml:103
452+msgid ""
453+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
454+"conditions</a>."
455+msgstr ""
456+"Seleccionando esta opción acepta os <a href='#'>termos e condicións</a> do "
457+"HERE de Nokia."
458+
459+#: qml/Wizard/Pages/50-location.qml:112
460+msgid "Not at all"
461+msgstr "De ningún xeito"
462+
463+#: qml/Wizard/Pages/50-location.qml:124
464+msgid "You can change your mind later in <b>System Settings</b>."
465+msgstr "Pode cambialo máis tarde nos <b>Axustes do sistema</b>."
466+
467+#: qml/Wizard/Pages/60-reporting.qml:24
468+msgid "Improving your experience"
469+msgstr "Mellorando a súa experiencia"
470+
471+#: qml/Wizard/Pages/60-reporting.qml:36
472+msgid ""
473+"Your phone is set up to automatically report errors to Canonical and its "
474+"partners, the makers of the operating system."
475+msgstr ""
476+"O teléfono configurouse para informar dos erros automaticamente a Canonical "
477+"e os seus socios, os creadores do sistema operativo."
478+
479+#: qml/Wizard/Pages/60-reporting.qml:43
480+msgid ""
481+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
482+"Privacy</b>"
483+msgstr ""
484+"Pode desactivalo nos <b>Axustes do sistema</b> en <b>Seguranza e "
485+"privacidade</b>"
486+
487+#: qml/Wizard/Pages/80-finished.qml:24
488+msgid "All done"
489+msgstr "Rematado"
490+
491+#: qml/Wizard/Pages/80-finished.qml:39
492+msgid "Nice work!"
493+msgstr "Bo traballo!"
494+
495+#: qml/Wizard/Pages/80-finished.qml:46
496+msgid "Your phone is now ready to use."
497+msgstr "Xa ten o teléfono listo para o seu uso."
498+
499+#: qml/Wizard/Pages/80-finished.qml:53
500+msgid "Finish"
501+msgstr "Rematar"
502+
503+#: qml/Wizard/Pages/here-terms.qml:27
504+msgid "Terms & Conditions"
505+msgstr "Termos e condicións"
506+
507+#: qml/Wizard/Pages/passwd-confirm.qml:49
508+msgid "Confirm passphrase"
509+msgstr "Confirmar a frase secreta"
510+
511+#: qml/Wizard/Pages/passwd-confirm.qml:50
512+msgid "Confirm passcode"
513+msgstr "Confirmar a clave"
514+
515+#: qml/Wizard/Pages/passwd-confirm.qml:53
516+#: qml/Wizard/Pages/passwd-confirm.qml:54
517+msgid "Please try again."
518+msgstr "Ténteo de novo."
519+
520+#: qml/Wizard/Pages/passwd-set.qml:61
521+msgid "Choose your passcode"
522+msgstr "Escolla unha clave"
523+
524+#: qml/Wizard/Pages/passwd-set.qml:68
525+msgid "Passphrase must be 4 characters long"
526+msgstr "A frase secreta debe ter 4 caracteres"
527+
528+#: qml/Wizard/StackButton.qml:39
529+#, qt-format
530+msgid "〈 %1"
531+msgstr "〈 %1"
532+
533+#: qml/Wizard/StackButton.qml:42
534+#, qt-format
535+msgid "%1 〉"
536+msgstr "%1 〉"
537+
354#~ msgid "Confirm"
538#~ msgid "Confirm"
355#~ msgstr "Confirmar"
539#~ msgstr "Confirmar"
356
540
@@ -365,3 +549,15 @@ msgstr ""
365
549
366#~ msgid "Loading. Please Wait..."
550#~ msgid "Loading. Please Wait..."
367#~ msgstr "Cargando, agarde…"
551#~ msgstr "Cargando, agarde…"
552+
553+#~ msgid "All"
554+#~ msgstr "Todos"
555+
556+#~ msgid "Favorites"
557+#~ msgstr "Favoritos"
558+
559+#~ msgid "Done"
560+#~ msgstr "Feito"
561+
562+#~ msgid "Manage Scopes"
563+#~ msgstr "Xestionar os Ámbitos"
po/he.po+263−77
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2014-08-23 14:19+0000\n"
11"PO-Revision-Date: 2014-08-23 14:19+0000\n"
12"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
12"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
13"Language-Team: Hebrew <he@li.org>\n"
13"Language-Team: Hebrew <he@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "ססמה: "
23msgstr "ססמה: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "הצמדת קיצור דרך"
28msgstr "הצמדת קיצור דרך"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "הפרדת קיצור הדרך"
32msgstr "הפרדת קיצור הדרך"
33
33
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] ""
50msgstr[0] ""
51msgstr[1] ""
51msgstr[1] ""
52
52
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
54msgid "Log out"
54msgid "Log out"
55msgstr ""
55msgstr ""
56
56
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr ""
59msgstr ""
60
60
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:134
63msgid "No"
63msgid "No"
64msgstr ""
64msgstr ""
65
65
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:140
68msgid "Yes"
68msgid "Yes"
69msgstr ""
69msgstr ""
70
70
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
72msgid "Shut down"
72msgid "Shut down"
73msgstr ""
73msgstr ""
74
74
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr ""
77msgstr ""
78
78
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
80msgid "Reboot"
80msgid "Reboot"
81msgstr ""
81msgstr ""
82
82
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr ""
85msgstr ""
86
86
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
88msgid "Power"
88msgid "Power"
89msgstr ""
89msgstr ""
90
90
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
95msgstr ""
95msgstr ""
96
96
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
98msgid "Power off"
98msgid "Power off"
99msgstr "כיבוי"
99msgstr "כיבוי"
100
100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102msgid "Restart"
102msgid "Restart"
103msgstr ""
103msgstr ""
104
104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106msgid "Cancel"
106msgid "Cancel"
107msgstr "ביטול"
107msgstr "ביטול"
108
108
@@ -110,43 +110,43 @@ msgstr "ביטול"
110msgid "Skip intro"
110msgid "Skip intro"
111msgstr "לדלג על הפתיחה"
111msgstr "לדלג על הפתיחה"
112
112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114msgid "Right edge"
114msgid "Right edge"
115msgstr "שול ימני"
115msgstr "שול ימני"
116
116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118msgid "Try swiping from the right edge to unlock the phone"
118msgid "Try swiping from the right edge to unlock the phone"
119msgstr "נא לנסות למשוך מהשול הימני כדי לשחרר את נעילת הטלפון"
119msgstr "נא לנסות למשוך מהשול הימני כדי לשחרר את נעילת הטלפון"
120
120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122msgid "Top edge"
122msgid "Top edge"
123msgstr "השול העליון"
123msgstr "השול העליון"
124
124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126msgid "Try swiping from the top edge to access the indicators"
126msgid "Try swiping from the top edge to access the indicators"
127msgstr "נא לנסות למשוך מהשול העליון כדי לגשת למחוונים"
127msgstr "נא לנסות למשוך מהשול העליון כדי לגשת למחוונים"
128
128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130msgid "Close"
130msgid "Close"
131msgstr "סגירה"
131msgstr "סגירה"
132
132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134msgid "Swipe up again to close the settings screen"
134msgid "Swipe up again to close the settings screen"
135msgstr "ניתן למשוך שוב כדי לסגור את מסך ההגדרות"
135msgstr "ניתן למשוך שוב כדי לסגור את מסך ההגדרות"
136
136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
138msgid "Left edge"
139msgstr "שול שמאלי"
139msgstr "שול שמאלי"
140
140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143msgstr "יש למשוך משמאל כדי לחשוף את המשגר לצורך גישה מהירה ליישומים"
143msgstr "יש למשוך משמאל כדי לחשוף את המשגר לצורך גישה מהירה ליישומים"
144
144
145−#: qml/Components/EdgeDemo.qml:229
145+#: qml/Components/EdgeDemo.qml:242
146msgid "Well done"
146msgid "Well done"
147msgstr "כל הכבוד"
147msgstr "כל הכבוד"
148
148
149−#: qml/Components/EdgeDemo.qml:230
149+#: qml/Components/EdgeDemo.qml:243
150msgid ""
150msgid ""
151"You have now mastered the edge gestures and can start using the "
151"You have now mastered the edge gestures and can start using the "
152"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
@@ -154,40 +154,44 @@ msgstr ""
154"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
154"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
155"לגעת במסך כדי להתחיל"
155"לגעת במסך כדי להתחיל"
156
156
157−#: qml/Components/Lockscreen.qml:223
157+#: qml/Components/Lockscreen.qml:238
158msgid "Return to Call"
158msgid "Return to Call"
159msgstr ""
159msgstr ""
160
160
161−#: qml/Components/Lockscreen.qml:223
161+#: qml/Components/Lockscreen.qml:238
162msgid "Emergency Call"
162msgid "Emergency Call"
163msgstr "שיחת חירום"
163msgstr "שיחת חירום"
164
164
165−#: qml/Components/Lockscreen.qml:255
165+#: qml/Components/Lockscreen.qml:270
166msgid "OK"
166msgid "OK"
167msgstr "אישור"
167msgstr "אישור"
168
168
169−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
169+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
170msgid "See less"
170msgid "See less"
171msgstr "לראות פחות"
171msgstr "לראות פחות"
172
172
173−#: qml/Dash/GenericScopeView.qml:434
173+#: qml/Dash/GenericScopeView.qml:485
174msgid "See all"
174msgid "See all"
175msgstr "להציג הכול"
175msgstr "להציג הכול"
176
176
177−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
177+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
178#: qml/Panel/SearchIndicator.qml:27
178#: qml/Panel/SearchIndicator.qml:27
179msgid "Search"
179msgid "Search"
180msgstr "חיפוש"
180msgstr "חיפוש"
181
181
182−#: qml/Dash/PageHeader.qml:268
182+#: qml/Dash/PageHeader.qml:267
183+msgid "Store"
184+msgstr "אחסון"
185+
186+#: qml/Dash/PageHeader.qml:284
183msgid "Settings"
187msgid "Settings"
184msgstr ""
188msgstr ""
185
189
186−#: qml/Dash/PageHeader.qml:275
190+#: qml/Dash/PageHeader.qml:291
187msgid "Remove from Favorites"
191msgid "Remove from Favorites"
188msgstr ""
192msgstr ""
189
193
190−#: qml/Dash/PageHeader.qml:275
194+#: qml/Dash/PageHeader.qml:291
191msgid "Add to Favorites"
195msgid "Add to Favorites"
192msgstr ""
196msgstr ""
193
197
@@ -219,31 +223,23 @@ msgstr ""
219msgid "Release to refresh…"
223msgid "Release to refresh…"
220msgstr ""
224msgstr ""
221
225
222−#: qml/Dash/ScopesOverview.qml:215
226+#: qml/Dash/ScopesList.qml:66
223−msgid "Manage Scopes"
227+msgid "Manage"
224msgstr ""
228msgstr ""
225
229
226−#: qml/Dash/ScopesOverview.qml:437
230+#: qml/Dash/ScopesList.qml:112
227−msgid "Done"
228−msgstr "סיימתי"
229−
230−#: qml/Dash/ScopesOverview.qml:463
231−msgid "Store"
232−msgstr "אחסון"
233−
234−#: qml/Dash/ScopesOverviewTab.qml:36
235−msgid "Favorites"
231+msgid "Home"
236−msgstr "מועדפים"
232+msgstr ""
237
233
238−#: qml/Dash/ScopesOverviewTab.qml:54
234+#: qml/Dash/ScopesList.qml:113
239−msgid "All"
235+msgid "Also installed"
240−msgstr "הכול"
236+msgstr ""
241
237
242−#: qml/Greeter/Greeter.qml:174
238+#: qml/Greeter/Greeter.qml:133
243msgid "Unlock"
239msgid "Unlock"
244msgstr ""
240msgstr ""
245
241
246−#: qml/Notifications/NotificationMenuItemFactory.qml:116
242+#: qml/Notifications/NotificationMenuItemFactory.qml:128
247msgid "Show password"
243msgid "Show password"
248msgstr "הצגת הססמה"
244msgstr "הצגת הססמה"
249
245
@@ -283,6 +279,10 @@ msgstr "הושלם"
283msgid "Failed, tap to retry"
279msgid "Failed, tap to retry"
284msgstr "נכשל, יש לגעת כדי לנסות שוב"
280msgstr "נכשל, יש לגעת כדי לנסות שוב"
285
281
282+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
283+msgid "Reply"
284+msgstr ""
285+
286#: qml/Panel/Indicators/ModemInfoItem.qml:105
286#: qml/Panel/Indicators/ModemInfoItem.qml:105
287msgid "Unlock SIM"
287msgid "Unlock SIM"
288msgstr ""
288msgstr ""
@@ -291,60 +291,237 @@ msgstr ""
291msgid "Roaming"
291msgid "Roaming"
292msgstr "נדידה"
292msgstr "נדידה"
293
293
294−#: qml/Shell.qml:391
294+#: qml/Shell.qml:390
295+#, qt-format
296+msgid "Enter %1"
297+msgstr ""
298+
299+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
295msgid "Enter passphrase"
300msgid "Enter passphrase"
296msgstr ""
301msgstr ""
297
302
298#: qml/Shell.qml:392
303#: qml/Shell.qml:392
299−msgid "Sorry, incorrect passphrase"
304+msgid "Enter passcode"
300−msgstr "מילת הצופן שגויה, עמך הסליחה."
305+msgstr ""
301
306
302#: qml/Shell.qml:393
307#: qml/Shell.qml:393
303−msgid "Please re-enter"
308+#, qt-format
309+msgid "Sorry, incorrect %1"
304msgstr ""
310msgstr ""
305
311
312+#: qml/Shell.qml:394
313+msgid "Sorry, incorrect passphrase"
314+msgstr "מילת הצופן שגויה, עמך הסליחה."
315+
306#: qml/Shell.qml:395
316#: qml/Shell.qml:395
307−msgid "Enter passcode"
317+msgid "Please re-enter"
308msgstr ""
318msgstr ""
309
319
310#: qml/Shell.qml:396
320#: qml/Shell.qml:396
311msgid "Sorry, incorrect passcode"
321msgid "Sorry, incorrect passcode"
312msgstr ""
322msgstr ""
313
323
314−#: qml/Shell.qml:399
324+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
315−#, qt-format
316−msgid "Enter %1"
317−msgstr ""
318−
319−#: qml/Shell.qml:400
320−#, qt-format
321−msgid "Sorry, incorrect %1"
322−msgstr ""
323−
324−#: qml/Shell.qml:441
325msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
326msgstr "מילת הצופן שגויה, עמך הסליחה."
326msgstr "מילת הצופן שגויה, עמך הסליחה."
327
327
328−#: qml/Shell.qml:442
328+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
329msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
330msgstr "הצופן שגוי, עם הסליחה."
330msgstr "הצופן שגוי, עם הסליחה."
331
331
332−#: qml/Shell.qml:443
332+#: qml/Shell.qml:492
333msgid "This will be your last attempt."
333msgid "This will be your last attempt."
334msgstr "זה יהיה הניסיון האחרון שלך."
334msgstr "זה יהיה הניסיון האחרון שלך."
335
335
336−#: qml/Shell.qml:445
336+#: qml/Shell.qml:494
337msgid ""
337msgid ""
338"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
339"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Shell.qml:446
342+#: qml/Shell.qml:495
343msgid ""
343msgid ""
344"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"If passcode is entered incorrectly, your phone will conduct a factory reset "
345"and all personal data will be deleted."
345"and all personal data will be deleted."
346msgstr ""
346msgstr ""
347
347
348+#: qml/Wizard/Page.qml:89
349+msgid "Back"
350+msgstr ""
351+
352+#: qml/Wizard/Pages/10-welcome.qml:27
353+msgid "Hi!"
354+msgstr ""
355+
356+#: qml/Wizard/Pages/10-welcome.qml:44
357+msgid "Welcome to your Ubuntu phone."
358+msgstr ""
359+
360+#: qml/Wizard/Pages/10-welcome.qml:52
361+msgid "Let’s get started."
362+msgstr ""
363+
364+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
365+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
366+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
367+#: qml/Wizard/Pages/passwd-set.qml:90
368+msgid "Continue"
369+msgstr ""
370+
371+#: qml/Wizard/Pages/20-sim.qml:25
372+msgid "Add a SIM card and restart your device"
373+msgstr ""
374+
375+#: qml/Wizard/Pages/20-sim.qml:55
376+msgid "Without it, you won’t be able to make calls or use text messaging."
377+msgstr ""
378+
379+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
380+msgid "Skip"
381+msgstr ""
382+
383+#: qml/Wizard/Pages/30-passwd-type.qml:39
384+msgid "Lock security"
385+msgstr ""
386+
387+#: qml/Wizard/Pages/30-passwd-type.qml:74
388+msgid "Please select how you’d like to unlock your phone."
389+msgstr ""
390+
391+#: qml/Wizard/Pages/30-passwd-type.qml:97
392+msgid "Swipe"
393+msgstr ""
394+
395+#: qml/Wizard/Pages/30-passwd-type.qml:98
396+msgid "No security"
397+msgstr ""
398+
399+#: qml/Wizard/Pages/30-passwd-type.qml:100
400+msgid "Passcode"
401+msgstr ""
402+
403+#: qml/Wizard/Pages/30-passwd-type.qml:101
404+msgid "4 digits only"
405+msgstr ""
406+
407+#: qml/Wizard/Pages/30-passwd-type.qml:103
408+msgid "Passphrase"
409+msgstr ""
410+
411+#: qml/Wizard/Pages/30-passwd-type.qml:104
412+msgid "Numbers and letters"
413+msgstr ""
414+
415+#: qml/Wizard/Pages/40-wifi.qml:28
416+msgid "Connect to Wi‑Fi"
417+msgstr ""
418+
419+#: qml/Wizard/Pages/40-wifi.qml:147
420+msgid "Available networks…"
421+msgstr ""
422+
423+#: qml/Wizard/Pages/40-wifi.qml:148
424+msgid "No available networks."
425+msgstr ""
426+
427+#: qml/Wizard/Pages/50-location.qml:27
428+msgid "Location"
429+msgstr ""
430+
431+#: qml/Wizard/Pages/50-location.qml:62
432+msgid "Let the phone detect your location:"
433+msgstr ""
434+
435+#: qml/Wizard/Pages/50-location.qml:69
436+msgid "Using GPS only (less accurate)"
437+msgstr ""
438+
439+#: qml/Wizard/Pages/50-location.qml:86
440+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
441+msgstr ""
442+
443+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
444+#: qml/Wizard/Pages/50-location.qml:103
445+msgid ""
446+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
447+"conditions</a>."
448+msgstr ""
449+
450+#: qml/Wizard/Pages/50-location.qml:112
451+msgid "Not at all"
452+msgstr ""
453+
454+#: qml/Wizard/Pages/50-location.qml:124
455+msgid "You can change your mind later in <b>System Settings</b>."
456+msgstr ""
457+
458+#: qml/Wizard/Pages/60-reporting.qml:24
459+msgid "Improving your experience"
460+msgstr ""
461+
462+#: qml/Wizard/Pages/60-reporting.qml:36
463+msgid ""
464+"Your phone is set up to automatically report errors to Canonical and its "
465+"partners, the makers of the operating system."
466+msgstr ""
467+
468+#: qml/Wizard/Pages/60-reporting.qml:43
469+msgid ""
470+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
471+"Privacy</b>"
472+msgstr ""
473+
474+#: qml/Wizard/Pages/80-finished.qml:24
475+msgid "All done"
476+msgstr ""
477+
478+#: qml/Wizard/Pages/80-finished.qml:39
479+msgid "Nice work!"
480+msgstr ""
481+
482+#: qml/Wizard/Pages/80-finished.qml:46
483+msgid "Your phone is now ready to use."
484+msgstr ""
485+
486+#: qml/Wizard/Pages/80-finished.qml:53
487+msgid "Finish"
488+msgstr ""
489+
490+#: qml/Wizard/Pages/here-terms.qml:27
491+msgid "Terms & Conditions"
492+msgstr ""
493+
494+#: qml/Wizard/Pages/passwd-confirm.qml:49
495+msgid "Confirm passphrase"
496+msgstr ""
497+
498+#: qml/Wizard/Pages/passwd-confirm.qml:50
499+msgid "Confirm passcode"
500+msgstr ""
501+
502+#: qml/Wizard/Pages/passwd-confirm.qml:53
503+#: qml/Wizard/Pages/passwd-confirm.qml:54
504+msgid "Please try again."
505+msgstr ""
506+
507+#: qml/Wizard/Pages/passwd-set.qml:61
508+msgid "Choose your passcode"
509+msgstr ""
510+
511+#: qml/Wizard/Pages/passwd-set.qml:68
512+msgid "Passphrase must be 4 characters long"
513+msgstr ""
514+
515+#: qml/Wizard/StackButton.qml:39
516+#, qt-format
517+msgid "〈 %1"
518+msgstr ""
519+
520+#: qml/Wizard/StackButton.qml:42
521+#, qt-format
522+msgid "%1 〉"
523+msgstr ""
524+
348#~ msgid "Confirm"
525#~ msgid "Confirm"
349#~ msgstr "אישור"
526#~ msgstr "אישור"
350
527
@@ -359,3 +536,12 @@ msgstr ""
359
536
360#~ msgid "Speaking..."
537#~ msgid "Speaking..."
361#~ msgstr "הדיבור מושמע…"
538#~ msgstr "הדיבור מושמע…"
539+
540+#~ msgid "Done"
541+#~ msgstr "סיימתי"
542+
543+#~ msgid "All"
544+#~ msgstr "הכול"
545+
546+#~ msgid "Favorites"
547+#~ msgstr "מועדפים"
po/hi.po+251−74
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2014-01-15 01:49+0000\n"
11"PO-Revision-Date: 2014-01-15 01:49+0000\n"
12"Last-Translator: Siddhanathan S. <Unknown>\n"
12"Last-Translator: Siddhanathan S. <Unknown>\n"
13"Language-Team: Hindi <hi@li.org>\n"
13"Language-Team: Hindi <hi@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr ""
23msgstr ""
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr ""
28msgstr ""
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr ""
32msgstr ""
33
33
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] ""
50msgstr[0] ""
51msgstr[1] ""
51msgstr[1] ""
52
52
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
54msgid "Log out"
54msgid "Log out"
55msgstr ""
55msgstr ""
56
56
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr ""
59msgstr ""
60
60
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:134
63msgid "No"
63msgid "No"
64msgstr ""
64msgstr ""
65
65
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:140
68msgid "Yes"
68msgid "Yes"
69msgstr ""
69msgstr ""
70
70
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
72msgid "Shut down"
72msgid "Shut down"
73msgstr ""
73msgstr ""
74
74
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr ""
77msgstr ""
78
78
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
80msgid "Reboot"
80msgid "Reboot"
81msgstr ""
81msgstr ""
82
82
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr ""
85msgstr ""
86
86
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
88msgid "Power"
88msgid "Power"
89msgstr ""
89msgstr ""
90
90
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
95msgstr ""
95msgstr ""
96
96
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
98msgid "Power off"
98msgid "Power off"
99msgstr ""
99msgstr ""
100
100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102msgid "Restart"
102msgid "Restart"
103msgstr ""
103msgstr ""
104
104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106msgid "Cancel"
106msgid "Cancel"
107msgstr ""
107msgstr ""
108
108
@@ -110,82 +110,86 @@ msgstr ""
110msgid "Skip intro"
110msgid "Skip intro"
111msgstr "परिचय छोड़"
111msgstr "परिचय छोड़"
112
112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114msgid "Right edge"
114msgid "Right edge"
115msgstr "दायाँ किनारा"
115msgstr "दायाँ किनारा"
116
116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118msgid "Try swiping from the right edge to unlock the phone"
118msgid "Try swiping from the right edge to unlock the phone"
119msgstr ""
119msgstr ""
120
120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122msgid "Top edge"
122msgid "Top edge"
123msgstr "ऊपर किनारे"
123msgstr "ऊपर किनारे"
124
124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126msgid "Try swiping from the top edge to access the indicators"
126msgid "Try swiping from the top edge to access the indicators"
127msgstr ""
127msgstr ""
128
128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130msgid "Close"
130msgid "Close"
131msgstr "बंद करें"
131msgstr "बंद करें"
132
132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134msgid "Swipe up again to close the settings screen"
134msgid "Swipe up again to close the settings screen"
135msgstr ""
135msgstr ""
136
136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
138msgid "Left edge"
139msgstr "बायाँ किनारा"
139msgstr "बायाँ किनारा"
140
140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143msgstr ""
143msgstr ""
144
144
145−#: qml/Components/EdgeDemo.qml:229
145+#: qml/Components/EdgeDemo.qml:242
146msgid "Well done"
146msgid "Well done"
147msgstr "शाबाश"
147msgstr "शाबाश"
148
148
149−#: qml/Components/EdgeDemo.qml:230
149+#: qml/Components/EdgeDemo.qml:243
150msgid ""
150msgid ""
151"You have now mastered the edge gestures and can start using the "
151"You have now mastered the edge gestures and can start using the "
152"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
153msgstr ""
153msgstr ""
154
154
155−#: qml/Components/Lockscreen.qml:223
155+#: qml/Components/Lockscreen.qml:238
156msgid "Return to Call"
156msgid "Return to Call"
157msgstr ""
157msgstr ""
158
158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160msgid "Emergency Call"
160msgid "Emergency Call"
161msgstr "आपातकालीन कॉल"
161msgstr "आपातकालीन कॉल"
162
162
163−#: qml/Components/Lockscreen.qml:255
163+#: qml/Components/Lockscreen.qml:270
164msgid "OK"
164msgid "OK"
165msgstr ""
165msgstr ""
166
166
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
168msgid "See less"
168msgid "See less"
169msgstr ""
169msgstr ""
170
170
171−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:485
172msgid "See all"
172msgid "See all"
173msgstr ""
173msgstr ""
174
174
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
176#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
177msgid "Search"
178msgstr "खोजें"
178msgstr "खोजें"
179
179
180−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:267
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:284
181msgid "Settings"
185msgid "Settings"
182msgstr ""
186msgstr ""
183
187
184−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:291
185msgid "Remove from Favorites"
189msgid "Remove from Favorites"
186msgstr ""
190msgstr ""
187
191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189msgid "Add to Favorites"
193msgid "Add to Favorites"
190msgstr ""
194msgstr ""
191
195
@@ -217,31 +221,23 @@ msgstr ""
217msgid "Release to refresh…"
221msgid "Release to refresh…"
218msgstr ""
222msgstr ""
219
223
220−#: qml/Dash/ScopesOverview.qml:215
224+#: qml/Dash/ScopesList.qml:66
221−msgid "Manage Scopes"
225+msgid "Manage"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:437
225−msgid "Done"
226−msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:463
229−msgid "Store"
230msgstr ""
226msgstr ""
231
227
232−#: qml/Dash/ScopesOverviewTab.qml:36
228+#: qml/Dash/ScopesList.qml:112
233−msgid "Favorites"
229+msgid "Home"
234msgstr ""
230msgstr ""
235
231
236−#: qml/Dash/ScopesOverviewTab.qml:54
232+#: qml/Dash/ScopesList.qml:113
237−msgid "All"
233+msgid "Also installed"
238msgstr ""
234msgstr ""
239
235
240−#: qml/Greeter/Greeter.qml:174
236+#: qml/Greeter/Greeter.qml:133
241msgid "Unlock"
237msgid "Unlock"
242msgstr ""
238msgstr ""
243
239
244−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
245msgid "Show password"
241msgid "Show password"
246msgstr ""
242msgstr ""
247
243
@@ -281,6 +277,10 @@ msgstr ""
281msgid "Failed, tap to retry"
277msgid "Failed, tap to retry"
282msgstr ""
278msgstr ""
283
279
280+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
281+msgid "Reply"
282+msgstr ""
283+
284#: qml/Panel/Indicators/ModemInfoItem.qml:105
284#: qml/Panel/Indicators/ModemInfoItem.qml:105
285msgid "Unlock SIM"
285msgid "Unlock SIM"
286msgstr ""
286msgstr ""
@@ -289,60 +289,237 @@ msgstr ""
289msgid "Roaming"
289msgid "Roaming"
290msgstr ""
290msgstr ""
291
291
292−#: qml/Shell.qml:391
292+#: qml/Shell.qml:390
293+#, qt-format
294+msgid "Enter %1"
295+msgstr ""
296+
297+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
293msgid "Enter passphrase"
298msgid "Enter passphrase"
294msgstr ""
299msgstr ""
295
300
296#: qml/Shell.qml:392
301#: qml/Shell.qml:392
297−msgid "Sorry, incorrect passphrase"
302+msgid "Enter passcode"
298msgstr ""
303msgstr ""
299
304
300#: qml/Shell.qml:393
305#: qml/Shell.qml:393
301−msgid "Please re-enter"
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr ""
309+
310+#: qml/Shell.qml:394
311+msgid "Sorry, incorrect passphrase"
302msgstr ""
312msgstr ""
303
313
304#: qml/Shell.qml:395
314#: qml/Shell.qml:395
305−msgid "Enter passcode"
315+msgid "Please re-enter"
306msgstr ""
316msgstr ""
307
317
308#: qml/Shell.qml:396
318#: qml/Shell.qml:396
309msgid "Sorry, incorrect passcode"
319msgid "Sorry, incorrect passcode"
310msgstr ""
320msgstr ""
311
321
312−#: qml/Shell.qml:399
322+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
313−#, qt-format
314−msgid "Enter %1"
315−msgstr ""
316−
317−#: qml/Shell.qml:400
318−#, qt-format
319−msgid "Sorry, incorrect %1"
320−msgstr ""
321−
322−#: qml/Shell.qml:441
323msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Shell.qml:442
326+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
327msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Shell.qml:443
330+#: qml/Shell.qml:492
331msgid "This will be your last attempt."
331msgid "This will be your last attempt."
332msgstr ""
332msgstr ""
333
333
334−#: qml/Shell.qml:445
334+#: qml/Shell.qml:494
335msgid ""
335msgid ""
336"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
337"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
338msgstr ""
338msgstr ""
339
339
340−#: qml/Shell.qml:446
340+#: qml/Shell.qml:495
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
344msgstr ""
344msgstr ""
345
345
346+#: qml/Wizard/Page.qml:89
347+msgid "Back"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:27
351+msgid "Hi!"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:44
355+msgid "Welcome to your Ubuntu phone."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:52
359+msgid "Let’s get started."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
363+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
364+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365+#: qml/Wizard/Pages/passwd-set.qml:90
366+msgid "Continue"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:25
370+msgid "Add a SIM card and restart your device"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:55
374+msgid "Without it, you won’t be able to make calls or use text messaging."
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
378+msgid "Skip"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:39
382+msgid "Lock security"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:74
386+msgid "Please select how you’d like to unlock your phone."
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:97
390+msgid "Swipe"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:98
394+msgid "No security"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:100
398+msgid "Passcode"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:101
402+msgid "4 digits only"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:103
406+msgid "Passphrase"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:104
410+msgid "Numbers and letters"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:28
414+msgid "Connect to Wi‑Fi"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:147
418+msgid "Available networks…"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:148
422+msgid "No available networks."
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:27
426+msgid "Location"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:62
430+msgid "Let the phone detect your location:"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:69
434+msgid "Using GPS only (less accurate)"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:86
438+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
439+msgstr ""
440+
441+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
442+#: qml/Wizard/Pages/50-location.qml:103
443+msgid ""
444+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
445+"conditions</a>."
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:112
449+msgid "Not at all"
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:124
453+msgid "You can change your mind later in <b>System Settings</b>."
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:24
457+msgid "Improving your experience"
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:36
461+msgid ""
462+"Your phone is set up to automatically report errors to Canonical and its "
463+"partners, the makers of the operating system."
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:43
467+msgid ""
468+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
469+"Privacy</b>"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:24
473+msgid "All done"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:39
477+msgid "Nice work!"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:46
481+msgid "Your phone is now ready to use."
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:53
485+msgid "Finish"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/here-terms.qml:27
489+msgid "Terms & Conditions"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:49
493+msgid "Confirm passphrase"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:50
497+msgid "Confirm passcode"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:53
501+#: qml/Wizard/Pages/passwd-confirm.qml:54
502+msgid "Please try again."
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:61
506+msgid "Choose your passcode"
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:68
510+msgid "Passphrase must be 4 characters long"
511+msgstr ""
512+
513+#: qml/Wizard/StackButton.qml:39
514+#, qt-format
515+msgid "〈 %1"
516+msgstr ""
517+
518+#: qml/Wizard/StackButton.qml:42
519+#, qt-format
520+msgid "%1 〉"
521+msgstr ""
522+
346#~ msgid "Speaking..."
523#~ msgid "Speaking..."
347#~ msgstr "अब बोल रहे हैं"
524#~ msgstr "अब बोल रहे हैं"
348
525
po/hr.po+251−74
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2013-06-27 04:14+0000\n"
11"PO-Revision-Date: 2013-06-27 04:14+0000\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
13"Language-Team: Croatian <hr@li.org>\n"
13"Language-Team: Croatian <hr@li.org>\n"
@@ -16,19 +16,19 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
20−"X-Generator: Launchpad (build 17231)\n"
20+"X-Generator: Launchpad (build 17306)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
23msgid "Password: "
23msgid "Password: "
24msgstr ""
24msgstr ""
25
25
26#: plugins/Unity/Launcher/launcheritem.cpp:45
26#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
28msgid "Pin shortcut"
28msgid "Pin shortcut"
29msgstr ""
29msgstr ""
30
30
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
32msgid "Unpin shortcut"
32msgid "Unpin shortcut"
33msgstr ""
33msgstr ""
34
34
@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
51msgstr[0] ""
51msgstr[0] ""
52msgstr[1] ""
52msgstr[1] ""
53
53
54−#: qml/Components/Dialogs.qml:74
54+#: qml/Components/Dialogs.qml:86
55msgid "Log out"
55msgid "Log out"
56msgstr ""
56msgstr ""
57
57
58−#: qml/Components/Dialogs.qml:75
58+#: qml/Components/Dialogs.qml:87
59msgid "Are you sure you want to log out?"
59msgid "Are you sure you want to log out?"
60msgstr ""
60msgstr ""
61
61
62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63−#: qml/Components/Dialogs.qml:126
63+#: qml/Components/Dialogs.qml:134
64msgid "No"
64msgid "No"
65msgstr ""
65msgstr ""
66
66
67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68−#: qml/Components/Dialogs.qml:133
68+#: qml/Components/Dialogs.qml:140
69msgid "Yes"
69msgid "Yes"
70msgstr ""
70msgstr ""
71
71
72−#: qml/Components/Dialogs.qml:98
72+#: qml/Components/Dialogs.qml:108
73msgid "Shut down"
73msgid "Shut down"
74msgstr ""
74msgstr ""
75
75
76−#: qml/Components/Dialogs.qml:99
76+#: qml/Components/Dialogs.qml:109
77msgid "Are you sure you want to shut down?"
77msgid "Are you sure you want to shut down?"
78msgstr ""
78msgstr ""
79
79
80−#: qml/Components/Dialogs.qml:123
80+#: qml/Components/Dialogs.qml:131
81msgid "Reboot"
81msgid "Reboot"
82msgstr ""
82msgstr ""
83
83
84−#: qml/Components/Dialogs.qml:124
84+#: qml/Components/Dialogs.qml:132
85msgid "Are you sure you want to reboot?"
85msgid "Are you sure you want to reboot?"
86msgstr ""
86msgstr ""
87
87
88−#: qml/Components/Dialogs.qml:148
88+#: qml/Components/Dialogs.qml:154
89msgid "Power"
89msgid "Power"
90msgstr ""
90msgstr ""
91
91
92−#: qml/Components/Dialogs.qml:149
92+#: qml/Components/Dialogs.qml:155
93msgid ""
93msgid ""
94"Are you sure you would like\n"
94"Are you sure you would like\n"
95"to power off?"
95"to power off?"
96msgstr ""
96msgstr ""
97
97
98−#: qml/Components/Dialogs.qml:151
98+#: qml/Components/Dialogs.qml:157
99msgid "Power off"
99msgid "Power off"
100msgstr ""
100msgstr ""
101
101
102−#: qml/Components/Dialogs.qml:161
102+#: qml/Components/Dialogs.qml:166
103msgid "Restart"
103msgid "Restart"
104msgstr ""
104msgstr ""
105
105
106−#: qml/Components/Dialogs.qml:171
106+#: qml/Components/Dialogs.qml:175
107msgid "Cancel"
107msgid "Cancel"
108msgstr ""
108msgstr ""
109
109
@@ -111,82 +111,86 @@ msgstr ""
111msgid "Skip intro"
111msgid "Skip intro"
112msgstr ""
112msgstr ""
113
113
114−#: qml/Components/EdgeDemo.qml:112
114+#: qml/Components/EdgeDemo.qml:125
115msgid "Right edge"
115msgid "Right edge"
116msgstr ""
116msgstr ""
117
117
118−#: qml/Components/EdgeDemo.qml:113
118+#: qml/Components/EdgeDemo.qml:126
119msgid "Try swiping from the right edge to unlock the phone"
119msgid "Try swiping from the right edge to unlock the phone"
120msgstr ""
120msgstr ""
121
121
122−#: qml/Components/EdgeDemo.qml:144
122+#: qml/Components/EdgeDemo.qml:157
123msgid "Top edge"
123msgid "Top edge"
124msgstr ""
124msgstr ""
125
125
126−#: qml/Components/EdgeDemo.qml:145
126+#: qml/Components/EdgeDemo.qml:158
127msgid "Try swiping from the top edge to access the indicators"
127msgid "Try swiping from the top edge to access the indicators"
128msgstr ""
128msgstr ""
129
129
130−#: qml/Components/EdgeDemo.qml:170
130+#: qml/Components/EdgeDemo.qml:183
131msgid "Close"
131msgid "Close"
132msgstr ""
132msgstr ""
133
133
134−#: qml/Components/EdgeDemo.qml:171
134+#: qml/Components/EdgeDemo.qml:184
135msgid "Swipe up again to close the settings screen"
135msgid "Swipe up again to close the settings screen"
136msgstr ""
136msgstr ""
137
137
138−#: qml/Components/EdgeDemo.qml:201
138+#: qml/Components/EdgeDemo.qml:214
139msgid "Left edge"
139msgid "Left edge"
140msgstr ""
140msgstr ""
141
141
142−#: qml/Components/EdgeDemo.qml:202
142+#: qml/Components/EdgeDemo.qml:215
143msgid "Swipe from the left to reveal the launcher for quick access to apps"
143msgid "Swipe from the left to reveal the launcher for quick access to apps"
144msgstr ""
144msgstr ""
145
145
146−#: qml/Components/EdgeDemo.qml:229
146+#: qml/Components/EdgeDemo.qml:242
147msgid "Well done"
147msgid "Well done"
148msgstr ""
148msgstr ""
149
149
150−#: qml/Components/EdgeDemo.qml:230
150+#: qml/Components/EdgeDemo.qml:243
151msgid ""
151msgid ""
152"You have now mastered the edge gestures and can start using the "
152"You have now mastered the edge gestures and can start using the "
153"phone<br><br>Tap on the screen to start"
153"phone<br><br>Tap on the screen to start"
154msgstr ""
154msgstr ""
155
155
156−#: qml/Components/Lockscreen.qml:223
156+#: qml/Components/Lockscreen.qml:238
157msgid "Return to Call"
157msgid "Return to Call"
158msgstr ""
158msgstr ""
159
159
160−#: qml/Components/Lockscreen.qml:223
160+#: qml/Components/Lockscreen.qml:238
161msgid "Emergency Call"
161msgid "Emergency Call"
162msgstr ""
162msgstr ""
163
163
164−#: qml/Components/Lockscreen.qml:255
164+#: qml/Components/Lockscreen.qml:270
165msgid "OK"
165msgid "OK"
166msgstr ""
166msgstr ""
167
167
168−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
169msgid "See less"
169msgid "See less"
170msgstr ""
170msgstr ""
171
171
172−#: qml/Dash/GenericScopeView.qml:434
172+#: qml/Dash/GenericScopeView.qml:485
173msgid "See all"
173msgid "See all"
174msgstr ""
174msgstr ""
175
175
176−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
177#: qml/Panel/SearchIndicator.qml:27
177#: qml/Panel/SearchIndicator.qml:27
178msgid "Search"
178msgid "Search"
179msgstr "Pretraživanje"
179msgstr "Pretraživanje"
180
180
181−#: qml/Dash/PageHeader.qml:268
181+#: qml/Dash/PageHeader.qml:267
182+msgid "Store"
183+msgstr ""
184+
185+#: qml/Dash/PageHeader.qml:284
182msgid "Settings"
186msgid "Settings"
183msgstr ""
187msgstr ""
184
188
185−#: qml/Dash/PageHeader.qml:275
189+#: qml/Dash/PageHeader.qml:291
186msgid "Remove from Favorites"
190msgid "Remove from Favorites"
187msgstr ""
191msgstr ""
188
192
189−#: qml/Dash/PageHeader.qml:275
193+#: qml/Dash/PageHeader.qml:291
190msgid "Add to Favorites"
194msgid "Add to Favorites"
191msgstr ""
195msgstr ""
192
196
@@ -218,31 +222,23 @@ msgstr ""
218msgid "Release to refresh…"
222msgid "Release to refresh…"
219msgstr ""
223msgstr ""
220
224
221−#: qml/Dash/ScopesOverview.qml:215
225+#: qml/Dash/ScopesList.qml:66
222−msgid "Manage Scopes"
226+msgid "Manage"
223−msgstr ""
224−
225−#: qml/Dash/ScopesOverview.qml:437
226−msgid "Done"
227−msgstr ""
228−
229−#: qml/Dash/ScopesOverview.qml:463
230−msgid "Store"
231msgstr ""
227msgstr ""
232
228
233−#: qml/Dash/ScopesOverviewTab.qml:36
229+#: qml/Dash/ScopesList.qml:112
234−msgid "Favorites"
230+msgid "Home"
235msgstr ""
231msgstr ""
236
232
237−#: qml/Dash/ScopesOverviewTab.qml:54
233+#: qml/Dash/ScopesList.qml:113
238−msgid "All"
234+msgid "Also installed"
239msgstr ""
235msgstr ""
240
236
241−#: qml/Greeter/Greeter.qml:174
237+#: qml/Greeter/Greeter.qml:133
242msgid "Unlock"
238msgid "Unlock"
243msgstr ""
239msgstr ""
244
240
245−#: qml/Notifications/NotificationMenuItemFactory.qml:116
241+#: qml/Notifications/NotificationMenuItemFactory.qml:128
246msgid "Show password"
242msgid "Show password"
247msgstr ""
243msgstr ""
248
244
@@ -282,6 +278,10 @@ msgstr ""
282msgid "Failed, tap to retry"
278msgid "Failed, tap to retry"
283msgstr ""
279msgstr ""
284
280
281+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
282+msgid "Reply"
283+msgstr ""
284+
285#: qml/Panel/Indicators/ModemInfoItem.qml:105
285#: qml/Panel/Indicators/ModemInfoItem.qml:105
286msgid "Unlock SIM"
286msgid "Unlock SIM"
287msgstr ""
287msgstr ""
@@ -290,60 +290,237 @@ msgstr ""
290msgid "Roaming"
290msgid "Roaming"
291msgstr ""
291msgstr ""
292
292
293−#: qml/Shell.qml:391
293+#: qml/Shell.qml:390
294+#, qt-format
295+msgid "Enter %1"
296+msgstr ""
297+
298+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
294msgid "Enter passphrase"
299msgid "Enter passphrase"
295msgstr ""
300msgstr ""
296
301
297#: qml/Shell.qml:392
302#: qml/Shell.qml:392
298−msgid "Sorry, incorrect passphrase"
303+msgid "Enter passcode"
299msgstr ""
304msgstr ""
300
305
301#: qml/Shell.qml:393
306#: qml/Shell.qml:393
302−msgid "Please re-enter"
307+#, qt-format
308+msgid "Sorry, incorrect %1"
309+msgstr ""
310+
311+#: qml/Shell.qml:394
312+msgid "Sorry, incorrect passphrase"
303msgstr ""
313msgstr ""
304
314
305#: qml/Shell.qml:395
315#: qml/Shell.qml:395
306−msgid "Enter passcode"
316+msgid "Please re-enter"
307msgstr ""
317msgstr ""
308
318
309#: qml/Shell.qml:396
319#: qml/Shell.qml:396
310msgid "Sorry, incorrect passcode"
320msgid "Sorry, incorrect passcode"
311msgstr ""
321msgstr ""
312
322
313−#: qml/Shell.qml:399
323+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
314−#, qt-format
315−msgid "Enter %1"
316−msgstr ""
317−
318−#: qml/Shell.qml:400
319−#, qt-format
320−msgid "Sorry, incorrect %1"
321−msgstr ""
322−
323−#: qml/Shell.qml:441
324msgid "Sorry, incorrect passphrase."
324msgid "Sorry, incorrect passphrase."
325msgstr ""
325msgstr ""
326
326
327−#: qml/Shell.qml:442
327+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
328msgid "Sorry, incorrect passcode."
328msgid "Sorry, incorrect passcode."
329msgstr ""
329msgstr ""
330
330
331−#: qml/Shell.qml:443
331+#: qml/Shell.qml:492
332msgid "This will be your last attempt."
332msgid "This will be your last attempt."
333msgstr ""
333msgstr ""
334
334
335−#: qml/Shell.qml:445
335+#: qml/Shell.qml:494
336msgid ""
336msgid ""
337"If passphrase is entered incorrectly, your phone will conduct a factory "
337"If passphrase is entered incorrectly, your phone will conduct a factory "
338"reset and all personal data will be deleted."
338"reset and all personal data will be deleted."
339msgstr ""
339msgstr ""
340
340
341−#: qml/Shell.qml:446
341+#: qml/Shell.qml:495
342msgid ""
342msgid ""
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"and all personal data will be deleted."
344"and all personal data will be deleted."
345msgstr ""
345msgstr ""
346
346
347+#: qml/Wizard/Page.qml:89
348+msgid "Back"
349+msgstr ""
350+
351+#: qml/Wizard/Pages/10-welcome.qml:27
352+msgid "Hi!"
353+msgstr ""
354+
355+#: qml/Wizard/Pages/10-welcome.qml:44
356+msgid "Welcome to your Ubuntu phone."
357+msgstr ""
358+
359+#: qml/Wizard/Pages/10-welcome.qml:52
360+msgid "Let’s get started."
361+msgstr ""
362+
363+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
364+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
365+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
366+#: qml/Wizard/Pages/passwd-set.qml:90
367+msgid "Continue"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/20-sim.qml:25
371+msgid "Add a SIM card and restart your device"
372+msgstr ""
373+
374+#: qml/Wizard/Pages/20-sim.qml:55
375+msgid "Without it, you won’t be able to make calls or use text messaging."
376+msgstr ""
377+
378+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
379+msgid "Skip"
380+msgstr ""
381+
382+#: qml/Wizard/Pages/30-passwd-type.qml:39
383+msgid "Lock security"
384+msgstr ""
385+
386+#: qml/Wizard/Pages/30-passwd-type.qml:74
387+msgid "Please select how you’d like to unlock your phone."
388+msgstr ""
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:97
391+msgid "Swipe"
392+msgstr ""
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:98
395+msgid "No security"
396+msgstr ""
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:100
399+msgid "Passcode"
400+msgstr ""
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:101
403+msgid "4 digits only"
404+msgstr ""
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:103
407+msgid "Passphrase"
408+msgstr ""
409+
410+#: qml/Wizard/Pages/30-passwd-type.qml:104
411+msgid "Numbers and letters"
412+msgstr ""
413+
414+#: qml/Wizard/Pages/40-wifi.qml:28
415+msgid "Connect to Wi‑Fi"
416+msgstr ""
417+
418+#: qml/Wizard/Pages/40-wifi.qml:147
419+msgid "Available networks…"
420+msgstr ""
421+
422+#: qml/Wizard/Pages/40-wifi.qml:148
423+msgid "No available networks."
424+msgstr ""
425+
426+#: qml/Wizard/Pages/50-location.qml:27
427+msgid "Location"
428+msgstr ""
429+
430+#: qml/Wizard/Pages/50-location.qml:62
431+msgid "Let the phone detect your location:"
432+msgstr ""
433+
434+#: qml/Wizard/Pages/50-location.qml:69
435+msgid "Using GPS only (less accurate)"
436+msgstr ""
437+
438+#: qml/Wizard/Pages/50-location.qml:86
439+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
440+msgstr ""
441+
442+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
443+#: qml/Wizard/Pages/50-location.qml:103
444+msgid ""
445+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
446+"conditions</a>."
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:112
450+msgid "Not at all"
451+msgstr ""
452+
453+#: qml/Wizard/Pages/50-location.qml:124
454+msgid "You can change your mind later in <b>System Settings</b>."
455+msgstr ""
456+
457+#: qml/Wizard/Pages/60-reporting.qml:24
458+msgid "Improving your experience"
459+msgstr ""
460+
461+#: qml/Wizard/Pages/60-reporting.qml:36
462+msgid ""
463+"Your phone is set up to automatically report errors to Canonical and its "
464+"partners, the makers of the operating system."
465+msgstr ""
466+
467+#: qml/Wizard/Pages/60-reporting.qml:43
468+msgid ""
469+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
470+"Privacy</b>"
471+msgstr ""
472+
473+#: qml/Wizard/Pages/80-finished.qml:24
474+msgid "All done"
475+msgstr ""
476+
477+#: qml/Wizard/Pages/80-finished.qml:39
478+msgid "Nice work!"
479+msgstr ""
480+
481+#: qml/Wizard/Pages/80-finished.qml:46
482+msgid "Your phone is now ready to use."
483+msgstr ""
484+
485+#: qml/Wizard/Pages/80-finished.qml:53
486+msgid "Finish"
487+msgstr ""
488+
489+#: qml/Wizard/Pages/here-terms.qml:27
490+msgid "Terms & Conditions"
491+msgstr ""
492+
493+#: qml/Wizard/Pages/passwd-confirm.qml:49
494+msgid "Confirm passphrase"
495+msgstr ""
496+
497+#: qml/Wizard/Pages/passwd-confirm.qml:50
498+msgid "Confirm passcode"
499+msgstr ""
500+
501+#: qml/Wizard/Pages/passwd-confirm.qml:53
502+#: qml/Wizard/Pages/passwd-confirm.qml:54
503+msgid "Please try again."
504+msgstr ""
505+
506+#: qml/Wizard/Pages/passwd-set.qml:61
507+msgid "Choose your passcode"
508+msgstr ""
509+
510+#: qml/Wizard/Pages/passwd-set.qml:68
511+msgid "Passphrase must be 4 characters long"
512+msgstr ""
513+
514+#: qml/Wizard/StackButton.qml:39
515+#, qt-format
516+msgid "〈 %1"
517+msgstr ""
518+
519+#: qml/Wizard/StackButton.qml:42
520+#, qt-format
521+msgid "%1 〉"
522+msgstr ""
523+
347#~ msgid "Confirm"
524#~ msgid "Confirm"
348#~ msgstr "Potvrdi"
525#~ msgstr "Potvrdi"
349
526
po/hu.po+283−86
@@ -7,27 +7,27 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-11-05 15:45+0000\n"
11+"PO-Revision-Date: 2015-01-29 09:19+0000\n"
12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-30 07:08+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Jelszó: "
23msgstr "Jelszó: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Indító rögzítése"
28msgstr "Indító rögzítése"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Indító feloldása"
32msgstr "Indító feloldása"
33
33
@@ -47,48 +47,48 @@ msgstr "A túl sok hibás jelkód próbálkozás miatt le lett zárva az eszköz
47#, qt-format
47#, qt-format
48msgid "Please wait %1 minute and then try again…"
48msgid "Please wait %1 minute and then try again…"
49msgid_plural "Please wait %1 minutes and then try again…"
49msgid_plural "Please wait %1 minutes and then try again…"
50−msgstr[0] "Kérjük várjon %1 percet és próbálja újra…"
50+msgstr[0] "Várjon %1 percet és próbálja újra…"
51−msgstr[1] "Kérjük várjon %1 percet és próbálja újra…"
51+msgstr[1] "Várjon %1 percet és próbálja újra…"
52
52
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
54msgid "Log out"
54msgid "Log out"
55msgstr "Kijelentkezés"
55msgstr "Kijelentkezés"
56
56
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr "Biztos benne, hogy kijelentkezik?"
59msgstr "Biztos benne, hogy kijelentkezik?"
60
60
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:134
63msgid "No"
63msgid "No"
64msgstr "Nem"
64msgstr "Nem"
65
65
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:140
68msgid "Yes"
68msgid "Yes"
69msgstr "Igen"
69msgstr "Igen"
70
70
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
72msgid "Shut down"
72msgid "Shut down"
73msgstr "Leállítás"
73msgstr "Leállítás"
74
74
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr "Biztosan le szeretné állítani?"
77msgstr "Biztosan le szeretné állítani?"
78
78
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
80msgid "Reboot"
80msgid "Reboot"
81msgstr "Újraindítás"
81msgstr "Újraindítás"
82
82
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr "Biztosan újra szeretné indítani?"
85msgstr "Biztosan újra szeretné indítani?"
86
86
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
88msgid "Power"
88msgid "Power"
89msgstr "Kikapcsolás"
89msgstr "Kikapcsolás"
90
90
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
96"Biztos benne, hogy ki\n"
96"Biztos benne, hogy ki\n"
97"szeretné kapcsolni?"
97"szeretné kapcsolni?"
98
98
99−#: qml/Components/Dialogs.qml:151
99+#: qml/Components/Dialogs.qml:157
100msgid "Power off"
100msgid "Power off"
101msgstr "Kikapcsolás"
101msgstr "Kikapcsolás"
102
102
103−#: qml/Components/Dialogs.qml:161
103+#: qml/Components/Dialogs.qml:166
104msgid "Restart"
104msgid "Restart"
105msgstr "Újraindítás"
105msgstr "Újraindítás"
106
106
107−#: qml/Components/Dialogs.qml:171
107+#: qml/Components/Dialogs.qml:175
108msgid "Cancel"
108msgid "Cancel"
109msgstr "Mégse"
109msgstr "Mégse"
110
110
@@ -112,45 +112,45 @@ msgstr "Mégse"
112msgid "Skip intro"
112msgid "Skip intro"
113msgstr "A bemutató kihagyása"
113msgstr "A bemutató kihagyása"
114
114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116msgid "Right edge"
116msgid "Right edge"
117msgstr "Jobb szél"
117msgstr "Jobb szél"
118
118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120msgid "Try swiping from the right edge to unlock the phone"
120msgid "Try swiping from the right edge to unlock the phone"
121msgstr "A telefon feloldásához csúsztassa ujját a jobb szélről"
121msgstr "A telefon feloldásához csúsztassa ujját a jobb szélről"
122
122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124msgid "Top edge"
124msgid "Top edge"
125msgstr "Felső szél"
125msgstr "Felső szél"
126
126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128msgid "Try swiping from the top edge to access the indicators"
128msgid "Try swiping from the top edge to access the indicators"
129msgstr "Az állapotmenük eléréséhez csúsztassa ujját a felső szélről"
129msgstr "Az állapotmenük eléréséhez csúsztassa ujját a felső szélről"
130
130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132msgid "Close"
132msgid "Close"
133msgstr "Bezárás"
133msgstr "Bezárás"
134
134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136msgid "Swipe up again to close the settings screen"
136msgid "Swipe up again to close the settings screen"
137msgstr "A beállítások bezárásához csúsztassa ujját újra felfelé"
137msgstr "A beállítások bezárásához csúsztassa ujját újra felfelé"
138
138
139−#: qml/Components/EdgeDemo.qml:201
139+#: qml/Components/EdgeDemo.qml:214
140msgid "Left edge"
140msgid "Left edge"
141msgstr "Bal szél"
141msgstr "Bal szél"
142
142
143−#: qml/Components/EdgeDemo.qml:202
143+#: qml/Components/EdgeDemo.qml:215
144msgid "Swipe from the left to reveal the launcher for quick access to apps"
144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145msgstr ""
145msgstr ""
146"Csúsztassa ujját a bal szélről az indítón található alkalmazások gyors "
146"Csúsztassa ujját a bal szélről az indítón található alkalmazások gyors "
147"eléréséhez"
147"eléréséhez"
148
148
149−#: qml/Components/EdgeDemo.qml:229
149+#: qml/Components/EdgeDemo.qml:242
150msgid "Well done"
150msgid "Well done"
151msgstr "Rendben"
151msgstr "Rendben"
152
152
153−#: qml/Components/EdgeDemo.qml:230
153+#: qml/Components/EdgeDemo.qml:243
154msgid ""
154msgid ""
155"You have now mastered the edge gestures and can start using the "
155"You have now mastered the edge gestures and can start using the "
156"phone<br><br>Tap on the screen to start"
156"phone<br><br>Tap on the screen to start"
@@ -158,40 +158,44 @@ msgstr ""
158"Elsajátította a gesztusokat, és megkezdheti a telefon "
158"Elsajátította a gesztusokat, és megkezdheti a telefon "
159"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
159"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
160
160
161−#: qml/Components/Lockscreen.qml:223
161+#: qml/Components/Lockscreen.qml:238
162msgid "Return to Call"
162msgid "Return to Call"
163msgstr "Vissza a híváshoz"
163msgstr "Vissza a híváshoz"
164
164
165−#: qml/Components/Lockscreen.qml:223
165+#: qml/Components/Lockscreen.qml:238
166msgid "Emergency Call"
166msgid "Emergency Call"
167msgstr "Vészhívás"
167msgstr "Vészhívás"
168
168
169−#: qml/Components/Lockscreen.qml:255
169+#: qml/Components/Lockscreen.qml:270
170msgid "OK"
170msgid "OK"
171msgstr "Ok"
171msgstr "Ok"
172
172
173−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
173+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
174msgid "See less"
174msgid "See less"
175msgstr "Kevesebb"
175msgstr "Kevesebb"
176
176
177−#: qml/Dash/GenericScopeView.qml:434
177+#: qml/Dash/GenericScopeView.qml:485
178msgid "See all"
178msgid "See all"
179msgstr "Összes megtekintése"
179msgstr "Összes megtekintése"
180
180
181−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
181+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
182#: qml/Panel/SearchIndicator.qml:27
182#: qml/Panel/SearchIndicator.qml:27
183msgid "Search"
183msgid "Search"
184msgstr "Keresés"
184msgstr "Keresés"
185
185
186−#: qml/Dash/PageHeader.qml:268
186+#: qml/Dash/PageHeader.qml:267
187+msgid "Store"
188+msgstr "Áruház"
189+
190+#: qml/Dash/PageHeader.qml:284
187msgid "Settings"
191msgid "Settings"
188msgstr "Beállítások"
192msgstr "Beállítások"
189
193
190−#: qml/Dash/PageHeader.qml:275
194+#: qml/Dash/PageHeader.qml:291
191msgid "Remove from Favorites"
195msgid "Remove from Favorites"
192msgstr "Eltávolítás a kedvencek közül"
196msgstr "Eltávolítás a kedvencek közül"
193
197
194−#: qml/Dash/PageHeader.qml:275
198+#: qml/Dash/PageHeader.qml:291
195msgid "Add to Favorites"
199msgid "Add to Favorites"
196msgstr "Hozzáadás a kedvencekhez"
200msgstr "Hozzáadás a kedvencekhez"
197
201
@@ -223,31 +227,23 @@ msgstr "Húzza a frissítéshez…"
223msgid "Release to refresh…"
227msgid "Release to refresh…"
224msgstr "Engedje el a frissítéshez…"
228msgstr "Engedje el a frissítéshez…"
225
229
226−#: qml/Dash/ScopesOverview.qml:215
230+#: qml/Dash/ScopesList.qml:66
227−msgid "Manage Scopes"
231+msgid "Manage"
228−msgstr "Lencsék kezelése"
232+msgstr "Szerkesztés"
229
233
230−#: qml/Dash/ScopesOverview.qml:437
234+#: qml/Dash/ScopesList.qml:112
231−msgid "Done"
235+msgid "Home"
232−msgstr "Kész"
236+msgstr "Kezdőlapon"
233−
234−#: qml/Dash/ScopesOverview.qml:463
235−msgid "Store"
236−msgstr "Áruház"
237
237
238−#: qml/Dash/ScopesOverviewTab.qml:36
238+#: qml/Dash/ScopesList.qml:113
239−msgid "Favorites"
239+msgid "Also installed"
240−msgstr "Kedvencek"
240+msgstr "Telepítve"
241
241
242−#: qml/Dash/ScopesOverviewTab.qml:54
243−msgid "All"
244−msgstr "Összes"
245−
246−#: qml/Greeter/Greeter.qml:174
242+#: qml/Greeter/Greeter.qml:133
247msgid "Unlock"
243msgid "Unlock"
248msgstr "Feloldás"
244msgstr "Feloldás"
249
245
250−#: qml/Notifications/NotificationMenuItemFactory.qml:116
246+#: qml/Notifications/NotificationMenuItemFactory.qml:128
251msgid "Show password"
247msgid "Show password"
252msgstr "Jelszó megjelenítése"
248msgstr "Jelszó megjelenítése"
253
249
@@ -287,6 +283,10 @@ msgstr "Befejeződött"
287msgid "Failed, tap to retry"
283msgid "Failed, tap to retry"
288msgstr "Sikertelen, koppintson az újrapróbáláshoz"
284msgstr "Sikertelen, koppintson az újrapróbáláshoz"
289
285
286+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
287+msgid "Reply"
288+msgstr "Válasz"
289+
290#: qml/Panel/Indicators/ModemInfoItem.qml:105
290#: qml/Panel/Indicators/ModemInfoItem.qml:105
291msgid "Unlock SIM"
291msgid "Unlock SIM"
292msgstr "SIM feloldása"
292msgstr "SIM feloldása"
@@ -295,49 +295,49 @@ msgstr "SIM feloldása"
295msgid "Roaming"
295msgid "Roaming"
296msgstr "Barangolás"
296msgstr "Barangolás"
297
297
298−#: qml/Shell.qml:391
298+#: qml/Shell.qml:390
299+#, qt-format
300+msgid "Enter %1"
301+msgstr "Adja meg: %1"
302+
303+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
299msgid "Enter passphrase"
304msgid "Enter passphrase"
300msgstr "Jelmondat megadása"
305msgstr "Jelmondat megadása"
301
306
302#: qml/Shell.qml:392
307#: qml/Shell.qml:392
303−msgid "Sorry, incorrect passphrase"
308+msgid "Enter passcode"
304−msgstr "Sajnáljuk, helytelen jelmondat"
309+msgstr "Jelkód megadása"
305
310
306#: qml/Shell.qml:393
311#: qml/Shell.qml:393
307−msgid "Please re-enter"
312+#, qt-format
308−msgstr "Kérjük próbálja újra"
313+msgid "Sorry, incorrect %1"
314+msgstr "Sajnálom, helytelen %1"
315+
316+#: qml/Shell.qml:394
317+msgid "Sorry, incorrect passphrase"
318+msgstr "Sajnálom, helytelen jelmondat"
309
319
310#: qml/Shell.qml:395
320#: qml/Shell.qml:395
311−msgid "Enter passcode"
321+msgid "Please re-enter"
312−msgstr "Jelkód megadása"
322+msgstr "Próbálja újra"
313
323
314#: qml/Shell.qml:396
324#: qml/Shell.qml:396
315msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
316−msgstr "Sajnáljuk, helytelen jelkód"
326+msgstr "Sajnálom, helytelen jelkód"
317−
318−#: qml/Shell.qml:399
319−#, qt-format
320−msgid "Enter %1"
321−msgstr "Adja meg: %1"
322
327
323−#: qml/Shell.qml:400
328+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
324−#, qt-format
325−msgid "Sorry, incorrect %1"
326−msgstr "Sajnáljuk, helytelen %1"
327−
328−#: qml/Shell.qml:441
329msgid "Sorry, incorrect passphrase."
329msgid "Sorry, incorrect passphrase."
330−msgstr "Sajnáljuk, helytelen jelmondat."
330+msgstr "Sajnálom, helytelen jelmondat."
331
331
332−#: qml/Shell.qml:442
332+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
333msgid "Sorry, incorrect passcode."
333msgid "Sorry, incorrect passcode."
334−msgstr "Sajnáljuk, helytelen jelkód."
334+msgstr "Sajnálom, helytelen jelkód."
335
335
336−#: qml/Shell.qml:443
336+#: qml/Shell.qml:492
337msgid "This will be your last attempt."
337msgid "This will be your last attempt."
338msgstr "Ez az utolsó próbálkozási lehetősége."
338msgstr "Ez az utolsó próbálkozási lehetősége."
339
339
340−#: qml/Shell.qml:445
340+#: qml/Shell.qml:494
341msgid ""
341msgid ""
342"If passphrase is entered incorrectly, your phone will conduct a factory "
342"If passphrase is entered incorrectly, your phone will conduct a factory "
343"reset and all personal data will be deleted."
343"reset and all personal data will be deleted."
@@ -345,7 +345,7 @@ msgstr ""
345"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
345"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
346"beállításokat és törli minden személyes adatát."
346"beállításokat és törli minden személyes adatát."
347
347
348−#: qml/Shell.qml:446
348+#: qml/Shell.qml:495
349msgid ""
349msgid ""
350"If passcode is entered incorrectly, your phone will conduct a factory reset "
350"If passcode is entered incorrectly, your phone will conduct a factory reset "
351"and all personal data will be deleted."
351"and all personal data will be deleted."
@@ -353,6 +353,191 @@ msgstr ""
353"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "
353"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "
354"beállításokat és törli minden személyes adatát."
354"beállításokat és törli minden személyes adatát."
355
355
356+#: qml/Wizard/Page.qml:89
357+msgid "Back"
358+msgstr "Vissza"
359+
360+#: qml/Wizard/Pages/10-welcome.qml:27
361+msgid "Hi!"
362+msgstr "Üdv!"
363+
364+#: qml/Wizard/Pages/10-welcome.qml:44
365+msgid "Welcome to your Ubuntu phone."
366+msgstr "Üdvözöljük az Ubuntu telefonos változatában."
367+
368+#: qml/Wizard/Pages/10-welcome.qml:52
369+msgid "Let’s get started."
370+msgstr "Kezdjünk is bele."
371+
372+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
373+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
374+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
375+#: qml/Wizard/Pages/passwd-set.qml:90
376+msgid "Continue"
377+msgstr "Folytatás"
378+
379+#: qml/Wizard/Pages/20-sim.qml:25
380+msgid "Add a SIM card and restart your device"
381+msgstr "Helyezzen be egy SIM kártyát és indítsa újra az eszközét"
382+
383+#: qml/Wizard/Pages/20-sim.qml:55
384+msgid "Without it, you won’t be able to make calls or use text messaging."
385+msgstr ""
386+"Anélkül nem indíthat vagy fogadhat hívásokat és nem küldhet vagy fogadhat "
387+"üzeneteket."
388+
389+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
390+msgid "Skip"
391+msgstr "Kihagyás"
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:39
394+msgid "Lock security"
395+msgstr "Képernyőzárolás"
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:74
398+msgid "Please select how you’d like to unlock your phone."
399+msgstr "Válassza ki, hogy milyen módon kívánja feloldani a telefonját."
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:97
402+msgid "Swipe"
403+msgstr "Csúsztatás"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:98
406+msgid "No security"
407+msgstr "Nem biztonságos"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:100
410+msgid "Passcode"
411+msgstr "Jelkód"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:101
414+msgid "4 digits only"
415+msgstr "4 számjegy"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:103
418+msgid "Passphrase"
419+msgstr "Jelmondat"
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:104
422+msgid "Numbers and letters"
423+msgstr "Betűk és számok"
424+
425+#: qml/Wizard/Pages/40-wifi.qml:28
426+msgid "Connect to Wi‑Fi"
427+msgstr "Csatlakozás Wi-Fi hálózathoz"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:147
430+msgid "Available networks…"
431+msgstr "Elérhető hálózatok…"
432+
433+#: qml/Wizard/Pages/40-wifi.qml:148
434+msgid "No available networks."
435+msgstr "Nincsenek elérhető hálózatok."
436+
437+#: qml/Wizard/Pages/50-location.qml:27
438+msgid "Location"
439+msgstr "Tartózkodási hely"
440+
441+#: qml/Wizard/Pages/50-location.qml:62
442+msgid "Let the phone detect your location:"
443+msgstr "A telefon megpróbálja megállapítani az Ön tartózkodási helyét:"
444+
445+#: qml/Wizard/Pages/50-location.qml:69
446+msgid "Using GPS only (less accurate)"
447+msgstr "Csak GPS használata (kevésbé pontos)"
448+
449+#: qml/Wizard/Pages/50-location.qml:86
450+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
451+msgstr "GPS és névtelen Wi-Fi és mobilhálózati adatok (ajánlott)"
452+
453+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
454+#: qml/Wizard/Pages/50-location.qml:103
455+msgid ""
456+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
457+"conditions</a>."
458+msgstr ""
459+"A lehetőség kiválasztásával elfogadja a Nokia HERE <a href='#'>felhasználási "
460+"feltételeit</a>."
461+
462+#: qml/Wizard/Pages/50-location.qml:112
463+msgid "Not at all"
464+msgstr "Ne tegye"
465+
466+#: qml/Wizard/Pages/50-location.qml:124
467+msgid "You can change your mind later in <b>System Settings</b>."
468+msgstr "Ezt később a <b>Rendszerbeállítások</b> alatt módosíthatja."
469+
470+#: qml/Wizard/Pages/60-reporting.qml:24
471+msgid "Improving your experience"
472+msgstr "Javítson az élményen"
473+
474+#: qml/Wizard/Pages/60-reporting.qml:36
475+msgid ""
476+"Your phone is set up to automatically report errors to Canonical and its "
477+"partners, the makers of the operating system."
478+msgstr ""
479+"A telefonja automatikus hibajelentéseket küld az operációs rendszert készítő "
480+"Canonical, és annak partnerei felé."
481+
482+#: qml/Wizard/Pages/60-reporting.qml:43
483+msgid ""
484+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
485+"Privacy</b>"
486+msgstr ""
487+"Ezt kikapcsolhatja a <b>Rendszerbeállítások</b> alatt található <b>Biztonság "
488+"és adatvédelem</b> alatt"
489+
490+#: qml/Wizard/Pages/80-finished.qml:24
491+msgid "All done"
492+msgstr "Készen van"
493+
494+#: qml/Wizard/Pages/80-finished.qml:39
495+msgid "Nice work!"
496+msgstr "Szép munka!"
497+
498+#: qml/Wizard/Pages/80-finished.qml:46
499+msgid "Your phone is now ready to use."
500+msgstr "A telefonja készen áll a használatra."
501+
502+#: qml/Wizard/Pages/80-finished.qml:53
503+msgid "Finish"
504+msgstr "Befejezés"
505+
506+#: qml/Wizard/Pages/here-terms.qml:27
507+msgid "Terms & Conditions"
508+msgstr "Felhasználási feltételek"
509+
510+#: qml/Wizard/Pages/passwd-confirm.qml:49
511+msgid "Confirm passphrase"
512+msgstr "Jelmondat megerősítése"
513+
514+#: qml/Wizard/Pages/passwd-confirm.qml:50
515+msgid "Confirm passcode"
516+msgstr "Jelkód megerősítése"
517+
518+#: qml/Wizard/Pages/passwd-confirm.qml:53
519+#: qml/Wizard/Pages/passwd-confirm.qml:54
520+msgid "Please try again."
521+msgstr "Próbálja újra."
522+
523+#: qml/Wizard/Pages/passwd-set.qml:61
524+msgid "Choose your passcode"
525+msgstr "Jelkód kiválasztása"
526+
527+#: qml/Wizard/Pages/passwd-set.qml:68
528+msgid "Passphrase must be 4 characters long"
529+msgstr "A jelmondat legalább 4 karakter hosszú legyen"
530+
531+#: qml/Wizard/StackButton.qml:39
532+#, qt-format
533+msgid "〈 %1"
534+msgstr "〈 %1"
535+
536+#: qml/Wizard/StackButton.qml:42
537+#, qt-format
538+msgid "%1 〉"
539+msgstr "%1 〉"
540+
356#~ msgid "Confirm"
541#~ msgid "Confirm"
357#~ msgstr "Megerősítés"
542#~ msgstr "Megerősítés"
358
543
@@ -367,3 +552,15 @@ msgstr ""
367
552
368#~ msgid "Speak Now..."
553#~ msgid "Speak Now..."
369#~ msgstr "Most beszéljen…"
554#~ msgstr "Most beszéljen…"
555+
556+#~ msgid "All"
557+#~ msgstr "Összes"
558+
559+#~ msgid "Favorites"
560+#~ msgstr "Kedvencek"
561+
562+#~ msgid "Done"
563+#~ msgstr "Kész"
564+
565+#~ msgid "Manage Scopes"
566+#~ msgstr "Lencsék kezelése"
po/hy.po+264−78
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11"PO-Revision-Date: 2014-10-28 06:34+0000\n"
11"PO-Revision-Date: 2014-10-28 06:34+0000\n"
12"Last-Translator: Vahan Harutyunyan <Unknown>\n"
12"Last-Translator: Vahan Harutyunyan <Unknown>\n"
13"Language-Team: Armenian <hy@li.org>\n"
13"Language-Team: Armenian <hy@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:29+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Գաղտնաբառ: "
23msgstr "Գաղտնաբառ: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Փակցնել պիտակը"
28msgstr "Փակցնել պիտակը"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Հեռացնել պիտակը"
32msgstr "Հեռացնել պիտակը"
33
33
@@ -53,60 +53,60 @@ msgstr[0] ""
53"Խնդրում ենք սպասել %1 րոպե և փորձել կրկին...\r\n"
53"Խնդրում ենք սպասել %1 րոպե և փորձել կրկին...\r\n"
54"Խնդրում ենք սպասել %1 րոպե և փորձել կրկին..."
54"Խնդրում ենք սպասել %1 րոպե և փորձել կրկին..."
55
55
56−#: qml/Components/Dialogs.qml:74
56+#: qml/Components/Dialogs.qml:86
57msgid "Log out"
57msgid "Log out"
58msgstr "Ելք"
58msgstr "Ելք"
59
59
60−#: qml/Components/Dialogs.qml:75
60+#: qml/Components/Dialogs.qml:87
61msgid "Are you sure you want to log out?"
61msgid "Are you sure you want to log out?"
62msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք դուրս գալ համակարգից"
62msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք դուրս գալ համակարգից"
63
63
64−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
64+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
65−#: qml/Components/Dialogs.qml:126
65+#: qml/Components/Dialogs.qml:134
66msgid "No"
66msgid "No"
67msgstr "Ոչ"
67msgstr "Ոչ"
68
68
69−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
69+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
70−#: qml/Components/Dialogs.qml:133
70+#: qml/Components/Dialogs.qml:140
71msgid "Yes"
71msgid "Yes"
72msgstr "Այո"
72msgstr "Այո"
73
73
74−#: qml/Components/Dialogs.qml:98
74+#: qml/Components/Dialogs.qml:108
75msgid "Shut down"
75msgid "Shut down"
76msgstr "Անջատել"
76msgstr "Անջատել"
77
77
78−#: qml/Components/Dialogs.qml:99
78+#: qml/Components/Dialogs.qml:109
79msgid "Are you sure you want to shut down?"
79msgid "Are you sure you want to shut down?"
80msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք անջատել համակարգիչը"
80msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք անջատել համակարգիչը"
81
81
82−#: qml/Components/Dialogs.qml:123
82+#: qml/Components/Dialogs.qml:131
83msgid "Reboot"
83msgid "Reboot"
84msgstr "Վերաբեռնել"
84msgstr "Վերաբեռնել"
85
85
86−#: qml/Components/Dialogs.qml:124
86+#: qml/Components/Dialogs.qml:132
87msgid "Are you sure you want to reboot?"
87msgid "Are you sure you want to reboot?"
88msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք վերաբեռնել համակարգիչը"
88msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք վերաբեռնել համակարգիչը"
89
89
90−#: qml/Components/Dialogs.qml:148
90+#: qml/Components/Dialogs.qml:154
91msgid "Power"
91msgid "Power"
92msgstr "Էլեկտրասնուցում"
92msgstr "Էլեկտրասնուցում"
93
93
94−#: qml/Components/Dialogs.qml:149
94+#: qml/Components/Dialogs.qml:155
95msgid ""
95msgid ""
96"Are you sure you would like\n"
96"Are you sure you would like\n"
97"to power off?"
97"to power off?"
98msgstr ""
98msgstr ""
99"Դուք համոզվա՞ծ եք, որ ցանկանում եք անջատել համակարգիչը սնուցման աղբյուրից"
99"Դուք համոզվա՞ծ եք, որ ցանկանում եք անջատել համակարգիչը սնուցման աղբյուրից"
100
100
101−#: qml/Components/Dialogs.qml:151
101+#: qml/Components/Dialogs.qml:157
102msgid "Power off"
102msgid "Power off"
103msgstr "Անջատել սնուցման աղբյուրից"
103msgstr "Անջատել սնուցման աղբյուրից"
104
104
105−#: qml/Components/Dialogs.qml:161
105+#: qml/Components/Dialogs.qml:166
106msgid "Restart"
106msgid "Restart"
107msgstr "Վերագործարկել"
107msgstr "Վերագործարկել"
108
108
109−#: qml/Components/Dialogs.qml:171
109+#: qml/Components/Dialogs.qml:175
110msgid "Cancel"
110msgid "Cancel"
111msgstr "Չեղյալ համարել"
111msgstr "Չեղյալ համարել"
112
112
@@ -114,82 +114,86 @@ msgstr "Չեղյալ համարել"
114msgid "Skip intro"
114msgid "Skip intro"
115msgstr "Բաց թողնել ներածությունը"
115msgstr "Բաց թողնել ներածությունը"
116
116
117−#: qml/Components/EdgeDemo.qml:112
117+#: qml/Components/EdgeDemo.qml:125
118msgid "Right edge"
118msgid "Right edge"
119msgstr "Աջ եզրը"
119msgstr "Աջ եզրը"
120
120
121−#: qml/Components/EdgeDemo.qml:113
121+#: qml/Components/EdgeDemo.qml:126
122msgid "Try swiping from the right edge to unlock the phone"
122msgid "Try swiping from the right edge to unlock the phone"
123msgstr ""
123msgstr ""
124
124
125−#: qml/Components/EdgeDemo.qml:144
125+#: qml/Components/EdgeDemo.qml:157
126msgid "Top edge"
126msgid "Top edge"
127msgstr "Վերին եզրը"
127msgstr "Վերին եզրը"
128
128
129−#: qml/Components/EdgeDemo.qml:145
129+#: qml/Components/EdgeDemo.qml:158
130msgid "Try swiping from the top edge to access the indicators"
130msgid "Try swiping from the top edge to access the indicators"
131msgstr ""
131msgstr ""
132
132
133−#: qml/Components/EdgeDemo.qml:170
133+#: qml/Components/EdgeDemo.qml:183
134msgid "Close"
134msgid "Close"
135msgstr "Փակել"
135msgstr "Փակել"
136
136
137−#: qml/Components/EdgeDemo.qml:171
137+#: qml/Components/EdgeDemo.qml:184
138msgid "Swipe up again to close the settings screen"
138msgid "Swipe up again to close the settings screen"
139msgstr ""
139msgstr ""
140
140
141−#: qml/Components/EdgeDemo.qml:201
141+#: qml/Components/EdgeDemo.qml:214
142msgid "Left edge"
142msgid "Left edge"
143msgstr "Ձախ եզրը"
143msgstr "Ձախ եզրը"
144
144
145−#: qml/Components/EdgeDemo.qml:202
145+#: qml/Components/EdgeDemo.qml:215
146msgid "Swipe from the left to reveal the launcher for quick access to apps"
146msgid "Swipe from the left to reveal the launcher for quick access to apps"
147msgstr ""
147msgstr ""
148
148
149−#: qml/Components/EdgeDemo.qml:229
149+#: qml/Components/EdgeDemo.qml:242
150msgid "Well done"
150msgid "Well done"
151msgstr "Լավ է"
151msgstr "Լավ է"
152
152
153−#: qml/Components/EdgeDemo.qml:230
153+#: qml/Components/EdgeDemo.qml:243
154msgid ""
154msgid ""
155"You have now mastered the edge gestures and can start using the "
155"You have now mastered the edge gestures and can start using the "
156"phone<br><br>Tap on the screen to start"
156"phone<br><br>Tap on the screen to start"
157msgstr ""
157msgstr ""
158
158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160msgid "Return to Call"
160msgid "Return to Call"
161msgstr ""
161msgstr ""
162
162
163−#: qml/Components/Lockscreen.qml:223
163+#: qml/Components/Lockscreen.qml:238
164msgid "Emergency Call"
164msgid "Emergency Call"
165msgstr ""
165msgstr ""
166
166
167−#: qml/Components/Lockscreen.qml:255
167+#: qml/Components/Lockscreen.qml:270
168msgid "OK"
168msgid "OK"
169msgstr ""
169msgstr ""
170
170
171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
172msgid "See less"
172msgid "See less"
173msgstr ""
173msgstr ""
174
174
175−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:485
176msgid "See all"
176msgid "See all"
177msgstr "Տեսնել բոլորը"
177msgstr "Տեսնել բոլորը"
178
178
179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
181msgid "Search"
181msgid "Search"
182msgstr "Որոնում"
182msgstr "Որոնում"
183
183
184−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:267
185+msgid "Store"
186+msgstr "Խանութ"
187+
188+#: qml/Dash/PageHeader.qml:284
185msgid "Settings"
189msgid "Settings"
186msgstr "Կարգավորումներ"
190msgstr "Կարգավորումներ"
187
191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189msgid "Remove from Favorites"
193msgid "Remove from Favorites"
190msgstr "Հեռացնել ընտրյալների ցուցակից"
194msgstr "Հեռացնել ընտրյալների ցուցակից"
191
195
192−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:291
193msgid "Add to Favorites"
197msgid "Add to Favorites"
194msgstr "Ավելացնել ընտրյալների ցուցակում"
198msgstr "Ավելացնել ընտրյալների ցուցակում"
195
199
@@ -221,31 +225,23 @@ msgstr ""
221msgid "Release to refresh…"
225msgid "Release to refresh…"
222msgstr ""
226msgstr ""
223
227
224−#: qml/Dash/ScopesOverview.qml:215
228+#: qml/Dash/ScopesList.qml:66
225−msgid "Manage Scopes"
229+msgid "Manage"
226msgstr ""
230msgstr ""
227
231
228−#: qml/Dash/ScopesOverview.qml:437
232+#: qml/Dash/ScopesList.qml:112
229−msgid "Done"
230−msgstr "Կատարված է"
231−
232−#: qml/Dash/ScopesOverview.qml:463
233−msgid "Store"
234−msgstr "Խանութ"
235−
236−#: qml/Dash/ScopesOverviewTab.qml:36
237−msgid "Favorites"
233+msgid "Home"
238−msgstr "Նախընտրելի"
234+msgstr ""
239
235
240−#: qml/Dash/ScopesOverviewTab.qml:54
236+#: qml/Dash/ScopesList.qml:113
241−msgid "All"
237+msgid "Also installed"
242−msgstr "Բոլորը"
238+msgstr ""
243
239
244−#: qml/Greeter/Greeter.qml:174
240+#: qml/Greeter/Greeter.qml:133
245msgid "Unlock"
241msgid "Unlock"
246msgstr "Ապաբլոկավորել"
242msgstr "Ապաբլոկավորել"
247
243
248−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
249msgid "Show password"
245msgid "Show password"
250msgstr "Ցույց տալ գաղտնաբառը"
246msgstr "Ցույց տալ գաղտնաբառը"
251
247
@@ -285,6 +281,10 @@ msgstr "Ավարտված է"
285msgid "Failed, tap to retry"
281msgid "Failed, tap to retry"
286msgstr ""
282msgstr ""
287
283
284+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
285+msgid "Reply"
286+msgstr ""
287+
288#: qml/Panel/Indicators/ModemInfoItem.qml:105
288#: qml/Panel/Indicators/ModemInfoItem.qml:105
289msgid "Unlock SIM"
289msgid "Unlock SIM"
290msgstr "Ապաբլոկավորել SIM-ը"
290msgstr "Ապաբլոկավորել SIM-ը"
@@ -293,60 +293,237 @@ msgstr "Ապաբլոկավորել SIM-ը"
293msgid "Roaming"
293msgid "Roaming"
294msgstr "Ռոումինգ"
294msgstr "Ռոումինգ"
295
295
296−#: qml/Shell.qml:391
296+#: qml/Shell.qml:390
297+#, qt-format
298+msgid "Enter %1"
299+msgstr "Մուտքագրեք %1"
300+
301+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
297msgid "Enter passphrase"
302msgid "Enter passphrase"
298msgstr "Մուտքագրե՛ք անցաբառը"
303msgstr "Մուտքագրե՛ք անցաբառը"
299
304
300#: qml/Shell.qml:392
305#: qml/Shell.qml:392
306+msgid "Enter passcode"
307+msgstr "Մոտքագրեք ծածկագիրը"
308+
309+#: qml/Shell.qml:393
310+#, qt-format
311+msgid "Sorry, incorrect %1"
312+msgstr "Ներեցեք, սխալ %1"
313+
314+#: qml/Shell.qml:394
301msgid "Sorry, incorrect passphrase"
315msgid "Sorry, incorrect passphrase"
302msgstr "Ներեցեք, սխալ անցաբառ է"
316msgstr "Ներեցեք, սխալ անցաբառ է"
303
317
304−#: qml/Shell.qml:393
318+#: qml/Shell.qml:395
305msgid "Please re-enter"
319msgid "Please re-enter"
306msgstr "Խնդրում ենք նորից մուտքագրել"
320msgstr "Խնդրում ենք նորից մուտքագրել"
307
321
308−#: qml/Shell.qml:395
309−msgid "Enter passcode"
310−msgstr "Մոտքագրեք ծածկագիրը"
311−
312#: qml/Shell.qml:396
322#: qml/Shell.qml:396
313msgid "Sorry, incorrect passcode"
323msgid "Sorry, incorrect passcode"
314msgstr "Ներեցեք, սխալ ծածկագիր է"
324msgstr "Ներեցեք, սխալ ծածկագիր է"
315
325
316−#: qml/Shell.qml:399
326+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
317−#, qt-format
318−msgid "Enter %1"
319−msgstr "Մուտքագրեք %1"
320−
321−#: qml/Shell.qml:400
322−#, qt-format
323−msgid "Sorry, incorrect %1"
324−msgstr "Ներեցեք, սխալ %1"
325−
326−#: qml/Shell.qml:441
327msgid "Sorry, incorrect passphrase."
327msgid "Sorry, incorrect passphrase."
328msgstr "Ներեցեք, սխալ անցաբառ է"
328msgstr "Ներեցեք, սխալ անցաբառ է"
329
329
330−#: qml/Shell.qml:442
330+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331msgid "Sorry, incorrect passcode."
331msgid "Sorry, incorrect passcode."
332msgstr "Ներեցեք, սխալ ծածկագիր է:"
332msgstr "Ներեցեք, սխալ ծածկագիր է:"
333
333
334−#: qml/Shell.qml:443
334+#: qml/Shell.qml:492
335msgid "This will be your last attempt."
335msgid "This will be your last attempt."
336msgstr "Սա կլինի ձեր վերջին փորձը"
336msgstr "Սա կլինի ձեր վերջին փորձը"
337
337
338−#: qml/Shell.qml:445
338+#: qml/Shell.qml:494
339msgid ""
339msgid ""
340"If passphrase is entered incorrectly, your phone will conduct a factory "
340"If passphrase is entered incorrectly, your phone will conduct a factory "
341"reset and all personal data will be deleted."
341"reset and all personal data will be deleted."
342msgstr ""
342msgstr ""
343
343
344−#: qml/Shell.qml:446
344+#: qml/Shell.qml:495
345msgid ""
345msgid ""
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"and all personal data will be deleted."
347"and all personal data will be deleted."
348msgstr ""
348msgstr ""
349
349
350+#: qml/Wizard/Page.qml:89
351+msgid "Back"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:27
355+msgid "Hi!"
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:44
359+msgid "Welcome to your Ubuntu phone."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:52
363+msgid "Let’s get started."
364+msgstr ""
365+
366+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
367+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
368+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369+#: qml/Wizard/Pages/passwd-set.qml:90
370+msgid "Continue"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:25
374+msgid "Add a SIM card and restart your device"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:55
378+msgid "Without it, you won’t be able to make calls or use text messaging."
379+msgstr ""
380+
381+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
382+msgid "Skip"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:39
386+msgid "Lock security"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:74
390+msgid "Please select how you’d like to unlock your phone."
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:97
394+msgid "Swipe"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:98
398+msgid "No security"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:100
402+msgid "Passcode"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:101
406+msgid "4 digits only"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:103
410+msgid "Passphrase"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:104
414+msgid "Numbers and letters"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:28
418+msgid "Connect to Wi‑Fi"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:147
422+msgid "Available networks…"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/40-wifi.qml:148
426+msgid "No available networks."
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:27
430+msgid "Location"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:62
434+msgid "Let the phone detect your location:"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:69
438+msgid "Using GPS only (less accurate)"
439+msgstr ""
440+
441+#: qml/Wizard/Pages/50-location.qml:86
442+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
443+msgstr ""
444+
445+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
446+#: qml/Wizard/Pages/50-location.qml:103
447+msgid ""
448+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
449+"conditions</a>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:112
453+msgid "Not at all"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/50-location.qml:124
457+msgid "You can change your mind later in <b>System Settings</b>."
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:24
461+msgid "Improving your experience"
462+msgstr ""
463+
464+#: qml/Wizard/Pages/60-reporting.qml:36
465+msgid ""
466+"Your phone is set up to automatically report errors to Canonical and its "
467+"partners, the makers of the operating system."
468+msgstr ""
469+
470+#: qml/Wizard/Pages/60-reporting.qml:43
471+msgid ""
472+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
473+"Privacy</b>"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:24
477+msgid "All done"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:39
481+msgid "Nice work!"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:46
485+msgid "Your phone is now ready to use."
486+msgstr ""
487+
488+#: qml/Wizard/Pages/80-finished.qml:53
489+msgid "Finish"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/here-terms.qml:27
493+msgid "Terms & Conditions"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:49
497+msgid "Confirm passphrase"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:50
501+msgid "Confirm passcode"
502+msgstr ""
503+
504+#: qml/Wizard/Pages/passwd-confirm.qml:53
505+#: qml/Wizard/Pages/passwd-confirm.qml:54
506+msgid "Please try again."
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:61
510+msgid "Choose your passcode"
511+msgstr ""
512+
513+#: qml/Wizard/Pages/passwd-set.qml:68
514+msgid "Passphrase must be 4 characters long"
515+msgstr ""
516+
517+#: qml/Wizard/StackButton.qml:39
518+#, qt-format
519+msgid "〈 %1"
520+msgstr ""
521+
522+#: qml/Wizard/StackButton.qml:42
523+#, qt-format
524+msgid "%1 〉"
525+msgstr ""
526+
350#~ msgid "Confirm"
527#~ msgid "Confirm"
351#~ msgstr "Հաստատել"
528#~ msgstr "Հաստատել"
352
529
@@ -356,8 +533,17 @@ msgstr ""
356#~ msgid "Speaking..."
533#~ msgid "Speaking..."
357#~ msgstr "Խոսում եմ..."
534#~ msgstr "Խոսում եմ..."
358
535
536+#~ msgid "Favorites"
537+#~ msgstr "Նախընտրելի"
538+
539+#~ msgid "Done"
540+#~ msgstr "Կատարված է"
541+
359#~ msgid "Loading. Please Wait..."
542#~ msgid "Loading. Please Wait..."
360#~ msgstr "Բեռնվում է: Խնդրում ենք սպասել..."
543#~ msgstr "Բեռնվում է: Խնդրում ենք սպասել..."
361
544
362#~ msgid "Speak Now..."
545#~ msgid "Speak Now..."
363#~ msgstr "Հիմա խոսեք..."
546#~ msgstr "Հիմա խոսեք..."
547+
548+#~ msgid "All"
549+#~ msgstr "Բոլորը"
po/id.po+353−140

This diff is too big to show here.

po/is.po+277−88

This diff is too big to show here.

po/it.po+281−82

This diff is too big to show here.

po/ja.po+277−88

This diff is too big to show here.

po/km.po+264−78

This diff is too big to show here.

po/kn.po+251−74

This diff is too big to show here.

po/ko.po+268−79

This diff is too big to show here.

po/ku.po+264−78

This diff is too big to show here.

po/ky.po+251−74

This diff is too big to show here.

po/lo.po+251−74

This diff is too big to show here.

po/lt.po+251−74

This diff is too big to show here.

po/lv.po+262−76

This diff is too big to show here.

po/ml.po+251−74

This diff is too big to show here.

po/mr.po+251−74

This diff is too big to show here.

po/ms.po+268−79

This diff is too big to show here.

po/my.po+251−74

This diff is too big to show here.

po/nb.po+285−90

This diff is too big to show here.

po/nl.po+276−80

This diff is too big to show here.

po/pa.po+251−74

This diff is too big to show here.

po/pl.po+251−74

This diff is too big to show here.

po/pt.po+271−81

This diff is too big to show here.

po/pt_BR.po+275−86

This diff is too big to show here.

po/ro.po+290−90

This diff is too big to show here.

po/ru.po+280−82

This diff is too big to show here.

po/shn.po+251−74

This diff is too big to show here.

po/si.po+251−74

This diff is too big to show here.

po/sl.po+274−80

This diff is too big to show here.

po/sq.po+251−74

This diff is too big to show here.

po/sr.po+264−78

This diff is too big to show here.

po/sv.po+277−80

This diff is too big to show here.

po/sw.po+251−74

This diff is too big to show here.

po/ta.po+251−74

This diff is too big to show here.

po/te.po+251−74

This diff is too big to show here.

po/th.po+251−74

This diff is too big to show here.

po/tr.po+295−105

This diff is too big to show here.

po/ug.po+269−80

This diff is too big to show here.

po/uk.po+277−79

This diff is too big to show here.

po/unity8.pot+249−72

This diff is too big to show here.

po/vi.po+251−74

This diff is too big to show here.

po/xh.po+251−74

This diff is too big to show here.

po/zh_CN.po+265−79

This diff is too big to show here.

po/zh_HK.po+251−74

This diff is too big to show here.

po/zh_TW.po+273−87

This diff is too big to show here.

qml/CMakeLists.txt+1

This diff is too big to show here.

qml/Components/Carousel.qml+6−2

This diff is too big to show here.

qml/Components/Dialogs.qml+77−87

This diff is too big to show here.

qml/Components/DragHandle.qml+10−2

This diff is too big to show here.

qml/Components/EdgeDemo.qml+19−6

This diff is too big to show here.

qml/Components/EdgeDragEvaluator.qml+11−5

This diff is too big to show here.

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

This diff is too big to show here.

qml/Components/PanelState/qmldirnew file+1

This diff is too big to show here.

qml/Components/ResponsiveVerticalJournal.qml+1

This diff is too big to show here.

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

This diff is too big to show here.

qml/Components/Showable.qml+13

This diff is too big to show here.

qml/Components/WindowControlButtons.qmlnew file+60

This diff is too big to show here.

qml/Dash/CardCarousel.qml+6−2

This diff is too big to show here.

qml/Dash/CardGrid.qml+1−2

This diff is too big to show here.

qml/Dash/CardHorizontalList.qml+7−2

This diff is too big to show here.

qml/Dash/CardVerticalJournal.qml+1

This diff is too big to show here.

qml/Dash/Dash.qml+95−139

This diff is too big to show here.

qml/Dash/DashContent.qml+15−3

This diff is too big to show here.

qml/Dash/DashNavigation.qml+4

This diff is too big to show here.

qml/Dash/DashNavigationButton.qml+30−23

This diff is too big to show here.

qml/Dash/DashRenderer.qml+8−1

This diff is too big to show here.

qml/Dash/GenericScopeView.qml+124−27

This diff is too big to show here.

qml/Dash/PageHeader.qml+18−1

This diff is too big to show here.

qml/Dash/Previews/PreviewTable.qml+6

This diff is too big to show here.

qml/Dash/ScopeListView.qml+4−2

This diff is too big to show here.

qml/Dash/ScopesList.qmlnew file+132

This diff is too big to show here.

qml/Dash/ScopesListCategory.qmlnew file+176

This diff is too big to show here.

qml/Dash/ScopesListCategoryItem.qmlnew file+107

This diff is too big to show here.

qml/Dash/ScopesOverview.qmldeleted−575

This diff is too big to show here.

qml/Dash/ScopesOverviewAll.qmldeleted−54

This diff is too big to show here.

qml/Dash/ScopesOverviewFavorites.qmldeleted−73

This diff is too big to show here.

qml/Dash/ScopesOverviewTab.qmldeleted−74

This diff is too big to show here.

qml/Greeter/Clock.qml+11−1

This diff is too big to show here.

qml/Greeter/Greeter.qml+99−82

This diff is too big to show here.

qml/Greeter/GreeterContent.qml+11−2

This diff is too big to show here.

qml/Greeter/Infographics.qml+9−10

This diff is too big to show here.

qml/Launcher/Launcher.qml+13−4

This diff is too big to show here.

qml/Launcher/LauncherPanel.qml+2−1

This diff is too big to show here.

qml/Notifications/Notifications.qml+1−1

This diff is too big to show here.

qml/Panel/IndicatorItem.qml−8

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

qml/Panel/Indicators/MessageMenuItemFactory.qml+1

This diff is too big to show here.

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

The content is the same.

qml/Panel/IndicatorsBar.qml+29−20

This diff is too big to show here.

qml/Panel/IndicatorsMenu.qml+5

This diff is too big to show here.

qml/Panel/Panel.qml+17−2

This diff is too big to show here.

qml/Shell.qml+95−37

This diff is too big to show here.

qml/Stages/DecoratedWindow.qmlnew file+60

This diff is too big to show here.

qml/Stages/DesktopStage.qmlnew file+139

This diff is too big to show here.

qml/Stages/PhoneStage.qml+2−2

This diff is too big to show here.

qml/Stages/TabletStage.qml+2−2

This diff is too big to show here.

qml/Stages/TransformedSpreadDelegate.qml+10−3

This diff is too big to show here.

qml/Stages/WindowDecoration.qmlnew file+65

This diff is too big to show here.

qml/Stages/WindowMoveResizeArea.qmlnew file+98

This diff is too big to show here.

qml/Wizard/CheckableSetting.qmlnew file+84

This diff is too big to show here.

qml/Wizard/Page.qmlnew file+108

This diff is too big to show here.

qml/Wizard/Pages.qmlnew file+138

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

Binary file not shown.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

qml/Wizard/StackButton.qmlnew file+47

This diff is too big to show here.

qml/Wizard/Wizard.qmlnew file+55

This diff is too big to show here.

run.sh+3−26

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

src/main.cpp−6

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.h+20

This diff is too big to show here.

tests/mocks/CMakeLists.txt+3

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/LightDM/QLightDM/InfographicModeldeleted−1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Lights/qmldirnew file+3

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/QMenuModel/CMakeLists.txt+2

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/QMenuModel/plugin.cpp+13

This diff is too big to show here.

tests/mocks/Ubuntu/CMakeLists.txt+1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

The content is the same.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Wizard/qmldirnew file+3

This diff is too big to show here.

tests/plugins/CMakeLists.txt+1

This diff is too big to show here.

tests/plugins/Dash/horizontaljournaltest.qml+1

This diff is too big to show here.

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

This diff is too big to show here.

tests/plugins/Dash/organicgridtest.qml+1

This diff is too big to show here.

tests/plugins/Dash/verticaljournaltest.qml+1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/plugins/LightDM/greeter.qml+5

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/CMakeLists.txt+23−19

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle.cpp+4

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Greeter/tst_Infographics.qml+10

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Stages/tst_PhoneStage.qml+26

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/tst_Shell.qml+18−15

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml+87

This diff is too big to show here.

tests/qmltests/tst_TabletShell.qml+24−13

This diff is too big to show here.

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

This diff is too big to show here.