git.iko.soy/unity8
on xenial help sign in
Merge from trunk
fcb534aMichael Terry
CMakeLists.txt+6
compare with xenial
unifiedsplit
@@ -53,6 +53,7 @@ find_package(Qt5Qml 5.2 REQUIRED)
53find_package(Qt5Quick 5.2 REQUIRED)
53find_package(Qt5Quick 5.2 REQUIRED)
54find_package(Qt5Gui 5.2 REQUIRED)
54find_package(Qt5Gui 5.2 REQUIRED)
55find_package(Qt5DBus 5.2 REQUIRED)
55find_package(Qt5DBus 5.2 REQUIRED)
56+find_package(Qt5Concurrent 5.2 REQUIRED)
56
57
57# Standard install paths
58# Standard install paths
58include(GNUInstallDirs)
59include(GNUInstallDirs)
@@ -60,6 +61,11 @@ include(GNUInstallDirs)
60set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)
61set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)
61set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)
62set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)
62
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+
63execute_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)
64if(SHELL_INSTALL_QML STREQUAL "")
70if(SHELL_INSTALL_QML STREQUAL "")
65 message(FATAL_ERROR "Could not determine plugin installation dir.")
71 message(FATAL_ERROR "Could not determine plugin installation dir.")
build.sh+2−3
@@ -51,11 +51,10 @@ install_dependencies() {
51 qtdeclarative5-ubuntu-settings-components \
51 qtdeclarative5-ubuntu-settings-components \
52 qtdeclarative5-ubuntu-telephony0.1 \
52 qtdeclarative5-ubuntu-telephony0.1 \
53 qtdeclarative5-ubuntu-thumbnailer0.1 \
53 qtdeclarative5-ubuntu-thumbnailer0.1 \
54+ qtdeclarative5-unity-notifications-plugin \
54 qml-module-ubuntu-connectivity \
55 qml-module-ubuntu-connectivity \
55− unity-notifications-impl \
56 ubuntu-mobile-icons \
56 ubuntu-mobile-icons \
57− unity-scope-home \
57+ ubuntu-system-settings \
58− unity-lens-applications \
59 unity-plugin-scopes \
58 unity-plugin-scopes \
60 xvfb \
59 xvfb \
61 || exit 5
60 || exit 5
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+279
@@ -1,3 +1,282 @@
1+unity8 (8.02+15.04.20141216.1-0ubuntu1) vivid; urgency=low
2+
3+ [ Ubuntu daily release ]
4+ * New rebuild forced
5+
6+ [ Albert Astals ]
7+ * Need to wait until loaded is true to use the count property
8+ * Manage Dash: Ellide properly
9+
10+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 16 Dec 2014 11:03:37 +0000
11+
12+unity8 (8.02+15.04.20141215.3-0ubuntu1) vivid; urgency=low
13+
14+ [ Albert Astals Cid ]
15+ * ScopesList: Use the default scope style for the header
16+
17+ [ Daniel d'Andrada ]
18+ * Refactor Dialogs.qml to use proper in-scene dialogs
19+ * Make Greeter nicely handle being resized
20+
21+ [ Albert Astals ]
22+ * Rework how we set the ranges so we get some more asynchronousity
23+ from item views (LP: #1384374)
24+ * clickscope is back to being unfavoritable (LP: #1400762)
25+ * Fix clicking on the manage dash list after having moved the current
26+ scope
27+ * Make the drag range be a multiple of the drag "rate" value.
28+ Workarounds https://bugs.launchpad.net/mir/+bug/1399690
29+
30+ [ Gerry Boland ]
31+ * MockAppMan: emit SIGSTOP so AP test apps are run (LP: #1394208)
32+
33+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 15 Dec 2014 22:43:16 +0000
34+
35+unity8 (8.02+15.04.20141212.1-0ubuntu1) vivid; urgency=low
36+
37+ [ Ubuntu daily release ]
38+ * New rebuild forced
39+
40+ [ Albert Astals ]
41+ * Make Navigation work when "jumping" to the non root
42+
43+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 12 Dec 2014 12:28:10 +0000
44+
45+unity8 (8.02+15.04.20141211.2-0ubuntu1) vivid; urgency=medium
46+
47+ [ Michał Sawicz ]
48+ * Bump version due to new Manage Dash
49+
50+ [ Gerry Boland ]
51+ * [indicators] Fix positioning on panel resize.
52+
53+ [ Nick Dedekind ]
54+ * [indicators] Fix positioning on panel resize.
55+
56+ [ Albert Astals ]
57+ * Fix the Dash Header hamburger menu background color
58+ * Fix tests (LP: #1400449)
59+ * Allow pulling manage dash if there's no favorite scopes (LP:
60+ #1400774)
61+ * Manage Dash: Make store button work even if you have no favorites
62+ (LP: #1400771)
63+ * Make pot_file
64+
65+ [ CI Train Bot ]
66+ * Resync trunk
67+
68+ [ Andrea Cimitan ]
69+ * Remove dismiss timer in Launcher (LP: #1368778)
70+
71+ [ Michael Zanetti ]
72+ * decrease opacity changes in spread, move it to a separate surface.
73+ * Add an initial, rudimentary DesktopStage to get started
74+ * Uninvert Launcher in Desktop Mode
75+ * Add support for Wallpaper in Desktop stage
76+ * Add window control buttons to panel for fullscreen applications
77+
78+ [ Rodney Dawes ]
79+ * Add dependency on gir1.2-notify-0.7 to unity8-autopilot package.
80+ (LP: #1400437)
81+
82+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 11 Dec 2014 13:25:44 +0000
83+
84+unity8 (8.01+15.04.20141205-0ubuntu1) vivid; urgency=low
85+
86+ [ CI Train Bot ]
87+ * Resync trunk
88+
89+ [ Albert Astals ]
90+ * Replace Scopes Overview by the new Manage Dash (LP: #1386698,
91+ #1368670)
92+
93+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 05 Dec 2014 10:55:50 +0000
94+
95+unity8 (8.01+15.04.20141204-0ubuntu1) vivid; urgency=low
96+
97+ [ Michael Terry ]
98+ * Import wizard code from ubuntu-system-settings.
99+ * Convert the welcome wizard from a separate executable into a qml
100+ plugin (with a small C++ plugin for support).
101+ * Add tests for welcome wizard.
102+
103+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 04 Dec 2014 20:55:11 +0000
104+
105+unity8 (8.01+15.04.20141202-0ubuntu1) vivid; urgency=low
106+
107+ [ Michael Terry ]
108+ * Make sure that there is no window of opportunity for swiping away
109+ greeter before the lockscreen appears.
110+ * Don't allow dragging the greeter out from the left edge if it's
111+ hidden there. (LP: #1372952)
112+
113+ [ Michał Sawicz ]
114+ * Move from Theme colour to direct UbuntuColors.orange for activity
115+ indicator and preview buttons
116+
117+ [ Albert Astals ]
118+ * Use QImageReader not to load the image into memory twice (LP:
119+ #1384374)
120+ * Don't create the whole current scope delegates, just height * 3 (LP:
121+ #1384393, #1384374)
122+ * Make CroppedImageSizer async
123+ * Use ubuntu::connectivity::NetworkingStatus instead of
124+ QNetworkConfigurationManager
125+ * Compile with Qt 5.4 (LP: #1395636)
126+
127+ [ Michael Zanetti ]
128+ * close previews and temp scopes on left edge/BFB (LP: #1391798)
129+ * make spread reversible (LP: #1368668, #1355284, #1368677)
130+
131+ [ Andrea Cimitan ]
132+ * Different drag behaviour for not closable apps in spread (LP:
133+ #1368287)
134+
135+ [ Daniel d'Andrada ]
136+ * Make UnityTestCase.touchFlick properly map event coordinates
137+
138+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 02 Dec 2014 09:26:49 +0000
139+
140+unity8 (8.01+15.04.20141125.2-0ubuntu1) vivid; urgency=low
141+
142+ [ Michael Zanetti ]
143+ * improve snapping after dragging
144+ * Make the launcher BFB rounded on one end (LP: #1382596)
145+ * disable swipeToClose while some snapping is happening (LP: #1378938)
146+ * increase threshold and avoid jumping in SpreadDelegate dragging (LP:
147+ #1352842, #1350803)
148+
149+ [ Ying-Chun Liu ]
150+ * Notifications should be on right side when wide. (LP: 1379384) (LP:
151+ #1379384)
152+
153+ [ Albert Astals ]
154+ * Fix qml warnings
155+ * Fix some qmluitests
156+
157+ [ Lars Uebernickel ]
158+ * Use Icon instead of StatusIcon
159+
160+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 25 Nov 2014 13:54:47 +0000
161+
162+unity8 (8.01+15.04.20141117-0ubuntu1) vivid; urgency=low
163+
164+ [ josharenson ]
165+ * Return focus to the application after a tusted session overlay is
166+ closing. (LP: #1381292)
167+
168+ [ Josh Arenson ]
169+ * Return focus to the application after a tusted session overlay is
170+ closing. (LP: #1381292)
171+
172+ [ Albert Astals ]
173+ * Remove unused ResponsiveFlowView
174+ * Fix a few cmake warnings when running ./build.sh in a clean checkout
175+
176+ [ Mirco Müller ]
177+ * Make sure non-square icons are not cropped. (LP: #1378417)
178+
179+ [ Michael Terry ]
180+ * Drop the "EARLY ALPHA" scare label when running in testing mode.
181+
182+ [ Michael Zanetti ]
183+ * unify Greeter and Lockscreen wallpaper again
184+ * hide quicklist when launcher hides (LP: #1387088)
185+ * Keep applications suspended while lockscreen is shown (LP: #1378126)
186+ * change spread background color to 111111
187+
188+ [ Omer Akram ]
189+ * show password when tapped on the 'Show password' label, not just the
190+ checkbox. (LP: #1389832)
191+
192+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 17 Nov 2014 13:48:33 +0000
193+
194+unity8 (8.01+15.04.20141107.2-0ubuntu2) vivid; urgency=medium
195+
196+ * No-change rebuild against Qt 5.3.2.
197+
198+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Sat, 08 Nov 2014 13:50:11 +0200
199+
200+unity8 (8.01+15.04.20141107.2-0ubuntu1) vivid; urgency=low
201+
202+ [ Michael Terry ]
203+ * Skip second SIM unlock dialog if user presses Emergency Call on
204+ first one (LP: #1387925)
205+
206+ [ Michael Zanetti ]
207+ * fix positive/negative answer order on the new swipe notification
208+ (LP: #1358343)
209+ * Update PageHeader to use new SDK api
210+ * antialias surfaces when in spread (LP: #1351559)
211+
212+ [ Albert Astals ]
213+ * Remove Hud
214+
215+ [ Mirco Müller ]
216+ * Replace ComboButton in snap-decision notifications, used for
217+ additional actions (> 3 actions), with custom widget immune to
218+ accidental taps. (LP: #1384730)
219+
220+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 07 Nov 2014 14:33:02 +0000
221+
222+unity8 (8.01+15.04.20141104-0ubuntu1) vivid; urgency=low
223+
224+ [ Sebastien Bacher ]
225+ * Drop workaround, it's not needed and create issues for desktop-next
226+ (LP: #1387671)
227+
228+ [ Albert Astals ]
229+ * Do not append integer to char *
230+ * Remove unused end() function
231+ * Update build.sh
232+ * Fix i18n
233+
234+ [ Michael Zanetti ]
235+ * rework launcher quicklist visuals to fit new design (LP: #1368660)
236+ * Fix DBusVariant conversion for launcher emblems (LP: #1387261)
237+ * Fix desktop file encoding in launcher (LP: #1387083)
238+ * Add a hinting animation to indicate changes in the backend (LP:
239+ #1376707)
240+
241+ [ Alberto Aguirre ]
242+ * Add audioRole to QtMultimedia mock
243+ * Add a plugin to take screenshots on vol up + vol down
244+
245+ [ CI bot ]
246+ * Fix relative time formatter when using non-UTC timezone. (LP:
247+ #1378821)
248+
249+ [ Leo Arias ]
250+ * Removed the tests for the alternate paths of the autopilot helpers.
251+
252+ [ Nick Dedekind ]
253+ * Fix relative time formatter when using non-UTC timezone. (LP:
254+ #1378821)
255+ * Reset current item selection on deleted. (LP: #1378462)
256+ * Added timer to re-assert server value after indicator menu item
257+ activation. (LP: #1336715)
258+
259+ [ Mirco Müller ]
260+ * Added dedicated swipe-to-act button for snap-decisions, which avoids
261+ accidental taps/button-presses. (LP: #1358343)
262+
263+ [ Chris Gagnon ]
264+ * add missing unity-scope-click dependancy to unity8-autopilot package
265+ (LP: #1336276)
266+
267+ [ Michael Terry ]
268+ * Don't lock phone if user tries to switch back to an active call.
269+ (LP: #1388156)
270+
271+ [ Daniel d'Andrada ]
272+ * DirectionalDragArea: Update TODO comment in light of new events
273+ * TouchDispatcher: synthesize MouseButtonDblClick events
274+
275+ [ Leonardo Arias Fonseca ]
276+ * Removed the tests for the alternate paths of the autopilot helpers.
277+
278+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 04 Nov 2014 12:56:08 +0000
279+
1unity8 (8.01+15.04.20141030-0ubuntu1) vivid; urgency=medium
280unity8 (8.01+15.04.20141030-0ubuntu1) vivid; urgency=medium
2
281
3 [ Michael Terry ]
282 [ Michael Terry ]
debian/control+14−7
@@ -12,20 +12,20 @@ Build-Depends: cmake,
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.
14 g++-4.9,
14 g++-4.9,
15− libdee-qt5-dev (>= 3.2),
15+ libconnectivity-qt1-dev,
16 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
16 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
17 libgl1-mesa-dri,
17 libgl1-mesa-dri,
18 libgles2-mesa-dev[armhf],
18 libgles2-mesa-dev[armhf],
19 libglib2.0-dev,
19 libglib2.0-dev,
20 libgsettings-qt-dev,
20 libgsettings-qt-dev,
21 libhardware-dev,
21 libhardware-dev,
22− libhud-client2-dev,
23 libpam0g-dev,
22 libpam0g-dev,
24 libpay2-dev,
23 libpay2-dev,
25 libpulse-dev,
24 libpulse-dev,
26 libqmenumodel-dev (>= 0.2.8),
25 libqmenumodel-dev (>= 0.2.8),
27 libqt5xmlpatterns5-dev,
26 libqt5xmlpatterns5-dev,
27+ libsystemsettings-dev,
28− libunity-api-dev (>= 7.92),
28+ libunity-api-dev (>= 7.94),
29 libusermetricsoutput1-dev,
29 libusermetricsoutput1-dev,
30 libxcb1-dev,
30 libxcb1-dev,
31 pkg-config,
31 pkg-config,
@@ -33,6 +33,7 @@ Build-Depends: cmake,
33 python3-all:any,
33 python3-all:any,
34 python3-setuptools,
34 python3-setuptools,
35 python:any (>= 2.7),
35 python:any (>= 2.7),
36+ qml-module-qt-labs-folderlistmodel,
36 qml-module-qtquick-layouts,
37 qml-module-qtquick-layouts,
37 qml-module-qtquick-xmllistmodel,
38 qml-module-qtquick-xmllistmodel,
38 qml-module-qtquick2,
39 qml-module-qtquick2,
@@ -46,7 +47,8 @@ Build-Depends: cmake,
46 qtdeclarative5-private-dev (>= 5.2.1),
47 qtdeclarative5-private-dev (>= 5.2.1),
47 qtdeclarative5-qtmultimedia-plugin,
48 qtdeclarative5-qtmultimedia-plugin,
48 qtdeclarative5-ubuntu-settings-components (>= 0.4),
49 qtdeclarative5-ubuntu-settings-components (>= 0.4),
49− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
50+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
51+ qtdeclarative5-ubuntu-web-plugin,
50 ttf-ubuntu-font-family,
52 ttf-ubuntu-font-family,
51Standards-Version: 3.9.4
53Standards-Version: 3.9.4
52Homepage: http://launchpad.net/unity
54Homepage: http://launchpad.net/unity
@@ -60,7 +62,7 @@ X-Ubuntu-Use-Langpack: yes
60Package: indicators-client
62Package: indicators-client
61Architecture: amd64 armhf i386
63Architecture: amd64 armhf i386
62Depends: qmenumodel-qml (>= 0.2.8),
64Depends: qmenumodel-qml (>= 0.2.8),
63− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
65+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
64 unity8 (= ${binary:Version}),
66 unity8 (= ${binary:Version}),
65 ${misc:Depends},
67 ${misc:Depends},
66 ${shlibs:Depends},
68 ${shlibs:Depends},
@@ -84,10 +86,13 @@ Depends: gsettings-desktop-schemas,
84 libcap2-bin,
86 libcap2-bin,
85 libglib2.0-bin,
87 libglib2.0-bin,
86 qmenumodel-qml (>= 0.2.8),
88 qmenumodel-qml (>= 0.2.8),
89+ qml-module-qt-labs-folderlistmodel,
87 qml-module-qtquick-xmllistmodel,
90 qml-module-qtquick-xmllistmodel,
88 qtdeclarative5-gsettings1.0,
91 qtdeclarative5-gsettings1.0,
89 qtdeclarative5-qtmir-plugin (>= 0.4.4),
92 qtdeclarative5-qtmir-plugin (>= 0.4.4),
90 qtdeclarative5-ubuntu-telephony0.1,
93 qtdeclarative5-ubuntu-telephony0.1,
94+ qtdeclarative5-ubuntu-web-plugin,
95+ ubuntu-system-settings,
91 unity-launcher-impl-4,
96 unity-launcher-impl-4,
92 unity8-common (= ${source:Version}),
97 unity8-common (= ${source:Version}),
93 unity8-private (= ${binary:Version}),
98 unity8-private (= ${binary:Version}),
@@ -102,6 +107,7 @@ Breaks: indicator-network (<< 0.5.1+14.10.20141014),
102 unity8-greeter (<< 7.89),
107 unity8-greeter (<< 7.89),
103Replaces: ubuntu-touch-session (<< 0.82~),
108Replaces: ubuntu-touch-session (<< 0.82~),
104 unity8-greeter (<< 7.89),
109 unity8-greeter (<< 7.89),
110+Conflicts: ubuntu-system-settings-wizard,
105Description: Unity 8 shell
111Description: Unity 8 shell
106 The Unity 8 shell is the primary user interface for Ubuntu devices.
112 The Unity 8 shell is the primary user interface for Ubuntu devices.
107
113
@@ -110,7 +116,7 @@ Architecture: all
110Depends: qml-module-qtquick-layouts,
116Depends: qml-module-qtquick-layouts,
111 qtdeclarative5-ubuntu-settings-components (>= 0.4),
117 qtdeclarative5-ubuntu-settings-components (>= 0.4),
112 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
118 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
113− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
119+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
114 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
120 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
115 ubuntu-thumbnailer-impl-0,
121 ubuntu-thumbnailer-impl-0,
116 unity-application-impl-4,
122 unity-application-impl-4,
@@ -130,6 +136,7 @@ Description: Unity 8 shell (common files)
130Package: unity8-autopilot
136Package: unity8-autopilot
131Architecture: all
137Architecture: all
132Depends: gir1.2-glib-2.0,
138Depends: gir1.2-glib-2.0,
139+ gir1.2-notify-0.7,
133 libautopilot-qt (>= 1.4),
140 libautopilot-qt (>= 1.4),
134 libqt5test5,
141 libqt5test5,
135 libqt5widgets5,
142 libqt5widgets5,
@@ -143,6 +150,7 @@ Depends: gir1.2-glib-2.0,
143 python3-fixtures,
150 python3-fixtures,
144 python3-gi,
151 python3-gi,
145 ubuntu-ui-toolkit-autopilot,
152 ubuntu-ui-toolkit-autopilot,
153+ unity-scope-click,
146 unity8 (= ${source:Version}),
154 unity8 (= ${source:Version}),
147 unity8-fake-env (= ${source:Version}),
155 unity8-fake-env (= ${source:Version}),
148 url-dispatcher-tools,
156 url-dispatcher-tools,
@@ -174,7 +182,6 @@ Depends: accountsservice-ubuntu-schemas (>= 0.0.3),
174 libhardware2,
182 libhardware2,
175 unity-schemas (>= 7.3.1+14.10.20140915),
183 unity-schemas (>= 7.3.1+14.10.20140915),
176 pay-service,
184 pay-service,
177− qml-module-ubuntu-connectivity,
178 ${misc:Depends},
185 ${misc:Depends},
179 ${shlibs:Depends},
186 ${shlibs:Depends},
180Provides: unity-launcher-impl,
187Provides: unity-launcher-impl,
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+2−1
@@ -1,14 +1,15 @@
1usr/lib/*/libunity8-private.*
1usr/lib/*/libunity8-private.*
2usr/lib/*/unity8/qml/AccountsService
2usr/lib/*/unity8/qml/AccountsService
3usr/lib/*/unity8/qml/Dash
3usr/lib/*/unity8/qml/Dash
4−usr/lib/*/unity8/qml/HudClient
5usr/lib/*/unity8/qml/LightDM
4usr/lib/*/unity8/qml/LightDM
6usr/lib/*/unity8/qml/Lights
5usr/lib/*/unity8/qml/Lights
7usr/lib/*/unity8/qml/Powerd
6usr/lib/*/unity8/qml/Powerd
8usr/lib/*/unity8/qml/SessionBroadcast
7usr/lib/*/unity8/qml/SessionBroadcast
8+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−1
@@ -6,10 +6,10 @@ usr/bin/unity8-dash
6usr/share/applications/unity8.desktop
6usr/share/applications/unity8.desktop
7usr/share/applications/unity8-dash.desktop
7usr/share/applications/unity8-dash.desktop
8usr/share/unity8/Greeter
8usr/share/unity8/Greeter
9−usr/share/unity8/Hud
10usr/share/unity8/Launcher
9usr/share/unity8/Launcher
11usr/share/unity8/Panel
10usr/share/unity8/Panel
12usr/share/unity8/Shell.qml
11usr/share/unity8/Shell.qml
13usr/share/unity8/Stages
12usr/share/unity8/Stages
14usr/share/unity8/Tutorial
13usr/share/unity8/Tutorial
14+usr/share/unity8/Wizard
15usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
15usr/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 }
libs/UbuntuGestures/DebugHelpers.cpp+1−1
@@ -83,7 +83,7 @@ QString mouseEventToString(const QMouseEvent *ev)
83 message.append("MouseButtonDblClick ");
83 message.append("MouseButtonDblClick ");
84 break;
84 break;
85 case QEvent::MouseMove:
85 case QEvent::MouseMove:
86− message.append("MouseButtonMove ");
86+ message.append("MouseMove ");
87 break;
87 break;
88 default:
88 default:
89 message.append("INVALID_MOUSE_EVENT_TYPE ");
89 message.append("INVALID_MOUSE_EVENT_TYPE ");
libs/UbuntuGestures/Pool.h−2
@@ -74,8 +74,6 @@ public:
74 ItemType *item;
74 ItemType *item;
75 };
75 };
76
76
77− Iterator &end() const { return Iterator(); }
78−
79 ItemType &getEmptySlot() {
77 ItemType &getEmptySlot() {
80 Q_ASSERT(m_lastUsedIndex < m_slots.size());
78 Q_ASSERT(m_lastUsedIndex < m_slots.size());
81
79
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+2−1
@@ -12,12 +12,13 @@ macro(add_unity8_plugin PLUGIN VERSION PATH)
12endmacro()
12endmacro()
13
13
14add_subdirectory(AccountsService)
14add_subdirectory(AccountsService)
15−add_subdirectory(HudClient)
16add_subdirectory(LightDM)
15add_subdirectory(LightDM)
17add_subdirectory(Lights)
16add_subdirectory(Lights)
18add_subdirectory(Dash)
17add_subdirectory(Dash)
19add_subdirectory(Powerd)
18add_subdirectory(Powerd)
20add_subdirectory(SessionBroadcast)
19add_subdirectory(SessionBroadcast)
20+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/CMakeLists.txt+3−2
@@ -11,7 +11,6 @@ include_directories(
11 ${CMAKE_CURRENT_SOURCE_DIR}
11 ${CMAKE_CURRENT_SOURCE_DIR}
12 ${CMAKE_CURRENT_BINARY_DIR}
12 ${CMAKE_CURRENT_BINARY_DIR}
13 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
13 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
14− ${Qt5Quick_INCLUDE_DIRS}
15 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
14 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
16 ${Qt5V8_PRIVATE_INCLUDE_DIR}
15 ${Qt5V8_PRIVATE_INCLUDE_DIR}
17)
16)
@@ -25,6 +24,8 @@ set(QMLPLUGIN_SRC
25 verticaljournal.cpp
24 verticaljournal.cpp
26 horizontaljournal.cpp
25 horizontaljournal.cpp
27 organicgrid.cpp
26 organicgrid.cpp
27+ croppedimagesizer.cpp
28+ croppedimagesizerasyncworker.cpp
28 )
29 )
29
30
30add_library(Dash-qml MODULE
31add_library(Dash-qml MODULE
@@ -36,6 +37,6 @@ target_link_libraries(Dash-qml
36 ${Qt5Quick_LIBRARIES}
37 ${Qt5Quick_LIBRARIES}
37 )
38 )
38
39
39−qt5_use_modules(Dash-qml Qml Quick)
40+qt5_use_modules(Dash-qml Qml Quick Concurrent)
40
41
41add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)
42add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)
plugins/Dash/CardAttributes.qml+1−3
@@ -17,7 +17,6 @@
17import QtQuick 2.2
17import QtQuick 2.2
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.1
19import Ubuntu.Components 1.1
20−import Ubuntu.Settings.Components 0.1
21
20
22GridLayout {
21GridLayout {
23 id: grid
22 id: grid
@@ -47,10 +46,9 @@ GridLayout {
47 Layout.maximumWidth: Math.max(icon.width, label.x + label.implicitWidth)
46 Layout.maximumWidth: Math.max(icon.width, label.x + label.implicitWidth)
48 Layout.fillWidth: true
47 Layout.fillWidth: true
49 height: units.gu(2)
48 height: units.gu(2)
50− StatusIcon {
49+ Icon {
51 id: icon
50 id: icon
52 height: units.gu(2)
51 height: units.gu(2)
53− sets: ["actions", "status", "apps"]
54 source: "icon" in modelData && modelData["icon"] || ""
52 source: "icon" in modelData && modelData["icon"] || ""
55 color: grid.color
53 color: grid.color
56 }
54 }
plugins/Dash/CardCreator.js+9−11
@@ -82,16 +82,16 @@ var kArtShapeHolderCode = 'Item { \n\
82 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); \n\
82 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); \n\
83 } \n\
83 } \n\
84 } \n\
84 } \n\
85− image: CroppedImageMinimumSourceSize { \n\
85+ CroppedImageMinimumSourceSize { \n\
86+ id: artImage; \n\
86 objectName: "artImage"; \n\
87 objectName: "artImage"; \n\
87− property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
88− source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; } \n\
88+ source: cardData && cardData["art"] || ""; \n\
89− cache: true; \n\
90 asynchronous: root.asynchronous; \n\
89 asynchronous: root.asynchronous; \n\
91 visible: false; \n\
90 visible: false; \n\
92 width: %2; \n\
91 width: %2; \n\
93 height: %3; \n\
92 height: %3; \n\
94 } \n\
93 } \n\
94+ image: artImage.image; \n\
95 } \n\
95 } \n\
96 } \n\
96 } \n\
97 }\n';
97 }\n';
@@ -181,11 +181,11 @@ var kMascotShapeLoaderCode = 'Loader { \n\
181 id: mascotShapeLoader; \n\
181 id: mascotShapeLoader; \n\
182 objectName: "mascotShapeLoader"; \n\
182 objectName: "mascotShapeLoader"; \n\
183 asynchronous: root.asynchronous; \n\
183 asynchronous: root.asynchronous; \n\
184− active: mascotImage.status === Image.Ready; \n\
184+ active: mascotImage.image.status === Image.Ready; \n\
185 visible: showHeader && active && status == Loader.Ready; \n\
185 visible: showHeader && active && status == Loader.Ready; \n\
186 width: units.gu(6); \n\
186 width: units.gu(6); \n\
187 height: units.gu(5.625); \n\
187 height: units.gu(5.625); \n\
188− sourceComponent: UbuntuShape { image: mascotImage } \n\
188+ sourceComponent: UbuntuShape { image: mascotImage.image } \n\
189 anchors { %1 } \n\
189 anchors { %1 } \n\
190 }\n';
190 }\n';
191
191
@@ -195,8 +195,7 @@ var kMascotImageCode = 'CroppedImageMinimumSourceSize { \n\
195 id: mascotImage; \n\
195 id: mascotImage; \n\
196 objectName: "mascotImage"; \n\
196 objectName: "mascotImage"; \n\
197 anchors { %1 } \n\
197 anchors { %1 } \n\
198− property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
199− source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; } \n\
198+ source: cardData && cardData["mascot"] || ""; \n\
200 width: units.gu(6); \n\
199 width: units.gu(6); \n\
201 height: units.gu(5.625); \n\
200 height: units.gu(5.625); \n\
202 horizontalAlignment: Image.AlignHCenter; \n\
201 horizontalAlignment: Image.AlignHCenter; \n\
@@ -225,7 +224,7 @@ var kTitleLabelCode = 'Label { \n\
225
224
226// %1 is used as extra anchors of emblemIcon
225// %1 is used as extra anchors of emblemIcon
227// %2 is used as color of emblemIcon
226// %2 is used as color of emblemIcon
228−var kEmblemIconCode = 'StatusIcon { \n\
227+var kEmblemIconCode = 'Icon { \n\
229 id: emblemIcon; \n\
228 id: emblemIcon; \n\
230 objectName: "emblemIcon"; \n\
229 objectName: "emblemIcon"; \n\
231 anchors { \n\
230 anchors { \n\
@@ -435,7 +434,7 @@ function cardString(template, components) {
435 mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);
434 mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);
436 }
435 }
437
436
438− var mascotImageVisible = useMascotShape ? 'false' : 'showHeader && resized';
437+ var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
439 mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);
438 mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);
440 }
439 }
441
440
@@ -655,7 +654,6 @@ function createCardComponent(parent, template, components) {
655 var imports = 'import QtQuick 2.2; \n\
654 var imports = 'import QtQuick 2.2; \n\
656 import Ubuntu.Components 1.1; \n\
655 import Ubuntu.Components 1.1; \n\
657 import Ubuntu.Settings.Components 0.1; \n\
656 import Ubuntu.Settings.Components 0.1; \n\
658− import Ubuntu.Connectivity 1.0; \n\
659 import Dash 0.1;\n\
657 import Dash 0.1;\n\
660 import Utils 0.1;\n';
658 import Utils 0.1;\n';
661 var card = cardString(template, components);
659 var card = cardString(template, components);
plugins/Dash/CroppedImageMinimumSourceSize.qml+24−18
@@ -15,24 +15,30 @@
15 */
15 */
16
16
17import QtQuick 2.3
17import QtQuick 2.3
18+import Dash 0.1
18
19
19−Image {
20+Item {
20− property bool resized: false
21+ id: root
21− property bool resizing: false
22+
23+ property string source
24+ property alias image: innerImage
25+ property alias asynchronous: innerImage.asynchronous
26+ property alias verticalAlignment: innerImage.verticalAlignment
27+ property alias horizontalAlignment: innerImage.horizontalAlignment
28+ property alias fillMode: innerImage.fillMode
29+
30+ CroppedImageSizer {
31+ id: sizer
32+ source: root.source
33+ width: root.width
34+ height: root.height
35+ }
36+
37+ Image {
38+ id: innerImage
39+ anchors.fill: parent
22− fillMode: Image.PreserveAspectCrop
40+ fillMode: Image.PreserveAspectCrop
23− visible: resized
41+ sourceSize: sizer.sourceSize.width == 0 && sizer.sourceSize.height == 0 ? undefined : sizer.sourceSize
24− onSourceSizeChanged: {
25− if (!resized && !resizing) {
26− resizing = true;
27− var ar = width / height;
28− var ssar = sourceSize.width / sourceSize.height;
42+ source: sizer.sourceSize.width == -1 && sizer.sourceSize.height == -1 ? "" : root.source
29− if (ar > ssar) {
30− sourceSize = Qt.size(width, 0);
31− } else {
32− sourceSize = Qt.size(0, height);
33− }
34− resizing = false;
35− resized = true;
36− }
37 }
43 }
38}
44}
plugins/Dash/ScopeStyle.qml+1−1
@@ -70,7 +70,7 @@ QtObject {
70 readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"
70 readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"
71
71
72 /// Color of the primary preview button
72 /// Color of the primary preview button
73− readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : Theme.palette.selected.foreground
73+ readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : UbuntuColors.orange
74
74
75 //! @cond
75 //! @cond
76 property var d: QtObject {
76 property var d: QtObject {
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+10
@@ -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
@@ -104,7 +109,11 @@ private:
104 virtual void doRelayout() = 0;
109 virtual void doRelayout() = 0;
105 virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;
110 virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;
106 virtual void calculateImplicitHeight() = 0;
111 virtual void calculateImplicitHeight() = 0;
112+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
107 virtual void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) = 0;
113 virtual void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) = 0;
114+#else
115+ virtual void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) = 0;
116+#endif
108
117
109 QQmlDelegateModel *m_delegateModel;
118 QQmlDelegateModel *m_delegateModel;
110
119
@@ -113,6 +122,7 @@ private:
113
122
114 int m_columnSpacing;
123 int m_columnSpacing;
115 int m_rowSpacing;
124 int m_rowSpacing;
125+ int m_buffer;
116 qreal m_displayMarginBeginning;
126 qreal m_displayMarginBeginning;
117 qreal m_displayMarginEnd;
127 qreal m_displayMarginEnd;
118 bool m_needsRelayout;
128 bool m_needsRelayout;
plugins/Dash/croppedimagesizer.cppnew file+136
@@ -0,0 +1,136 @@
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+#include "croppedimagesizer.h"
18+
19+#include "croppedimagesizerasyncworker.h"
20+
21+#include <QNetworkAccessManager>
22+#include <QNetworkRequest>
23+#include <QQmlEngine>
24+#include <QQuickItem>
25+
26+CroppedImageSizer::CroppedImageSizer()
27+ : m_width(0),
28+ m_height(0),
29+ m_sourceSize(QSize(-1, -1)),
30+ m_worker(nullptr)
31+{
32+ connect(this, &CroppedImageSizer::inputParamsChanged, this, &CroppedImageSizer::calculateSourceSize);
33+ connect(this, &CroppedImageSizer::sourceChanged, this, &CroppedImageSizer::requestImage);
34+}
35+
36+CroppedImageSizer::~CroppedImageSizer()
37+{
38+ if (m_worker) {
39+ m_worker->abort();
40+ }
41+}
42+
43+QUrl CroppedImageSizer::source() const
44+{
45+ return m_source;
46+}
47+
48+void CroppedImageSizer::setSource(const QUrl &source)
49+{
50+ if (source != m_source) {
51+ m_source = source;
52+ Q_EMIT sourceChanged();
53+ }
54+}
55+
56+qreal CroppedImageSizer::width() const
57+{
58+ return m_width;
59+}
60+
61+void CroppedImageSizer::setWidth(qreal width)
62+{
63+ if (width != m_width) {
64+ m_width = width;
65+ Q_EMIT inputParamsChanged();
66+ }
67+}
68+
69+qreal CroppedImageSizer::height() const
70+{
71+ return m_height;
72+}
73+
74+void CroppedImageSizer::setHeight(qreal height)
75+{
76+ if (height != m_height) {
77+ m_height = height;
78+ Q_EMIT inputParamsChanged();
79+ }
80+}
81+
82+QSize CroppedImageSizer::sourceSize() const
83+{
84+ return m_sourceSize;
85+}
86+
87+void CroppedImageSizer::setSourceSize(const QSize &sourceSize)
88+{
89+ if (sourceSize != m_sourceSize) {
90+ m_sourceSize = sourceSize;
91+ Q_EMIT sourceSizeChanged();
92+ }
93+}
94+
95+void CroppedImageSizer::setImageSize(const QSize &imageSize)
96+{
97+ m_imageSize = imageSize;
98+ m_worker = nullptr;
99+ calculateSourceSize();
100+}
101+
102+void CroppedImageSizer::requestImage()
103+{
104+ if (m_worker) {
105+ m_worker->abort();
106+ m_worker = nullptr;
107+ }
108+
109+ if (m_source.isValid() && qmlEngine(this) && qmlEngine(this)->networkAccessManager()) {
110+ QNetworkRequest request(m_source);
111+ QNetworkReply *reply = qmlEngine(this)->networkAccessManager()->get(request);
112+ m_worker = new CroppedImageSizerAsyncWorker(this, reply);
113+ } else {
114+ setSourceSize(QSize(-1, -1));
115+ }
116+}
117+
118+void CroppedImageSizer::calculateSourceSize()
119+{
120+ if (m_source.isValid() && m_width > 0 && m_height > 0 && !m_worker) {
121+ if (!m_imageSize.isEmpty()) {
122+ const qreal ar = m_width / m_height;
123+ const qreal ssar = m_imageSize.width() / (qreal)m_imageSize.height();
124+ if (ar > ssar) {
125+ setSourceSize(QSize(m_width, 0));
126+ } else {
127+ setSourceSize(QSize(0, m_height));
128+ }
129+ } else {
130+ qWarning() << "Invalid size for " << m_source << m_imageSize;
131+ setSourceSize(QSize(0, 0));
132+ }
133+ } else {
134+ setSourceSize(QSize(-1, -1));
135+ }
136+}
plugins/Dash/croppedimagesizer.hnew file+72
@@ -0,0 +1,72 @@
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 CROPPEDIMAGESIZER_H
18+#define CROPPEDIMAGESIZER_H
19+
20+#include <QImageReader>
21+#include <QObject>
22+#include <QSize>
23+#include <QUrl>
24+
25+class CroppedImageSizerAsyncWorker;
26+
27+class CroppedImageSizer : public QObject
28+{
29+ Q_OBJECT
30+
31+ Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
32+ Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY inputParamsChanged)
33+ Q_PROPERTY(qreal height READ height WRITE setHeight NOTIFY inputParamsChanged)
34+ Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)
35+
36+public:
37+ CroppedImageSizer();
38+ ~CroppedImageSizer();
39+
40+ QUrl source() const;
41+ void setSource(const QUrl &source);
42+
43+ qreal width() const;
44+ void setWidth(qreal width);
45+
46+ qreal height() const;
47+ void setHeight(qreal height);
48+
49+ QSize sourceSize() const;
50+ void setSourceSize(const QSize &sourceSize);
51+
52+ Q_INVOKABLE void setImageSize(const QSize &imageSize);
53+
54+Q_SIGNALS:
55+ void inputParamsChanged();
56+ void sourceChanged();
57+ void sourceSizeChanged();
58+
59+private Q_SLOT:
60+ void calculateSourceSize();
61+ void requestImage();
62+
63+private:
64+ QUrl m_source;
65+ qreal m_width;
66+ qreal m_height;
67+ QSize m_sourceSize;
68+ QSize m_imageSize;
69+ QPointer<CroppedImageSizerAsyncWorker> m_worker;
70+};
71+
72+#endif
plugins/Dash/croppedimagesizerasyncworker.cppnew file+74
@@ -0,0 +1,74 @@
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+#include "croppedimagesizerasyncworker.h"
18+
19+#include "croppedimagesizer.h"
20+
21+#include <QNetworkReply>
22+#include <QtConcurrentRun>
23+
24+CroppedImageSizerAsyncWorker::CroppedImageSizerAsyncWorker(CroppedImageSizer *sizer, QNetworkReply *reply)
25+ : m_sizer(sizer),
26+ m_reply(reply),
27+ m_ignoreAbort(false)
28+{
29+ connect(m_reply, &QNetworkReply::finished, this, &CroppedImageSizerAsyncWorker::requestFinished);
30+}
31+
32+void CroppedImageSizerAsyncWorker::abort()
33+{
34+ // This runs on main thread
35+ QMutexLocker locker(&m_mutex);
36+ m_sizer = nullptr;
37+ // If we already started the future run we can't abort the reply
38+ // since we don't know at which stage the future is, just let it finish
39+ if (!m_ignoreAbort) {
40+ QMetaObject::invokeMethod(m_reply, "abort", Qt::QueuedConnection);
41+ }
42+}
43+
44+void CroppedImageSizerAsyncWorker::requestFinished()
45+{
46+ // This runs on main thread
47+ QMutexLocker locker(&m_mutex);
48+ if (m_sizer) {
49+ m_ignoreAbort = true;
50+ QtConcurrent::run(processRequestFinished, this);
51+ } else {
52+ // We were aborted delete ourselves
53+ m_reply->deleteLater();
54+ deleteLater();
55+ }
56+}
57+
58+void CroppedImageSizerAsyncWorker::processRequestFinished(CroppedImageSizerAsyncWorker *worker)
59+{
60+ // This runs on non main thread
61+ // m_reply has finished at this point and is protected against change by m_ignoreAbort
62+ QImageReader reader(worker->m_reply);
63+ const QSize imageSize = reader.size();
64+
65+ worker->m_mutex.lock();
66+ if (worker->m_sizer) {
67+ QMetaObject::invokeMethod(worker->m_sizer, "setImageSize", Qt::QueuedConnection, Q_ARG(QSize, imageSize));
68+ }
69+ worker->m_mutex.unlock();
70+
71+ // All work is done, delete ourselves
72+ worker->m_reply->deleteLater();
73+ worker->deleteLater();
74+}
plugins/HudClient/hudtoolbarmodel.h → plugins/Dash/croppedimagesizerasyncworker.hrenamed+18−15
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2014 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -14,31 +14,34 @@
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 HUDTOOLBARMODEL_H
17+#ifndef CROPPEDIMAGESIZERASYNCWORKER_H
18−#define HUDTOOLBARMODEL_H
18+#define CROPPEDIMAGESIZERASYNCWORKER_H
19
19
20−#include <QAbstractListModel>
20+#include <QMutex>
21+#include <QObject>
21
22
22−#include <hud-client.h>
23+class CroppedImageSizer;
23
24
24−class HudToolBarModel : public QAbstractListModel
25+class QNetworkReply;
26+
27+class CroppedImageSizerAsyncWorker : public QObject
25{
28{
26 Q_OBJECT
29 Q_OBJECT
27−
28public:
30public:
29− HudToolBarModel(HudClientQuery *query);
31+ CroppedImageSizerAsyncWorker(CroppedImageSizer *sizer, QNetworkReply *reply);
30− ~HudToolBarModel();
31
32
32− int rowCount(const QModelIndex &parent = QModelIndex()) const;
33+ void abort();
33− QVariant data(const QModelIndex &parent, int role) const;
34− QHash<int,QByteArray> roleNames() const;
35
34
36− void updatedByBackend();
35+private Q_SLOTS:
36+ void requestFinished();
37
37
38private:
38private:
39− QList<HudClientQueryToolbarItems> m_actions;
39+ static void processRequestFinished(CroppedImageSizerAsyncWorker *worker);
40
40
41− HudClientQuery *m_query;
41+ QMutex m_mutex;
42+ CroppedImageSizer *m_sizer;
43+ QNetworkReply *m_reply;
44+ bool m_ignoreAbort;
42};
45};
43
46
44#endif
47#endif
plugins/Dash/horizontaljournal.cpp+5−1
@@ -184,9 +184,13 @@ void HorizontalJournal::calculateImplicitHeight()
184 }
184 }
185}
185}
186
186
187+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
187void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
188void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
189+#else
190+void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
191+#endif
188{
192{
189− Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {
193+ Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
190 for (int i = remove.count - 1; i >= 0; --i) {
194 for (int i = remove.count - 1; i >= 0; --i) {
191 const int indexToRemove = remove.index + i;
195 const int indexToRemove = remove.index + i;
192 // We only support removing from the end so
196 // We only support removing from the end so
plugins/Dash/horizontaljournal.h+4
@@ -52,7 +52,11 @@ private:
52 void calculateImplicitHeight() override;
52 void calculateImplicitHeight() override;
53 void doRelayout() override;
53 void doRelayout() override;
54 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
54 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
55+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
55 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
56 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
57+#else
58+ void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
59+#endif
56
60
57 int m_firstVisibleIndex;
61 int m_firstVisibleIndex;
58 QList<QQuickItem*> m_visibleItems;
62 QList<QQuickItem*> m_visibleItems;
plugins/Dash/listviewwithpageheader.cpp+9−4
@@ -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();
@@ -936,7 +941,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool
936// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;
941// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;
937 const auto oldFirstVisibleIndex = m_firstVisibleIndex;
942 const auto oldFirstVisibleIndex = m_firstVisibleIndex;
938
943
939− Q_FOREACH(const QQmlChangeSet::Remove &remove, changeSet.removes()) {
944+ Q_FOREACH(const QQmlChangeSet::Change &remove, changeSet.removes()) {
940// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;
945// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;
941 if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {
946 if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {
942 const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();
947 const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();
@@ -990,7 +995,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool
990 }
995 }
991 }
996 }
992
997
993− Q_FOREACH(const QQmlChangeSet::Insert &insert, changeSet.inserts()) {
998+ Q_FOREACH(const QQmlChangeSet::Change &insert, changeSet.inserts()) {
994// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;
999// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;
995 const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();
1000 const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();
996 const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();
1001 const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();
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/Dash/organicgrid.cpp+5−1
@@ -237,9 +237,13 @@ void OrganicGrid::calculateImplicitHeight()
237 }
237 }
238}
238}
239
239
240+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
240void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
241void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
242+#else
243+void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
244+#endif
241{
245{
242− Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {
246+ Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
243 for (int i = remove.count - 1; i >= 0; --i) {
247 for (int i = remove.count - 1; i >= 0; --i) {
244 const int indexToRemove = remove.index + i;
248 const int indexToRemove = remove.index + i;
245 // We only support removing from the end
249 // We only support removing from the end
plugins/Dash/organicgrid.h+4
@@ -79,7 +79,11 @@ private:
79 void doRelayout() override;
79 void doRelayout() override;
80 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
80 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
81 void calculateImplicitHeight() override;
81 void calculateImplicitHeight() override;
82+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
82 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
83 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
84+#else
85+ void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
86+#endif
83
87
84 QSizeF m_smallDelegateSize;
88 QSizeF m_smallDelegateSize;
85 QSizeF m_bigDelegateSize;
89 QSizeF m_bigDelegateSize;
plugins/Dash/plugin.cpp+2
@@ -17,6 +17,7 @@
17
17
18#include "plugin.h"
18#include "plugin.h"
19
19
20+#include "croppedimagesizer.h"
20#include "horizontaljournal.h"
21#include "horizontaljournal.h"
21#include "listviewwithpageheader.h"
22#include "listviewwithpageheader.h"
22#include "organicgrid.h"
23#include "organicgrid.h"
@@ -32,4 +33,5 @@ void DashPlugin::registerTypes(const char *uri)
32 qmlRegisterType<ListViewWithPageHeader>(uri, 0, 1, "ListViewWithPageHeader");
33 qmlRegisterType<ListViewWithPageHeader>(uri, 0, 1, "ListViewWithPageHeader");
33 qmlRegisterType<OrganicGrid>(uri, 0, 1, "OrganicGrid");
34 qmlRegisterType<OrganicGrid>(uri, 0, 1, "OrganicGrid");
34 qmlRegisterType<VerticalJournal>(uri, 0, 1, "VerticalJournal");
35 qmlRegisterType<VerticalJournal>(uri, 0, 1, "VerticalJournal");
36+ qmlRegisterType<CroppedImageSizer>(uri, 0, 1, "CroppedImageSizer");
35}
37}
plugins/Dash/verticaljournal.cpp+5−1
@@ -239,9 +239,13 @@ void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)
239 }
239 }
240}
240}
241
241
242+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
242void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
243void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
244+#else
245+void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
246+#endif
243{
247{
244− Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {
248+ Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
245 for (int i = remove.count - 1; i >= 0; --i) {
249 for (int i = remove.count - 1; i >= 0; --i) {
246 const int indexToRemove = remove.index + i;
250 const int indexToRemove = remove.index + i;
247 // Since we only support removing from the end, indexToRemove
251 // Since we only support removing from the end, indexToRemove
plugins/Dash/verticaljournal.h+4
@@ -90,7 +90,11 @@ private:
90 void calculateImplicitHeight() override;
90 void calculateImplicitHeight() override;
91 void doRelayout() override;
91 void doRelayout() override;
92 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
92 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
93+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
93 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
94 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
95+#else
96+ void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
97+#endif
94
98
95 QVector<QList<ViewItem>> m_columnVisibleItems;
99 QVector<QList<ViewItem>> m_columnVisibleItems;
96 QHash<int, int> m_indexColumnMap;
100 QHash<int, int> m_indexColumnMap;
plugins/HudClient/CMakeLists.txtdeleted−38
@@ -1,38 +0,0 @@
1−find_package(Qt5Core REQUIRED)
2−find_package(Qt5Quick REQUIRED)
3−pkg_search_module(DEE dee-1.0 REQUIRED)
4−pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
5−pkg_search_module(HUDCLIENT hud-client-2 REQUIRED)
6−pkg_search_module(DEEQT libdee-qt5 REQUIRED)
7−pkg_search_module(PULSE libpulse REQUIRED)
8−
9−include_directories(
10− ${CMAKE_CURRENT_BINARY_DIR}
11− ${Qt5Core_INCLUDE_DIRS}
12− ${Qt5Quick_INCLUDE_DIRS}
13− ${DEE_INCLUDE_DIRS}
14− ${DEEQT_INCLUDE_DIRS}
15− ${HUDCLIENT_INCLUDE_DIRS}
16− ${PULSE_INCLUDE_DIRS}
17−)
18−
19−set(HudQML_SOURCES
20− hudclient.cpp
21− hudtoolbarmodel.cpp
22− volumepeakdetector.cpp
23− plugin.cpp
24−)
25−
26−add_library(HudClientQml MODULE ${HudQML_SOURCES})
27−target_link_libraries(HudClientQml
28− ${Qt5Core_LIBRARIES}
29− ${Qt5Quick_LIBRARIES}
30− ${DEEQT_LDFLAGS}
31− ${HUDCLIENT_LDFLAGS}
32− ${GOBJECT_LDFLAGS}
33− ${PULSE_LDFLAGS}
34−)
35−
36−qt5_use_modules(HudClientQml Qml)
37−
38−add_unity8_plugin(HudClient 0.1 HudClient TARGETS HudClientQml)
plugins/HudClient/HudClient.qmltypesdeleted−91
@@ -1,91 +0,0 @@
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 HudClient 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "DeeListModel"
12− prototype: "QAbstractListModel"
13− Property { name: "name"; type: "string" }
14− Property { name: "synchronized"; type: "bool"; isReadonly: true }
15− Property { name: "count"; type: "int"; isReadonly: true }
16− Signal {
17− name: "nameChanged"
18− Parameter { type: "string" }
19− }
20− Signal {
21− name: "synchronizedChanged"
22− Parameter { type: "bool" }
23− }
24− Signal {
25− name: "roleNamesChanged"
26− Parameter { type: "QHash<int,QByteArray>" }
27− }
28− Method {
29− name: "get"
30− type: "QVariantMap"
31− Parameter { name: "row"; type: "int" }
32− }
33− Method { name: "count"; type: "int" }
34− }
35− Component {
36− name: "HudClient"
37− prototype: "QObject"
38− exports: ["HudClient/HudClient 0.1"]
39− exportMetaObjectRevisions: [0]
40− Property { name: "results"; type: "DeeListModel"; isReadonly: true; isPointer: true }
41− Property { name: "toolBarModel"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }
42− Signal { name: "voiceQueryLoading" }
43− Signal { name: "voiceQueryListening" }
44− Signal { name: "voiceQueryHeardSomething" }
45− Signal { name: "voiceQueryFailed" }
46− Signal {
47− name: "voiceQueryFinished"
48− Parameter { name: "query"; type: "string" }
49− }
50− Signal { name: "commandExecuted" }
51− Signal {
52− name: "showParametrizedAction"
53− Parameter { name: "action"; type: "string" }
54− Parameter { name: "items"; type: "QVariant" }
55− }
56− Method {
57− name: "executeCommand"
58− Parameter { name: "index"; type: "int" }
59− }
60− Method {
61− name: "setQuery"
62− Parameter { name: "new_query"; type: "string" }
63− }
64− Method { name: "startVoiceQuery" }
65− Method {
66− name: "executeParametrizedAction"
67− Parameter { name: "values"; type: "QVariant" }
68− }
69− Method {
70− name: "updateParametrizedAction"
71− Parameter { name: "values"; type: "QVariant" }
72− }
73− Method { name: "cancelParametrizedAction" }
74− Method {
75− name: "executeToolBarAction"
76− Parameter { name: "action"; type: "HudClientQueryToolbarItems" }
77− }
78− }
79− Component {
80− name: "VolumePeakDetector"
81− prototype: "QObject"
82− exports: ["HudClient/VolumePeakDetector 0.1"]
83− exportMetaObjectRevisions: [0]
84− Property { name: "enabled"; type: "bool" }
85− Property { name: "desiredInterval"; type: "int" }
86− Signal {
87− name: "newPeak"
88− Parameter { name: "volume"; type: "float" }
89− }
90− }
91−}
plugins/HudClient/hudclient.cppdeleted−294
@@ -1,294 +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−#include "hudclient.h"
18−
19−#include "hudtoolbarmodel.h"
20−
21−#include <deelistmodel.h>
22−
23−#include <QDebug>
24−
25−namespace
26−{
27−
28−extern "C"
29−{
30−
31−void loadingCB(GObject* /*src*/, gpointer dst)
32−{
33− static_cast<HudClient*>(dst)->voiceQueryLoading();
34−}
35−
36−void listeningCB(GObject* /*src*/, gpointer dst)
37−{
38− static_cast<HudClient*>(dst)->voiceQueryListening();
39−}
40−
41−void heardSomethingCB(GObject* /*src*/, gpointer dst)
42−{
43− static_cast<HudClient*>(dst)->voiceQueryHeardSomething();
44−}
45−
46−void failedCB(GObject* /*src*/, const gchar * /*reason*/, gpointer dst)
47−{
48− static_cast<HudClient*>(dst)->voiceQueryFailed();
49−}
50−
51−void finishedCB(GObject* /*src*/, const gchar* query, gpointer dst)
52−{
53− static_cast<HudClient*>(dst)->voiceQueryFinished(QString::fromUtf8(query));
54−}
55−
56−void modelReadyCB(GObject* /*src*/, gpointer dst)
57−{
58− static_cast<HudClient*>(dst)->modelReady(true);
59−}
60−
61−void modelReallyReadyCB(GObject* /*src*/, gint /*position*/, gint /*removed*/, gint /*added*/, gpointer dst)
62−{
63− static_cast<HudClient*>(dst)->modelReallyReady(true);
64−}
65−
66−static void modelsChangedCB(GObject* /*src*/, gpointer dst)
67−{
68− static_cast<HudClient*>(dst)->queryModelsChanged();
69−}
70−
71−static void toolBarUpdatedCB(GObject* /*src*/, gpointer dst)
72−{
73− static_cast<HudToolBarModel*>(dst)->updatedByBackend();
74−}
75−
76−} // extern "C"
77−
78−} // namespace
79−
80−HudClient::HudClient()
81−{
82− m_results = new DeeListModel();
83− m_clientQuery = hud_client_query_new("");
84− m_toolBarModel = new HudToolBarModel(m_clientQuery);
85− m_currentActionParam = nullptr;
86− m_results->setModel(hud_client_query_get_results_model(m_clientQuery));
87−
88− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-loading", G_CALLBACK(loadingCB), this);
89− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-listening", G_CALLBACK(listeningCB), this);
90− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-heard-something", G_CALLBACK(heardSomethingCB), this);
91− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-finished", G_CALLBACK(finishedCB), this);
92− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-failed", G_CALLBACK(failedCB), this);
93− g_signal_connect(G_OBJECT(m_clientQuery), HUD_CLIENT_QUERY_SIGNAL_MODELS_CHANGED, G_CALLBACK(modelsChangedCB), this);
94− g_signal_connect(G_OBJECT(m_clientQuery), HUD_CLIENT_QUERY_SIGNAL_TOOLBAR_UPDATED, G_CALLBACK(toolBarUpdatedCB), m_toolBarModel);
95−}
96−
97−// Terrible hack to get around GLib. GLib stores function pointers as gpointer, which violates the C and C++ spec
98−// because data and function pointers may have different sizes. gcc rightfully emits a warning. There is no #pragma
99−// in gcc to selectively turn off the warning, however. This hack gets around the problem, by using a union (ick) to
100−// convert between the two types.
101−
102−class ToGPointer
103−{
104−public:
105− ToGPointer(void (*cb)())
106− {
107− u_.cb = cb;
108− }
109−
110− operator gpointer()
111− {
112− return u_.p;
113− }
114−
115−private:
116− union
117− {
118− void (*cb)();
119− gpointer p;
120− } u_;
121−};
122−
123−#define TO_GPOINTER(cb) (ToGPointer(reinterpret_cast<void(*)()>((cb))))
124−
125−HudClient::~HudClient()
126−{
127− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(loadingCB), this);
128− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(listeningCB), this);
129− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(heardSomethingCB), this);
130− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(finishedCB), this);
131− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(toolBarUpdatedCB), m_toolBarModel);
132−
133− delete m_results;
134− delete m_toolBarModel;
135−
136− g_object_unref(m_clientQuery);
137−}
138−
139−void HudClient::setQuery(const QString &new_query)
140−{
141− hud_client_query_set_query(m_clientQuery, new_query.toUtf8().constData());
142−}
143−
144−void HudClient::startVoiceQuery()
145−{
146− hud_client_query_voice_query(m_clientQuery);
147−}
148−
149−void HudClient::executeParametrizedAction(const QVariant &values)
150−{
151− updateParametrizedAction(values);
152− hud_client_param_send_commit(m_currentActionParam);
153− g_object_unref(m_currentActionParam);
154− m_currentActionParam = nullptr;
155− Q_EMIT commandExecuted();
156−}
157−
158−void HudClient::updateParametrizedAction(const QVariant &values)
159−{
160− if (m_currentActionParam != nullptr) {
161− const QVariantMap map = values.value<QVariantMap>();
162− GActionGroup *ag = hud_client_param_get_actions(m_currentActionParam);
163−
164− auto it = map.begin();
165− for ( ; it != map.end(); ++it) {
166− const QString action = it.key();
167− const QVariant value = it.value();
168− const GVariantType *actionType = g_action_group_get_action_parameter_type(ag, action.toUtf8().constData());
169− if (g_variant_type_equal(actionType, G_VARIANT_TYPE_DOUBLE) && value.canConvert(QVariant::Double)) {
170− g_action_group_activate_action(ag, action.toUtf8().constData(), g_variant_new_double(value.toDouble()));
171− } else {
172− qWarning() << "Unsuported action type in HudClient::executeParametrizedAction";
173− }
174− }
175− } else {
176− qWarning() << "Got to HudClient::updateParametrizedAction with no m_currentActionParam";
177− }
178−}
179−
180−void HudClient::cancelParametrizedAction()
181−{
182− if (m_currentActionParam != nullptr) {
183− hud_client_param_send_cancel(m_currentActionParam);
184− g_object_unref(m_currentActionParam);
185− m_currentActionParam = nullptr;
186− }
187−}
188−
189−void HudClient::executeToolBarAction(HudClientQueryToolbarItems action)
190−{
191− hud_client_query_execute_toolbar_item(m_clientQuery, action, /* timestamp */ 0);
192− Q_EMIT commandExecuted();
193−}
194−
195−DeeListModel *HudClient::results() const
196−{
197− return m_results;
198−}
199−
200−QAbstractItemModel *HudClient::toolBarModel() const
201−{
202− return m_toolBarModel;
203−}
204−
205−void HudClient::executeCommand(int index)
206−{
207− m_currentActionIndex = index;
208− DeeModel *model = hud_client_query_get_results_model(m_clientQuery);
209− DeeModelIter *iter = dee_model_get_iter_at_row(model, index);
210−
211− GVariant *command_key = dee_model_get_value(model, iter, 0);
212− GVariant *is_parametrized = dee_model_get_value(model, iter, 7);
213− if (g_variant_get_boolean(is_parametrized)) {
214− m_currentActionParam = hud_client_query_execute_param_command(m_clientQuery, command_key, /* timestamp */ 0);
215− if (m_currentActionParam != nullptr) {
216− GMenuModel *menuModel = hud_client_param_get_model (m_currentActionParam);
217− if (menuModel == nullptr) {
218− g_signal_connect(m_currentActionParam, HUD_CLIENT_PARAM_SIGNAL_MODEL_READY, G_CALLBACK(modelReadyCB), this);
219− } else {
220− modelReady(false);
221− }
222− } else {
223− qWarning() << "HudClient::executeCommand::Could not get the HudClientParam for parametrized action with index" << index;
224− }
225− } else {
226− hud_client_query_execute_command(m_clientQuery, command_key, /* timestamp */ 0);
227− Q_EMIT commandExecuted();
228− }
229− g_variant_unref(command_key);
230− g_variant_unref(is_parametrized);
231−}
232−
233−void HudClient::modelReady(bool needDisconnect)
234−{
235− if (needDisconnect) {
236− g_signal_handlers_disconnect_by_func(m_currentActionParam, TO_GPOINTER(modelReadyCB), this);
237− }
238− GMenuModel *menuModel = hud_client_param_get_model (m_currentActionParam);
239− if (g_menu_model_get_n_items(menuModel) == 0) {
240− g_signal_connect(menuModel, "items-changed", G_CALLBACK(modelReallyReadyCB), this);
241− } else {
242− modelReallyReady(false);
243− }
244−}
245−
246−static void addAttribute(QVariantMap &properties, GMenuModel *menuModel, int item, const char *attribute) {
247− GVariant *v = g_menu_model_get_item_attribute_value(menuModel, item, attribute, nullptr);
248−
249− if (v == nullptr)
250− return;
251−
252− properties.insert(attribute, DeeListModel::VariantForData(v));
253− g_variant_unref(v);
254−}
255−
256−void HudClient::modelReallyReady(bool needDisconnect)
257−{
258− GMenuModel *menuModel = hud_client_param_get_model (m_currentActionParam);
259− if (needDisconnect) {
260− g_signal_handlers_disconnect_by_func(menuModel, TO_GPOINTER(modelReallyReadyCB), this);
261− }
262−
263− QVariantList items;
264− for (int i = 0; i < g_menu_model_get_n_items(menuModel); i++) {
265− GVariant *v = g_menu_model_get_item_attribute_value(menuModel, i, "parameter-type", G_VARIANT_TYPE_STRING);
266−
267− if (v == nullptr)
268− continue;
269−
270− const QString type = QString::fromUtf8(g_variant_get_string(v, nullptr));
271− if (type == "slider") {
272− const char *sliderAttributes[] = { "label", "min", "max", "step", "value", "live", "action" };
273− QVariantMap properties;
274− properties.insert("parameter-type", "slider");
275− for (uint j = 0; j < sizeof(sliderAttributes)/sizeof(sliderAttributes[0]); ++j) {
276− addAttribute(properties, menuModel, i, sliderAttributes[j]);
277− }
278− items << properties;
279− }
280− g_variant_unref(v);
281− }
282−
283− DeeModel *model = hud_client_query_get_results_model(m_clientQuery);
284− DeeModelIter *iter = dee_model_get_iter_at_row(model, m_currentActionIndex);
285− GVariant *actionTextVariant = dee_model_get_value(model, iter, 1);
286− const QString actionText = QString::fromUtf8(g_variant_get_string(actionTextVariant, nullptr));
287− g_variant_unref(actionTextVariant);
288− Q_EMIT showParametrizedAction(actionText, QVariant::fromValue(items));
289−}
290−
291−void HudClient::queryModelsChanged()
292−{
293− m_results->setModel(hud_client_query_get_results_model(m_clientQuery));
294−}
plugins/HudClient/hudclient.hdeleted−71
@@ -1,71 +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−#ifndef HUDCLIENT_H
18−#define HUDCLIENT_H
19−
20−#include <QObject>
21−
22−#include <hud-client.h>
23−
24−class DeeListModel;
25−class QAbstractItemModel;
26−
27−class HudClient : public QObject
28−{
29− Q_OBJECT
30− Q_PROPERTY(DeeListModel* results READ results)
31− Q_PROPERTY(QAbstractItemModel* toolBarModel READ toolBarModel)
32−
33−public:
34− HudClient();
35− ~HudClient();
36−
37− DeeListModel *results() const;
38−
39− QAbstractItemModel *toolBarModel() const;
40−
41− Q_INVOKABLE void executeCommand(int index);
42− Q_INVOKABLE void setQuery(const QString &new_query);
43− Q_INVOKABLE void startVoiceQuery();
44− Q_INVOKABLE void executeParametrizedAction(const QVariant &values);
45− Q_INVOKABLE void updateParametrizedAction(const QVariant &values);
46− Q_INVOKABLE void cancelParametrizedAction();
47− Q_INVOKABLE void executeToolBarAction(HudClientQueryToolbarItems action);
48−
49− void modelReady(bool needDisconnect);
50− void modelReallyReady(bool needDisconnect);
51− void queryModelsChanged();
52−
53−Q_SIGNALS:
54− void voiceQueryLoading();
55− void voiceQueryListening();
56− void voiceQueryHeardSomething();
57− void voiceQueryFailed();
58− void voiceQueryFinished(const QString &query);
59− void commandExecuted();
60− void showParametrizedAction(const QString &action, const QVariant &items);
61−
62−private:
63− HudClientQuery *m_clientQuery;
64− DeeListModel *m_results;
65− QAbstractItemModel *m_toolBarModel;
66− int m_currentActionIndex;
67− HudClientParam *m_currentActionParam;
68−};
69−Q_DECLARE_METATYPE(HudClientQueryToolbarItems)
70−
71−#endif
plugins/HudClient/hudtoolbarmodel.cppdeleted−98
@@ -1,98 +0,0 @@
1−/*
2− * Copyright (C) 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−#include "hudtoolbarmodel.h"
18−
19−#include "hudclient.h"
20−
21−static const int ActionRole = Qt::UserRole;
22−static const int EnabledRole = Qt::UserRole + 1;
23−
24−static QString iconForAction(int action)
25−{
26− switch (action) {
27− case HUD_CLIENT_QUERY_TOOLBAR_UNDO:
28− return "graphics/undo.png";
29− case HUD_CLIENT_QUERY_TOOLBAR_HELP:
30− return "graphics/help.png";
31− case HUD_CLIENT_QUERY_TOOLBAR_FULLSCREEN:
32− return "graphics/view-fullscreen.png";
33− case HUD_CLIENT_QUERY_TOOLBAR_PREFERENCES:
34− return "graphics/settings.png";
35− }
36− return QString();
37−}
38−
39−HudToolBarModel::HudToolBarModel(HudClientQuery *query)
40− : m_query(query)
41−{
42− m_actions << HUD_CLIENT_QUERY_TOOLBAR_UNDO
43− << HUD_CLIENT_QUERY_TOOLBAR_HELP
44− << HUD_CLIENT_QUERY_TOOLBAR_FULLSCREEN
45− << HUD_CLIENT_QUERY_TOOLBAR_PREFERENCES;
46−}
47−
48−HudToolBarModel::~HudToolBarModel()
49−{
50−}
51−
52−int HudToolBarModel::rowCount(const QModelIndex &parent) const
53−{
54− if (parent.isValid())
55− return 0;
56−
57− return m_actions.count();
58−}
59−
60−QVariant HudToolBarModel::data(const QModelIndex &index, int role) const
61−{
62− const int row = index.row();
63− if (row >= m_actions.count())
64− return QVariant();
65−
66− const HudClientQueryToolbarItems action = m_actions[row];
67−
68− switch (role) {
69− case Qt::DecorationRole:
70− return iconForAction(action);
71− break;
72−
73− case ActionRole:
74− return action;
75− break;
76−
77− case EnabledRole:
78− return hud_client_query_toolbar_item_active(m_query, action);
79− break;
80− }
81− return QVariant();
82−}
83−
84−QHash<int,QByteArray> HudToolBarModel::roleNames() const
85−{
86− static QHash<int,QByteArray> roles;
87− if (roles.isEmpty()) {
88− roles[Qt::DecorationRole] = "iconPath";
89− roles[ActionRole] = "action";
90− roles[EnabledRole] = "enabled";
91− }
92− return roles;
93−}
94−
95−void HudToolBarModel::updatedByBackend()
96−{
97− Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), QVector<int>() << EnabledRole);
98−}
plugins/HudClient/qmldirdeleted−3
@@ -1,3 +0,0 @@
1−module HudClient
2−plugin HudClientQml
3−typeinfo HudClient.qmltypes
plugins/HudClient/volumepeakdetector.cppdeleted−223
@@ -1,223 +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−#include "volumepeakdetector.h"
18−
19−static void stream_read_callback(pa_stream * /*s*/, size_t /*length*/, void *userdata) {
20− PulseAudioVolumePeakDetector *peakDetector = static_cast<PulseAudioVolumePeakDetector *>(userdata);
21− peakDetector->processData();
22−}
23−
24−static void context_state_callback(pa_context *c, void *userdata) {
25− PulseAudioVolumePeakDetector *peakDetector = static_cast<PulseAudioVolumePeakDetector *>(userdata);
26−
27− switch (pa_context_get_state(c)) {
28− case PA_CONTEXT_CONNECTING:
29− case PA_CONTEXT_AUTHORIZING:
30− case PA_CONTEXT_SETTING_NAME:
31− break;
32−
33− case PA_CONTEXT_READY:
34− peakDetector->startStream();
35− break;
36−
37− case PA_CONTEXT_TERMINATED:
38− case PA_CONTEXT_FAILED:
39− default:
40− peakDetector->quit();
41− }
42−}
43−
44−PulseAudioVolumePeakDetector::PulseAudioVolumePeakDetector()
45− : m_accumulatedValue(0)
46− , m_nAccumulatedValues(0)
47− , m_accumulatedValuesLimit(1)
48− , m_context(nullptr)
49− , m_mainloop_api(nullptr)
50− , m_stream(nullptr)
51−{
52−}
53−
54−void PulseAudioVolumePeakDetector::start()
55−{
56− pa_mainloop *mainloop = nullptr;
57−
58− /* Set up a new main loop */
59− mainloop = pa_mainloop_new();
60− if (!mainloop)
61− return;
62−
63− m_mainloop_api = pa_mainloop_get_api(mainloop);
64−
65− /* Create a new connection context */
66− m_context = pa_context_new(m_mainloop_api, nullptr);
67− if (!m_context) {
68− goto quit;
69− }
70−
71− pa_context_set_state_callback(m_context, context_state_callback, this);
72−
73− /* Connect the context */
74− if (pa_context_connect(m_context, nullptr, PA_CONTEXT_NOFLAGS, nullptr) < 0) {
75− goto quit;
76− }
77−
78− /* Run the main loop */
79− if (pa_mainloop_run(mainloop, nullptr) < 0) {
80− goto quit;
81− }
82−
83−quit:
84− if (m_stream)
85− pa_stream_unref(m_stream);
86−
87− if (m_context)
88− pa_context_unref(m_context);
89−
90− if (mainloop) {
91− pa_signal_done();
92− pa_mainloop_free(mainloop);
93− }
94−
95− QThread::currentThread()->quit();
96−}
97−
98−int PulseAudioVolumePeakDetector::nAccumulatedValuesLimit() const
99−{
100− return m_accumulatedValuesLimit;
101−}
102−
103−void PulseAudioVolumePeakDetector::setNAccumulatedValuesLimit(int limit)
104−{
105− m_accumulatedValuesLimit = limit;
106−}
107−
108−// FIXME 16000 is hardcoded because julius needs it
109−// and the hardware/driver/pulse something gets confused
110−// if we use different rates
111−// We would be happier with a much smaller value like 100
112−static uint voice_needed_rate = 16000;
113−
114−void PulseAudioVolumePeakDetector::startStream()
115−{
116− pa_buffer_attr buffer_attr;
117− pa_proplist *proplist = pa_proplist_new();
118−
119− // FIXME 16000 is hardcoded because julius needs it
120− // and the hardware/driver/pulse something gets confused
121− // if we use different rates
122− // We would be happier with a much smaller value like 100
123− pa_sample_spec sample_spec;
124− sample_spec.format = PA_SAMPLE_FLOAT32;
125− sample_spec.rate = 16000;
126− sample_spec.channels = 1;
127−
128− pa_channel_map channel_map;
129−
130− pa_channel_map_init_extend(&channel_map, sample_spec.channels, PA_CHANNEL_MAP_DEFAULT);
131− pa_proplist_sets(proplist, PA_PROP_MEDIA_NAME, "HUD Peak Detector");
132−
133− m_stream = pa_stream_new_with_proplist(m_context, nullptr, &sample_spec, &channel_map, proplist);
134− if (!m_stream) {
135− pa_proplist_free(proplist);
136− quit();
137− return;
138− }
139− pa_proplist_free(proplist);
140−
141− pa_stream_set_read_callback(m_stream, stream_read_callback, this);
142−
143− memset(&buffer_attr, 0, sizeof(buffer_attr));
144− buffer_attr.maxlength = (uint32_t) -1;
145− buffer_attr.fragsize = sizeof(float);
146−
147− if (pa_stream_connect_record(m_stream, nullptr, &buffer_attr, (pa_stream_flags_t)(PA_STREAM_PEAK_DETECT | PA_STREAM_ADJUST_LATENCY)) < 0) {
148− quit();
149− }
150−}
151−
152−void PulseAudioVolumePeakDetector::processData()
153−{
154− while (pa_stream_readable_size(m_stream) > 0) {
155− const void *data;
156− size_t length;
157−
158− if (pa_stream_peek(m_stream, &data, &length) < 0) {
159− quit();
160− return;
161− }
162−
163− const float *values = (float*)data;
164− for (size_t i = 0; i < length / sizeof(float); ++i) {
165− float value = values[i];
166− if (value < 0) value = 0;
167− if (value > 1) value = 1;
168− m_nAccumulatedValues++;
169− m_accumulatedValue += value;
170− if (m_nAccumulatedValues == m_accumulatedValuesLimit) {
171− Q_EMIT newPeak(m_accumulatedValue / m_nAccumulatedValues);
172− m_nAccumulatedValues = 0;
173− m_accumulatedValue = 0;
174− }
175− }
176−
177− pa_stream_drop(m_stream);
178− }
179−}
180−
181−void PulseAudioVolumePeakDetector::quit()
182−{
183− m_mainloop_api->quit(m_mainloop_api, 0);
184−}
185−
186−
187−/* VolumePeakDetector */
188−
189−VolumePeakDetector::VolumePeakDetector()
190−{
191− QObject::connect(&m_thread, SIGNAL(started()), &m_volumeDetector, SLOT(start()));
192− QObject::connect(&m_volumeDetector, SIGNAL(newPeak(float)), this, SIGNAL(newPeak(float)));
193−
194− m_volumeDetector.moveToThread(&m_thread);
195−}
196−
197−bool VolumePeakDetector::enabled() const
198−{
199− return m_thread.isRunning();
200−}
201−
202−int VolumePeakDetector::desiredInterval() const
203−{
204− return m_volumeDetector.nAccumulatedValuesLimit() * 1000 / voice_needed_rate;
205−}
206−
207−void VolumePeakDetector::setDesiredInterval(int interval)
208−{
209− m_volumeDetector.setNAccumulatedValuesLimit(voice_needed_rate * interval / 1000);
210−}
211−
212−void VolumePeakDetector::setEnabled(int enabled)
213−{
214− if (enabled) {
215− if (!m_thread.isRunning()) {
216− m_thread.start();
217− }
218− } else {
219− if (m_thread.isRunning()) {
220− m_volumeDetector.quit();
221− }
222− }
223−}
plugins/HudClient/volumepeakdetector.hdeleted−78
@@ -1,78 +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−#ifndef VOLUMEPEAKDETECTOR_H
18−#define VOLUMEPEAKDETECTOR_H
19−
20−#include <QObject>
21−
22−#include <QThread>
23−
24−#include <pulse/pulseaudio.h>
25−
26−class PulseAudioVolumePeakDetector : public QObject
27−{
28− Q_OBJECT
29−
30−public:
31− PulseAudioVolumePeakDetector();
32−
33− int nAccumulatedValuesLimit() const;
34− void setNAccumulatedValuesLimit(int limit);
35−
36− void startStream();
37− void processData();
38− void quit();
39−
40−public Q_SLOTS:
41− void start();
42−
43−Q_SIGNALS:
44− void newPeak(float value);
45−
46−private:
47− float m_accumulatedValue;
48− int m_nAccumulatedValues;
49− int m_accumulatedValuesLimit;
50− pa_context *m_context;
51− pa_mainloop_api *m_mainloop_api;
52− pa_stream *m_stream;
53−};
54−
55−class VolumePeakDetector : public QObject
56−{
57− Q_OBJECT
58− Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
59− Q_PROPERTY(int desiredInterval READ desiredInterval WRITE setDesiredInterval)
60−
61−public:
62− VolumePeakDetector();
63−
64− bool enabled() const;
65− void setEnabled(int enabled);
66−
67− int desiredInterval() const;
68− void setDesiredInterval(int interval);
69−
70−Q_SIGNALS:
71− void newPeak(float volume);
72−
73−private:
74− QThread m_thread;
75− PulseAudioVolumePeakDetector m_volumeDetector;
76−};
77−
78−#endif
plugins/ScreenGrabber/CMakeLists.txtnew file+13
@@ -0,0 +1,13 @@
1+include_directories(
2+ ${CMAKE_CURRENT_BINARY_DIR}
3+)
4+
5+set(SCREENGRABBERSOURCES
6+ screengrabber.cpp
7+ plugin.cpp
8+)
9+
10+add_library(ScreenGrabber-qml MODULE ${SCREENGRABBERSOURCES})
11+qt5_use_modules(ScreenGrabber-qml Qml Gui Quick Concurrent)
12+
13+add_unity8_plugin(ScreenGrabber 0.1 ScreenGrabber TARGETS ScreenGrabber-qml)
plugins/ScreenGrabber/ScreenGrabber.qmltypesnew file+17
@@ -0,0 +1,17 @@
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 -nonrelocatable ScreenGrabber 0.1 plugins'
8+
9+Module {
10+ Component {
11+ name: "ScreenGrabber"
12+ prototype: "QObject"
13+ exports: ["ScreenGrabber/ScreenGrabber 0.1"]
14+ exportMetaObjectRevisions: [0]
15+ Method { name: "captureAndSave" }
16+ }
17+}
plugins/ScreenGrabber/plugin.cppnew file+28
@@ -0,0 +1,28 @@
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+ * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
17+ */
18+
19+#include "plugin.h"
20+#include "screengrabber.h"
21+
22+#include <QtQml/qqml.h>
23+
24+void ScreenGrabberPlugin::registerTypes(const char *uri)
25+{
26+ Q_ASSERT(uri == QLatin1String("ScreenGrabber"));
27+ qmlRegisterType<ScreenGrabber>(uri, 0, 1, "ScreenGrabber");
28+}
qml/Hud/ToolBar.qml → plugins/ScreenGrabber/plugin.hrenamed+16−16
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2012, 2013 Canonical, Ltd.
2+ * Copyright (C) 2014 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -12,22 +12,22 @@
12 *
12 *
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
15 */
17 */
16
18
17−import QtQuick 2.0
19+#ifndef SCREENGRABBER_PLUGIN_H
18−import HudClient 0.1
20+#define SCREENGRABBER_PLUGIN_H
21+
22+#include <QtQml/QQmlExtensionPlugin>
23+
24+class ScreenGrabberPlugin : public QQmlExtensionPlugin
25+{
26+ Q_OBJECT
27+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
19
28
20−Row {
29+public:
21− signal actionTriggered(int action)
30+ void registerTypes(const char *uri);
22− property alias model: repeater.model
31+};
23
32
24− spacing: units.gu(3)
33+#endif // SCREENGRABBER_PLUGIN_H
25− Repeater {
26− id: repeater
27− ToolBarIcon {
28− source: model.iconPath
29− onClicked: actionTriggered(model.action)
30− enabled: model.enabled
31− }
32− }
33−}
plugins/ScreenGrabber/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module ScreenGrabber
2+plugin ScreenGrabber-qml
3+typeinfo ScreenGrabber.qmltypes
plugins/ScreenGrabber/screengrabber.cppnew file+94
@@ -0,0 +1,94 @@
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+ * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
17+ */
18+
19+#include "screengrabber.h"
20+
21+#include <QDir>
22+#include <QDateTime>
23+#include <QStandardPaths>
24+#include <QtGui/QImage>
25+#include <QtGui/QGuiApplication>
26+#include <QtQuick/QQuickWindow>
27+#include <QtConcurrent/QtConcurrentRun>
28+
29+#include <QDebug>
30+
31+void saveScreenshot(QImage screenshot, QString filename, QString format, int quality)
32+{
33+ if (!screenshot.save(filename, format.toLatin1().data(), quality))
34+ qWarning() << "ScreenShotter: failed to save snapshot!";
35+}
36+
37+ScreenGrabber::ScreenGrabber(QObject *parent)
38+ : QObject(parent),
39+ screenshotQuality(0)
40+{
41+ QDir screenshotsDir(QStandardPaths::displayName(QStandardPaths::PicturesLocation));
42+ screenshotsDir.mkdir("Screenshots");
43+ screenshotsDir.cd("Screenshots");
44+ if (screenshotsDir.exists())
45+ {
46+ fileNamePrefix = screenshotsDir.absolutePath();
47+ fileNamePrefix.append("/screenshot");
48+ }
49+ else
50+ {
51+ qWarning() << "ScreenShotter: failed to create directory at: " << screenshotsDir.absolutePath();
52+ }
53+}
54+
55+void ScreenGrabber::captureAndSave()
56+{
57+ if (fileNamePrefix.isEmpty())
58+ {
59+ qWarning() << "ScreenShotter: no directory to save screenshot";
60+ return;
61+ }
62+
63+ const QWindowList windows = QGuiApplication::topLevelWindows();
64+ if (windows.empty())
65+ {
66+ qWarning() << "ScreenShotter: no top level windows found!";
67+ return;
68+ }
69+
70+ QQuickWindow *main_window = qobject_cast<QQuickWindow *>(windows[0]);
71+ if (!main_window)
72+ {
73+ qWarning() << "ScreenShotter: can only take screenshots of QQuickWindows";
74+ return;
75+ }
76+
77+ QImage screenshot = main_window->grabWindow();
78+ QtConcurrent::run(saveScreenshot, screenshot, makeFileName(), getFormat(), screenshotQuality);
79+}
80+
81+QString ScreenGrabber::makeFileName()
82+{
83+ QString fileName(fileNamePrefix);
84+ fileName.append(QDateTime::currentDateTime().toString("yyyymmdd_hhmmsszzz"));
85+ fileName.append(".");
86+ fileName.append(getFormat());
87+ return fileName;
88+}
89+
90+QString ScreenGrabber::getFormat()
91+{
92+ //TODO: This should be configurable (perhaps through gsettings?)
93+ return "png";
94+}
plugins/ScreenGrabber/screengrabber.hnew file+42
@@ -0,0 +1,42 @@
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+ * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
17+ */
18+
19+#ifndef SNAPSHOTTER_H
20+#define SNAPSHOTTER_H
21+
22+#include <QObject>
23+#include <QString>
24+
25+class ScreenGrabber: public QObject
26+{
27+ Q_OBJECT
28+
29+public:
30+ explicit ScreenGrabber(QObject *parent = 0);
31+
32+public Q_SLOTS:
33+ void captureAndSave();
34+
35+private:
36+ QString makeFileName();
37+ QString getFormat();
38+ QString fileNamePrefix;
39+ int screenshotQuality;
40+};
41+
42+#endif
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+30−38
@@ -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,17 +253,19 @@ 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
260 // emulation it will cause the emulation logic to go nuts.
260 // emulation it will cause the emulation logic to go nuts.
261 // Thus we have to also grab the mouse in this case.
261 // Thus we have to also grab the mouse in this case.
262− // TODO: Report bug to Qt
262+ //
263+ // The fix for this bug has landed in Qt 5.4 (https://codereview.qt-project.org/96887)
264+ // TODO: Remove this workaround once we start using Qt 5.4
263 if (window()) {
265 if (window()) {
264 QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(window());
266 QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(window());
265 if (windowPrivate->touchMouseId == event->touchId() && window()->mouseGrabberItem()) {
267 if (windowPrivate->touchMouseId == event->touchId() && window()->mouseGrabberItem()) {
266− DDA_DEBUG("removing mouse grabber");
268+ ddaDebug("removing mouse grabber");
267 window()->mouseGrabberItem()->ungrabMouse();
269 window()->mouseGrabberItem()->ungrabMouse();
268 }
270 }
269 }
271 }
@@ -281,11 +283,7 @@ void DirectionalDragArea::unownedTouchEvent(UnownedTouchEvent *unownedTouchEvent
281
283
282 Q_ASSERT(!event->touchPointStates().testFlag(Qt::TouchPointPressed));
284 Q_ASSERT(!event->touchPointStates().testFlag(Qt::TouchPointPressed));
283
285
284− #if DIRECTIONALDRAGAREA_DEBUG
285− // TODO Consider using qCDebug() when available (Qt 5.2)
286− qDebug() << "[DDA] Unowned" << m_timeSource->msecsSinceReference()
286+ ddaDebug("Unowned " << m_timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));
287− << qPrintable(touchEventToString(event));
288− #endif
289
287
290 switch (m_status) {
288 switch (m_status) {
291 case WaitingForTouch:
289 case WaitingForTouch:
@@ -320,7 +318,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
320
318
321 if (touchPoint->state() == Qt::TouchPointReleased) {
319 if (touchPoint->state() == Qt::TouchPointReleased) {
322 // touch has ended before recognition concluded
320 // touch has ended before recognition concluded
323− DDA_DEBUG("Touch has ended before recognition concluded");
321+ ddaDebug("Touch has ended before recognition concluded");
324 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
322 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
325 emitSignalIfTapped();
323 emitSignalIfTapped();
326 setStatus(WaitingForTouch);
324 setStatus(WaitingForTouch);
@@ -333,7 +331,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
333 updateVelocityCalculator(touchScenePos);
331 updateVelocityCalculator(touchScenePos);
334
332
335 if (!pointInsideAllowedArea()) {
333 if (!pointInsideAllowedArea()) {
336− DDA_DEBUG("Rejecting gesture because touch point is outside allowed area.");
334+ ddaDebug("Rejecting gesture because touch point is outside allowed area.");
337 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
335 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
338 // 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
339 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
337 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
@@ -342,7 +340,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
342 }
340 }
343
341
344 if (!movingInRightDirection()) {
342 if (!movingInRightDirection()) {
345− 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.");
346 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
344 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
347 // 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
348 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
346 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
@@ -356,7 +354,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
356 if (isWithinTouchCompositionWindow()) {
354 if (isWithinTouchCompositionWindow()) {
357 // 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
358 // 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.
359− DDA_DEBUG("Sill within composition window. Let's wait more.");
357+ ddaDebug("Sill within composition window. Let's wait more.");
360 return;
358 return;
361 }
359 }
362
360
@@ -364,7 +362,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
364 TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);
362 TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);
365 setStatus(Recognized);
363 setStatus(Recognized);
366 } else {
364 } else {
367− DDA_DEBUG("Didn't move far enough yet. Let's wait more.");
365+ ddaDebug("Didn't move far enough yet. Let's wait more.");
368 }
366 }
369}
367}
370
368
@@ -373,11 +371,7 @@ void DirectionalDragArea::touchEvent(QTouchEvent *event)
373 // 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
374 // 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.
375
373
376− #if DIRECTIONALDRAGAREA_DEBUG
377− // TODO Consider using qCDebug() when available (Qt 5.2)
378− qDebug() << "[DDA]" << m_timeSource->msecsSinceReference()
379− << qPrintable(touchEventToString(event));
374+ ddaDebug(m_timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));
380− #endif
381
375
382 if (!isEnabled() || !isVisible()) {
376 if (!isEnabled() || !isVisible()) {
383 QQuickItem::touchEvent(event);
377 QQuickItem::touchEvent(event);
@@ -414,9 +408,7 @@ void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)
414 if (isWithinTouchCompositionWindow()) {
408 if (isWithinTouchCompositionWindow()) {
415 // 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.
416 // Can't be a single-touch gesture.
410 // Can't be a single-touch gesture.
417− #if DIRECTIONALDRAGAREA_DEBUG
418− 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.");
419− #endif
420 allGood = false;
412 allGood = false;
421 }
413 }
422
414
@@ -454,6 +446,7 @@ void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)
454
446
455 if (recognitionIsDisabled()) {
447 if (recognitionIsDisabled()) {
456 // Behave like a dumb TouchArea
448 // Behave like a dumb TouchArea
449+ ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");
457 TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);
450 TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);
458 setStatus(Recognized);
451 setStatus(Recognized);
459 event->accept();
452 event->accept();
@@ -485,7 +478,7 @@ void DirectionalDragArea::touchEvent_undecided(QTouchEvent *event)
485
478
486 if (event->touchPointStates().testFlag(Qt::TouchPointPressed) && isWithinTouchCompositionWindow()) {
479 if (event->touchPointStates().testFlag(Qt::TouchPointPressed) && isWithinTouchCompositionWindow()) {
487 // multi-finger drags are not accepted
480 // multi-finger drags are not accepted
488− DDA_DEBUG("Multi-finger drags are not accepted");
481+ ddaDebug("Multi-finger drags are not accepted");
489
482
490 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
483 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
491 // 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
@@ -579,12 +572,16 @@ bool DirectionalDragArea::pointInsideAllowedArea() const
579
572
580bool DirectionalDragArea::movingInRightDirection() const
573bool DirectionalDragArea::movingInRightDirection() const
581{
574{
575+ if (m_direction == Direction::Horizontal) {
576+ return true;
577+ } else {
582− QPointF movementVector(m_dampedScenePos.x() - m_previousDampedScenePos.x(),
578+ QPointF movementVector(m_dampedScenePos.x() - m_previousDampedScenePos.x(),
583− m_dampedScenePos.y() - m_previousDampedScenePos.y());
579+ m_dampedScenePos.y() - m_previousDampedScenePos.y());
584
580
585− qreal scalarProjection = projectOntoDirectionVector(movementVector);
581+ qreal scalarProjection = projectOntoDirectionVector(movementVector);
586
582
587− return scalarProjection >= 0.;
583+ return scalarProjection >= 0.;
584+ }
588}
585}
589
586
590bool DirectionalDragArea::movedFarEnough(const QPointF &point) const
587bool DirectionalDragArea::movedFarEnough(const QPointF &point) const
@@ -612,7 +609,7 @@ void DirectionalDragArea::checkSpeed()
612 qreal minSpeedMsecs = m_minSpeed / 1000.0;
609 qreal minSpeedMsecs = m_minSpeed / 1000.0;
613
610
614 if (speed < minSpeedMsecs) {
611 if (speed < minSpeedMsecs) {
615− DDA_DEBUG("Rejecting gesture because it's below minimum speed.");
612+ ddaDebug("Rejecting gesture because it's below minimum speed.");
616 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
613 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
617 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
614 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
618 setStatus(WaitingForTouch);
615 setStatus(WaitingForTouch);
@@ -623,7 +620,7 @@ void DirectionalDragArea::checkSpeed()
623 m_silenceTime += m_recognitionTimer->interval();
620 m_silenceTime += m_recognitionTimer->interval();
624
621
625 if (m_silenceTime > m_maxSilenceTime) {
622 if (m_silenceTime > m_maxSilenceTime) {
626− DDA_DEBUG("Rejecting gesture because its silence time has been exceeded.");
623+ ddaDebug("Rejecting gesture because its silence time has been exceeded.");
627 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
624 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
628 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
625 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
629 setStatus(WaitingForTouch);
626 setStatus(WaitingForTouch);
@@ -644,7 +641,7 @@ void DirectionalDragArea::giveUpIfDisabledOrInvisible()
644 }
641 }
645
642
646 if (m_status != WaitingForTouch) {
643 if (m_status != WaitingForTouch) {
647− DDA_DEBUG("Resetting status because got disabled or made invisible");
644+ ddaDebug("Resetting status because got disabled or made invisible");
648 setStatus(WaitingForTouch);
645 setStatus(WaitingForTouch);
649 }
646 }
650 }
647 }
@@ -664,9 +661,7 @@ void DirectionalDragArea::setStatus(DirectionalDragArea::Status newStatus)
664 m_status = newStatus;
661 m_status = newStatus;
665 Q_EMIT statusChanged(m_status);
662 Q_EMIT statusChanged(m_status);
666
663
667− #if DIRECTIONALDRAGAREA_DEBUG
668− qDebug() << "[DDA]" << statusToString(oldStatus) << "->" << statusToString(newStatus);
664+ ddaDebug(statusToString(oldStatus) << " -> " << statusToString(newStatus));
669− #endif
670
665
671 switch (newStatus) {
666 switch (newStatus) {
672 case WaitingForTouch:
667 case WaitingForTouch:
@@ -873,7 +868,7 @@ void DirectionalDragArea::updateSceneDirectionVector()
873 localDirection.rx() = -1.;
868 localDirection.rx() = -1.;
874 localDirection.ry() = 0.;
869 localDirection.ry() = 0.;
875 break;
870 break;
876− default: // Direction::Rightwards:
871+ default: // Direction::Rightwards || Direction.Horizontal
877 localDirection.rx() = 1.;
872 localDirection.rx() = 1.;
878 localDirection.ry() = 0.;
873 localDirection.ry() = 0.;
879 break;
874 break;
@@ -889,6 +884,3 @@ qreal DirectionalDragArea::projectOntoDirectionVector(const QPointF &sceneVector
889 return sceneVector.x() * m_sceneDirectionVector.x() +
884 return sceneVector.x() * m_sceneDirectionVector.x() +
890 sceneVector.y() * m_sceneDirectionVector.y();
885 sceneVector.y() * m_sceneDirectionVector.y();
891}
886}
892−
893−// Because we are defining a new QObject-based class (RecognitionTimer) here.
894−#include "DirectionalDragArea.moc"
plugins/Ubuntu/Gestures/TouchDispatcher.cpp+43
@@ -16,7 +16,9 @@
16
16
17#include "TouchDispatcher.h"
17#include "TouchDispatcher.h"
18
18
19+#include <QGuiApplication>
19#include <QScopedPointer>
20#include <QScopedPointer>
21+#include <QStyleHints>
20
22
21#pragma GCC diagnostic push
23#pragma GCC diagnostic push
22#pragma GCC diagnostic ignored "-pedantic"
24#pragma GCC diagnostic ignored "-pedantic"
@@ -32,6 +34,7 @@
32TouchDispatcher::TouchDispatcher()
34TouchDispatcher::TouchDispatcher()
33 : m_status(NoActiveTouch)
35 : m_status(NoActiveTouch)
34 , m_touchMouseId(-1)
36 , m_touchMouseId(-1)
37+ , m_touchMousePressTimestamp(0)
35{
38{
36}
39}
37
40
@@ -148,6 +151,18 @@ void TouchDispatcher::dispatchTouchBegin(
148 #endif
151 #endif
149 m_status = DeliveringMouseEvents;
152 m_status = DeliveringMouseEvents;
150 m_touchMouseId = targetTouchPoints.at(0).id();
153 m_touchMouseId = targetTouchPoints.at(0).id();
154+
155+ if (checkIfDoubleClicked(timestamp)) {
156+ QScopedPointer<QMouseEvent> doubleClickEvent(
157+ touchToMouseEvent(QEvent::MouseButtonDblClick, targetTouchPoints.at(0), timestamp,
158+ modifiers, false /* transformNeeded */));
159+ #if TOUCHDISPATCHER_DEBUG
160+ qDebug() << "[TouchDispatcher] dispatching" << qPrintable(mouseEventToString(doubleClickEvent.data()))
161+ << "to" << m_targetItem.data();
162+ #endif
163+ QCoreApplication::sendEvent(targetItem, doubleClickEvent.data());
164+ }
165+
151 } else {
166 } else {
152 #if TOUCHDISPATCHER_DEBUG
167 #if TOUCHDISPATCHER_DEBUG
153 qDebug() << "[TouchDispatcher] Item rejected the QMouseEvent.";
168 qDebug() << "[TouchDispatcher] Item rejected the QMouseEvent.";
@@ -322,3 +337,31 @@ QMouseEvent *TouchDispatcher::touchToMouseEvent(
322 //QGuiApplicationPrivate::setMouseEventSource(me, Qt::MouseEventSynthesizedByQt);
337 //QGuiApplicationPrivate::setMouseEventSource(me, Qt::MouseEventSynthesizedByQt);
323 return me;
338 return me;
324}
339}
340+
341+/*
342+ Copied from qquickwindow.cpp which has:
343+ Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies)
344+ Under GPL 3.0 license.
345+*/
346+bool TouchDispatcher::checkIfDoubleClicked(ulong newPressEventTimestamp)
347+{
348+ bool doubleClicked;
349+
350+ if (m_touchMousePressTimestamp == 0) {
351+ // just initialize the variable
352+ m_touchMousePressTimestamp = newPressEventTimestamp;
353+ doubleClicked = false;
354+ } else {
355+ ulong timeBetweenPresses = newPressEventTimestamp - m_touchMousePressTimestamp;
356+ ulong doubleClickInterval = static_cast<ulong>(qApp->styleHints()->
357+ mouseDoubleClickInterval());
358+ doubleClicked = timeBetweenPresses < doubleClickInterval;
359+ if (doubleClicked) {
360+ m_touchMousePressTimestamp = 0;
361+ } else {
362+ m_touchMousePressTimestamp = newPressEventTimestamp;
363+ }
364+ }
365+
366+ return doubleClicked;
367+}
plugins/Ubuntu/Gestures/TouchDispatcher.h+3
@@ -71,6 +71,8 @@ private:
71 QMouseEvent *touchToMouseEvent(QEvent::Type type, const QTouchEvent::TouchPoint &p,
71 QMouseEvent *touchToMouseEvent(QEvent::Type type, const QTouchEvent::TouchPoint &p,
72 ulong timestamp, Qt::KeyboardModifiers modifiers, bool transformNeeded = true);
72 ulong timestamp, Qt::KeyboardModifiers modifiers, bool transformNeeded = true);
73
73
74+ bool checkIfDoubleClicked(ulong newPressEventTimestamp);
75+
74 QPointer<QQuickItem> m_targetItem;
76 QPointer<QQuickItem> m_targetItem;
75
77
76 enum {
78 enum {
@@ -81,6 +83,7 @@ private:
81 } m_status;
83 } m_status;
82
84
83 int m_touchMouseId;
85 int m_touchMouseId;
86+ ulong m_touchMousePressTimestamp;
84};
87};
85
88
86#endif // UBUNTU_TOUCH_DISPATCHER_H
89#endif // UBUNTU_TOUCH_DISPATCHER_H
plugins/Unity/Launcher/CMakeLists.txt+1−1
@@ -1,5 +1,5 @@
1include(FindPkgConfig)
1include(FindPkgConfig)
2−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)
2+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=5)
3pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
3pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
4pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
4pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
5
5
plugins/Unity/Launcher/dbusinterface.cpp+2−2
@@ -171,13 +171,13 @@ bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnec
171 }
171 }
172 } else if (message.member() == "Set") {
172 } else if (message.member() == "Set") {
173 if (message.arguments()[1].toString() == "count") {
173 if (message.arguments()[1].toString() == "count") {
174− int newCount = message.arguments()[2].toInt();
174+ int newCount = message.arguments()[2].value<QDBusVariant>().variant().toInt();
175 if (!item || newCount != item->count()) {
175 if (!item || newCount != item->count()) {
176 Q_EMIT countChanged(appid, newCount);
176 Q_EMIT countChanged(appid, newCount);
177 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "count", QVariant(newCount));
177 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "count", QVariant(newCount));
178 }
178 }
179 } else if (message.arguments()[1].toString() == "countVisible") {
179 } else if (message.arguments()[1].toString() == "countVisible") {
180− bool newVisible = message.arguments()[2].toBool();
180+ bool newVisible = message.arguments()[2].value<QDBusVariant>().variant().toBool();
181 if (!item || newVisible != item->countVisible()) {
181 if (!item || newVisible != item->countVisible()) {
182 Q_EMIT countVisibleChanged(appid, newVisible);
182 Q_EMIT countVisibleChanged(appid, newVisible);
183 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "countVisible", newVisible);
183 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "countVisible", newVisible);
plugins/Unity/Launcher/desktopfilehandler.cpp+3−1
@@ -106,10 +106,11 @@ QString DesktopFileHandler::displayName() const
106 }
106 }
107
107
108 QSettings settings(m_filename, QSettings::IniFormat);
108 QSettings settings(m_filename, QSettings::IniFormat);
109+ settings.setIniCodec("UTF-8");
109 settings.beginGroup("Desktop Entry");
110 settings.beginGroup("Desktop Entry");
110
111
111 // 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
112− QString locale = QLocale::system().name();
113+ QString locale = QLocale().name();
113 QString shortLocale = locale.split('_').first();
114 QString shortLocale = locale.split('_').first();
114
115
115 if (locale != shortLocale && settings.contains(QString("Name[%1]").arg(locale))) {
116 if (locale != shortLocale && settings.contains(QString("Name[%1]").arg(locale))) {
@@ -138,6 +139,7 @@ QString DesktopFileHandler::icon() const
138 }
139 }
139
140
140 QSettings settings(m_filename, QSettings::IniFormat);
141 QSettings settings(m_filename, QSettings::IniFormat);
142+ settings.setIniCodec("UTF-8");
141 settings.beginGroup("Desktop Entry");
143 settings.beginGroup("Desktop Entry");
142 QString iconString = settings.value("Icon").toString();
144 QString iconString = settings.value("Icon").toString();
143 QString pathString = settings.value("Path").toString();
145 QString pathString = settings.value("Path").toString();
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+16−4
@@ -281,9 +281,11 @@ void LauncherModel::unpin(const QString &appId)
281 }
281 }
282
282
283 if (m_appManager->findApplication(appId)) {
283 if (m_appManager->findApplication(appId)) {
284+ if (m_list.at(index)->pinned()) {
284− m_list.at(index)->setPinned(false);
285+ m_list.at(index)->setPinned(false);
285− QModelIndex modelIndex = this->index(index);
286+ QModelIndex modelIndex = this->index(index);
286− Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RolePinned);
287+ Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RolePinned);
288+ }
287 } else {
289 } else {
288 beginRemoveRows(QModelIndex(), index, index);
290 beginRemoveRows(QModelIndex(), index, index);
289 m_list.takeAt(index)->deleteLater();
291 m_list.takeAt(index)->deleteLater();
@@ -347,6 +349,7 @@ void LauncherModel::countVisibleChanged(const QString &appId, int countVisible)
347 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
349 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
348 m_list.append(item);
350 m_list.append(item);
349 endInsertRows();
351 endInsertRows();
352+ Q_EMIT hint();
350 }
353 }
351 }
354 }
352}
355}
@@ -367,6 +370,7 @@ void LauncherModel::refresh()
367 int idx = m_list.indexOf(item);
370 int idx = m_list.indexOf(item);
368 item->setName(desktopFile.displayName());
371 item->setName(desktopFile.displayName());
369 item->setIcon(desktopFile.icon());
372 item->setIcon(desktopFile.icon());
373+ item->setPinned(item->pinned()); // update pinned text if needed
370 Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
374 Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
371 }
375 }
372 }
376 }
@@ -375,6 +379,8 @@ void LauncherModel::refresh()
375 unpin(item->appId());
379 unpin(item->appId());
376 }
380 }
377
381
382+ bool changed = toBeRemoved.count() > 0;
383+
378 // This brings the Launcher into sync with the settings backend again. There's an issue though:
384 // This brings the Launcher into sync with the settings backend again. There's an issue though:
379 // If we can't find a .desktop file for an entry we need to skip it. That makes our settingsIndex
385 // If we can't find a .desktop file for an entry we need to skip it. That makes our settingsIndex
380 // go out of sync with the actual index of items. So let's also use an addedIndex which reflects
386 // go out of sync with the actual index of items. So let's also use an addedIndex which reflects
@@ -409,18 +415,24 @@ void LauncherModel::refresh()
409 beginInsertRows(QModelIndex(), addedIndex, addedIndex);
415 beginInsertRows(QModelIndex(), addedIndex, addedIndex);
410 m_list.insert(addedIndex, item);
416 m_list.insert(addedIndex, item);
411 endInsertRows();
417 endInsertRows();
418+ changed = true;
412 } else if (itemIndex != addedIndex) {
419 } else if (itemIndex != addedIndex) {
413− // The item is already there, but it is in a different place then in the settings.
420+ // The item is already there, but it is in a different place than in the settings.
414 // Move it to the addedIndex
421 // Move it to the addedIndex
415 beginMoveRows(QModelIndex(), itemIndex, itemIndex, QModelIndex(), addedIndex);
422 beginMoveRows(QModelIndex(), itemIndex, itemIndex, QModelIndex(), addedIndex);
416 m_list.move(itemIndex, addedIndex);
423 m_list.move(itemIndex, addedIndex);
417 endMoveRows();
424 endMoveRows();
425+ changed = true;
418 }
426 }
419
427
420 // Just like settingsIndex, this will increase with every item, except the ones we
428 // Just like settingsIndex, this will increase with every item, except the ones we
421 // skipped with the "continue" call above.
429 // skipped with the "continue" call above.
422 addedIndex++;
430 addedIndex++;
423 }
431 }
432+
433+ if (changed) {
434+ Q_EMIT hint();
435+ }
424}
436}
425
437
426void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
438void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
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/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−1
@@ -33,6 +33,6 @@ target_link_libraries(Utils-qml ${GIO_LDFLAGS})
33# files directly in targets.
33# files directly in targets.
34set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
34set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
35
35
36−qt5_use_modules(Utils-qml Qml Quick DBus Network XmlPatterns Gui Concurrent)
36+qt5_use_modules(Utils-qml Qml Quick DBus Network Gui)
37
37
38add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)
38add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)
plugins/Utils/relativetimeformatter.cpp+31−39
@@ -74,53 +74,45 @@ getDateProximity(GDateTime* now, GDateTime* time)
74 }
74 }
75
75
76 // did it happen yesterday?
76 // did it happen yesterday?
77− GDateTime* tomorrow = g_date_time_add_days(now, -1);
77+ GDateTime* yesterday = g_date_time_add_days(now, -1);
78 gint tom_year, tom_month, tom_day;
78 gint tom_year, tom_month, tom_day;
79− g_date_time_get_ymd(tomorrow, &tom_year, &tom_month, &tom_day);
79+ g_date_time_get_ymd(yesterday, &tom_year, &tom_month, &tom_day);
80− g_date_time_unref(tomorrow);
80+ g_date_time_unref(yesterday);
81 if ((tom_year == time_year) && (tom_month == time_month) && (tom_day == time_day)) {
81 if ((tom_year == time_year) && (tom_month == time_month) && (tom_day == time_day)) {
82 return DATE_PROXIMITY_YESTERDAY;
82 return DATE_PROXIMITY_YESTERDAY;
83 }
83 }
84
84
85 // does it happen tomorrow?
85 // does it happen tomorrow?
86− if (prox == DATE_PROXIMITY_FAR)
87− {
88− GDateTime* tomorrow = g_date_time_add_days(now, 1);
86+ GDateTime* tomorrow = g_date_time_add_days(now, 1);
89−
90− gint tom_year, tom_month, tom_day;
91− g_date_time_get_ymd(tomorrow, &tom_year, &tom_month, &tom_day);
87+ g_date_time_get_ymd(tomorrow, &tom_year, &tom_month, &tom_day);
92− g_date_time_unref(tomorrow);
88+ g_date_time_unref(tomorrow);
93− if ((tom_year == time_year) && (tom_month == time_month) && (tom_day == time_day)) {
89+ if ((tom_year == time_year) && (tom_month == time_month) && (tom_day == time_day)) {
94− return DATE_PROXIMITY_TOMORROW;
90+ return DATE_PROXIMITY_TOMORROW;
95− }
96 }
91 }
97
92
98 // does it happen this week?
93 // does it happen this week?
99− if (prox == DATE_PROXIMITY_FAR) {
100− if (g_date_time_compare(time, now) < 0) {
94+ if (g_date_time_compare(time, now) < 0) {
101− GDateTime* last_week = g_date_time_add_days(now, -6);
95+ GDateTime* last_week = g_date_time_add_days(now, -6);
102− GDateTime* last_week_bound = g_date_time_new_local(g_date_time_get_year(last_week),
96+ GDateTime* last_week_bound = g_date_time_new_local(g_date_time_get_year(last_week),
103− g_date_time_get_month(last_week),
97+ g_date_time_get_month(last_week),
104− g_date_time_get_day_of_month(last_week),
98+ g_date_time_get_day_of_month(last_week),
105− 0, 0, 0);
99+ 0, 0, 0);
106− if (g_date_time_compare(time, last_week_bound) >= 0)
100+ if (g_date_time_compare(time, last_week_bound) >= 0)
107− prox = DATE_PROXIMITY_LAST_WEEK;
101+ prox = DATE_PROXIMITY_LAST_WEEK;
108−
102+
109− g_date_time_unref(last_week);
103+ g_date_time_unref(last_week);
110− g_date_time_unref(last_week_bound);
104+ g_date_time_unref(last_week_bound);
111− } else {
105+ } else {
112− GDateTime* next_week = g_date_time_add_days(now, 6);
106+ GDateTime* next_week = g_date_time_add_days(now, 6);
113− GDateTime* next_week_bound = g_date_time_new_local(g_date_time_get_year(next_week),
107+ GDateTime* next_week_bound = g_date_time_new_local(g_date_time_get_year(next_week),
114− g_date_time_get_month(next_week),
108+ g_date_time_get_month(next_week),
115− g_date_time_get_day_of_month(next_week),
109+ g_date_time_get_day_of_month(next_week),
116− 23, 59, 59.9);
110+ 23, 59, 59.9);
117− if (g_date_time_compare(time, next_week_bound) <= 0)
111+ if (g_date_time_compare(time, next_week_bound) <= 0)
118− prox = DATE_PROXIMITY_NEXT_WEEK;
112+ prox = DATE_PROXIMITY_NEXT_WEEK;
119−
113+
120− g_date_time_unref(next_week);
114+ g_date_time_unref(next_week);
121− g_date_time_unref(next_week_bound);
115+ g_date_time_unref(next_week_bound);
122− }
123−
124 }
116 }
125
117
126 return prox;
118 return prox;
@@ -250,7 +242,7 @@ char* generate_full_format_string_at_time (GDateTime* now,
250
242
251QString RelativeTimeFormatter::format() const
243QString RelativeTimeFormatter::format() const
252{
244{
253− GDateTime* now = g_date_time_new_from_unix_utc(QDateTime::currentMSecsSinceEpoch() / 1000);
245+ GDateTime* now = g_date_time_new_now_local();
254 if (!now) { return QString(); }
246 if (!now) { return QString(); }
255
247
256 GDateTime* then = g_date_time_new_from_unix_local(time());
248 GDateTime* then = g_date_time_new_from_unix_local(time());
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+277−99
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-08 00:48+0000\n"
11+"PO-Revision-Date: 2014-11-06 00:53+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-10-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -112,79 +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:198
139+#: qml/Components/EdgeDemo.qml:214
140msgid "Left edge"
140msgid "Left edge"
141msgstr "የግራ ጠርዝ"
141msgstr "የግራ ጠርዝ"
142
142
143−#: qml/Components/EdgeDemo.qml:199
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:226
147+#: qml/Components/EdgeDemo.qml:242
148msgid "Well done"
148msgid "Well done"
149msgstr "ጥሩ አድረገዋል"
149msgstr "ጥሩ አድረገዋል"
150
150
151−#: qml/Components/EdgeDemo.qml:227
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:220
158+#: qml/Components/Lockscreen.qml:238
159+msgid "Return to Call"
160+msgstr "ወደ ጥሪ መመለሻ"
161+
162+#: qml/Components/Lockscreen.qml:238
159msgid "Emergency Call"
163msgid "Emergency Call"
160msgstr "የ ድንገተኛ ጥሪ"
164msgstr "የ ድንገተኛ ጥሪ"
161
165
162−#: qml/Components/Lockscreen.qml:252
166+#: qml/Components/Lockscreen.qml:270
163msgid "OK"
167msgid "OK"
164msgstr "እሺ"
168msgstr "እሺ"
165
169
166−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
170+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
167msgid "See less"
171msgid "See less"
168msgstr "አነስተኛ መመልከቻ"
172msgstr "አነስተኛ መመልከቻ"
169
173
170−#: qml/Dash/GenericScopeView.qml:434
174+#: qml/Dash/GenericScopeView.qml:431
171msgid "See all"
175msgid "See all"
172msgstr "ሁሉንም መመልከቻ"
176msgstr "ሁሉንም መመልከቻ"
173
177
174−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
178+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
175#: qml/Panel/SearchIndicator.qml:27
179#: qml/Panel/SearchIndicator.qml:27
176msgid "Search"
180msgid "Search"
177msgstr "መፈለጊያ"
181msgstr "መፈለጊያ"
178
182
179−#: qml/Dash/PageHeader.qml:268
183+#: qml/Dash/PageHeader.qml:260
184+msgid "Store"
185+msgstr "ማስቀመጫ"
186+
187+#: qml/Dash/PageHeader.qml:277
180msgid "Settings"
188msgid "Settings"
181msgstr "ማሰናጃ"
189msgstr "ማሰናጃ"
182
190
183−#: qml/Dash/PageHeader.qml:275
191+#: qml/Dash/PageHeader.qml:284
184msgid "Remove from Favorites"
192msgid "Remove from Favorites"
185msgstr "ከምወዳቸው ማስወገጃ"
193msgstr "ከምወዳቸው ማስወገጃ"
186
194
187−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:284
188msgid "Add to Favorites"
196msgid "Add to Favorites"
189msgstr "ወደምወዳቸው መጨመሪያ"
197msgstr "ወደምወዳቸው መጨመሪያ"
190
198
@@ -216,87 +224,59 @@ msgstr "ይሳቡ ለማነቃቃት…"
216msgid "Release to refresh…"
224msgid "Release to refresh…"
217msgstr "ይልቀቁ ለማነቃቃት…"
225msgstr "ይልቀቁ ለማነቃቃት…"
218
226
219−#: qml/Dash/ScopesOverview.qml:206
227+#: qml/Dash/ScopesList.qml:63
220−msgid "Manage Scopes"
228+msgid "Manage"
221−msgstr "የ ክልል አስተዳዳሪ"
229+msgstr ""
222−
223−#: qml/Dash/ScopesOverview.qml:428
224−msgid "Done"
225−msgstr "ጨርሷል"
226−
227−#: qml/Dash/ScopesOverview.qml:454
228−msgid "Store"
229−msgstr "ማስቀመጫ"
230
230
231−#: qml/Dash/ScopesOverviewTab.qml:36
231+#: qml/Dash/ScopesList.qml:107
232−msgid "Favorites"
232+msgid "Home"
233−msgstr "የምወዳቸው"
233+msgstr ""
234
234
235−#: qml/Dash/ScopesOverviewTab.qml:54
235+#: qml/Dash/ScopesList.qml:108
236−msgid "All"
236+msgid "Also installed"
237−msgstr "ሁሉንም"
237+msgstr ""
238
238
239−#: qml/Greeter/Greeter.qml:157
239+#: qml/Greeter/Greeter.qml:174
240msgid "Unlock"
240msgid "Unlock"
241msgstr "መክፈቻ"
241msgstr "መክፈቻ"
242
242
243−#: qml/Hud/HudParametrizedActionsPage.qml:139
244−msgid "Confirm"
245−msgstr "ማረጋገጫ"
246−
247−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
248−msgid "Type or say a command"
249−msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"
250−
251−#: qml/Hud/Hud.qml:84
252−msgid "Loading. Please Wait..."
253−msgstr "እባክዎን ይቆዩ በመጫን ላይ..."
254−
255−#: qml/Hud/Hud.qml:89
256−msgid "Speak Now..."
257−msgstr "አሁን ይናገሩ..."
258−
259−#: qml/Hud/Hud.qml:94
260−msgid "Speaking..."
261−msgstr "በመናገር ላይ..."
262−
263−#: qml/Notifications/NotificationMenuItemFactory.qml:116
243+#: qml/Notifications/NotificationMenuItemFactory.qml:128
264msgid "Show password"
244msgid "Show password"
265msgstr "የመግቢያ ቃል ማሳያ"
245msgstr "የመግቢያ ቃል ማሳያ"
266
246
267−#: qml/Panel/ActiveCallHint.qml:77
247+#: qml/Panel/ActiveCallHint.qml:79
268msgid "Tap to return to call..."
248msgid "Tap to return to call..."
269msgstr "ወደ ጥሪው ለመመለስ መታ ያድርጉ..."
249msgstr "ወደ ጥሪው ለመመለስ መታ ያድርጉ..."
270
250
271−#: qml/Panel/ActiveCallHint.qml:90
251+#: qml/Panel/ActiveCallHint.qml:92
272msgid "Conference"
252msgid "Conference"
273msgstr "ስብሰባ"
253msgstr "ስብሰባ"
274
254
275−#: qml/Panel/Indicators/MenuItemFactory.qml:600
255+#: qml/Panel/Indicators/MenuItemFactory.qml:643
276msgid "Nothing is playing"
256msgid "Nothing is playing"
277msgstr "ምንም አይጫወትም"
257msgstr "ምንም አይጫወትም"
278
258
279−#: qml/Panel/Indicators/MenuItemFactory.qml:748
259+#: qml/Panel/Indicators/MenuItemFactory.qml:791
280msgid "In queue…"
260msgid "In queue…"
281msgstr "ወረፋ በመጠበቅ ላይ…"
261msgstr "ወረፋ በመጠበቅ ላይ…"
282
262
283−#: qml/Panel/Indicators/MenuItemFactory.qml:752
263+#: qml/Panel/Indicators/MenuItemFactory.qml:795
284msgid "Downloading"
264msgid "Downloading"
285msgstr "በማውረድ ላይ"
265msgstr "በማውረድ ላይ"
286
266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:754
267+#: qml/Panel/Indicators/MenuItemFactory.qml:797
288msgid "Paused, tap to resume"
268msgid "Paused, tap to resume"
289msgstr "ማስቆሚያ: ለመቀጠል መታ ያድርጉ"
269msgstr "ማስቆሚያ: ለመቀጠል መታ ያድርጉ"
290
270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:756
271+#: qml/Panel/Indicators/MenuItemFactory.qml:799
292msgid "Canceled"
272msgid "Canceled"
293msgstr "ተሰርዟል"
273msgstr "ተሰርዟል"
294
274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:758
275+#: qml/Panel/Indicators/MenuItemFactory.qml:801
296msgid "Finished"
276msgid "Finished"
297msgstr "ጨርሷል"
277msgstr "ጨርሷል"
298
278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:760
279+#: qml/Panel/Indicators/MenuItemFactory.qml:803
300msgid "Failed, tap to retry"
280msgid "Failed, tap to retry"
301msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"
281msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"
302
282
@@ -308,49 +288,49 @@ msgstr "ሲም መክፈቻ"
308msgid "Roaming"
288msgid "Roaming"
309msgstr "ማዘዋወሪያ"
289msgstr "ማዘዋወሪያ"
310
290
311−#: qml/Shell.qml:346
291+#: qml/Shell.qml:367
292+#, qt-format
293+msgid "Enter %1"
294+msgstr "ማስገቢያ %1"
295+
296+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
312msgid "Enter passphrase"
297msgid "Enter passphrase"
313msgstr "የ ማለፊያ ሀረግ ያስገቡ"
298msgstr "የ ማለፊያ ሀረግ ያስገቡ"
314
299
315−#: qml/Shell.qml:347
300+#: qml/Shell.qml:369
301+msgid "Enter passcode"
302+msgstr "የ ማለፊያ ኮድ ያስገቡ"
303+
304+#: qml/Shell.qml:370
305+#, qt-format
306+msgid "Sorry, incorrect %1"
307+msgstr "አዝናለሁ: የተሳሳተ%1"
308+
309+#: qml/Shell.qml:371
316msgid "Sorry, incorrect passphrase"
310msgid "Sorry, incorrect passphrase"
317msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
311msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
318
312
319−#: qml/Shell.qml:348
313+#: qml/Shell.qml:372
320msgid "Please re-enter"
314msgid "Please re-enter"
321msgstr "እባክዎን እንደገና-ያስገቡ"
315msgstr "እባክዎን እንደገና-ያስገቡ"
322
316
323−#: qml/Shell.qml:350
317+#: qml/Shell.qml:373
324−msgid "Enter passcode"
325−msgstr "የ ማለፊያ ኮድ ያስገቡ"
326−
327−#: qml/Shell.qml:351
328msgid "Sorry, incorrect passcode"
318msgid "Sorry, incorrect passcode"
329msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
319msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
330
320
331−#: qml/Shell.qml:354
321+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
332−#, qt-format
333−msgid "Enter %1"
334−msgstr "ማስገቢያ %1"
335−
336−#: qml/Shell.qml:355
337−#, qt-format
338−msgid "Sorry, incorrect %1"
339−msgstr "አዝናለሁ: የተሳሳተ%1"
340−
341−#: qml/Shell.qml:390
342msgid "Sorry, incorrect passphrase."
322msgid "Sorry, incorrect passphrase."
343msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
323msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
344
324
345−#: qml/Shell.qml:391
325+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
346msgid "Sorry, incorrect passcode."
326msgid "Sorry, incorrect passcode."
347msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
327msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
348
328
349−#: qml/Shell.qml:392
329+#: qml/Shell.qml:469
350msgid "This will be your last attempt."
330msgid "This will be your last attempt."
351msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
331msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
352
332
353−#: qml/Shell.qml:394
333+#: qml/Shell.qml:471
354msgid ""
334msgid ""
355"If passphrase is entered incorrectly, your phone will conduct a factory "
335"If passphrase is entered incorrectly, your phone will conduct a factory "
356"reset and all personal data will be deleted."
336"reset and all personal data will be deleted."
@@ -358,7 +338,7 @@ msgstr ""
358"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
338"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
359"ይጠፋል"
339"ይጠፋል"
360
340
361−#: qml/Shell.qml:395
341+#: qml/Shell.qml:472
362msgid ""
342msgid ""
363"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 "
364"and all personal data will be deleted."
344"and all personal data will be deleted."
@@ -366,8 +346,206 @@ msgstr ""
366"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
346"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
367"ይጠፋል"
347"ይጠፋል"
368
348
369−#~ msgid "Sorry, incorrect PIN"
349+#: qml/Wizard/Page.qml:89
370−#~ msgstr "አዝናለሁ የተሳሳተ ፒን"
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+
526+#~ msgid "Type or say a command"
527+#~ msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"
528+
529+#~ msgid "Loading. Please Wait..."
530+#~ msgstr "እባክዎን ይቆዩ በመጫን ላይ..."
531+
532+#~ msgid "Speaking..."
533+#~ msgstr "በመናገር ላይ..."
534+
535+#~ msgid "Speak Now..."
536+#~ msgstr "አሁን ይናገሩ..."
537+
538+#~ msgid "Confirm"
539+#~ msgstr "ማረጋገጫ"
540+
541+#~ msgid "Favorites"
542+#~ msgstr "የምወዳቸው"
543+
544+#~ msgid "All"
545+#~ msgstr "ሁሉንም"
546+
547+#~ msgid "Done"
548+#~ msgstr "ጨርሷል"
371
549
372−#~ msgid "Enter SIM PIN"
550+#~ msgid "Manage Scopes"
373−#~ msgstr "ሲም ፒን ያስገቡ"
551+#~ msgstr "የ ክልል አስተዳዳሪ"
po/ar.po+261−89
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+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-10-09 06:36+0000\n"
19+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
20−"X-Generator: Launchpad (build 17196)\n"
20+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
138+#: qml/Components/EdgeDemo.qml:214
139msgid "Left edge"
139msgid "Left edge"
140msgstr "الحافة اليسرى"
140msgstr "الحافة اليسرى"
141
141
142−#: qml/Components/EdgeDemo.qml:199
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:226
147+#: qml/Components/EdgeDemo.qml:242
148msgid "Well done"
148msgid "Well done"
149msgstr "أحسنت!"
149msgstr "أحسنت!"
150
150
151−#: qml/Components/EdgeDemo.qml:227
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,36 +156,44 @@ msgstr ""
156"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
156"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
157"الشاشة للبدء"
157"الشاشة للبدء"
158
158
159−#: qml/Components/Lockscreen.qml:220
159+#: qml/Components/Lockscreen.qml:238
160+msgid "Return to Call"
161+msgstr ""
162+
163+#: qml/Components/Lockscreen.qml:238
160msgid "Emergency Call"
164msgid "Emergency Call"
161msgstr "مكالمة طوارئ"
165msgstr "مكالمة طوارئ"
162
166
163−#: qml/Components/Lockscreen.qml:252
167+#: qml/Components/Lockscreen.qml:270
164msgid "OK"
168msgid "OK"
165msgstr ""
169msgstr ""
166
170
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
168msgid "See less"
172msgid "See less"
169msgstr "شاهد أقل"
173msgstr "شاهد أقل"
170
174
171−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:431
172msgid "See all"
176msgid "See all"
173msgstr ""
177msgstr ""
174
178
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
176#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
181msgid "Search"
178msgstr "ابحث"
182msgstr "ابحث"
179
183
180−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:260
185+msgid "Store"
186+msgstr ""
187+
188+#: qml/Dash/PageHeader.qml:277
181msgid "Settings"
189msgid "Settings"
182msgstr ""
190msgstr ""
183
191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185msgid "Remove from Favorites"
193msgid "Remove from Favorites"
186msgstr ""
194msgstr ""
187
195
188−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:284
189msgid "Add to Favorites"
197msgid "Add to Favorites"
190msgstr ""
198msgstr ""
191
199
@@ -217,87 +225,59 @@ msgstr ""
217msgid "Release to refresh…"
225msgid "Release to refresh…"
218msgstr ""
226msgstr ""
219
227
220−#: qml/Dash/ScopesOverview.qml:206
228+#: qml/Dash/ScopesList.qml:63
221−msgid "Manage Scopes"
229+msgid "Manage"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:428
225−msgid "Done"
226−msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:454
229−msgid "Store"
230msgstr ""
230msgstr ""
231
231
232−#: qml/Dash/ScopesOverviewTab.qml:36
232+#: qml/Dash/ScopesList.qml:107
233−msgid "Favorites"
233+msgid "Home"
234msgstr ""
234msgstr ""
235
235
236−#: qml/Dash/ScopesOverviewTab.qml:54
236+#: qml/Dash/ScopesList.qml:108
237−msgid "All"
237+msgid "Also installed"
238msgstr ""
238msgstr ""
239
239
240−#: qml/Greeter/Greeter.qml:157
240+#: qml/Greeter/Greeter.qml:174
241msgid "Unlock"
241msgid "Unlock"
242msgstr ""
242msgstr ""
243
243
244−#: qml/Hud/HudParametrizedActionsPage.qml:139
245−msgid "Confirm"
246−msgstr "التأكيد"
247−
248−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
249−msgid "Type or say a command"
250−msgstr "اكتب أو قُل أمرا"
251−
252−#: qml/Hud/Hud.qml:84
253−msgid "Loading. Please Wait..."
254−msgstr "يجري التحميل. برجاء الانتظار..."
255−
256−#: qml/Hud/Hud.qml:89
257−msgid "Speak Now..."
258−msgstr "تكلم الآن..."
259−
260−#: qml/Hud/Hud.qml:94
261−msgid "Speaking..."
262−msgstr "تتكلم الآن..."
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
265msgid "Show password"
245msgid "Show password"
266msgstr "عرض كلمة السر"
246msgstr "عرض كلمة السر"
267
247
268−#: qml/Panel/ActiveCallHint.qml:77
248+#: qml/Panel/ActiveCallHint.qml:79
269msgid "Tap to return to call..."
249msgid "Tap to return to call..."
270msgstr ""
250msgstr ""
271
251
272−#: qml/Panel/ActiveCallHint.qml:90
252+#: qml/Panel/ActiveCallHint.qml:92
273msgid "Conference"
253msgid "Conference"
274msgstr ""
254msgstr ""
275
255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:600
256+#: qml/Panel/Indicators/MenuItemFactory.qml:643
277msgid "Nothing is playing"
257msgid "Nothing is playing"
278msgstr ""
258msgstr ""
279
259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:748
260+#: qml/Panel/Indicators/MenuItemFactory.qml:791
281msgid "In queue…"
261msgid "In queue…"
282msgstr ""
262msgstr ""
283
263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:752
264+#: qml/Panel/Indicators/MenuItemFactory.qml:795
285msgid "Downloading"
265msgid "Downloading"
286msgstr ""
266msgstr ""
287
267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:754
268+#: qml/Panel/Indicators/MenuItemFactory.qml:797
289msgid "Paused, tap to resume"
269msgid "Paused, tap to resume"
290msgstr ""
270msgstr ""
291
271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:756
272+#: qml/Panel/Indicators/MenuItemFactory.qml:799
293msgid "Canceled"
273msgid "Canceled"
294msgstr ""
274msgstr ""
295
275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:758
276+#: qml/Panel/Indicators/MenuItemFactory.qml:801
297msgid "Finished"
277msgid "Finished"
298msgstr ""
278msgstr ""
299
279
300−#: qml/Panel/Indicators/MenuItemFactory.qml:760
280+#: qml/Panel/Indicators/MenuItemFactory.qml:803
301msgid "Failed, tap to retry"
281msgid "Failed, tap to retry"
302msgstr ""
282msgstr ""
303
283
@@ -309,56 +289,248 @@ msgstr ""
309msgid "Roaming"
289msgid "Roaming"
310msgstr ""
290msgstr ""
311
291
312−#: qml/Shell.qml:346
292+#: qml/Shell.qml:367
293+#, qt-format
313−msgid "Enter passphrase"
294+msgid "Enter %1"
314msgstr ""
295msgstr ""
315
296
316−#: qml/Shell.qml:347
297+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
317−msgid "Sorry, incorrect passphrase"
298+msgid "Enter passphrase"
318msgstr ""
299msgstr ""
319
300
320−#: qml/Shell.qml:348
301+#: qml/Shell.qml:369
321−msgid "Please re-enter"
302+msgid "Enter passcode"
322msgstr ""
303msgstr ""
323
304
324−#: qml/Shell.qml:350
305+#: qml/Shell.qml:370
325−msgid "Enter passcode"
306+#, qt-format
307+msgid "Sorry, incorrect %1"
326msgstr ""
308msgstr ""
327
309
328−#: qml/Shell.qml:351
310+#: qml/Shell.qml:371
329−msgid "Sorry, incorrect passcode"
311+msgid "Sorry, incorrect passphrase"
330msgstr ""
312msgstr ""
331
313
332−#: qml/Shell.qml:354
314+#: qml/Shell.qml:372
333−#, qt-format
315+msgid "Please re-enter"
334−msgid "Enter %1"
335msgstr ""
316msgstr ""
336
317
337−#: qml/Shell.qml:355
318+#: qml/Shell.qml:373
338−#, qt-format
339−msgid "Sorry, incorrect %1"
319+msgid "Sorry, incorrect passcode"
340msgstr ""
320msgstr ""
341
321
342−#: qml/Shell.qml:390
322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
343msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
344msgstr ""
324msgstr ""
345
325
346−#: qml/Shell.qml:391
326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
347msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
348msgstr ""
328msgstr ""
349
329
350−#: qml/Shell.qml:392
330+#: qml/Shell.qml:469
351msgid "This will be your last attempt."
331msgid "This will be your last attempt."
352msgstr ""
332msgstr ""
353
333
354−#: qml/Shell.qml:394
334+#: qml/Shell.qml:471
355msgid ""
335msgid ""
356"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
357"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
358msgstr ""
338msgstr ""
359
339
360−#: qml/Shell.qml:395
340+#: qml/Shell.qml:472
361msgid ""
341msgid ""
362"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 "
363"and all personal data will be deleted."
343"and all personal data will be deleted."
364msgstr ""
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 ""
522+
523+#~ msgid "Confirm"
524+#~ msgstr "التأكيد"
525+
526+#~ msgid "Type or say a command"
527+#~ msgstr "اكتب أو قُل أمرا"
528+
529+#~ msgid "Loading. Please Wait..."
530+#~ msgstr "يجري التحميل. برجاء الانتظار..."
531+
532+#~ msgid "Speak Now..."
533+#~ msgstr "تكلم الآن..."
534+
535+#~ msgid "Speaking..."
536+#~ msgstr "تتكلم الآن..."
po/ast.po+277−99
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-09 09:49+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"
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-10-10 05:23+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
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:227
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,36 +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:220
162+#: qml/Components/Lockscreen.qml:238
163+msgid "Return to Call"
164+msgstr "Tornar a la llamada"
165+
166+#: qml/Components/Lockscreen.qml:238
163msgid "Emergency Call"
167msgid "Emergency Call"
164msgstr "Llamada d'emerxencia"
168msgstr "Llamada d'emerxencia"
165
169
166−#: qml/Components/Lockscreen.qml:252
170+#: qml/Components/Lockscreen.qml:270
167msgid "OK"
171msgid "OK"
168msgstr "Aceutar"
172msgstr "Aceutar"
169
173
170−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
174+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
171msgid "See less"
175msgid "See less"
172msgstr "Ver menos"
176msgstr "Ver menos"
173
177
174−#: qml/Dash/GenericScopeView.qml:434
178+#: qml/Dash/GenericScopeView.qml:431
175msgid "See all"
179msgid "See all"
176msgstr "Ver too"
180msgstr "Ver too"
177
181
178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
182+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
179#: qml/Panel/SearchIndicator.qml:27
183#: qml/Panel/SearchIndicator.qml:27
180msgid "Search"
184msgid "Search"
181msgstr "Guetar"
185msgstr "Guetar"
182
186
183−#: qml/Dash/PageHeader.qml:268
187+#: qml/Dash/PageHeader.qml:260
188+msgid "Store"
189+msgstr "Tienda"
190+
191+#: qml/Dash/PageHeader.qml:277
184msgid "Settings"
192msgid "Settings"
185msgstr "Axustes"
193msgstr "Axustes"
186
194
187−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:284
188msgid "Remove from Favorites"
196msgid "Remove from Favorites"
189msgstr "Desaniciar de favoritos"
197msgstr "Desaniciar de favoritos"
190
198
191−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:284
192msgid "Add to Favorites"
200msgid "Add to Favorites"
193msgstr "Amestar a favoritos"
201msgstr "Amestar a favoritos"
194
202
@@ -220,87 +228,59 @@ msgstr "Tirar p'anovar..."
220msgid "Release to refresh…"
228msgid "Release to refresh…"
221msgstr "Soltar p'anovar..."
229msgstr "Soltar p'anovar..."
222
230
223−#: qml/Dash/ScopesOverview.qml:206
231+#: qml/Dash/ScopesList.qml:63
224−msgid "Manage Scopes"
232+msgid "Manage"
225−msgstr "Xestionar ámbitos"
233+msgstr ""
226−
227−#: qml/Dash/ScopesOverview.qml:428
228−msgid "Done"
229−msgstr "Fecho"
230−
231−#: qml/Dash/ScopesOverview.qml:454
232−msgid "Store"
233−msgstr "Tienda"
234
234
235−#: qml/Dash/ScopesOverviewTab.qml:36
235+#: qml/Dash/ScopesList.qml:107
236−msgid "Favorites"
236+msgid "Home"
237−msgstr "Favoritos"
237+msgstr ""
238
238
239−#: qml/Dash/ScopesOverviewTab.qml:54
239+#: qml/Dash/ScopesList.qml:108
240−msgid "All"
240+msgid "Also installed"
241−msgstr "Too"
241+msgstr ""
242
242
243−#: qml/Greeter/Greeter.qml:157
243+#: qml/Greeter/Greeter.qml:174
244msgid "Unlock"
244msgid "Unlock"
245msgstr "Desbloquiar"
245msgstr "Desbloquiar"
246
246
247−#: qml/Hud/HudParametrizedActionsPage.qml:139
248−msgid "Confirm"
249−msgstr "Confirmar"
250−
251−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
252−msgid "Type or say a command"
253−msgstr "Escribi o di una orde"
254−
255−#: qml/Hud/Hud.qml:84
256−msgid "Loading. Please Wait..."
257−msgstr "Cargando, espera…"
258−
259−#: qml/Hud/Hud.qml:89
260−msgid "Speak Now..."
261−msgstr "Fala agora…"
262−
263−#: qml/Hud/Hud.qml:94
264−msgid "Speaking..."
265−msgstr "Falando…"
266−
267−#: qml/Notifications/NotificationMenuItemFactory.qml:116
247+#: qml/Notifications/NotificationMenuItemFactory.qml:128
268msgid "Show password"
248msgid "Show password"
269msgstr "Amosar contraseña"
249msgstr "Amosar contraseña"
270
250
271−#: qml/Panel/ActiveCallHint.qml:77
251+#: qml/Panel/ActiveCallHint.qml:79
272msgid "Tap to return to call..."
252msgid "Tap to return to call..."
273msgstr "Tocar pa tornar a la llamada..."
253msgstr "Tocar pa tornar a la llamada..."
274
254
275−#: qml/Panel/ActiveCallHint.qml:90
255+#: qml/Panel/ActiveCallHint.qml:92
276msgid "Conference"
256msgid "Conference"
277msgstr "Conferencia"
257msgstr "Conferencia"
278
258
279−#: qml/Panel/Indicators/MenuItemFactory.qml:600
259+#: qml/Panel/Indicators/MenuItemFactory.qml:643
280msgid "Nothing is playing"
260msgid "Nothing is playing"
281msgstr "Nun hai nada en reproducción"
261msgstr "Nun hai nada en reproducción"
282
262
283−#: qml/Panel/Indicators/MenuItemFactory.qml:748
263+#: qml/Panel/Indicators/MenuItemFactory.qml:791
284msgid "In queue…"
264msgid "In queue…"
285msgstr "N'espera…"
265msgstr "N'espera…"
286
266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:752
267+#: qml/Panel/Indicators/MenuItemFactory.qml:795
288msgid "Downloading"
268msgid "Downloading"
289msgstr "Baxando"
269msgstr "Baxando"
290
270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:754
271+#: qml/Panel/Indicators/MenuItemFactory.qml:797
292msgid "Paused, tap to resume"
272msgid "Paused, tap to resume"
293msgstr "Posáu, toca pa reanudar"
273msgstr "Posáu, toca pa reanudar"
294
274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:756
275+#: qml/Panel/Indicators/MenuItemFactory.qml:799
296msgid "Canceled"
276msgid "Canceled"
297msgstr "Encaboxáu"
277msgstr "Encaboxáu"
298
278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:758
279+#: qml/Panel/Indicators/MenuItemFactory.qml:801
300msgid "Finished"
280msgid "Finished"
301msgstr "Finó"
281msgstr "Finó"
302
282
303−#: qml/Panel/Indicators/MenuItemFactory.qml:760
283+#: qml/Panel/Indicators/MenuItemFactory.qml:803
304msgid "Failed, tap to retry"
284msgid "Failed, tap to retry"
305msgstr "Falló, toca pa reintentar"
285msgstr "Falló, toca pa reintentar"
306
286
@@ -312,49 +292,49 @@ msgstr "Desbloquiar SIM"
312msgid "Roaming"
292msgid "Roaming"
313msgstr "Roaming"
293msgstr "Roaming"
314
294
315−#: qml/Shell.qml:346
295+#: qml/Shell.qml:367
296+#, qt-format
297+msgid "Enter %1"
298+msgstr "Escribi %1"
299+
300+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
316msgid "Enter passphrase"
301msgid "Enter passphrase"
317msgstr "Escribi la frase contraseña"
302msgstr "Escribi la frase contraseña"
318
303
319−#: qml/Shell.qml:347
304+#: qml/Shell.qml:369
305+msgid "Enter passcode"
306+msgstr "Escribi'l códigu de pasu"
307+
308+#: qml/Shell.qml:370
309+#, qt-format
310+msgid "Sorry, incorrect %1"
311+msgstr "Sentímoslo, %1 incorreutu"
312+
313+#: qml/Shell.qml:371
320msgid "Sorry, incorrect passphrase"
314msgid "Sorry, incorrect passphrase"
321msgstr "Sentímoslo, contraseña incorreuta"
315msgstr "Sentímoslo, contraseña incorreuta"
322
316
323−#: qml/Shell.qml:348
317+#: qml/Shell.qml:372
324msgid "Please re-enter"
318msgid "Please re-enter"
325msgstr "Vuelvi a escribila"
319msgstr "Vuelvi a escribila"
326
320
327−#: qml/Shell.qml:350
321+#: qml/Shell.qml:373
328−msgid "Enter passcode"
329−msgstr "Escribi'l códigu de pasu"
330−
331−#: qml/Shell.qml:351
332msgid "Sorry, incorrect passcode"
322msgid "Sorry, incorrect passcode"
333msgstr "Sentímoslo, códigu de pasu incorreutu"
323msgstr "Sentímoslo, códigu de pasu incorreutu"
334
324
335−#: qml/Shell.qml:354
325+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
336−#, qt-format
337−msgid "Enter %1"
338−msgstr "Escribi %1"
339−
340−#: qml/Shell.qml:355
341−#, qt-format
342−msgid "Sorry, incorrect %1"
343−msgstr "Sentímoslo, %1 incorreutu"
344−
345−#: qml/Shell.qml:390
346msgid "Sorry, incorrect passphrase."
326msgid "Sorry, incorrect passphrase."
347msgstr "Fras de pasu incorreuta"
327msgstr "Fras de pasu incorreuta"
348
328
349−#: qml/Shell.qml:391
329+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
350msgid "Sorry, incorrect passcode."
330msgid "Sorry, incorrect passcode."
351msgstr "Códigu de pasu incorreutu"
331msgstr "Códigu de pasu incorreutu"
352
332
353−#: qml/Shell.qml:392
333+#: qml/Shell.qml:469
354msgid "This will be your last attempt."
334msgid "This will be your last attempt."
355msgstr "Esti ye'l caberu intentu."
335msgstr "Esti ye'l caberu intentu."
356
336
357−#: qml/Shell.qml:394
337+#: qml/Shell.qml:471
358msgid ""
338msgid ""
359"If passphrase is entered incorrectly, your phone will conduct a factory "
339"If passphrase is entered incorrectly, your phone will conduct a factory "
360"reset and all personal data will be deleted."
340"reset and all personal data will be deleted."
@@ -362,7 +342,7 @@ msgstr ""
362"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "
342"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "
363"configuración de fábrica y van perdese tolos datos personales."
343"configuración de fábrica y van perdese tolos datos personales."
364
344
365−#: qml/Shell.qml:395
345+#: qml/Shell.qml:472
366msgid ""
346msgid ""
367"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 "
368"and all personal data will be deleted."
348"and all personal data will be deleted."
@@ -370,8 +350,206 @@ msgstr ""
370"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "
350"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "
371"configuración de fábrica y van perdese tolos datos personales."
351"configuración de fábrica y van perdese tolos datos personales."
372
352
373−#~ msgid "Sorry, incorrect PIN"
353+#: qml/Wizard/Page.qml:89
374−#~ msgstr "PIN incorreutu"
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+
530+#~ msgid "Confirm"
531+#~ msgstr "Confirmar"
532+
533+#~ msgid "Speaking..."
534+#~ msgstr "Falando…"
535+
536+#~ msgid "Loading. Please Wait..."
537+#~ msgstr "Cargando, espera…"
538+
539+#~ msgid "Type or say a command"
540+#~ msgstr "Escribi o di una orde"
541+
542+#~ msgid "Speak Now..."
543+#~ msgstr "Fala agora…"
544+
545+#~ msgid "Done"
546+#~ msgstr "Fecho"
547+
548+#~ msgid "Favorites"
549+#~ msgstr "Favoritos"
550+
551+#~ msgid "All"
552+#~ msgstr "Too"
375
553
376−#~ msgid "Enter SIM PIN"
554+#~ msgid "Manage Scopes"
377−#~ msgstr "Escribi'l PIN de la SIM"
555+#~ msgstr "Xestionar ámbitos"
po/az.po+271−96
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+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-10-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
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:227
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,36 +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:220
158+#: qml/Components/Lockscreen.qml:238
159+msgid "Return to Call"
160+msgstr ""
161+
162+#: qml/Components/Lockscreen.qml:238
159msgid "Emergency Call"
163msgid "Emergency Call"
160msgstr "Zərurət zəngi"
164msgstr "Zərurət zəngi"
161
165
162−#: qml/Components/Lockscreen.qml:252
166+#: qml/Components/Lockscreen.qml:270
163msgid "OK"
167msgid "OK"
164msgstr "Oldu"
168msgstr "Oldu"
165
169
166−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
170+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
167msgid "See less"
171msgid "See less"
168msgstr "Daha azını gör"
172msgstr "Daha azını gör"
169
173
170−#: qml/Dash/GenericScopeView.qml:434
174+#: qml/Dash/GenericScopeView.qml:431
171msgid "See all"
175msgid "See all"
172msgstr "Hamısını gör"
176msgstr "Hamısını gör"
173
177
174−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
178+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
175#: qml/Panel/SearchIndicator.qml:27
179#: qml/Panel/SearchIndicator.qml:27
176msgid "Search"
180msgid "Search"
177msgstr "Axtar"
181msgstr "Axtar"
178
182
179−#: qml/Dash/PageHeader.qml:268
183+#: qml/Dash/PageHeader.qml:260
184+msgid "Store"
185+msgstr ""
186+
187+#: qml/Dash/PageHeader.qml:277
180msgid "Settings"
188msgid "Settings"
181msgstr "Tənzimləmələr"
189msgstr "Tənzimləmələr"
182
190
183−#: qml/Dash/PageHeader.qml:275
191+#: qml/Dash/PageHeader.qml:284
184msgid "Remove from Favorites"
192msgid "Remove from Favorites"
185msgstr "Seçilmişlәrdәn çıxart"
193msgstr "Seçilmişlәrdәn çıxart"
186
194
187−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:284
188msgid "Add to Favorites"
196msgid "Add to Favorites"
189msgstr "Seçilmişlәrә әlavә et"
197msgstr "Seçilmişlәrә әlavә et"
190
198
@@ -216,87 +224,59 @@ msgstr ""
216msgid "Release to refresh…"
224msgid "Release to refresh…"
217msgstr ""
225msgstr ""
218
226
219−#: qml/Dash/ScopesOverview.qml:206
227+#: qml/Dash/ScopesList.qml:63
220−msgid "Manage Scopes"
228+msgid "Manage"
221msgstr ""
229msgstr ""
222
230
223−#: qml/Dash/ScopesOverview.qml:428
231+#: qml/Dash/ScopesList.qml:107
224−msgid "Done"
232+msgid "Home"
225−msgstr "Başa çatdı"
226−
227−#: qml/Dash/ScopesOverview.qml:454
228−msgid "Store"
229msgstr ""
233msgstr ""
230
234
231−#: qml/Dash/ScopesOverviewTab.qml:36
235+#: qml/Dash/ScopesList.qml:108
232−msgid "Favorites"
236+msgid "Also installed"
233−msgstr "Seçilmişlər"
234−
235−#: qml/Dash/ScopesOverviewTab.qml:54
236−msgid "All"
237−msgstr "Hamısı"
237+msgstr ""
238
238
239−#: qml/Greeter/Greeter.qml:157
239+#: qml/Greeter/Greeter.qml:174
240msgid "Unlock"
240msgid "Unlock"
241msgstr ""
241msgstr ""
242
242
243−#: qml/Hud/HudParametrizedActionsPage.qml:139
244−msgid "Confirm"
245−msgstr "Təsdiqlə"
246−
247−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
248−msgid "Type or say a command"
249−msgstr "Bir әmr söyləyin və ya yazın"
250−
251−#: qml/Hud/Hud.qml:84
252−msgid "Loading. Please Wait..."
253−msgstr "Yüklənir. Zəhmət olmasa, gözləyin..."
254−
255−#: qml/Hud/Hud.qml:89
256−msgid "Speak Now..."
257−msgstr "Danışın..."
258−
259−#: qml/Hud/Hud.qml:94
260−msgid "Speaking..."
261−msgstr "Danışır..."
262−
263−#: qml/Notifications/NotificationMenuItemFactory.qml:116
243+#: qml/Notifications/NotificationMenuItemFactory.qml:128
264msgid "Show password"
244msgid "Show password"
265msgstr "Şifrәni göstәr"
245msgstr "Şifrәni göstәr"
266
246
267−#: qml/Panel/ActiveCallHint.qml:77
247+#: qml/Panel/ActiveCallHint.qml:79
268msgid "Tap to return to call..."
248msgid "Tap to return to call..."
269msgstr "Zəngə qayıtmaq üçün toxunun..."
249msgstr "Zəngə qayıtmaq üçün toxunun..."
270
250
271−#: qml/Panel/ActiveCallHint.qml:90
251+#: qml/Panel/ActiveCallHint.qml:92
272msgid "Conference"
252msgid "Conference"
273msgstr "Konfrans"
253msgstr "Konfrans"
274
254
275−#: qml/Panel/Indicators/MenuItemFactory.qml:600
255+#: qml/Panel/Indicators/MenuItemFactory.qml:643
276msgid "Nothing is playing"
256msgid "Nothing is playing"
277msgstr ""
257msgstr ""
278
258
279−#: qml/Panel/Indicators/MenuItemFactory.qml:748
259+#: qml/Panel/Indicators/MenuItemFactory.qml:791
280msgid "In queue…"
260msgid "In queue…"
281msgstr "Növbədədir..."
261msgstr "Növbədədir..."
282
262
283−#: qml/Panel/Indicators/MenuItemFactory.qml:752
263+#: qml/Panel/Indicators/MenuItemFactory.qml:795
284msgid "Downloading"
264msgid "Downloading"
285msgstr "Endirilir"
265msgstr "Endirilir"
286
266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:754
267+#: qml/Panel/Indicators/MenuItemFactory.qml:797
288msgid "Paused, tap to resume"
268msgid "Paused, tap to resume"
289msgstr "Dayandırıldı. Davam etmək üçün toxunun"
269msgstr "Dayandırıldı. Davam etmək üçün toxunun"
290
270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:756
271+#: qml/Panel/Indicators/MenuItemFactory.qml:799
292msgid "Canceled"
272msgid "Canceled"
293msgstr "İmtina edildi"
273msgstr "İmtina edildi"
294
274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:758
275+#: qml/Panel/Indicators/MenuItemFactory.qml:801
296msgid "Finished"
276msgid "Finished"
297msgstr "Bitdi"
277msgstr "Bitdi"
298
278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:760
279+#: qml/Panel/Indicators/MenuItemFactory.qml:803
300msgid "Failed, tap to retry"
280msgid "Failed, tap to retry"
301msgstr "Alınmadı. Yenidәn cәhd etmək üçün toxunun"
281msgstr "Alınmadı. Yenidәn cәhd etmək üçün toxunun"
302
282
@@ -308,49 +288,49 @@ msgstr "SIM kilidini aç"
308msgid "Roaming"
288msgid "Roaming"
309msgstr "Rominq"
289msgstr "Rominq"
310
290
311−#: qml/Shell.qml:346
291+#: qml/Shell.qml:367
292+#, qt-format
293+msgid "Enter %1"
294+msgstr ""
295+
296+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
312msgid "Enter passphrase"
297msgid "Enter passphrase"
313msgstr ""
298msgstr ""
314
299
315−#: qml/Shell.qml:347
300+#: qml/Shell.qml:369
301+msgid "Enter passcode"
302+msgstr ""
303+
304+#: qml/Shell.qml:370
305+#, qt-format
306+msgid "Sorry, incorrect %1"
307+msgstr "Bağışlayın, %1 yanlışdır"
308+
309+#: qml/Shell.qml:371
316msgid "Sorry, incorrect passphrase"
310msgid "Sorry, incorrect passphrase"
317msgstr "Bağışlayın, açar söz yanlışdır"
311msgstr "Bağışlayın, açar söz yanlışdır"
318
312
319−#: qml/Shell.qml:348
313+#: qml/Shell.qml:372
320msgid "Please re-enter"
314msgid "Please re-enter"
321msgstr ""
315msgstr ""
322
316
323−#: qml/Shell.qml:350
317+#: qml/Shell.qml:373
324−msgid "Enter passcode"
325−msgstr ""
326−
327−#: qml/Shell.qml:351
328msgid "Sorry, incorrect passcode"
318msgid "Sorry, incorrect passcode"
329msgstr ""
319msgstr ""
330
320
331−#: qml/Shell.qml:354
321+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
332−#, qt-format
333−msgid "Enter %1"
334−msgstr ""
335−
336−#: qml/Shell.qml:355
337−#, qt-format
338−msgid "Sorry, incorrect %1"
339−msgstr "Bağışlayın, %1 yanlışdır"
340−
341−#: qml/Shell.qml:390
342msgid "Sorry, incorrect passphrase."
322msgid "Sorry, incorrect passphrase."
343msgstr "Bağışlayın, açar söz yanlışdır."
323msgstr "Bağışlayın, açar söz yanlışdır."
344
324
345−#: qml/Shell.qml:391
325+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
346msgid "Sorry, incorrect passcode."
326msgid "Sorry, incorrect passcode."
347msgstr "Təəssüf ki, açar kod yanlışdır."
327msgstr "Təəssüf ki, açar kod yanlışdır."
348
328
349−#: qml/Shell.qml:392
329+#: qml/Shell.qml:469
350msgid "This will be your last attempt."
330msgid "This will be your last attempt."
351msgstr "Bu sizin son cəhdiniz olacaq."
331msgstr "Bu sizin son cəhdiniz olacaq."
352
332
353−#: qml/Shell.qml:394
333+#: qml/Shell.qml:471
354msgid ""
334msgid ""
355"If passphrase is entered incorrectly, your phone will conduct a factory "
335"If passphrase is entered incorrectly, your phone will conduct a factory "
356"reset and all personal data will be deleted."
336"reset and all personal data will be deleted."
@@ -358,7 +338,7 @@ msgstr ""
358"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
338"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
359"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
339"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
360
340
361−#: qml/Shell.qml:395
341+#: qml/Shell.qml:472
362msgid ""
342msgid ""
363"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 "
364"and all personal data will be deleted."
344"and all personal data will be deleted."
@@ -366,8 +346,203 @@ msgstr ""
366"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
346"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
367"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
347"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
368
348
349+#: qml/Wizard/Page.qml:89
369−#~ msgid "Enter SIM PIN"
350+msgid "Back"
370−#~ msgstr "SIM PIN kodunuzu daxil edin"
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+
526+#~ msgid "Confirm"
527+#~ msgstr "Təsdiqlə"
528+
529+#~ msgid "Speaking..."
530+#~ msgstr "Danışır..."
531+
532+#~ msgid "Loading. Please Wait..."
533+#~ msgstr "Yüklənir. Zəhmət olmasa, gözləyin..."
534+
535+#~ msgid "Speak Now..."
536+#~ msgstr "Danışın..."
537+
538+#~ msgid "All"
539+#~ msgstr "Hamısı"
540+
541+#~ msgid "Favorites"
542+#~ msgstr "Seçilmişlər"
543+
544+#~ msgid "Done"
545+#~ msgstr "Başa çatdı"
371
546
372−#~ msgid "Sorry, incorrect PIN"
547+#~ msgid "Type or say a command"
373−#~ msgstr "Bağışlayın, PIN yanlışdır"
548+#~ msgstr "Bir әmr söyləyin və ya yazın"
po/be.po+246−89
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11"PO-Revision-Date: 2014-09-24 17:12+0000\n"
11"PO-Revision-Date: 2014-09-24 17:12+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Belarusian <be@li.org>\n"
13"Language-Team: Belarusian <be@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-10-09 06:36+0000\n"
19+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
20−"X-Generator: Launchpad (build 17196)\n"
20+"X-Generator: Launchpad (build 17286)\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
@@ -111,78 +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:198
138+#: qml/Components/EdgeDemo.qml:214
139msgid "Left edge"
139msgid "Left edge"
140msgstr ""
140msgstr ""
141
141
142−#: qml/Components/EdgeDemo.qml:199
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:226
146+#: qml/Components/EdgeDemo.qml:242
147msgid "Well done"
147msgid "Well done"
148msgstr ""
148msgstr ""
149
149
150−#: qml/Components/EdgeDemo.qml:227
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:220
156+#: qml/Components/Lockscreen.qml:238
157+msgid "Return to Call"
158+msgstr ""
159+
160+#: qml/Components/Lockscreen.qml:238
157msgid "Emergency Call"
161msgid "Emergency Call"
158msgstr ""
162msgstr ""
159
163
160−#: qml/Components/Lockscreen.qml:252
164+#: qml/Components/Lockscreen.qml:270
161msgid "OK"
165msgid "OK"
162msgstr ""
166msgstr ""
163
167
164−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
165msgid "See less"
169msgid "See less"
166msgstr ""
170msgstr ""
167
171
168−#: qml/Dash/GenericScopeView.qml:434
172+#: qml/Dash/GenericScopeView.qml:431
169msgid "See all"
173msgid "See all"
170msgstr ""
174msgstr ""
171
175
172−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
173#: qml/Panel/SearchIndicator.qml:27
177#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
178msgid "Search"
175msgstr ""
179msgstr ""
176
180
177−#: qml/Dash/PageHeader.qml:268
181+#: qml/Dash/PageHeader.qml:260
182+msgid "Store"
183+msgstr ""
184+
185+#: qml/Dash/PageHeader.qml:277
178msgid "Settings"
186msgid "Settings"
179msgstr ""
187msgstr ""
180
188
181−#: qml/Dash/PageHeader.qml:275
189+#: qml/Dash/PageHeader.qml:284
182msgid "Remove from Favorites"
190msgid "Remove from Favorites"
183msgstr ""
191msgstr ""
184
192
185−#: qml/Dash/PageHeader.qml:275
193+#: qml/Dash/PageHeader.qml:284
186msgid "Add to Favorites"
194msgid "Add to Favorites"
187msgstr ""
195msgstr ""
188
196
@@ -214,87 +222,59 @@ msgstr ""
214msgid "Release to refresh…"
222msgid "Release to refresh…"
215msgstr ""
223msgstr ""
216
224
217−#: qml/Dash/ScopesOverview.qml:206
225+#: qml/Dash/ScopesList.qml:63
218−msgid "Manage Scopes"
226+msgid "Manage"
219−msgstr ""
220−
221−#: qml/Dash/ScopesOverview.qml:428
222−msgid "Done"
223−msgstr ""
224−
225−#: qml/Dash/ScopesOverview.qml:454
226−msgid "Store"
227msgstr ""
227msgstr ""
228
228
229−#: qml/Dash/ScopesOverviewTab.qml:36
229+#: qml/Dash/ScopesList.qml:107
230−msgid "Favorites"
230+msgid "Home"
231msgstr ""
231msgstr ""
232
232
233−#: qml/Dash/ScopesOverviewTab.qml:54
233+#: qml/Dash/ScopesList.qml:108
234−msgid "All"
234+msgid "Also installed"
235msgstr ""
235msgstr ""
236
236
237−#: qml/Greeter/Greeter.qml:157
237+#: qml/Greeter/Greeter.qml:174
238msgid "Unlock"
238msgid "Unlock"
239msgstr ""
239msgstr ""
240
240
241−#: qml/Hud/HudParametrizedActionsPage.qml:139
242−msgid "Confirm"
243−msgstr ""
244−
245−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
246−msgid "Type or say a command"
247−msgstr ""
248−
249−#: qml/Hud/Hud.qml:84
250−msgid "Loading. Please Wait..."
251−msgstr ""
252−
253−#: qml/Hud/Hud.qml:89
254−msgid "Speak Now..."
255−msgstr ""
256−
257−#: qml/Hud/Hud.qml:94
258−msgid "Speaking..."
259−msgstr ""
260−
261−#: qml/Notifications/NotificationMenuItemFactory.qml:116
241+#: qml/Notifications/NotificationMenuItemFactory.qml:128
262msgid "Show password"
242msgid "Show password"
263msgstr ""
243msgstr ""
264
244
265−#: qml/Panel/ActiveCallHint.qml:77
245+#: qml/Panel/ActiveCallHint.qml:79
266msgid "Tap to return to call..."
246msgid "Tap to return to call..."
267msgstr ""
247msgstr ""
268
248
269−#: qml/Panel/ActiveCallHint.qml:90
249+#: qml/Panel/ActiveCallHint.qml:92
270msgid "Conference"
250msgid "Conference"
271msgstr ""
251msgstr ""
272
252
273−#: qml/Panel/Indicators/MenuItemFactory.qml:600
253+#: qml/Panel/Indicators/MenuItemFactory.qml:643
274msgid "Nothing is playing"
254msgid "Nothing is playing"
275msgstr ""
255msgstr ""
276
256
277−#: qml/Panel/Indicators/MenuItemFactory.qml:748
257+#: qml/Panel/Indicators/MenuItemFactory.qml:791
278msgid "In queue…"
258msgid "In queue…"
279msgstr ""
259msgstr ""
280
260
281−#: qml/Panel/Indicators/MenuItemFactory.qml:752
261+#: qml/Panel/Indicators/MenuItemFactory.qml:795
282msgid "Downloading"
262msgid "Downloading"
283msgstr ""
263msgstr ""
284
264
285−#: qml/Panel/Indicators/MenuItemFactory.qml:754
265+#: qml/Panel/Indicators/MenuItemFactory.qml:797
286msgid "Paused, tap to resume"
266msgid "Paused, tap to resume"
287msgstr ""
267msgstr ""
288
268
289−#: qml/Panel/Indicators/MenuItemFactory.qml:756
269+#: qml/Panel/Indicators/MenuItemFactory.qml:799
290msgid "Canceled"
270msgid "Canceled"
291msgstr ""
271msgstr ""
292
272
293−#: qml/Panel/Indicators/MenuItemFactory.qml:758
273+#: qml/Panel/Indicators/MenuItemFactory.qml:801
294msgid "Finished"
274msgid "Finished"
295msgstr ""
275msgstr ""
296
276
297−#: qml/Panel/Indicators/MenuItemFactory.qml:760
277+#: qml/Panel/Indicators/MenuItemFactory.qml:803
298msgid "Failed, tap to retry"
278msgid "Failed, tap to retry"
299msgstr ""
279msgstr ""
300
280
@@ -306,56 +286,233 @@ msgstr ""
306msgid "Roaming"
286msgid "Roaming"
307msgstr ""
287msgstr ""
308
288
309−#: qml/Shell.qml:346
289+#: qml/Shell.qml:367
290+#, qt-format
310−msgid "Enter passphrase"
291+msgid "Enter %1"
311msgstr ""
292msgstr ""
312
293
313−#: qml/Shell.qml:347
294+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
314−msgid "Sorry, incorrect passphrase"
295+msgid "Enter passphrase"
315msgstr ""
296msgstr ""
316
297
317−#: qml/Shell.qml:348
298+#: qml/Shell.qml:369
318−msgid "Please re-enter"
299+msgid "Enter passcode"
319msgstr ""
300msgstr ""
320
301
321−#: qml/Shell.qml:350
302+#: qml/Shell.qml:370
322−msgid "Enter passcode"
303+#, qt-format
304+msgid "Sorry, incorrect %1"
323msgstr ""
305msgstr ""
324
306
325−#: qml/Shell.qml:351
307+#: qml/Shell.qml:371
326−msgid "Sorry, incorrect passcode"
308+msgid "Sorry, incorrect passphrase"
327msgstr ""
309msgstr ""
328
310
329−#: qml/Shell.qml:354
311+#: qml/Shell.qml:372
330−#, qt-format
312+msgid "Please re-enter"
331−msgid "Enter %1"
332msgstr ""
313msgstr ""
333
314
334−#: qml/Shell.qml:355
315+#: qml/Shell.qml:373
335−#, qt-format
336−msgid "Sorry, incorrect %1"
316+msgid "Sorry, incorrect passcode"
337msgstr ""
317msgstr ""
338
318
339−#: qml/Shell.qml:390
319+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
340msgid "Sorry, incorrect passphrase."
320msgid "Sorry, incorrect passphrase."
341msgstr ""
321msgstr ""
342
322
343−#: qml/Shell.qml:391
323+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
344msgid "Sorry, incorrect passcode."
324msgid "Sorry, incorrect passcode."
345msgstr ""
325msgstr ""
346
326
347−#: qml/Shell.qml:392
327+#: qml/Shell.qml:469
348msgid "This will be your last attempt."
328msgid "This will be your last attempt."
349msgstr ""
329msgstr ""
350
330
351−#: qml/Shell.qml:394
331+#: qml/Shell.qml:471
352msgid ""
332msgid ""
353"If passphrase is entered incorrectly, your phone will conduct a factory "
333"If passphrase is entered incorrectly, your phone will conduct a factory "
354"reset and all personal data will be deleted."
334"reset and all personal data will be deleted."
355msgstr ""
335msgstr ""
356
336
357−#: qml/Shell.qml:395
337+#: qml/Shell.qml:472
358msgid ""
338msgid ""
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"If passcode is entered incorrectly, your phone will conduct a factory reset "
360"and all personal data will be deleted."
340"and all personal data will be deleted."
361msgstr ""
341msgstr ""
342+
343+#: qml/Wizard/Page.qml:89
344+msgid "Back"
345+msgstr ""
346+
347+#: qml/Wizard/Pages/10-welcome.qml:27
348+msgid "Hi!"
349+msgstr ""
350+
351+#: qml/Wizard/Pages/10-welcome.qml:44
352+msgid "Welcome to your Ubuntu phone."
353+msgstr ""
354+
355+#: qml/Wizard/Pages/10-welcome.qml:52
356+msgid "Let’s get started."
357+msgstr ""
358+
359+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
360+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
361+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
362+#: qml/Wizard/Pages/passwd-set.qml:90
363+msgid "Continue"
364+msgstr ""
365+
366+#: qml/Wizard/Pages/20-sim.qml:25
367+msgid "Add a SIM card and restart your device"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/20-sim.qml:55
371+msgid "Without it, you won’t be able to make calls or use text messaging."
372+msgstr ""
373+
374+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
375+msgid "Skip"
376+msgstr ""
377+
378+#: qml/Wizard/Pages/30-passwd-type.qml:39
379+msgid "Lock security"
380+msgstr ""
381+
382+#: qml/Wizard/Pages/30-passwd-type.qml:74
383+msgid "Please select how you’d like to unlock your phone."
384+msgstr ""
385+
386+#: qml/Wizard/Pages/30-passwd-type.qml:97
387+msgid "Swipe"
388+msgstr ""
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:98
391+msgid "No security"
392+msgstr ""
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:100
395+msgid "Passcode"
396+msgstr ""
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:101
399+msgid "4 digits only"
400+msgstr ""
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:103
403+msgid "Passphrase"
404+msgstr ""
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:104
407+msgid "Numbers and letters"
408+msgstr ""
409+
410+#: qml/Wizard/Pages/40-wifi.qml:28
411+msgid "Connect to Wi‑Fi"
412+msgstr ""
413+
414+#: qml/Wizard/Pages/40-wifi.qml:147
415+msgid "Available networks…"
416+msgstr ""
417+
418+#: qml/Wizard/Pages/40-wifi.qml:148
419+msgid "No available networks."
420+msgstr ""
421+
422+#: qml/Wizard/Pages/50-location.qml:27
423+msgid "Location"
424+msgstr ""
425+
426+#: qml/Wizard/Pages/50-location.qml:62
427+msgid "Let the phone detect your location:"
428+msgstr ""
429+
430+#: qml/Wizard/Pages/50-location.qml:69
431+msgid "Using GPS only (less accurate)"
432+msgstr ""
433+
434+#: qml/Wizard/Pages/50-location.qml:86
435+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
436+msgstr ""
437+
438+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
439+#: qml/Wizard/Pages/50-location.qml:103
440+msgid ""
441+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
442+"conditions</a>."
443+msgstr ""
444+
445+#: qml/Wizard/Pages/50-location.qml:112
446+msgid "Not at all"
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:124
450+msgid "You can change your mind later in <b>System Settings</b>."
451+msgstr ""
452+
453+#: qml/Wizard/Pages/60-reporting.qml:24
454+msgid "Improving your experience"
455+msgstr ""
456+
457+#: qml/Wizard/Pages/60-reporting.qml:36
458+msgid ""
459+"Your phone is set up to automatically report errors to Canonical and its "
460+"partners, the makers of the operating system."
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:43
464+msgid ""
465+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
466+"Privacy</b>"
467+msgstr ""
468+
469+#: qml/Wizard/Pages/80-finished.qml:24
470+msgid "All done"
471+msgstr ""
472+
473+#: qml/Wizard/Pages/80-finished.qml:39
474+msgid "Nice work!"
475+msgstr ""
476+
477+#: qml/Wizard/Pages/80-finished.qml:46
478+msgid "Your phone is now ready to use."
479+msgstr ""
480+
481+#: qml/Wizard/Pages/80-finished.qml:53
482+msgid "Finish"
483+msgstr ""
484+
485+#: qml/Wizard/Pages/here-terms.qml:27
486+msgid "Terms & Conditions"
487+msgstr ""
488+
489+#: qml/Wizard/Pages/passwd-confirm.qml:49
490+msgid "Confirm passphrase"
491+msgstr ""
492+
493+#: qml/Wizard/Pages/passwd-confirm.qml:50
494+msgid "Confirm passcode"
495+msgstr ""
496+
497+#: qml/Wizard/Pages/passwd-confirm.qml:53
498+#: qml/Wizard/Pages/passwd-confirm.qml:54
499+msgid "Please try again."
500+msgstr ""
501+
502+#: qml/Wizard/Pages/passwd-set.qml:61
503+msgid "Choose your passcode"
504+msgstr ""
505+
506+#: qml/Wizard/Pages/passwd-set.qml:68
507+msgid "Passphrase must be 4 characters long"
508+msgstr ""
509+
510+#: qml/Wizard/StackButton.qml:39
511+#, qt-format
512+msgid "〈 %1"
513+msgstr ""
514+
515+#: qml/Wizard/StackButton.qml:42
516+#, qt-format
517+msgid "%1 〉"
518+msgstr ""
po/bg.po+261−89
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+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-10-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -110,85 +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:198
142+#: qml/Components/EdgeDemo.qml:214
143msgid "Left edge"
143msgid "Left edge"
144msgstr "Ляв край"
144msgstr "Ляв край"
145
145
146−#: qml/Components/EdgeDemo.qml:199
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:226
152+#: qml/Components/EdgeDemo.qml:242
153msgid "Well done"
153msgid "Well done"
154msgstr "Великолепно"
154msgstr "Великолепно"
155
155
156−#: qml/Components/EdgeDemo.qml:227
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:220
162+#: qml/Components/Lockscreen.qml:238
163+msgid "Return to Call"
164+msgstr ""
165+
166+#: qml/Components/Lockscreen.qml:238
163msgid "Emergency Call"
167msgid "Emergency Call"
164msgstr "Спешно повикване"
168msgstr "Спешно повикване"
165
169
166−#: qml/Components/Lockscreen.qml:252
170+#: qml/Components/Lockscreen.qml:270
167msgid "OK"
171msgid "OK"
168msgstr ""
172msgstr ""
169
173
170−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
174+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
171msgid "See less"
175msgid "See less"
172msgstr ""
176msgstr ""
173
177
174−#: qml/Dash/GenericScopeView.qml:434
178+#: qml/Dash/GenericScopeView.qml:431
175msgid "See all"
179msgid "See all"
176msgstr ""
180msgstr ""
177
181
178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
182+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
179#: qml/Panel/SearchIndicator.qml:27
183#: qml/Panel/SearchIndicator.qml:27
180msgid "Search"
184msgid "Search"
181msgstr "Търсене"
185msgstr "Търсене"
182
186
183−#: qml/Dash/PageHeader.qml:268
187+#: qml/Dash/PageHeader.qml:260
188+msgid "Store"
189+msgstr ""
190+
191+#: qml/Dash/PageHeader.qml:277
184msgid "Settings"
192msgid "Settings"
185msgstr ""
193msgstr ""
186
194
187−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:284
188msgid "Remove from Favorites"
196msgid "Remove from Favorites"
189msgstr ""
197msgstr ""
190
198
191−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:284
192msgid "Add to Favorites"
200msgid "Add to Favorites"
193msgstr ""
201msgstr ""
194
202
@@ -220,87 +228,59 @@ msgstr ""
220msgid "Release to refresh…"
228msgid "Release to refresh…"
221msgstr ""
229msgstr ""
222
230
223−#: qml/Dash/ScopesOverview.qml:206
231+#: qml/Dash/ScopesList.qml:63
224−msgid "Manage Scopes"
232+msgid "Manage"
225−msgstr ""
226−
227−#: qml/Dash/ScopesOverview.qml:428
228−msgid "Done"
229−msgstr ""
230−
231−#: qml/Dash/ScopesOverview.qml:454
232−msgid "Store"
233msgstr ""
233msgstr ""
234
234
235−#: qml/Dash/ScopesOverviewTab.qml:36
235+#: qml/Dash/ScopesList.qml:107
236−msgid "Favorites"
236+msgid "Home"
237msgstr ""
237msgstr ""
238
238
239−#: qml/Dash/ScopesOverviewTab.qml:54
239+#: qml/Dash/ScopesList.qml:108
240−msgid "All"
240+msgid "Also installed"
241msgstr ""
241msgstr ""
242
242
243−#: qml/Greeter/Greeter.qml:157
243+#: qml/Greeter/Greeter.qml:174
244msgid "Unlock"
244msgid "Unlock"
245msgstr ""
245msgstr ""
246
246
247−#: qml/Hud/HudParametrizedActionsPage.qml:139
248−msgid "Confirm"
249−msgstr "Потвърди"
250−
251−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
252−msgid "Type or say a command"
253−msgstr "Въведете или кажете команда"
254−
255−#: qml/Hud/Hud.qml:84
256−msgid "Loading. Please Wait..."
257−msgstr "Зарежда се. Моля, почакайте..."
258−
259−#: qml/Hud/Hud.qml:89
260−msgid "Speak Now..."
261−msgstr "Говорете сега..."
262−
263−#: qml/Hud/Hud.qml:94
264−msgid "Speaking..."
265−msgstr "Говорете..."
266−
267−#: qml/Notifications/NotificationMenuItemFactory.qml:116
247+#: qml/Notifications/NotificationMenuItemFactory.qml:128
268msgid "Show password"
248msgid "Show password"
269msgstr "Покажи паролата"
249msgstr "Покажи паролата"
270
250
271−#: qml/Panel/ActiveCallHint.qml:77
251+#: qml/Panel/ActiveCallHint.qml:79
272msgid "Tap to return to call..."
252msgid "Tap to return to call..."
273msgstr ""
253msgstr ""
274
254
275−#: qml/Panel/ActiveCallHint.qml:90
255+#: qml/Panel/ActiveCallHint.qml:92
276msgid "Conference"
256msgid "Conference"
277msgstr ""
257msgstr ""
278
258
279−#: qml/Panel/Indicators/MenuItemFactory.qml:600
259+#: qml/Panel/Indicators/MenuItemFactory.qml:643
280msgid "Nothing is playing"
260msgid "Nothing is playing"
281msgstr ""
261msgstr ""
282
262
283−#: qml/Panel/Indicators/MenuItemFactory.qml:748
263+#: qml/Panel/Indicators/MenuItemFactory.qml:791
284msgid "In queue…"
264msgid "In queue…"
285msgstr ""
265msgstr ""
286
266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:752
267+#: qml/Panel/Indicators/MenuItemFactory.qml:795
288msgid "Downloading"
268msgid "Downloading"
289msgstr ""
269msgstr ""
290
270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:754
271+#: qml/Panel/Indicators/MenuItemFactory.qml:797
292msgid "Paused, tap to resume"
272msgid "Paused, tap to resume"
293msgstr ""
273msgstr ""
294
274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:756
275+#: qml/Panel/Indicators/MenuItemFactory.qml:799
296msgid "Canceled"
276msgid "Canceled"
297msgstr ""
277msgstr ""
298
278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:758
279+#: qml/Panel/Indicators/MenuItemFactory.qml:801
300msgid "Finished"
280msgid "Finished"
301msgstr ""
281msgstr ""
302
282
303−#: qml/Panel/Indicators/MenuItemFactory.qml:760
283+#: qml/Panel/Indicators/MenuItemFactory.qml:803
304msgid "Failed, tap to retry"
284msgid "Failed, tap to retry"
305msgstr ""
285msgstr ""
306
286
@@ -312,56 +292,248 @@ msgstr ""
312msgid "Roaming"
292msgid "Roaming"
313msgstr ""
293msgstr ""
314
294
315−#: qml/Shell.qml:346
295+#: qml/Shell.qml:367
296+#, qt-format
316−msgid "Enter passphrase"
297+msgid "Enter %1"
317msgstr ""
298msgstr ""
318
299
319−#: qml/Shell.qml:347
300+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
320−msgid "Sorry, incorrect passphrase"
301+msgid "Enter passphrase"
321msgstr ""
302msgstr ""
322
303
323−#: qml/Shell.qml:348
304+#: qml/Shell.qml:369
324−msgid "Please re-enter"
305+msgid "Enter passcode"
325msgstr ""
306msgstr ""
326
307
327−#: qml/Shell.qml:350
308+#: qml/Shell.qml:370
328−msgid "Enter passcode"
309+#, qt-format
310+msgid "Sorry, incorrect %1"
329msgstr ""
311msgstr ""
330
312
331−#: qml/Shell.qml:351
313+#: qml/Shell.qml:371
332−msgid "Sorry, incorrect passcode"
314+msgid "Sorry, incorrect passphrase"
333msgstr ""
315msgstr ""
334
316
335−#: qml/Shell.qml:354
317+#: qml/Shell.qml:372
336−#, qt-format
318+msgid "Please re-enter"
337−msgid "Enter %1"
338msgstr ""
319msgstr ""
339
320
340−#: qml/Shell.qml:355
321+#: qml/Shell.qml:373
341−#, qt-format
342−msgid "Sorry, incorrect %1"
322+msgid "Sorry, incorrect passcode"
343msgstr ""
323msgstr ""
344
324
345−#: qml/Shell.qml:390
325+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
346msgid "Sorry, incorrect passphrase."
326msgid "Sorry, incorrect passphrase."
347msgstr ""
327msgstr ""
348
328
349−#: qml/Shell.qml:391
329+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
350msgid "Sorry, incorrect passcode."
330msgid "Sorry, incorrect passcode."
351msgstr ""
331msgstr ""
352
332
353−#: qml/Shell.qml:392
333+#: qml/Shell.qml:469
354msgid "This will be your last attempt."
334msgid "This will be your last attempt."
355msgstr ""
335msgstr ""
356
336
357−#: qml/Shell.qml:394
337+#: qml/Shell.qml:471
358msgid ""
338msgid ""
359"If passphrase is entered incorrectly, your phone will conduct a factory "
339"If passphrase is entered incorrectly, your phone will conduct a factory "
360"reset and all personal data will be deleted."
340"reset and all personal data will be deleted."
361msgstr ""
341msgstr ""
362
342
363−#: qml/Shell.qml:395
343+#: qml/Shell.qml:472
364msgid ""
344msgid ""
365"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 "
366"and all personal data will be deleted."
346"and all personal data will be deleted."
367msgstr ""
347msgstr ""
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+
526+#~ msgid "Confirm"
527+#~ msgstr "Потвърди"
528+
529+#~ msgid "Type or say a command"
530+#~ msgstr "Въведете или кажете команда"
531+
532+#~ msgid "Speaking..."
533+#~ msgstr "Говорете..."
534+
535+#~ msgid "Speak Now..."
536+#~ msgstr "Говорете сега..."
537+
538+#~ msgid "Loading. Please Wait..."
539+#~ msgstr "Зарежда се. Моля, почакайте..."
po/br.po+285−99
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-07 07:03+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-10-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-16 07:34+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
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:227
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,36 +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:220
168+#: qml/Components/Lockscreen.qml:238
169+msgid "Return to Call"
170+msgstr "Distreiñ d'ar bellgomzadenn"
171+
172+#: qml/Components/Lockscreen.qml:238
169msgid "Emergency Call"
173msgid "Emergency Call"
170msgstr "Pellgomzadenn vallus"
174msgstr "Pellgomzadenn vallus"
171
175
172−#: qml/Components/Lockscreen.qml:252
176+#: qml/Components/Lockscreen.qml:270
173msgid "OK"
177msgid "OK"
174msgstr "Mat eo"
178msgstr "Mat eo"
175
179
176−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
180+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
177msgid "See less"
181msgid "See less"
178msgstr "Gwelet nebeutoc'h"
182msgstr "Gwelet nebeutoc'h"
179
183
180−#: qml/Dash/GenericScopeView.qml:434
184+#: qml/Dash/GenericScopeView.qml:431
181msgid "See all"
185msgid "See all"
182msgstr "Gwelet pep tra"
186msgstr "Gwelet pep tra"
183
187
184−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
188+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
185#: qml/Panel/SearchIndicator.qml:27
189#: qml/Panel/SearchIndicator.qml:27
186msgid "Search"
190msgid "Search"
187msgstr "Klask"
191msgstr "Klask"
188
192
189−#: qml/Dash/PageHeader.qml:268
193+#: qml/Dash/PageHeader.qml:260
194+msgid "Store"
195+msgstr "Enrollañ"
196+
197+#: qml/Dash/PageHeader.qml:277
190msgid "Settings"
198msgid "Settings"
191msgstr "Arventennoù"
199msgstr "Arventennoù"
192
200
193−#: qml/Dash/PageHeader.qml:275
201+#: qml/Dash/PageHeader.qml:284
194msgid "Remove from Favorites"
202msgid "Remove from Favorites"
195msgstr "Lemel eus ar sinedoù"
203msgstr "Lemel eus ar sinedoù"
196
204
197−#: qml/Dash/PageHeader.qml:275
205+#: qml/Dash/PageHeader.qml:284
198msgid "Add to Favorites"
206msgid "Add to Favorites"
199msgstr "Ouzhpennañ d'ar sinedoù"
207msgstr "Ouzhpennañ d'ar sinedoù"
200
208
@@ -226,87 +234,59 @@ msgstr "Tennañ evit freskaat..."
226msgid "Release to refresh…"
234msgid "Release to refresh…"
227msgstr "Lezel da vont evit freskaat..."
235msgstr "Lezel da vont evit freskaat..."
228
236
229−#: qml/Dash/ScopesOverview.qml:206
237+#: qml/Dash/ScopesList.qml:63
230−msgid "Manage Scopes"
238+msgid "Manage"
231−msgstr "Merañ ar c'hefluskerioù enklask"
239+msgstr "Merañ"
232−
233−#: qml/Dash/ScopesOverview.qml:428
234−msgid "Done"
235−msgstr "Graet eo"
236−
237−#: qml/Dash/ScopesOverview.qml:454
238−msgid "Store"
239−msgstr "Enrollañ"
240
240
241−#: qml/Dash/ScopesOverviewTab.qml:36
241+#: qml/Dash/ScopesList.qml:107
242−msgid "Favorites"
242+msgid "Home"
243−msgstr "Gwellañ deuet"
243+msgstr "Er gêr"
244
244
245−#: qml/Dash/ScopesOverviewTab.qml:54
245+#: qml/Dash/ScopesList.qml:108
246−msgid "All"
246+msgid "Also installed"
247−msgstr "An holl anezho"
247+msgstr "Staliet ivez"
248
248
249−#: qml/Greeter/Greeter.qml:157
249+#: qml/Greeter/Greeter.qml:174
250msgid "Unlock"
250msgid "Unlock"
251msgstr "Dibrennañ"
251msgstr "Dibrennañ"
252
252
253−#: qml/Hud/HudParametrizedActionsPage.qml:139
254−msgid "Confirm"
255−msgstr "Kadarnaat"
256−
257−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
258−msgid "Type or say a command"
259−msgstr "Skrivit pe lavarit un urzhiad"
260−
261−#: qml/Hud/Hud.qml:84
262−msgid "Loading. Please Wait..."
263−msgstr "O kargañ. Gortozit, mar plij..."
264−
265−#: qml/Hud/Hud.qml:89
266−msgid "Speak Now..."
267−msgstr "Komzit bremañ..."
268−
269−#: qml/Hud/Hud.qml:94
270−msgid "Speaking..."
271−msgstr "O komz..."
272−
273−#: qml/Notifications/NotificationMenuItemFactory.qml:116
253+#: qml/Notifications/NotificationMenuItemFactory.qml:128
274msgid "Show password"
254msgid "Show password"
275msgstr "Diskouez ar ger-tremen"
255msgstr "Diskouez ar ger-tremen"
276
256
277−#: qml/Panel/ActiveCallHint.qml:77
257+#: qml/Panel/ActiveCallHint.qml:79
278msgid "Tap to return to call..."
258msgid "Tap to return to call..."
279msgstr "Touchit evit distreiñ d'ar bellgomzadenn..."
259msgstr "Touchit evit distreiñ d'ar bellgomzadenn..."
280
260
281−#: qml/Panel/ActiveCallHint.qml:90
261+#: qml/Panel/ActiveCallHint.qml:92
282msgid "Conference"
262msgid "Conference"
283msgstr "Kendiviz"
263msgstr "Kendiviz"
284
264
285−#: qml/Panel/Indicators/MenuItemFactory.qml:600
265+#: qml/Panel/Indicators/MenuItemFactory.qml:643
286msgid "Nothing is playing"
266msgid "Nothing is playing"
287msgstr "Ne lenner netra bremañ"
267msgstr "Ne lenner netra bremañ"
288
268
289−#: qml/Panel/Indicators/MenuItemFactory.qml:748
269+#: qml/Panel/Indicators/MenuItemFactory.qml:791
290msgid "In queue…"
270msgid "In queue…"
291msgstr "El lostennad..."
271msgstr "El lostennad..."
292
272
293−#: qml/Panel/Indicators/MenuItemFactory.qml:752
273+#: qml/Panel/Indicators/MenuItemFactory.qml:795
294msgid "Downloading"
274msgid "Downloading"
295msgstr "O pellgargañ"
275msgstr "O pellgargañ"
296
276
297−#: qml/Panel/Indicators/MenuItemFactory.qml:754
277+#: qml/Panel/Indicators/MenuItemFactory.qml:797
298msgid "Paused, tap to resume"
278msgid "Paused, tap to resume"
299msgstr "Ehanet, touchit evit adkregiñ"
279msgstr "Ehanet, touchit evit adkregiñ"
300
280
301−#: qml/Panel/Indicators/MenuItemFactory.qml:756
281+#: qml/Panel/Indicators/MenuItemFactory.qml:799
302msgid "Canceled"
282msgid "Canceled"
303msgstr "Nullet"
283msgstr "Nullet"
304
284
305−#: qml/Panel/Indicators/MenuItemFactory.qml:758
285+#: qml/Panel/Indicators/MenuItemFactory.qml:801
306msgid "Finished"
286msgid "Finished"
307msgstr "Echu"
287msgstr "Echu"
308
288
309−#: qml/Panel/Indicators/MenuItemFactory.qml:760
289+#: qml/Panel/Indicators/MenuItemFactory.qml:803
310msgid "Failed, tap to retry"
290msgid "Failed, tap to retry"
311msgstr "C'hwitet, touchit evit adkregiñ"
291msgstr "C'hwitet, touchit evit adkregiñ"
312
292
@@ -318,49 +298,49 @@ msgstr "Dibrennañ ar gartenn SIM"
318msgid "Roaming"
298msgid "Roaming"
319msgstr "O kantren"
299msgstr "O kantren"
320
300
321−#: qml/Shell.qml:346
301+#: qml/Shell.qml:367
302+#, qt-format
303+msgid "Enter %1"
304+msgstr "Merkañ %1"
305+
306+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
322msgid "Enter passphrase"
307msgid "Enter passphrase"
323msgstr "Merkañ ar frazenn-dremen"
308msgstr "Merkañ ar frazenn-dremen"
324
309
325−#: qml/Shell.qml:347
310+#: qml/Shell.qml:369
311+msgid "Enter passcode"
312+msgstr "Merkañ ar c'hod-tremen"
313+
314+#: qml/Shell.qml:370
315+#, qt-format
316+msgid "Sorry, incorrect %1"
317+msgstr "Siwazh, %1 direizh"
318+
319+#: qml/Shell.qml:371
326msgid "Sorry, incorrect passphrase"
320msgid "Sorry, incorrect passphrase"
327msgstr "Siwazh, frazenn-dremen direizh"
321msgstr "Siwazh, frazenn-dremen direizh"
328
322
329−#: qml/Shell.qml:348
323+#: qml/Shell.qml:372
330msgid "Please re-enter"
324msgid "Please re-enter"
331msgstr "Adverkañ, mar plij"
325msgstr "Adverkañ, mar plij"
332
326
333−#: qml/Shell.qml:350
327+#: qml/Shell.qml:373
334−msgid "Enter passcode"
335−msgstr "Merkañ ar c'hod-tremen"
336−
337−#: qml/Shell.qml:351
338msgid "Sorry, incorrect passcode"
328msgid "Sorry, incorrect passcode"
339msgstr "Digarezit, kod-tremen direizh"
329msgstr "Digarezit, kod-tremen direizh"
340
330
341−#: qml/Shell.qml:354
331+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
342−#, qt-format
343−msgid "Enter %1"
344−msgstr "Merkañ %1"
345−
346−#: qml/Shell.qml:355
347−#, qt-format
348−msgid "Sorry, incorrect %1"
349−msgstr "Siwazh, %1 direizh"
350−
351−#: qml/Shell.qml:390
352msgid "Sorry, incorrect passphrase."
332msgid "Sorry, incorrect passphrase."
353msgstr "Siwazh, frazenn-dremen direizh"
333msgstr "Siwazh, frazenn-dremen direizh"
354
334
355−#: qml/Shell.qml:391
335+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
356msgid "Sorry, incorrect passcode."
336msgid "Sorry, incorrect passcode."
357msgstr "Siwazh, kod-tremen direizh"
337msgstr "Siwazh, kod-tremen direizh"
358
338
359−#: qml/Shell.qml:392
339+#: qml/Shell.qml:469
360msgid "This will be your last attempt."
340msgid "This will be your last attempt."
361msgstr "Ho taol-esae diwezhañ e vo."
341msgstr "Ho taol-esae diwezhañ e vo."
362
342
363−#: qml/Shell.qml:394
343+#: qml/Shell.qml:471
364msgid ""
344msgid ""
365"If passphrase is entered incorrectly, your phone will conduct a factory "
345"If passphrase is entered incorrectly, your phone will conduct a factory "
366"reset and all personal data will be deleted."
346"reset and all personal data will be deleted."
@@ -368,7 +348,7 @@ msgstr ""
368"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "
348"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "
369"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"
349"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"
370
350
371−#: qml/Shell.qml:395
351+#: qml/Shell.qml:472
372msgid ""
352msgid ""
373"If passcode is entered incorrectly, your phone will conduct a factory reset "
353"If passcode is entered incorrectly, your phone will conduct a factory reset "
374"and all personal data will be deleted."
354"and all personal data will be deleted."
@@ -376,8 +356,214 @@ msgstr ""
376"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "
356"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "
377"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."
357"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."
378
358
379−#~ msgid "Sorry, incorrect PIN"
359+#: qml/Wizard/Page.qml:89
380−#~ msgstr "Siwazh, kod PIN direizh"
360+msgid "Back"
361+msgstr "Distreiñ"
362+
363+#: qml/Wizard/Pages/10-welcome.qml:27
364+msgid "Hi!"
365+msgstr "Salud deoc'h !"
366+
367+#: qml/Wizard/Pages/10-welcome.qml:44
368+msgid "Welcome to your Ubuntu phone."
369+msgstr "Deuet-mat oc'h en ho pellgomzer Ubuntu."
370+
371+#: qml/Wizard/Pages/10-welcome.qml:52
372+msgid "Let’s get started."
373+msgstr "Krogomp ganti."
374+
375+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
376+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
377+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
378+#: qml/Wizard/Pages/passwd-set.qml:90
379+msgid "Continue"
380+msgstr "Kenderc'hel"
381+
382+#: qml/Wizard/Pages/20-sim.qml:25
383+msgid "Add a SIM card and restart your device"
384+msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"
385+
386+#: qml/Wizard/Pages/20-sim.qml:55
387+msgid "Without it, you won’t be able to make calls or use text messaging."
388+msgstr "Ne vioc'h ket evit pellgomz pe kas kemennadennoù hepti."
389+
390+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
391+msgid "Skip"
392+msgstr "Tremen hebiou"
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:39
395+msgid "Lock security"
396+msgstr "Surentez ar prennañ"
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:74
399+msgid "Please select how you’d like to unlock your phone."
400+msgstr ""
401+"Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."
402+
403+#: qml/Wizard/Pages/30-passwd-type.qml:97
404+msgid "Swipe"
405+msgstr "Riklañ"
406+
407+#: qml/Wizard/Pages/30-passwd-type.qml:98
408+msgid "No security"
409+msgstr "Tamm surentez ebet"
410+
411+#: qml/Wizard/Pages/30-passwd-type.qml:100
412+msgid "Passcode"
413+msgstr "Kod-tremen"
414+
415+#: qml/Wizard/Pages/30-passwd-type.qml:101
416+msgid "4 digits only"
417+msgstr "4 sifr hepken"
418+
419+#: qml/Wizard/Pages/30-passwd-type.qml:103
420+msgid "Passphrase"
421+msgstr "Frazenn-dremen"
422+
423+#: qml/Wizard/Pages/30-passwd-type.qml:104
424+msgid "Numbers and letters"
425+msgstr "Sifroù ha lizherennoù"
426+
427+#: qml/Wizard/Pages/40-wifi.qml:28
428+msgid "Connect to Wi‑Fi"
429+msgstr "Kevreañ ouzh ar Wi-Fi"
430+
431+#: qml/Wizard/Pages/40-wifi.qml:147
432+msgid "Available networks…"
433+msgstr "Rouedadoù a c'haller kaout..."
434+
435+#: qml/Wizard/Pages/40-wifi.qml:148
436+msgid "No available networks."
437+msgstr "N'eus rouedad ebet da gaout."
438+
439+#: qml/Wizard/Pages/50-location.qml:27
440+msgid "Location"
441+msgstr "Lec'h"
442+
443+#: qml/Wizard/Pages/50-location.qml:62
444+msgid "Let the phone detect your location:"
445+msgstr "Lezel ar pellgomzer da gavout pelec'h emaoc'h :"
446+
447+#: qml/Wizard/Pages/50-location.qml:69
448+msgid "Using GPS only (less accurate)"
449+msgstr "Implijout ar GPS hepken (n'eo ket ken resis)"
450+
451+#: qml/Wizard/Pages/50-location.qml:86
452+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
453+msgstr ""
454+"Implijout ar GPS, Wi-Fi dizanv pe titouroù ar rouedad kelligel (aliet)"
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+"Pa ziuzit an dibarzh-mañ ez asantit da <a href='#'>zivizoù implij</a> Nokia."
463+
464+#: qml/Wizard/Pages/50-location.qml:112
465+msgid "Not at all"
466+msgstr "Tamm ebet"
467+
468+#: qml/Wizard/Pages/50-location.qml:124
469+msgid "You can change your mind later in <b>System Settings</b>."
470+msgstr ""
471+"Gallout a rit cheñch soñj diwezhatoc'h en <b>Arventennoù ar reizhad</b>."
472+
473+#: qml/Wizard/Pages/60-reporting.qml:24
474+msgid "Improving your experience"
475+msgstr "Gwellaat ho skiant-prenet"
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+"Arventennet eo ho pellgomzer evit titourañ ent emgefre ar fazioù da "
483+"gCanonical ha d'e gevelerien, ar re o deus savet ar reizhiad korvoiñ."
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+"Gallout a ra bezañ diweredekaet e-barzh <b>Arventennoù ar reizhiad</b> "
491+"dindan <b>Surentez &amp; Prevezded</b>"
492+
493+#: qml/Wizard/Pages/80-finished.qml:24
494+msgid "All done"
495+msgstr "Echu penn-da-benn"
496+
497+#: qml/Wizard/Pages/80-finished.qml:39
498+msgid "Nice work!"
499+msgstr "Gwellat labour !"
500+
501+#: qml/Wizard/Pages/80-finished.qml:46
502+msgid "Your phone is now ready to use."
503+msgstr "Prest eo ho pellgomzer da vezañ implijet bremañ."
504+
505+#: qml/Wizard/Pages/80-finished.qml:53
506+msgid "Finish"
507+msgstr "Echuiñ"
508+
509+#: qml/Wizard/Pages/here-terms.qml:27
510+msgid "Terms & Conditions"
511+msgstr "Penndivizoù implij"
512+
513+#: qml/Wizard/Pages/passwd-confirm.qml:49
514+msgid "Confirm passphrase"
515+msgstr "Kadarnaat ar frazenn-dremen"
516+
517+#: qml/Wizard/Pages/passwd-confirm.qml:50
518+msgid "Confirm passcode"
519+msgstr "Kadarnaat ar c'hod-tremen"
520+
521+#: qml/Wizard/Pages/passwd-confirm.qml:53
522+#: qml/Wizard/Pages/passwd-confirm.qml:54
523+msgid "Please try again."
524+msgstr "Esaeit en-dro, mar plij."
525+
526+#: qml/Wizard/Pages/passwd-set.qml:61
527+msgid "Choose your passcode"
528+msgstr "Choaz ho kod-tremen"
529+
530+#: qml/Wizard/Pages/passwd-set.qml:68
531+msgid "Passphrase must be 4 characters long"
532+msgstr "4 arouezenn a rank bezañ er frazenn-dremen"
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+
544+#~ msgid "Loading. Please Wait..."
545+#~ msgstr "O kargañ. Gortozit, mar plij..."
546+
547+#~ msgid "Speaking..."
548+#~ msgstr "O komz..."
549+
550+#~ msgid "Speak Now..."
551+#~ msgstr "Komzit bremañ..."
552+
553+#~ msgid "Confirm"
554+#~ msgstr "Kadarnaat"
555+
556+#~ msgid "Type or say a command"
557+#~ msgstr "Skrivit pe lavarit un urzhiad"
558+
559+#~ msgid "Done"
560+#~ msgstr "Graet eo"
561+
562+#~ msgid "All"
563+#~ msgstr "An holl anezho"
564+
565+#~ msgid "Favorites"
566+#~ msgstr "Gwellañ deuet"
381
567
382−#~ msgid "Enter SIM PIN"
568+#~ msgid "Manage Scopes"
383−#~ msgstr "Ebarzhit kod PIN ar gartenn SIM"
569+#~ msgstr "Merañ ar c'hefluskerioù enklask"
po/bs.po+250−93
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+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-10-09 06:36+0000\n"
19+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
20−"X-Generator: Launchpad (build 17196)\n"
20+"X-Generator: Launchpad (build 17286)\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
@@ -109,80 +109,88 @@ msgstr ""
109
109
110#: qml/Components/EdgeDemoOverlay.qml:151
110#: qml/Components/EdgeDemoOverlay.qml:151
111msgid "Skip intro"
111msgid "Skip intro"
112−msgstr ""
112+msgstr "Preskoči uvod"
113
113
114−#: qml/Components/EdgeDemo.qml:112
114+#: qml/Components/EdgeDemo.qml:125
115msgid "Right edge"
115msgid "Right edge"
116−msgstr ""
116+msgstr "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"
124−msgstr ""
124+msgstr "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"
132−msgstr ""
132+msgstr "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:198
138+#: qml/Components/EdgeDemo.qml:214
139msgid "Left edge"
139msgid "Left edge"
140msgstr ""
140msgstr ""
141
141
142−#: qml/Components/EdgeDemo.qml:199
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:226
146+#: qml/Components/EdgeDemo.qml:242
147msgid "Well done"
147msgid "Well done"
148msgstr ""
148msgstr ""
149
149
150−#: qml/Components/EdgeDemo.qml:227
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:220
156+#: qml/Components/Lockscreen.qml:238
157+msgid "Return to Call"
158+msgstr ""
159+
160+#: qml/Components/Lockscreen.qml:238
157msgid "Emergency Call"
161msgid "Emergency Call"
158msgstr ""
162msgstr ""
159
163
160−#: qml/Components/Lockscreen.qml:252
164+#: qml/Components/Lockscreen.qml:270
161msgid "OK"
165msgid "OK"
162msgstr ""
166msgstr ""
163
167
164−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
165msgid "See less"
169msgid "See less"
166msgstr ""
170msgstr ""
167
171
168−#: qml/Dash/GenericScopeView.qml:434
172+#: qml/Dash/GenericScopeView.qml:431
169msgid "See all"
173msgid "See all"
170msgstr ""
174msgstr ""
171
175
172−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
173#: qml/Panel/SearchIndicator.qml:27
177#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
178msgid "Search"
175msgstr ""
179msgstr ""
176
180
177−#: qml/Dash/PageHeader.qml:268
181+#: qml/Dash/PageHeader.qml:260
182+msgid "Store"
183+msgstr ""
184+
185+#: qml/Dash/PageHeader.qml:277
178msgid "Settings"
186msgid "Settings"
179msgstr ""
187msgstr ""
180
188
181−#: qml/Dash/PageHeader.qml:275
189+#: qml/Dash/PageHeader.qml:284
182msgid "Remove from Favorites"
190msgid "Remove from Favorites"
183msgstr ""
191msgstr ""
184
192
185−#: qml/Dash/PageHeader.qml:275
193+#: qml/Dash/PageHeader.qml:284
186msgid "Add to Favorites"
194msgid "Add to Favorites"
187msgstr ""
195msgstr ""
188
196
@@ -214,87 +222,59 @@ msgstr ""
214msgid "Release to refresh…"
222msgid "Release to refresh…"
215msgstr ""
223msgstr ""
216
224
217−#: qml/Dash/ScopesOverview.qml:206
225+#: qml/Dash/ScopesList.qml:63
218−msgid "Manage Scopes"
226+msgid "Manage"
219msgstr ""
227msgstr ""
220
228
221−#: qml/Dash/ScopesOverview.qml:428
229+#: qml/Dash/ScopesList.qml:107
222−msgid "Done"
230+msgid "Home"
223msgstr ""
231msgstr ""
224
232
225−#: qml/Dash/ScopesOverview.qml:454
233+#: qml/Dash/ScopesList.qml:108
226−msgid "Store"
234+msgid "Also installed"
227−msgstr ""
228−
229−#: qml/Dash/ScopesOverviewTab.qml:36
230−msgid "Favorites"
231−msgstr ""
232−
233−#: qml/Dash/ScopesOverviewTab.qml:54
234−msgid "All"
235msgstr ""
235msgstr ""
236
236
237−#: qml/Greeter/Greeter.qml:157
237+#: qml/Greeter/Greeter.qml:174
238msgid "Unlock"
238msgid "Unlock"
239msgstr ""
239msgstr ""
240
240
241−#: qml/Hud/HudParametrizedActionsPage.qml:139
242−msgid "Confirm"
243−msgstr ""
244−
245−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
246−msgid "Type or say a command"
247−msgstr ""
248−
249−#: qml/Hud/Hud.qml:84
250−msgid "Loading. Please Wait..."
251−msgstr ""
252−
253−#: qml/Hud/Hud.qml:89
254−msgid "Speak Now..."
255−msgstr ""
256−
257−#: qml/Hud/Hud.qml:94
258−msgid "Speaking..."
259−msgstr ""
260−
261−#: qml/Notifications/NotificationMenuItemFactory.qml:116
241+#: qml/Notifications/NotificationMenuItemFactory.qml:128
262msgid "Show password"
242msgid "Show password"
263msgstr ""
243msgstr ""
264
244
265−#: qml/Panel/ActiveCallHint.qml:77
245+#: qml/Panel/ActiveCallHint.qml:79
266msgid "Tap to return to call..."
246msgid "Tap to return to call..."
267msgstr ""
247msgstr ""
268
248
269−#: qml/Panel/ActiveCallHint.qml:90
249+#: qml/Panel/ActiveCallHint.qml:92
270msgid "Conference"
250msgid "Conference"
271msgstr ""
251msgstr ""
272
252
273−#: qml/Panel/Indicators/MenuItemFactory.qml:600
253+#: qml/Panel/Indicators/MenuItemFactory.qml:643
274msgid "Nothing is playing"
254msgid "Nothing is playing"
275msgstr ""
255msgstr ""
276
256
277−#: qml/Panel/Indicators/MenuItemFactory.qml:748
257+#: qml/Panel/Indicators/MenuItemFactory.qml:791
278msgid "In queue…"
258msgid "In queue…"
279msgstr ""
259msgstr ""
280
260
281−#: qml/Panel/Indicators/MenuItemFactory.qml:752
261+#: qml/Panel/Indicators/MenuItemFactory.qml:795
282msgid "Downloading"
262msgid "Downloading"
283msgstr ""
263msgstr ""
284
264
285−#: qml/Panel/Indicators/MenuItemFactory.qml:754
265+#: qml/Panel/Indicators/MenuItemFactory.qml:797
286msgid "Paused, tap to resume"
266msgid "Paused, tap to resume"
287msgstr ""
267msgstr ""
288
268
289−#: qml/Panel/Indicators/MenuItemFactory.qml:756
269+#: qml/Panel/Indicators/MenuItemFactory.qml:799
290msgid "Canceled"
270msgid "Canceled"
291msgstr ""
271msgstr ""
292
272
293−#: qml/Panel/Indicators/MenuItemFactory.qml:758
273+#: qml/Panel/Indicators/MenuItemFactory.qml:801
294msgid "Finished"
274msgid "Finished"
295msgstr ""
275msgstr ""
296
276
297−#: qml/Panel/Indicators/MenuItemFactory.qml:760
277+#: qml/Panel/Indicators/MenuItemFactory.qml:803
298msgid "Failed, tap to retry"
278msgid "Failed, tap to retry"
299msgstr ""
279msgstr ""
300
280
@@ -306,56 +286,233 @@ msgstr ""
306msgid "Roaming"
286msgid "Roaming"
307msgstr ""
287msgstr ""
308
288
309−#: qml/Shell.qml:346
289+#: qml/Shell.qml:367
290+#, qt-format
310−msgid "Enter passphrase"
291+msgid "Enter %1"
311msgstr ""
292msgstr ""
312
293
313−#: qml/Shell.qml:347
294+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
314−msgid "Sorry, incorrect passphrase"
295+msgid "Enter passphrase"
315msgstr ""
296msgstr ""
316
297
317−#: qml/Shell.qml:348
298+#: qml/Shell.qml:369
318−msgid "Please re-enter"
299+msgid "Enter passcode"
319msgstr ""
300msgstr ""
320
301
321−#: qml/Shell.qml:350
302+#: qml/Shell.qml:370
322−msgid "Enter passcode"
303+#, qt-format
304+msgid "Sorry, incorrect %1"
323msgstr ""
305msgstr ""
324
306
325−#: qml/Shell.qml:351
307+#: qml/Shell.qml:371
326−msgid "Sorry, incorrect passcode"
308+msgid "Sorry, incorrect passphrase"
327msgstr ""
309msgstr ""
328
310
329−#: qml/Shell.qml:354
311+#: qml/Shell.qml:372
330−#, qt-format
312+msgid "Please re-enter"
331−msgid "Enter %1"
332msgstr ""
313msgstr ""
333
314
334−#: qml/Shell.qml:355
315+#: qml/Shell.qml:373
335−#, qt-format
336−msgid "Sorry, incorrect %1"
316+msgid "Sorry, incorrect passcode"
337msgstr ""
317msgstr ""
338
318
339−#: qml/Shell.qml:390
319+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
340msgid "Sorry, incorrect passphrase."
320msgid "Sorry, incorrect passphrase."
341msgstr ""
321msgstr ""
342
322
343−#: qml/Shell.qml:391
323+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
344msgid "Sorry, incorrect passcode."
324msgid "Sorry, incorrect passcode."
345msgstr ""
325msgstr ""
346
326
347−#: qml/Shell.qml:392
327+#: qml/Shell.qml:469
348msgid "This will be your last attempt."
328msgid "This will be your last attempt."
349msgstr ""
329msgstr ""
350
330
351−#: qml/Shell.qml:394
331+#: qml/Shell.qml:471
352msgid ""
332msgid ""
353"If passphrase is entered incorrectly, your phone will conduct a factory "
333"If passphrase is entered incorrectly, your phone will conduct a factory "
354"reset and all personal data will be deleted."
334"reset and all personal data will be deleted."
355msgstr ""
335msgstr ""
356
336
357−#: qml/Shell.qml:395
337+#: qml/Shell.qml:472
358msgid ""
338msgid ""
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"If passcode is entered incorrectly, your phone will conduct a factory reset "
360"and all personal data will be deleted."
340"and all personal data will be deleted."
361msgstr ""
341msgstr ""
342+
343+#: qml/Wizard/Page.qml:89
344+msgid "Back"
345+msgstr ""
346+
347+#: qml/Wizard/Pages/10-welcome.qml:27
348+msgid "Hi!"
349+msgstr ""
350+
351+#: qml/Wizard/Pages/10-welcome.qml:44
352+msgid "Welcome to your Ubuntu phone."
353+msgstr ""
354+
355+#: qml/Wizard/Pages/10-welcome.qml:52
356+msgid "Let’s get started."
357+msgstr ""
358+
359+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
360+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
361+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
362+#: qml/Wizard/Pages/passwd-set.qml:90
363+msgid "Continue"
364+msgstr ""
365+
366+#: qml/Wizard/Pages/20-sim.qml:25
367+msgid "Add a SIM card and restart your device"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/20-sim.qml:55
371+msgid "Without it, you won’t be able to make calls or use text messaging."
372+msgstr ""
373+
374+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
375+msgid "Skip"
376+msgstr ""
377+
378+#: qml/Wizard/Pages/30-passwd-type.qml:39
379+msgid "Lock security"
380+msgstr ""
381+
382+#: qml/Wizard/Pages/30-passwd-type.qml:74
383+msgid "Please select how you’d like to unlock your phone."
384+msgstr ""
385+
386+#: qml/Wizard/Pages/30-passwd-type.qml:97
387+msgid "Swipe"
388+msgstr ""
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:98
391+msgid "No security"
392+msgstr ""
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:100
395+msgid "Passcode"
396+msgstr ""
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:101
399+msgid "4 digits only"
400+msgstr ""
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:103
403+msgid "Passphrase"
404+msgstr ""
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:104
407+msgid "Numbers and letters"
408+msgstr ""
409+
410+#: qml/Wizard/Pages/40-wifi.qml:28
411+msgid "Connect to Wi‑Fi"
412+msgstr ""
413+
414+#: qml/Wizard/Pages/40-wifi.qml:147
415+msgid "Available networks…"
416+msgstr ""
417+
418+#: qml/Wizard/Pages/40-wifi.qml:148
419+msgid "No available networks."
420+msgstr ""
421+
422+#: qml/Wizard/Pages/50-location.qml:27
423+msgid "Location"
424+msgstr ""
425+
426+#: qml/Wizard/Pages/50-location.qml:62
427+msgid "Let the phone detect your location:"
428+msgstr ""
429+
430+#: qml/Wizard/Pages/50-location.qml:69
431+msgid "Using GPS only (less accurate)"
432+msgstr ""
433+
434+#: qml/Wizard/Pages/50-location.qml:86
435+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
436+msgstr ""
437+
438+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
439+#: qml/Wizard/Pages/50-location.qml:103
440+msgid ""
441+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
442+"conditions</a>."
443+msgstr ""
444+
445+#: qml/Wizard/Pages/50-location.qml:112
446+msgid "Not at all"
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:124
450+msgid "You can change your mind later in <b>System Settings</b>."
451+msgstr ""
452+
453+#: qml/Wizard/Pages/60-reporting.qml:24
454+msgid "Improving your experience"
455+msgstr ""
456+
457+#: qml/Wizard/Pages/60-reporting.qml:36
458+msgid ""
459+"Your phone is set up to automatically report errors to Canonical and its "
460+"partners, the makers of the operating system."
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:43
464+msgid ""
465+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
466+"Privacy</b>"
467+msgstr ""
468+
469+#: qml/Wizard/Pages/80-finished.qml:24
470+msgid "All done"
471+msgstr ""
472+
473+#: qml/Wizard/Pages/80-finished.qml:39
474+msgid "Nice work!"
475+msgstr ""
476+
477+#: qml/Wizard/Pages/80-finished.qml:46
478+msgid "Your phone is now ready to use."
479+msgstr ""
480+
481+#: qml/Wizard/Pages/80-finished.qml:53
482+msgid "Finish"
483+msgstr ""
484+
485+#: qml/Wizard/Pages/here-terms.qml:27
486+msgid "Terms & Conditions"
487+msgstr ""
488+
489+#: qml/Wizard/Pages/passwd-confirm.qml:49
490+msgid "Confirm passphrase"
491+msgstr ""
492+
493+#: qml/Wizard/Pages/passwd-confirm.qml:50
494+msgid "Confirm passcode"
495+msgstr ""
496+
497+#: qml/Wizard/Pages/passwd-confirm.qml:53
498+#: qml/Wizard/Pages/passwd-confirm.qml:54
499+msgid "Please try again."
500+msgstr ""
501+
502+#: qml/Wizard/Pages/passwd-set.qml:61
503+msgid "Choose your passcode"
504+msgstr ""
505+
506+#: qml/Wizard/Pages/passwd-set.qml:68
507+msgid "Passphrase must be 4 characters long"
508+msgstr ""
509+
510+#: qml/Wizard/StackButton.qml:39
511+#, qt-format
512+msgid "〈 %1"
513+msgstr ""
514+
515+#: qml/Wizard/StackButton.qml:42
516+#, qt-format
517+msgid "%1 〉"
518+msgstr ""
po/ca.po+277−99
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-07 10:51+0000\n"
11+"PO-Revision-Date: 2014-11-10 09:22+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-10-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
157+#: qml/Components/EdgeDemo.qml:242
158msgid "Well done"
158msgid "Well done"
159msgstr "Enhorabona!"
159msgstr "Enhorabona!"
160
160
161−#: qml/Components/EdgeDemo.qml:227
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,36 +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:220
169+#: qml/Components/Lockscreen.qml:238
170+msgid "Return to Call"
171+msgstr "Torna a la trucada"
172+
173+#: qml/Components/Lockscreen.qml:238
170msgid "Emergency Call"
174msgid "Emergency Call"
171msgstr "Trucada d'emergència"
175msgstr "Trucada d'emergència"
172
176
173−#: qml/Components/Lockscreen.qml:252
177+#: qml/Components/Lockscreen.qml:270
174msgid "OK"
178msgid "OK"
175msgstr "D'acord"
179msgstr "D'acord"
176
180
177−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
181+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
178msgid "See less"
182msgid "See less"
179msgstr "Mostra'n menys"
183msgstr "Mostra'n menys"
180
184
181−#: qml/Dash/GenericScopeView.qml:434
185+#: qml/Dash/GenericScopeView.qml:431
182msgid "See all"
186msgid "See all"
183msgstr "Mostra-ho tot"
187msgstr "Mostra-ho tot"
184
188
185−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
189+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
186#: qml/Panel/SearchIndicator.qml:27
190#: qml/Panel/SearchIndicator.qml:27
187msgid "Search"
191msgid "Search"
188msgstr "Cerca"
192msgstr "Cerca"
189
193
190−#: qml/Dash/PageHeader.qml:268
194+#: qml/Dash/PageHeader.qml:260
195+msgid "Store"
196+msgstr "Botiga"
197+
198+#: qml/Dash/PageHeader.qml:277
191msgid "Settings"
199msgid "Settings"
192msgstr "Paràmetres"
200msgstr "Paràmetres"
193
201
194−#: qml/Dash/PageHeader.qml:275
202+#: qml/Dash/PageHeader.qml:284
195msgid "Remove from Favorites"
203msgid "Remove from Favorites"
196msgstr "Suprimeix dels preferits"
204msgstr "Suprimeix dels preferits"
197
205
198−#: qml/Dash/PageHeader.qml:275
206+#: qml/Dash/PageHeader.qml:284
199msgid "Add to Favorites"
207msgid "Add to Favorites"
200msgstr "Afegeix als preferits"
208msgstr "Afegeix als preferits"
201
209
@@ -227,87 +235,59 @@ msgstr "Estireu per actualitzar..."
227msgid "Release to refresh…"
235msgid "Release to refresh…"
228msgstr "Deixeu anar per actualitzar..."
236msgstr "Deixeu anar per actualitzar..."
229
237
230−#: qml/Dash/ScopesOverview.qml:206
238+#: qml/Dash/ScopesList.qml:63
231−msgid "Manage Scopes"
239+msgid "Manage"
232−msgstr "Gestioneu les lents"
240+msgstr ""
233−
234−#: qml/Dash/ScopesOverview.qml:428
235−msgid "Done"
236−msgstr "Fet"
237−
238−#: qml/Dash/ScopesOverview.qml:454
239−msgid "Store"
240−msgstr "Botiga"
241
241
242−#: qml/Dash/ScopesOverviewTab.qml:36
242+#: qml/Dash/ScopesList.qml:107
243−msgid "Favorites"
243+msgid "Home"
244−msgstr "Preferides"
244+msgstr ""
245
245
246−#: qml/Dash/ScopesOverviewTab.qml:54
246+#: qml/Dash/ScopesList.qml:108
247−msgid "All"
247+msgid "Also installed"
248−msgstr "Totes"
248+msgstr ""
249
249
250−#: qml/Greeter/Greeter.qml:157
250+#: qml/Greeter/Greeter.qml:174
251msgid "Unlock"
251msgid "Unlock"
252msgstr "Desbloca"
252msgstr "Desbloca"
253
253
254−#: qml/Hud/HudParametrizedActionsPage.qml:139
255−msgid "Confirm"
256−msgstr "Confirma"
257−
258−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
259−msgid "Type or say a command"
260−msgstr "Escriviu o pronuncieu una ordre"
261−
262−#: qml/Hud/Hud.qml:84
263−msgid "Loading. Please Wait..."
264−msgstr "S'està carregant. Espereu-vos un moment..."
265−
266−#: qml/Hud/Hud.qml:89
267−msgid "Speak Now..."
268−msgstr "Parleu..."
269−
270−#: qml/Hud/Hud.qml:94
271−msgid "Speaking..."
272−msgstr "S'està parlant..."
273−
274−#: qml/Notifications/NotificationMenuItemFactory.qml:116
254+#: qml/Notifications/NotificationMenuItemFactory.qml:128
275msgid "Show password"
255msgid "Show password"
276msgstr "Mostra la contrasenya"
256msgstr "Mostra la contrasenya"
277
257
278−#: qml/Panel/ActiveCallHint.qml:77
258+#: qml/Panel/ActiveCallHint.qml:79
279msgid "Tap to return to call..."
259msgid "Tap to return to call..."
280msgstr "Feu un toc per tornar a la trucada..."
260msgstr "Feu un toc per tornar a la trucada..."
281
261
282−#: qml/Panel/ActiveCallHint.qml:90
262+#: qml/Panel/ActiveCallHint.qml:92
283msgid "Conference"
263msgid "Conference"
284msgstr "Conferència"
264msgstr "Conferència"
285
265
286−#: qml/Panel/Indicators/MenuItemFactory.qml:600
266+#: qml/Panel/Indicators/MenuItemFactory.qml:643
287msgid "Nothing is playing"
267msgid "Nothing is playing"
288msgstr "No s'està reproduint res"
268msgstr "No s'està reproduint res"
289
269
290−#: qml/Panel/Indicators/MenuItemFactory.qml:748
270+#: qml/Panel/Indicators/MenuItemFactory.qml:791
291msgid "In queue…"
271msgid "In queue…"
292msgstr "A la cua..."
272msgstr "A la cua..."
293
273
294−#: qml/Panel/Indicators/MenuItemFactory.qml:752
274+#: qml/Panel/Indicators/MenuItemFactory.qml:795
295msgid "Downloading"
275msgid "Downloading"
296msgstr "S'està baixant"
276msgstr "S'està baixant"
297
277
298−#: qml/Panel/Indicators/MenuItemFactory.qml:754
278+#: qml/Panel/Indicators/MenuItemFactory.qml:797
299msgid "Paused, tap to resume"
279msgid "Paused, tap to resume"
300msgstr "En pausa, feu un toc per continuar"
280msgstr "En pausa, feu un toc per continuar"
301
281
302−#: qml/Panel/Indicators/MenuItemFactory.qml:756
282+#: qml/Panel/Indicators/MenuItemFactory.qml:799
303msgid "Canceled"
283msgid "Canceled"
304msgstr "S'ha cancel·lat"
284msgstr "S'ha cancel·lat"
305
285
306−#: qml/Panel/Indicators/MenuItemFactory.qml:758
286+#: qml/Panel/Indicators/MenuItemFactory.qml:801
307msgid "Finished"
287msgid "Finished"
308msgstr "S'ha finalitzat"
288msgstr "S'ha finalitzat"
309
289
310−#: qml/Panel/Indicators/MenuItemFactory.qml:760
290+#: qml/Panel/Indicators/MenuItemFactory.qml:803
311msgid "Failed, tap to retry"
291msgid "Failed, tap to retry"
312msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
292msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
313
293
@@ -319,49 +299,49 @@ msgstr "Desbloca la SIM"
319msgid "Roaming"
299msgid "Roaming"
320msgstr "Itinerància"
300msgstr "Itinerància"
321
301
322−#: qml/Shell.qml:346
302+#: qml/Shell.qml:367
303+#, qt-format
304+msgid "Enter %1"
305+msgstr "Introduïu: %1"
306+
307+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
323msgid "Enter passphrase"
308msgid "Enter passphrase"
324msgstr "Introduïu la contrasenya"
309msgstr "Introduïu la contrasenya"
325
310
326−#: qml/Shell.qml:347
311+#: qml/Shell.qml:369
312+msgid "Enter passcode"
313+msgstr "Introduïu el codi d'accés"
314+
315+#: qml/Shell.qml:370
316+#, qt-format
317+msgid "Sorry, incorrect %1"
318+msgstr "Incorrecte (%1)"
319+
320+#: qml/Shell.qml:371
327msgid "Sorry, incorrect passphrase"
321msgid "Sorry, incorrect passphrase"
328msgstr "La contrasenya no és correcta"
322msgstr "La contrasenya no és correcta"
329
323
330−#: qml/Shell.qml:348
324+#: qml/Shell.qml:372
331msgid "Please re-enter"
325msgid "Please re-enter"
332msgstr "Torneu-ho a introduir"
326msgstr "Torneu-ho a introduir"
333
327
334−#: qml/Shell.qml:350
328+#: qml/Shell.qml:373
335−msgid "Enter passcode"
336−msgstr "Introduïu el codi d'accés"
337−
338−#: qml/Shell.qml:351
339msgid "Sorry, incorrect passcode"
329msgid "Sorry, incorrect passcode"
340msgstr "El codi d'accés no és correcte"
330msgstr "El codi d'accés no és correcte"
341
331
342−#: qml/Shell.qml:354
332+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
343−#, qt-format
344−msgid "Enter %1"
345−msgstr "Introduïu: %1"
346−
347−#: qml/Shell.qml:355
348−#, qt-format
349−msgid "Sorry, incorrect %1"
350−msgstr "Incorrecte (%1)"
351−
352−#: qml/Shell.qml:390
353msgid "Sorry, incorrect passphrase."
333msgid "Sorry, incorrect passphrase."
354msgstr "La contrasenya és incorrecta"
334msgstr "La contrasenya és incorrecta"
355
335
356−#: qml/Shell.qml:391
336+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
357msgid "Sorry, incorrect passcode."
337msgid "Sorry, incorrect passcode."
358msgstr "El codi d'accés no és correcte"
338msgstr "El codi d'accés no és correcte"
359
339
360−#: qml/Shell.qml:392
340+#: qml/Shell.qml:469
361msgid "This will be your last attempt."
341msgid "This will be your last attempt."
362msgstr "Aquest serà el darrer intent."
342msgstr "Aquest serà el darrer intent."
363
343
364−#: qml/Shell.qml:394
344+#: qml/Shell.qml:471
365msgid ""
345msgid ""
366"If passphrase is entered incorrectly, your phone will conduct a factory "
346"If passphrase is entered incorrectly, your phone will conduct a factory "
367"reset and all personal data will be deleted."
347"reset and all personal data will be deleted."
@@ -370,7 +350,7 @@ msgstr ""
370"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
350"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
371"personals."
351"personals."
372
352
373−#: qml/Shell.qml:395
353+#: qml/Shell.qml:472
374msgid ""
354msgid ""
375"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 "
376"and all personal data will be deleted."
356"and all personal data will be deleted."
@@ -379,8 +359,206 @@ msgstr ""
379"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
359"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
380"personals."
360"personals."
381
361
382−#~ msgid "Sorry, incorrect PIN"
362+#: qml/Wizard/Page.qml:89
383−#~ msgstr "El PIN no és correcte"
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 ""
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 ""
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 ""
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 ""
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 ""
452+
453+#: qml/Wizard/Pages/50-location.qml:86
454+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
455+msgstr ""
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+
464+#: qml/Wizard/Pages/50-location.qml:112
465+msgid "Not at all"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/50-location.qml:124
469+msgid "You can change your mind later in <b>System Settings</b>."
470+msgstr ""
471+
472+#: qml/Wizard/Pages/60-reporting.qml:24
473+msgid "Improving your experience"
474+msgstr ""
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+
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+
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 ""
533+
534+#: qml/Wizard/StackButton.qml:42
535+#, qt-format
536+msgid "%1 〉"
537+msgstr ""
538+
539+#~ msgid "Confirm"
540+#~ msgstr "Confirma"
541+
542+#~ msgid "Type or say a command"
543+#~ msgstr "Escriviu o pronuncieu una ordre"
544+
545+#~ msgid "Loading. Please Wait..."
546+#~ msgstr "S'està carregant. Espereu-vos un moment..."
547+
548+#~ msgid "Speak Now..."
549+#~ msgstr "Parleu..."
550+
551+#~ msgid "Speaking..."
552+#~ msgstr "S'està parlant..."
553+
554+#~ msgid "Done"
555+#~ msgstr "Fet"
556+
557+#~ msgid "Favorites"
558+#~ msgstr "Preferides"
559+
560+#~ msgid "All"
561+#~ msgstr "Totes"
384
562
385−#~ msgid "Enter SIM PIN"
563+#~ msgid "Manage Scopes"
386−#~ msgstr "Introduïu el PIN de la targeta SIM"
564+#~ msgstr "Gestioneu les lents"
po/ca@valencia.po+279−95
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-15 14:39+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"
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-10-16 05:44+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
157+#: qml/Components/EdgeDemo.qml:242
158msgid "Well done"
158msgid "Well done"
159msgstr "Enhorabona!"
159msgstr "Enhorabona!"
160
160
161−#: qml/Components/EdgeDemo.qml:227
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,36 +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:220
169+#: qml/Components/Lockscreen.qml:238
170+msgid "Return to Call"
171+msgstr "Torna a la trucada"
172+
173+#: qml/Components/Lockscreen.qml:238
170msgid "Emergency Call"
174msgid "Emergency Call"
171msgstr "Cridada d'emergència"
175msgstr "Cridada d'emergència"
172
176
173−#: qml/Components/Lockscreen.qml:252
177+#: qml/Components/Lockscreen.qml:270
174msgid "OK"
178msgid "OK"
175msgstr "D'acord"
179msgstr "D'acord"
176
180
177−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
181+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
178msgid "See less"
182msgid "See less"
179msgstr "Mostra'n menys"
183msgstr "Mostra'n menys"
180
184
181−#: qml/Dash/GenericScopeView.qml:434
185+#: qml/Dash/GenericScopeView.qml:431
182msgid "See all"
186msgid "See all"
183msgstr "Mostra-ho tot"
187msgstr "Mostra-ho tot"
184
188
185−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
189+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
186#: qml/Panel/SearchIndicator.qml:27
190#: qml/Panel/SearchIndicator.qml:27
187msgid "Search"
191msgid "Search"
188msgstr "Cerca"
192msgstr "Cerca"
189
193
190−#: qml/Dash/PageHeader.qml:268
194+#: qml/Dash/PageHeader.qml:260
195+msgid "Store"
196+msgstr "Botiga"
197+
198+#: qml/Dash/PageHeader.qml:277
191msgid "Settings"
199msgid "Settings"
192msgstr "Paràmetres"
200msgstr "Paràmetres"
193
201
194−#: qml/Dash/PageHeader.qml:275
202+#: qml/Dash/PageHeader.qml:284
195msgid "Remove from Favorites"
203msgid "Remove from Favorites"
196msgstr "Suprimeix dels preferits"
204msgstr "Suprimeix dels preferits"
197
205
198−#: qml/Dash/PageHeader.qml:275
206+#: qml/Dash/PageHeader.qml:284
199msgid "Add to Favorites"
207msgid "Add to Favorites"
200msgstr "Afig als preferits"
208msgstr "Afig als preferits"
201
209
@@ -227,87 +235,59 @@ msgstr "Estireu per actualitzar..."
227msgid "Release to refresh…"
235msgid "Release to refresh…"
228msgstr "Deixeu anar per actualitzar..."
236msgstr "Deixeu anar per actualitzar..."
229
237
230−#: qml/Dash/ScopesOverview.qml:206
238+#: qml/Dash/ScopesList.qml:63
231−msgid "Manage Scopes"
239+msgid "Manage"
232−msgstr "Gestioneu les lents"
240+msgstr ""
233−
234−#: qml/Dash/ScopesOverview.qml:428
235−msgid "Done"
236−msgstr "Fet"
237−
238−#: qml/Dash/ScopesOverview.qml:454
239−msgid "Store"
240−msgstr "Botiga"
241
241
242−#: qml/Dash/ScopesOverviewTab.qml:36
242+#: qml/Dash/ScopesList.qml:107
243−msgid "Favorites"
243+msgid "Home"
244−msgstr "Preferides"
244+msgstr ""
245
245
246−#: qml/Dash/ScopesOverviewTab.qml:54
246+#: qml/Dash/ScopesList.qml:108
247−msgid "All"
247+msgid "Also installed"
248−msgstr "Totes"
248+msgstr ""
249
249
250−#: qml/Greeter/Greeter.qml:157
250+#: qml/Greeter/Greeter.qml:174
251msgid "Unlock"
251msgid "Unlock"
252msgstr "Desbloca"
252msgstr "Desbloca"
253
253
254−#: qml/Hud/HudParametrizedActionsPage.qml:139
255−msgid "Confirm"
256−msgstr "Confirma"
257−
258−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
259−msgid "Type or say a command"
260−msgstr "Escriviu o pronuncieu una orde"
261−
262−#: qml/Hud/Hud.qml:84
263−msgid "Loading. Please Wait..."
264−msgstr "S'està carregant. Espereu-vos un moment..."
265−
266−#: qml/Hud/Hud.qml:89
267−msgid "Speak Now..."
268−msgstr "Parleu..."
269−
270−#: qml/Hud/Hud.qml:94
271−msgid "Speaking..."
272−msgstr "S'està parlant..."
273−
274−#: qml/Notifications/NotificationMenuItemFactory.qml:116
254+#: qml/Notifications/NotificationMenuItemFactory.qml:128
275msgid "Show password"
255msgid "Show password"
276msgstr "Mostra la contrasenya"
256msgstr "Mostra la contrasenya"
277
257
278−#: qml/Panel/ActiveCallHint.qml:77
258+#: qml/Panel/ActiveCallHint.qml:79
279msgid "Tap to return to call..."
259msgid "Tap to return to call..."
280msgstr "Feu un toc per tornar a la cridada..."
260msgstr "Feu un toc per tornar a la cridada..."
281
261
282−#: qml/Panel/ActiveCallHint.qml:90
262+#: qml/Panel/ActiveCallHint.qml:92
283msgid "Conference"
263msgid "Conference"
284msgstr "Conferència"
264msgstr "Conferència"
285
265
286−#: qml/Panel/Indicators/MenuItemFactory.qml:600
266+#: qml/Panel/Indicators/MenuItemFactory.qml:643
287msgid "Nothing is playing"
267msgid "Nothing is playing"
288msgstr "No s'està reproduint res"
268msgstr "No s'està reproduint res"
289
269
290−#: qml/Panel/Indicators/MenuItemFactory.qml:748
270+#: qml/Panel/Indicators/MenuItemFactory.qml:791
291msgid "In queue…"
271msgid "In queue…"
292msgstr "A la cua..."
272msgstr "A la cua..."
293
273
294−#: qml/Panel/Indicators/MenuItemFactory.qml:752
274+#: qml/Panel/Indicators/MenuItemFactory.qml:795
295msgid "Downloading"
275msgid "Downloading"
296msgstr "S'està baixant"
276msgstr "S'està baixant"
297
277
298−#: qml/Panel/Indicators/MenuItemFactory.qml:754
278+#: qml/Panel/Indicators/MenuItemFactory.qml:797
299msgid "Paused, tap to resume"
279msgid "Paused, tap to resume"
300msgstr "En pausa, feu un toc per continuar"
280msgstr "En pausa, feu un toc per continuar"
301
281
302−#: qml/Panel/Indicators/MenuItemFactory.qml:756
282+#: qml/Panel/Indicators/MenuItemFactory.qml:799
303msgid "Canceled"
283msgid "Canceled"
304msgstr "S'ha cancel·lat"
284msgstr "S'ha cancel·lat"
305
285
306−#: qml/Panel/Indicators/MenuItemFactory.qml:758
286+#: qml/Panel/Indicators/MenuItemFactory.qml:801
307msgid "Finished"
287msgid "Finished"
308msgstr "S'ha finalitzat"
288msgstr "S'ha finalitzat"
309
289
310−#: qml/Panel/Indicators/MenuItemFactory.qml:760
290+#: qml/Panel/Indicators/MenuItemFactory.qml:803
311msgid "Failed, tap to retry"
291msgid "Failed, tap to retry"
312msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
292msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
313
293
@@ -319,49 +299,49 @@ msgstr "Desbloca la SIM"
319msgid "Roaming"
299msgid "Roaming"
320msgstr "Itinerància"
300msgstr "Itinerància"
321
301
322−#: qml/Shell.qml:346
302+#: qml/Shell.qml:367
303+#, qt-format
304+msgid "Enter %1"
305+msgstr "Introduïu: %1"
306+
307+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
323msgid "Enter passphrase"
308msgid "Enter passphrase"
324msgstr "Introduïu la contrasenya"
309msgstr "Introduïu la contrasenya"
325
310
326−#: qml/Shell.qml:347
311+#: qml/Shell.qml:369
312+msgid "Enter passcode"
313+msgstr "Introduïu el codi d'accés"
314+
315+#: qml/Shell.qml:370
316+#, qt-format
317+msgid "Sorry, incorrect %1"
318+msgstr "Incorrecte (%1)"
319+
320+#: qml/Shell.qml:371
327msgid "Sorry, incorrect passphrase"
321msgid "Sorry, incorrect passphrase"
328msgstr "La contrasenya no és correcta"
322msgstr "La contrasenya no és correcta"
329
323
330−#: qml/Shell.qml:348
324+#: qml/Shell.qml:372
331msgid "Please re-enter"
325msgid "Please re-enter"
332msgstr "Torneu-ho a introduir"
326msgstr "Torneu-ho a introduir"
333
327
334−#: qml/Shell.qml:350
328+#: qml/Shell.qml:373
335−msgid "Enter passcode"
336−msgstr "Introduïu el codi d'accés"
337−
338−#: qml/Shell.qml:351
339msgid "Sorry, incorrect passcode"
329msgid "Sorry, incorrect passcode"
340msgstr "El codi d'accés no és correcte"
330msgstr "El codi d'accés no és correcte"
341
331
342−#: qml/Shell.qml:354
332+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
343−#, qt-format
344−msgid "Enter %1"
345−msgstr "Introduïu: %1"
346−
347−#: qml/Shell.qml:355
348−#, qt-format
349−msgid "Sorry, incorrect %1"
350−msgstr "Incorrecte (%1)"
351−
352−#: qml/Shell.qml:390
353msgid "Sorry, incorrect passphrase."
333msgid "Sorry, incorrect passphrase."
354msgstr "La contrasenya és incorrecta"
334msgstr "La contrasenya és incorrecta"
355
335
356−#: qml/Shell.qml:391
336+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
357msgid "Sorry, incorrect passcode."
337msgid "Sorry, incorrect passcode."
358msgstr "El codi d'accés no és correcte"
338msgstr "El codi d'accés no és correcte"
359
339
360−#: qml/Shell.qml:392
340+#: qml/Shell.qml:469
361msgid "This will be your last attempt."
341msgid "This will be your last attempt."
362msgstr "Este serà el darrer intent."
342msgstr "Este serà el darrer intent."
363
343
364−#: qml/Shell.qml:394
344+#: qml/Shell.qml:471
365msgid ""
345msgid ""
366"If passphrase is entered incorrectly, your phone will conduct a factory "
346"If passphrase is entered incorrectly, your phone will conduct a factory "
367"reset and all personal data will be deleted."
347"reset and all personal data will be deleted."
@@ -370,7 +350,7 @@ msgstr ""
370"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
350"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
371"personals."
351"personals."
372
352
373−#: qml/Shell.qml:395
353+#: qml/Shell.qml:472
374msgid ""
354msgid ""
375"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 "
376"and all personal data will be deleted."
356"and all personal data will be deleted."
@@ -378,3 +358,207 @@ msgstr ""
378"Si el codi d'accés s'introdueix de manera incorrecta, el telèfon es "
358"Si el codi d'accés s'introdueix de manera incorrecta, el telèfon es "
379"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
359"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
380"personals."
360"personals."
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 ""
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 ""
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 ""
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 ""
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 ""
452+
453+#: qml/Wizard/Pages/50-location.qml:86
454+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
455+msgstr ""
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+
464+#: qml/Wizard/Pages/50-location.qml:112
465+msgid "Not at all"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/50-location.qml:124
469+msgid "You can change your mind later in <b>System Settings</b>."
470+msgstr ""
471+
472+#: qml/Wizard/Pages/60-reporting.qml:24
473+msgid "Improving your experience"
474+msgstr ""
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+
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+
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 ""
533+
534+#: qml/Wizard/StackButton.qml:42
535+#, qt-format
536+msgid "%1 〉"
537+msgstr ""
538+
539+#~ msgid "Manage Scopes"
540+#~ msgstr "Gestioneu les lents"
541+
542+#~ msgid "Done"
543+#~ msgstr "Fet"
544+
545+#~ msgid "Favorites"
546+#~ msgstr "Preferides"
547+
548+#~ msgid "All"
549+#~ msgstr "Totes"
550+
551+#~ msgid "Confirm"
552+#~ msgstr "Confirma"
553+
554+#~ msgid "Type or say a command"
555+#~ msgstr "Escriviu o pronuncieu una orde"
556+
557+#~ msgid "Loading. Please Wait..."
558+#~ msgstr "S'està carregant. Espereu-vos un moment..."
559+
560+#~ msgid "Speak Now..."
561+#~ msgstr "Parleu..."
562+
563+#~ msgid "Speaking..."
564+#~ msgstr "S'està parlant..."
po/ckb.po+261−89
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+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-10-09 06:37+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -110,78 +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:198
137+#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
138msgid "Left edge"
139msgstr "لێواری چەپ"
139msgstr "لێواری چەپ"
140
140
141−#: qml/Components/EdgeDemo.qml:199
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:226
145+#: qml/Components/EdgeDemo.qml:242
146msgid "Well done"
146msgid "Well done"
147msgstr "دەستخۆش"
147msgstr "دەستخۆش"
148
148
149−#: qml/Components/EdgeDemo.qml:227
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:220
155+#: qml/Components/Lockscreen.qml:238
156+msgid "Return to Call"
157+msgstr ""
158+
159+#: qml/Components/Lockscreen.qml:238
156msgid "Emergency Call"
160msgid "Emergency Call"
157msgstr "هێڵی فریاگوزاری"
161msgstr "هێڵی فریاگوزاری"
158
162
159−#: qml/Components/Lockscreen.qml:252
163+#: qml/Components/Lockscreen.qml:270
160msgid "OK"
164msgid "OK"
161msgstr ""
165msgstr ""
162
166
163−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
164msgid "See less"
168msgid "See less"
165msgstr ""
169msgstr ""
166
170
167−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:431
168msgid "See all"
172msgid "See all"
169msgstr ""
173msgstr ""
170
174
171−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
172#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
173msgid "Search"
177msgid "Search"
174msgstr "گەڕان"
178msgstr "گەڕان"
175
179
176−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:260
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:277
177msgid "Settings"
185msgid "Settings"
178msgstr ""
186msgstr ""
179
187
180−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:284
181msgid "Remove from Favorites"
189msgid "Remove from Favorites"
182msgstr ""
190msgstr ""
183
191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185msgid "Add to Favorites"
193msgid "Add to Favorites"
186msgstr ""
194msgstr ""
187
195
@@ -213,87 +221,59 @@ msgstr ""
213msgid "Release to refresh…"
221msgid "Release to refresh…"
214msgstr ""
222msgstr ""
215
223
216−#: qml/Dash/ScopesOverview.qml:206
224+#: qml/Dash/ScopesList.qml:63
217−msgid "Manage Scopes"
225+msgid "Manage"
218−msgstr ""
219−
220−#: qml/Dash/ScopesOverview.qml:428
221−msgid "Done"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:454
225−msgid "Store"
226msgstr ""
226msgstr ""
227
227
228−#: qml/Dash/ScopesOverviewTab.qml:36
228+#: qml/Dash/ScopesList.qml:107
229−msgid "Favorites"
229+msgid "Home"
230msgstr ""
230msgstr ""
231
231
232−#: qml/Dash/ScopesOverviewTab.qml:54
232+#: qml/Dash/ScopesList.qml:108
233−msgid "All"
233+msgid "Also installed"
234msgstr ""
234msgstr ""
235
235
236−#: qml/Greeter/Greeter.qml:157
236+#: qml/Greeter/Greeter.qml:174
237msgid "Unlock"
237msgid "Unlock"
238msgstr ""
238msgstr ""
239
239
240−#: qml/Hud/HudParametrizedActionsPage.qml:139
241−msgid "Confirm"
242−msgstr "پشتڕاستکردنەوە"
243−
244−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
245−msgid "Type or say a command"
246−msgstr "فەرمانێک بێژە یان بنووسە"
247−
248−#: qml/Hud/Hud.qml:84
249−msgid "Loading. Please Wait..."
250−msgstr "لە بارکردندایە. تکایە چاوەڕێ بکە..."
251−
252−#: qml/Hud/Hud.qml:89
253−msgid "Speak Now..."
254−msgstr "ئێستا قسە بکە"
255−
256−#: qml/Hud/Hud.qml:94
257−msgid "Speaking..."
258−msgstr "قسە دەکات..."
259−
260−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
261msgid "Show password"
241msgid "Show password"
262msgstr "تێپەڕەوشە پیشان بدە"
242msgstr "تێپەڕەوشە پیشان بدە"
263
243
264−#: qml/Panel/ActiveCallHint.qml:77
244+#: qml/Panel/ActiveCallHint.qml:79
265msgid "Tap to return to call..."
245msgid "Tap to return to call..."
266msgstr ""
246msgstr ""
267
247
268−#: qml/Panel/ActiveCallHint.qml:90
248+#: qml/Panel/ActiveCallHint.qml:92
269msgid "Conference"
249msgid "Conference"
270msgstr ""
250msgstr ""
271
251
272−#: qml/Panel/Indicators/MenuItemFactory.qml:600
252+#: qml/Panel/Indicators/MenuItemFactory.qml:643
273msgid "Nothing is playing"
253msgid "Nothing is playing"
274msgstr ""
254msgstr ""
275
255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:748
256+#: qml/Panel/Indicators/MenuItemFactory.qml:791
277msgid "In queue…"
257msgid "In queue…"
278msgstr ""
258msgstr ""
279
259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:752
260+#: qml/Panel/Indicators/MenuItemFactory.qml:795
281msgid "Downloading"
261msgid "Downloading"
282msgstr ""
262msgstr ""
283
263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:754
264+#: qml/Panel/Indicators/MenuItemFactory.qml:797
285msgid "Paused, tap to resume"
265msgid "Paused, tap to resume"
286msgstr ""
266msgstr ""
287
267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:756
268+#: qml/Panel/Indicators/MenuItemFactory.qml:799
289msgid "Canceled"
269msgid "Canceled"
290msgstr ""
270msgstr ""
291
271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:758
272+#: qml/Panel/Indicators/MenuItemFactory.qml:801
293msgid "Finished"
273msgid "Finished"
294msgstr ""
274msgstr ""
295
275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:760
276+#: qml/Panel/Indicators/MenuItemFactory.qml:803
297msgid "Failed, tap to retry"
277msgid "Failed, tap to retry"
298msgstr ""
278msgstr ""
299
279
@@ -305,56 +285,248 @@ msgstr ""
305msgid "Roaming"
285msgid "Roaming"
306msgstr ""
286msgstr ""
307
287
308−#: qml/Shell.qml:346
288+#: qml/Shell.qml:367
289+#, qt-format
309−msgid "Enter passphrase"
290+msgid "Enter %1"
310msgstr ""
291msgstr ""
311
292
312−#: qml/Shell.qml:347
293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313−msgid "Sorry, incorrect passphrase"
294+msgid "Enter passphrase"
314msgstr ""
295msgstr ""
315
296
316−#: qml/Shell.qml:348
297+#: qml/Shell.qml:369
317−msgid "Please re-enter"
298+msgid "Enter passcode"
318msgstr ""
299msgstr ""
319
300
320−#: qml/Shell.qml:350
301+#: qml/Shell.qml:370
321−msgid "Enter passcode"
302+#, qt-format
303+msgid "Sorry, incorrect %1"
322msgstr ""
304msgstr ""
323
305
324−#: qml/Shell.qml:351
306+#: qml/Shell.qml:371
325−msgid "Sorry, incorrect passcode"
307+msgid "Sorry, incorrect passphrase"
326msgstr ""
308msgstr ""
327
309
328−#: qml/Shell.qml:354
310+#: qml/Shell.qml:372
329−#, qt-format
311+msgid "Please re-enter"
330−msgid "Enter %1"
331msgstr ""
312msgstr ""
332
313
333−#: qml/Shell.qml:355
314+#: qml/Shell.qml:373
334−#, qt-format
335−msgid "Sorry, incorrect %1"
315+msgid "Sorry, incorrect passcode"
336msgstr ""
316msgstr ""
337
317
338−#: qml/Shell.qml:390
318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
339msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
340msgstr ""
320msgstr ""
341
321
342−#: qml/Shell.qml:391
322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
343msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
344msgstr ""
324msgstr ""
345
325
346−#: qml/Shell.qml:392
326+#: qml/Shell.qml:469
347msgid "This will be your last attempt."
327msgid "This will be your last attempt."
348msgstr ""
328msgstr ""
349
329
350−#: qml/Shell.qml:394
330+#: qml/Shell.qml:471
351msgid ""
331msgid ""
352"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
353"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
354msgstr ""
334msgstr ""
355
335
356−#: qml/Shell.qml:395
336+#: qml/Shell.qml:472
357msgid ""
337msgid ""
358"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"and all personal data will be deleted."
339"and all personal data will be deleted."
360msgstr ""
340msgstr ""
341+
342+#: qml/Wizard/Page.qml:89
343+msgid "Back"
344+msgstr ""
345+
346+#: qml/Wizard/Pages/10-welcome.qml:27
347+msgid "Hi!"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:44
351+msgid "Welcome to your Ubuntu phone."
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:52
355+msgid "Let’s get started."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
361+#: qml/Wizard/Pages/passwd-set.qml:90
362+msgid "Continue"
363+msgstr ""
364+
365+#: qml/Wizard/Pages/20-sim.qml:25
366+msgid "Add a SIM card and restart your device"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:55
370+msgid "Without it, you won’t be able to make calls or use text messaging."
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
374+msgid "Skip"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/30-passwd-type.qml:39
378+msgid "Lock security"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:74
382+msgid "Please select how you’d like to unlock your phone."
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:97
386+msgid "Swipe"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:98
390+msgid "No security"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:100
394+msgid "Passcode"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:101
398+msgid "4 digits only"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:103
402+msgid "Passphrase"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:104
406+msgid "Numbers and letters"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/40-wifi.qml:28
410+msgid "Connect to Wi‑Fi"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:147
414+msgid "Available networks…"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:148
418+msgid "No available networks."
419+msgstr ""
420+
421+#: qml/Wizard/Pages/50-location.qml:27
422+msgid "Location"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:62
426+msgid "Let the phone detect your location:"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:69
430+msgid "Using GPS only (less accurate)"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:86
434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
435+msgstr ""
436+
437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
438+#: qml/Wizard/Pages/50-location.qml:103
439+msgid ""
440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
441+"conditions</a>."
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:112
445+msgid "Not at all"
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:124
449+msgid "You can change your mind later in <b>System Settings</b>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/60-reporting.qml:24
453+msgid "Improving your experience"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:36
457+msgid ""
458+"Your phone is set up to automatically report errors to Canonical and its "
459+"partners, the makers of the operating system."
460+msgstr ""
461+
462+#: qml/Wizard/Pages/60-reporting.qml:43
463+msgid ""
464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
465+"Privacy</b>"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/80-finished.qml:24
469+msgid "All done"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:39
473+msgid "Nice work!"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:46
477+msgid "Your phone is now ready to use."
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:53
481+msgid "Finish"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/here-terms.qml:27
485+msgid "Terms & Conditions"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/passwd-confirm.qml:49
489+msgid "Confirm passphrase"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:50
493+msgid "Confirm passcode"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:53
497+#: qml/Wizard/Pages/passwd-confirm.qml:54
498+msgid "Please try again."
499+msgstr ""
500+
501+#: qml/Wizard/Pages/passwd-set.qml:61
502+msgid "Choose your passcode"
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:68
506+msgid "Passphrase must be 4 characters long"
507+msgstr ""
508+
509+#: qml/Wizard/StackButton.qml:39
510+#, qt-format
511+msgid "〈 %1"
512+msgstr ""
513+
514+#: qml/Wizard/StackButton.qml:42
515+#, qt-format
516+msgid "%1 〉"
517+msgstr ""
518+
519+#~ msgid "Speaking..."
520+#~ msgstr "قسە دەکات..."
521+
522+#~ msgid "Speak Now..."
523+#~ msgstr "ئێستا قسە بکە"
524+
525+#~ msgid "Confirm"
526+#~ msgstr "پشتڕاستکردنەوە"
527+
528+#~ msgid "Type or say a command"
529+#~ msgstr "فەرمانێک بێژە یان بنووسە"
530+
531+#~ msgid "Loading. Please Wait..."
532+#~ msgstr "لە بارکردندایە. تکایە چاوەڕێ بکە..."
po/cs.po+261−89
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+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-10-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -110,78 +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:198
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:199
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:226
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:227
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:220
155+#: qml/Components/Lockscreen.qml:238
156+msgid "Return to Call"
157+msgstr ""
158+
159+#: qml/Components/Lockscreen.qml:238
156msgid "Emergency Call"
160msgid "Emergency Call"
157msgstr "Tísňové volání"
161msgstr "Tísňové volání"
158
162
159−#: qml/Components/Lockscreen.qml:252
163+#: qml/Components/Lockscreen.qml:270
160msgid "OK"
164msgid "OK"
161msgstr ""
165msgstr ""
162
166
163−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
164msgid "See less"
168msgid "See less"
165msgstr ""
169msgstr ""
166
170
167−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:431
168msgid "See all"
172msgid "See all"
169msgstr ""
173msgstr ""
170
174
171−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
172#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
173msgid "Search"
177msgid "Search"
174msgstr "Hledat"
178msgstr "Hledat"
175
179
176−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:260
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:277
177msgid "Settings"
185msgid "Settings"
178msgstr ""
186msgstr ""
179
187
180−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:284
181msgid "Remove from Favorites"
189msgid "Remove from Favorites"
182msgstr ""
190msgstr ""
183
191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185msgid "Add to Favorites"
193msgid "Add to Favorites"
186msgstr ""
194msgstr ""
187
195
@@ -213,87 +221,59 @@ msgstr ""
213msgid "Release to refresh…"
221msgid "Release to refresh…"
214msgstr ""
222msgstr ""
215
223
216−#: qml/Dash/ScopesOverview.qml:206
224+#: qml/Dash/ScopesList.qml:63
217−msgid "Manage Scopes"
225+msgid "Manage"
218−msgstr ""
219−
220−#: qml/Dash/ScopesOverview.qml:428
221−msgid "Done"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:454
225−msgid "Store"
226msgstr ""
226msgstr ""
227
227
228−#: qml/Dash/ScopesOverviewTab.qml:36
228+#: qml/Dash/ScopesList.qml:107
229−msgid "Favorites"
229+msgid "Home"
230msgstr ""
230msgstr ""
231
231
232−#: qml/Dash/ScopesOverviewTab.qml:54
232+#: qml/Dash/ScopesList.qml:108
233−msgid "All"
233+msgid "Also installed"
234msgstr ""
234msgstr ""
235
235
236−#: qml/Greeter/Greeter.qml:157
236+#: qml/Greeter/Greeter.qml:174
237msgid "Unlock"
237msgid "Unlock"
238msgstr ""
238msgstr ""
239
239
240−#: qml/Hud/HudParametrizedActionsPage.qml:139
241−msgid "Confirm"
242−msgstr "Potvrdit"
243−
244−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
245−msgid "Type or say a command"
246−msgstr "Napište nebo řekněte příkaz"
247−
248−#: qml/Hud/Hud.qml:84
249−msgid "Loading. Please Wait..."
250−msgstr "Načítám. Čekejte prosím..."
251−
252−#: qml/Hud/Hud.qml:89
253−msgid "Speak Now..."
254−msgstr "Mluvte..."
255−
256−#: qml/Hud/Hud.qml:94
257−msgid "Speaking..."
258−msgstr "Mluvte..."
259−
260−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
261msgid "Show password"
241msgid "Show password"
262msgstr "Zobrazit heslo"
242msgstr "Zobrazit heslo"
263
243
264−#: qml/Panel/ActiveCallHint.qml:77
244+#: qml/Panel/ActiveCallHint.qml:79
265msgid "Tap to return to call..."
245msgid "Tap to return to call..."
266msgstr ""
246msgstr ""
267
247
268−#: qml/Panel/ActiveCallHint.qml:90
248+#: qml/Panel/ActiveCallHint.qml:92
269msgid "Conference"
249msgid "Conference"
270msgstr ""
250msgstr ""
271
251
272−#: qml/Panel/Indicators/MenuItemFactory.qml:600
252+#: qml/Panel/Indicators/MenuItemFactory.qml:643
273msgid "Nothing is playing"
253msgid "Nothing is playing"
274msgstr ""
254msgstr ""
275
255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:748
256+#: qml/Panel/Indicators/MenuItemFactory.qml:791
277msgid "In queue…"
257msgid "In queue…"
278msgstr ""
258msgstr ""
279
259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:752
260+#: qml/Panel/Indicators/MenuItemFactory.qml:795
281msgid "Downloading"
261msgid "Downloading"
282msgstr ""
262msgstr ""
283
263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:754
264+#: qml/Panel/Indicators/MenuItemFactory.qml:797
285msgid "Paused, tap to resume"
265msgid "Paused, tap to resume"
286msgstr ""
266msgstr ""
287
267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:756
268+#: qml/Panel/Indicators/MenuItemFactory.qml:799
289msgid "Canceled"
269msgid "Canceled"
290msgstr ""
270msgstr ""
291
271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:758
272+#: qml/Panel/Indicators/MenuItemFactory.qml:801
293msgid "Finished"
273msgid "Finished"
294msgstr ""
274msgstr ""
295
275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:760
276+#: qml/Panel/Indicators/MenuItemFactory.qml:803
297msgid "Failed, tap to retry"
277msgid "Failed, tap to retry"
298msgstr ""
278msgstr ""
299
279
@@ -305,56 +285,248 @@ msgstr ""
305msgid "Roaming"
285msgid "Roaming"
306msgstr ""
286msgstr ""
307
287
308−#: qml/Shell.qml:346
288+#: qml/Shell.qml:367
289+#, qt-format
309−msgid "Enter passphrase"
290+msgid "Enter %1"
310msgstr ""
291msgstr ""
311
292
312−#: qml/Shell.qml:347
293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313−msgid "Sorry, incorrect passphrase"
294+msgid "Enter passphrase"
314msgstr ""
295msgstr ""
315
296
316−#: qml/Shell.qml:348
297+#: qml/Shell.qml:369
317−msgid "Please re-enter"
298+msgid "Enter passcode"
318msgstr ""
299msgstr ""
319
300
320−#: qml/Shell.qml:350
301+#: qml/Shell.qml:370
321−msgid "Enter passcode"
302+#, qt-format
303+msgid "Sorry, incorrect %1"
322msgstr ""
304msgstr ""
323
305
324−#: qml/Shell.qml:351
306+#: qml/Shell.qml:371
325−msgid "Sorry, incorrect passcode"
307+msgid "Sorry, incorrect passphrase"
326msgstr ""
308msgstr ""
327
309
328−#: qml/Shell.qml:354
310+#: qml/Shell.qml:372
329−#, qt-format
311+msgid "Please re-enter"
330−msgid "Enter %1"
331msgstr ""
312msgstr ""
332
313
333−#: qml/Shell.qml:355
314+#: qml/Shell.qml:373
334−#, qt-format
335−msgid "Sorry, incorrect %1"
315+msgid "Sorry, incorrect passcode"
336msgstr ""
316msgstr ""
337
317
338−#: qml/Shell.qml:390
318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
339msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
340msgstr ""
320msgstr ""
341
321
342−#: qml/Shell.qml:391
322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
343msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
344msgstr ""
324msgstr ""
345
325
346−#: qml/Shell.qml:392
326+#: qml/Shell.qml:469
347msgid "This will be your last attempt."
327msgid "This will be your last attempt."
348msgstr ""
328msgstr ""
349
329
350−#: qml/Shell.qml:394
330+#: qml/Shell.qml:471
351msgid ""
331msgid ""
352"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
353"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
354msgstr ""
334msgstr ""
355
335
356−#: qml/Shell.qml:395
336+#: qml/Shell.qml:472
357msgid ""
337msgid ""
358"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"and all personal data will be deleted."
339"and all personal data will be deleted."
360msgstr ""
340msgstr ""
341+
342+#: qml/Wizard/Page.qml:89
343+msgid "Back"
344+msgstr ""
345+
346+#: qml/Wizard/Pages/10-welcome.qml:27
347+msgid "Hi!"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:44
351+msgid "Welcome to your Ubuntu phone."
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:52
355+msgid "Let’s get started."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
361+#: qml/Wizard/Pages/passwd-set.qml:90
362+msgid "Continue"
363+msgstr ""
364+
365+#: qml/Wizard/Pages/20-sim.qml:25
366+msgid "Add a SIM card and restart your device"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:55
370+msgid "Without it, you won’t be able to make calls or use text messaging."
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
374+msgid "Skip"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/30-passwd-type.qml:39
378+msgid "Lock security"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:74
382+msgid "Please select how you’d like to unlock your phone."
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:97
386+msgid "Swipe"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:98
390+msgid "No security"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:100
394+msgid "Passcode"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:101
398+msgid "4 digits only"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:103
402+msgid "Passphrase"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:104
406+msgid "Numbers and letters"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/40-wifi.qml:28
410+msgid "Connect to Wi‑Fi"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:147
414+msgid "Available networks…"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:148
418+msgid "No available networks."
419+msgstr ""
420+
421+#: qml/Wizard/Pages/50-location.qml:27
422+msgid "Location"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:62
426+msgid "Let the phone detect your location:"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:69
430+msgid "Using GPS only (less accurate)"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:86
434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
435+msgstr ""
436+
437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
438+#: qml/Wizard/Pages/50-location.qml:103
439+msgid ""
440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
441+"conditions</a>."
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:112
445+msgid "Not at all"
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:124
449+msgid "You can change your mind later in <b>System Settings</b>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/60-reporting.qml:24
453+msgid "Improving your experience"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:36
457+msgid ""
458+"Your phone is set up to automatically report errors to Canonical and its "
459+"partners, the makers of the operating system."
460+msgstr ""
461+
462+#: qml/Wizard/Pages/60-reporting.qml:43
463+msgid ""
464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
465+"Privacy</b>"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/80-finished.qml:24
469+msgid "All done"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:39
473+msgid "Nice work!"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:46
477+msgid "Your phone is now ready to use."
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:53
481+msgid "Finish"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/here-terms.qml:27
485+msgid "Terms & Conditions"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/passwd-confirm.qml:49
489+msgid "Confirm passphrase"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:50
493+msgid "Confirm passcode"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:53
497+#: qml/Wizard/Pages/passwd-confirm.qml:54
498+msgid "Please try again."
499+msgstr ""
500+
501+#: qml/Wizard/Pages/passwd-set.qml:61
502+msgid "Choose your passcode"
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:68
506+msgid "Passphrase must be 4 characters long"
507+msgstr ""
508+
509+#: qml/Wizard/StackButton.qml:39
510+#, qt-format
511+msgid "〈 %1"
512+msgstr ""
513+
514+#: qml/Wizard/StackButton.qml:42
515+#, qt-format
516+msgid "%1 〉"
517+msgstr ""
518+
519+#~ msgid "Loading. Please Wait..."
520+#~ msgstr "Načítám. Čekejte prosím..."
521+
522+#~ msgid "Speak Now..."
523+#~ msgstr "Mluvte..."
524+
525+#~ msgid "Confirm"
526+#~ msgstr "Potvrdit"
527+
528+#~ msgid "Speaking..."
529+#~ msgstr "Mluvte..."
530+
531+#~ msgid "Type or say a command"
532+#~ msgstr "Napište nebo řekněte příkaz"
po/da.po+261−89
@@ -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-10-07 11:37+0300\n"
11+"POT-Creation-Date: 2014-12-10 10:55+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-10-09 06:36+0000\n"
19+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
20−"X-Generator: Launchpad (build 17196)\n"
20+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
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:227
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,36 +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:220
158+#: qml/Components/Lockscreen.qml:238
159+msgid "Return to Call"
160+msgstr ""
161+
162+#: qml/Components/Lockscreen.qml:238
159msgid "Emergency Call"
163msgid "Emergency Call"
160msgstr "Nødopkald"
164msgstr "Nødopkald"
161
165
162−#: qml/Components/Lockscreen.qml:252
166+#: qml/Components/Lockscreen.qml:270
163msgid "OK"
167msgid "OK"
164msgstr "O.k."
168msgstr "O.k."
165
169
166−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
170+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
167msgid "See less"
171msgid "See less"
168msgstr "Vis mindre"
172msgstr "Vis mindre"
169
173
170−#: qml/Dash/GenericScopeView.qml:434
174+#: qml/Dash/GenericScopeView.qml:431
171msgid "See all"
175msgid "See all"
172msgstr "Se alle"
176msgstr "Se alle"
173
177
174−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
178+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
175#: qml/Panel/SearchIndicator.qml:27
179#: qml/Panel/SearchIndicator.qml:27
176msgid "Search"
180msgid "Search"
177msgstr "Søg"
181msgstr "Søg"
178
182
179−#: qml/Dash/PageHeader.qml:268
183+#: qml/Dash/PageHeader.qml:260
184+msgid "Store"
185+msgstr ""
186+
187+#: qml/Dash/PageHeader.qml:277
180msgid "Settings"
188msgid "Settings"
181msgstr ""
189msgstr ""
182
190
183−#: qml/Dash/PageHeader.qml:275
191+#: qml/Dash/PageHeader.qml:284
184msgid "Remove from Favorites"
192msgid "Remove from Favorites"
185msgstr ""
193msgstr ""
186
194
187−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:284
188msgid "Add to Favorites"
196msgid "Add to Favorites"
189msgstr ""
197msgstr ""
190
198
@@ -216,87 +224,59 @@ msgstr ""
216msgid "Release to refresh…"
224msgid "Release to refresh…"
217msgstr ""
225msgstr ""
218
226
219−#: qml/Dash/ScopesOverview.qml:206
227+#: qml/Dash/ScopesList.qml:63
220−msgid "Manage Scopes"
228+msgid "Manage"
221−msgstr ""
222−
223−#: qml/Dash/ScopesOverview.qml:428
224−msgid "Done"
225−msgstr ""
226−
227−#: qml/Dash/ScopesOverview.qml:454
228−msgid "Store"
229msgstr ""
229msgstr ""
230
230
231−#: qml/Dash/ScopesOverviewTab.qml:36
231+#: qml/Dash/ScopesList.qml:107
232−msgid "Favorites"
232+msgid "Home"
233msgstr ""
233msgstr ""
234
234
235−#: qml/Dash/ScopesOverviewTab.qml:54
235+#: qml/Dash/ScopesList.qml:108
236−msgid "All"
236+msgid "Also installed"
237msgstr ""
237msgstr ""
238
238
239−#: qml/Greeter/Greeter.qml:157
239+#: qml/Greeter/Greeter.qml:174
240msgid "Unlock"
240msgid "Unlock"
241msgstr ""
241msgstr ""
242
242
243−#: qml/Hud/HudParametrizedActionsPage.qml:139
244−msgid "Confirm"
245−msgstr "Bekræft"
246−
247−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
248−msgid "Type or say a command"
249−msgstr "Skriv eller indtal en kommando"
250−
251−#: qml/Hud/Hud.qml:84
252−msgid "Loading. Please Wait..."
253−msgstr "Indlæser. Vent venligst..."
254−
255−#: qml/Hud/Hud.qml:89
256−msgid "Speak Now..."
257−msgstr "Tal nu..."
258−
259−#: qml/Hud/Hud.qml:94
260−msgid "Speaking..."
261−msgstr "Taler..."
262−
263−#: qml/Notifications/NotificationMenuItemFactory.qml:116
243+#: qml/Notifications/NotificationMenuItemFactory.qml:128
264msgid "Show password"
244msgid "Show password"
265msgstr "Vis adgangskode"
245msgstr "Vis adgangskode"
266
246
267−#: qml/Panel/ActiveCallHint.qml:77
247+#: qml/Panel/ActiveCallHint.qml:79
268msgid "Tap to return to call..."
248msgid "Tap to return to call..."
269msgstr "Tryk for at besvare opkaldet..."
249msgstr "Tryk for at besvare opkaldet..."
270
250
271−#: qml/Panel/ActiveCallHint.qml:90
251+#: qml/Panel/ActiveCallHint.qml:92
272msgid "Conference"
252msgid "Conference"
273msgstr "Konference"
253msgstr "Konference"
274
254
275−#: qml/Panel/Indicators/MenuItemFactory.qml:600
255+#: qml/Panel/Indicators/MenuItemFactory.qml:643
276msgid "Nothing is playing"
256msgid "Nothing is playing"
277msgstr ""
257msgstr ""
278
258
279−#: qml/Panel/Indicators/MenuItemFactory.qml:748
259+#: qml/Panel/Indicators/MenuItemFactory.qml:791
280msgid "In queue…"
260msgid "In queue…"
281msgstr "I kø…"
261msgstr "I kø…"
282
262
283−#: qml/Panel/Indicators/MenuItemFactory.qml:752
263+#: qml/Panel/Indicators/MenuItemFactory.qml:795
284msgid "Downloading"
264msgid "Downloading"
285msgstr "Henter"
265msgstr "Henter"
286
266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:754
267+#: qml/Panel/Indicators/MenuItemFactory.qml:797
288msgid "Paused, tap to resume"
268msgid "Paused, tap to resume"
289msgstr "På pause; tryk for at fortsætte"
269msgstr "På pause; tryk for at fortsætte"
290
270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:756
271+#: qml/Panel/Indicators/MenuItemFactory.qml:799
292msgid "Canceled"
272msgid "Canceled"
293msgstr "Annulleret"
273msgstr "Annulleret"
294
274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:758
275+#: qml/Panel/Indicators/MenuItemFactory.qml:801
296msgid "Finished"
276msgid "Finished"
297msgstr "Færdig"
277msgstr "Færdig"
298
278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:760
279+#: qml/Panel/Indicators/MenuItemFactory.qml:803
300msgid "Failed, tap to retry"
280msgid "Failed, tap to retry"
301msgstr "Mislykkedes; tryk for at prøve igen"
281msgstr "Mislykkedes; tryk for at prøve igen"
302
282
@@ -308,56 +288,248 @@ msgstr ""
308msgid "Roaming"
288msgid "Roaming"
309msgstr ""
289msgstr ""
310
290
311−#: qml/Shell.qml:346
291+#: qml/Shell.qml:367
292+#, qt-format
312−msgid "Enter passphrase"
293+msgid "Enter %1"
313msgstr ""
294msgstr ""
314
295
315−#: qml/Shell.qml:347
296+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
316−msgid "Sorry, incorrect passphrase"
297+msgid "Enter passphrase"
317msgstr ""
298msgstr ""
318
299
319−#: qml/Shell.qml:348
300+#: qml/Shell.qml:369
320−msgid "Please re-enter"
301+msgid "Enter passcode"
321msgstr ""
302msgstr ""
322
303
323−#: qml/Shell.qml:350
304+#: qml/Shell.qml:370
324−msgid "Enter passcode"
305+#, qt-format
306+msgid "Sorry, incorrect %1"
325msgstr ""
307msgstr ""
326
308
327−#: qml/Shell.qml:351
309+#: qml/Shell.qml:371
328−msgid "Sorry, incorrect passcode"
310+msgid "Sorry, incorrect passphrase"
329msgstr ""
311msgstr ""
330
312
331−#: qml/Shell.qml:354
313+#: qml/Shell.qml:372
332−#, qt-format
314+msgid "Please re-enter"
333−msgid "Enter %1"
334msgstr ""
315msgstr ""
335
316
336−#: qml/Shell.qml:355
317+#: qml/Shell.qml:373
337−#, qt-format
338−msgid "Sorry, incorrect %1"
318+msgid "Sorry, incorrect passcode"
339msgstr ""
319msgstr ""
340
320
341−#: qml/Shell.qml:390
321+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
342msgid "Sorry, incorrect passphrase."
322msgid "Sorry, incorrect passphrase."
343msgstr ""
323msgstr ""
344
324
345−#: qml/Shell.qml:391
325+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
346msgid "Sorry, incorrect passcode."
326msgid "Sorry, incorrect passcode."
347msgstr ""
327msgstr ""
348
328
349−#: qml/Shell.qml:392
329+#: qml/Shell.qml:469
350msgid "This will be your last attempt."
330msgid "This will be your last attempt."
351msgstr ""
331msgstr ""
352
332
353−#: qml/Shell.qml:394
333+#: qml/Shell.qml:471
354msgid ""
334msgid ""
355"If passphrase is entered incorrectly, your phone will conduct a factory "
335"If passphrase is entered incorrectly, your phone will conduct a factory "
356"reset and all personal data will be deleted."
336"reset and all personal data will be deleted."
357msgstr ""
337msgstr ""
358
338
359−#: qml/Shell.qml:395
339+#: qml/Shell.qml:472
360msgid ""
340msgid ""
361"If passcode is entered incorrectly, your phone will conduct a factory reset "
341"If passcode is entered incorrectly, your phone will conduct a factory reset "
362"and all personal data will be deleted."
342"and all personal data will be deleted."
363msgstr ""
343msgstr ""
344+
345+#: qml/Wizard/Page.qml:89
346+msgid "Back"
347+msgstr ""
348+
349+#: qml/Wizard/Pages/10-welcome.qml:27
350+msgid "Hi!"
351+msgstr ""
352+
353+#: qml/Wizard/Pages/10-welcome.qml:44
354+msgid "Welcome to your Ubuntu phone."
355+msgstr ""
356+
357+#: qml/Wizard/Pages/10-welcome.qml:52
358+msgid "Let’s get started."
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
362+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
363+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
364+#: qml/Wizard/Pages/passwd-set.qml:90
365+msgid "Continue"
366+msgstr ""
367+
368+#: qml/Wizard/Pages/20-sim.qml:25
369+msgid "Add a SIM card and restart your device"
370+msgstr ""
371+
372+#: qml/Wizard/Pages/20-sim.qml:55
373+msgid "Without it, you won’t be able to make calls or use text messaging."
374+msgstr ""
375+
376+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
377+msgid "Skip"
378+msgstr ""
379+
380+#: qml/Wizard/Pages/30-passwd-type.qml:39
381+msgid "Lock security"
382+msgstr ""
383+
384+#: qml/Wizard/Pages/30-passwd-type.qml:74
385+msgid "Please select how you’d like to unlock your phone."
386+msgstr ""
387+
388+#: qml/Wizard/Pages/30-passwd-type.qml:97
389+msgid "Swipe"
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:98
393+msgid "No security"
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:100
397+msgid "Passcode"
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:101
401+msgid "4 digits only"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:103
405+msgid "Passphrase"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:104
409+msgid "Numbers and letters"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/40-wifi.qml:28
413+msgid "Connect to Wi‑Fi"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/40-wifi.qml:147
417+msgid "Available networks…"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/40-wifi.qml:148
421+msgid "No available networks."
422+msgstr ""
423+
424+#: qml/Wizard/Pages/50-location.qml:27
425+msgid "Location"
426+msgstr ""
427+
428+#: qml/Wizard/Pages/50-location.qml:62
429+msgid "Let the phone detect your location:"
430+msgstr ""
431+
432+#: qml/Wizard/Pages/50-location.qml:69
433+msgid "Using GPS only (less accurate)"
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:86
437+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
438+msgstr ""
439+
440+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
441+#: qml/Wizard/Pages/50-location.qml:103
442+msgid ""
443+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
444+"conditions</a>."
445+msgstr ""
446+
447+#: qml/Wizard/Pages/50-location.qml:112
448+msgid "Not at all"
449+msgstr ""
450+
451+#: qml/Wizard/Pages/50-location.qml:124
452+msgid "You can change your mind later in <b>System Settings</b>."
453+msgstr ""
454+
455+#: qml/Wizard/Pages/60-reporting.qml:24
456+msgid "Improving your experience"
457+msgstr ""
458+
459+#: qml/Wizard/Pages/60-reporting.qml:36
460+msgid ""
461+"Your phone is set up to automatically report errors to Canonical and its "
462+"partners, the makers of the operating system."
463+msgstr ""
464+
465+#: qml/Wizard/Pages/60-reporting.qml:43
466+msgid ""
467+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
468+"Privacy</b>"
469+msgstr ""
470+
471+#: qml/Wizard/Pages/80-finished.qml:24
472+msgid "All done"
473+msgstr ""
474+
475+#: qml/Wizard/Pages/80-finished.qml:39
476+msgid "Nice work!"
477+msgstr ""
478+
479+#: qml/Wizard/Pages/80-finished.qml:46
480+msgid "Your phone is now ready to use."
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:53
484+msgid "Finish"
485+msgstr ""
486+
487+#: qml/Wizard/Pages/here-terms.qml:27
488+msgid "Terms & Conditions"
489+msgstr ""
490+
491+#: qml/Wizard/Pages/passwd-confirm.qml:49
492+msgid "Confirm passphrase"
493+msgstr ""
494+
495+#: qml/Wizard/Pages/passwd-confirm.qml:50
496+msgid "Confirm passcode"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/passwd-confirm.qml:53
500+#: qml/Wizard/Pages/passwd-confirm.qml:54
501+msgid "Please try again."
502+msgstr ""
503+
504+#: qml/Wizard/Pages/passwd-set.qml:61
505+msgid "Choose your passcode"
506+msgstr ""
507+
508+#: qml/Wizard/Pages/passwd-set.qml:68
509+msgid "Passphrase must be 4 characters long"
510+msgstr ""
511+
512+#: qml/Wizard/StackButton.qml:39
513+#, qt-format
514+msgid "〈 %1"
515+msgstr ""
516+
517+#: qml/Wizard/StackButton.qml:42
518+#, qt-format
519+msgid "%1 〉"
520+msgstr ""
521+
522+#~ msgid "Speaking..."
523+#~ msgstr "Taler..."
524+
525+#~ msgid "Confirm"
526+#~ msgstr "Bekræft"
527+
528+#~ msgid "Type or say a command"
529+#~ msgstr "Skriv eller indtal en kommando"
530+
531+#~ msgid "Loading. Please Wait..."
532+#~ msgstr "Indlæser. Vent venligst..."
533+
534+#~ msgid "Speak Now..."
535+#~ msgstr "Tal nu..."
po/de.po+281−97
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-21 11:26+0000\n"
11+"PO-Revision-Date: 2014-12-12 01:42+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-10-22 06:17+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17203)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
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:227
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,36 +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:220
166+#: qml/Components/Lockscreen.qml:238
167+msgid "Return to Call"
168+msgstr "Zu Anruf zurückkehren"
169+
170+#: qml/Components/Lockscreen.qml:238
167msgid "Emergency Call"
171msgid "Emergency Call"
168msgstr "Notruf"
172msgstr "Notruf"
169
173
170−#: qml/Components/Lockscreen.qml:252
174+#: qml/Components/Lockscreen.qml:270
171msgid "OK"
175msgid "OK"
172msgstr "OK"
176msgstr "OK"
173
177
174−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
178+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
175msgid "See less"
179msgid "See less"
176msgstr "Weniger ansehen"
180msgstr "Weniger ansehen"
177
181
178−#: qml/Dash/GenericScopeView.qml:434
182+#: qml/Dash/GenericScopeView.qml:431
179msgid "See all"
183msgid "See all"
180msgstr "Alle anzeigen"
184msgstr "Alle anzeigen"
181
185
182−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
186+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
183#: qml/Panel/SearchIndicator.qml:27
187#: qml/Panel/SearchIndicator.qml:27
184msgid "Search"
188msgid "Search"
185msgstr "Suchen"
189msgstr "Suchen"
186
190
187−#: qml/Dash/PageHeader.qml:268
191+#: qml/Dash/PageHeader.qml:260
192+msgid "Store"
193+msgstr "Store"
194+
195+#: qml/Dash/PageHeader.qml:277
188msgid "Settings"
196msgid "Settings"
189msgstr "Einstellungen"
197msgstr "Einstellungen"
190
198
191−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:284
192msgid "Remove from Favorites"
200msgid "Remove from Favorites"
193msgstr "Aus den Favoriten entfernen"
201msgstr "Aus den Favoriten entfernen"
194
202
195−#: qml/Dash/PageHeader.qml:275
203+#: qml/Dash/PageHeader.qml:284
196msgid "Add to Favorites"
204msgid "Add to Favorites"
197msgstr "Zu Favoriten hinzufügen"
205msgstr "Zu Favoriten hinzufügen"
198
206
@@ -224,87 +232,59 @@ msgstr "Zum Aktualisieren ziehen …"
224msgid "Release to refresh…"
232msgid "Release to refresh…"
225msgstr "Zum Aktualisieren loslassen …"
233msgstr "Zum Aktualisieren loslassen …"
226
234
227−#: qml/Dash/ScopesOverview.qml:206
235+#: qml/Dash/ScopesList.qml:63
228−msgid "Manage Scopes"
236+msgid "Manage"
229−msgstr "Filter verwalten"
237+msgstr "Verwalten"
230−
231−#: qml/Dash/ScopesOverview.qml:428
232−msgid "Done"
233−msgstr "Erledigt"
234−
235−#: qml/Dash/ScopesOverview.qml:454
236−msgid "Store"
237−msgstr "Store"
238
238
239−#: qml/Dash/ScopesOverviewTab.qml:36
239+#: qml/Dash/ScopesList.qml:107
240−msgid "Favorites"
240+msgid "Home"
241−msgstr "Favoriten"
241+msgstr ""
242
242
243−#: qml/Dash/ScopesOverviewTab.qml:54
243+#: qml/Dash/ScopesList.qml:108
244−msgid "All"
244+msgid "Also installed"
245−msgstr "Alle"
245+msgstr ""
246
246
247−#: qml/Greeter/Greeter.qml:157
247+#: qml/Greeter/Greeter.qml:174
248msgid "Unlock"
248msgid "Unlock"
249msgstr "Entsperren"
249msgstr "Entsperren"
250
250
251−#: qml/Hud/HudParametrizedActionsPage.qml:139
252−msgid "Confirm"
253−msgstr "Bestätigen"
254−
255−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
256−msgid "Type or say a command"
257−msgstr "Befehl eingeben oder sprechen"
258−
259−#: qml/Hud/Hud.qml:84
260−msgid "Loading. Please Wait..."
261−msgstr "Wird geladen. Bitte warten …"
262−
263−#: qml/Hud/Hud.qml:89
264−msgid "Speak Now..."
265−msgstr "Sprechen Sie jetzt …"
266−
267−#: qml/Hud/Hud.qml:94
268−msgid "Speaking..."
269−msgstr "Sprechen Sie …"
270−
271−#: qml/Notifications/NotificationMenuItemFactory.qml:116
251+#: qml/Notifications/NotificationMenuItemFactory.qml:128
272msgid "Show password"
252msgid "Show password"
273msgstr "Passwort anzeigen"
253msgstr "Passwort anzeigen"
274
254
275−#: qml/Panel/ActiveCallHint.qml:77
255+#: qml/Panel/ActiveCallHint.qml:79
276msgid "Tap to return to call..."
256msgid "Tap to return to call..."
277msgstr "Tippen um zum Anruf zurückzugehen"
257msgstr "Tippen um zum Anruf zurückzugehen"
278
258
279−#: qml/Panel/ActiveCallHint.qml:90
259+#: qml/Panel/ActiveCallHint.qml:92
280msgid "Conference"
260msgid "Conference"
281msgstr "Konferenz"
261msgstr "Konferenz"
282
262
283−#: qml/Panel/Indicators/MenuItemFactory.qml:600
263+#: qml/Panel/Indicators/MenuItemFactory.qml:643
284msgid "Nothing is playing"
264msgid "Nothing is playing"
285msgstr "Nichts wird abgespielt"
265msgstr "Nichts wird abgespielt"
286
266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:748
267+#: qml/Panel/Indicators/MenuItemFactory.qml:791
288msgid "In queue…"
268msgid "In queue…"
289msgstr "In Warteschlange …"
269msgstr "In Warteschlange …"
290
270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:752
271+#: qml/Panel/Indicators/MenuItemFactory.qml:795
292msgid "Downloading"
272msgid "Downloading"
293msgstr "Wird heruntergeladen"
273msgstr "Wird heruntergeladen"
294
274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:754
275+#: qml/Panel/Indicators/MenuItemFactory.qml:797
296msgid "Paused, tap to resume"
276msgid "Paused, tap to resume"
297msgstr "Pausiert, tippen Sie zum fortsetzen"
277msgstr "Pausiert, tippen Sie zum fortsetzen"
298
278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:756
279+#: qml/Panel/Indicators/MenuItemFactory.qml:799
300msgid "Canceled"
280msgid "Canceled"
301msgstr "Abgebrochen"
281msgstr "Abgebrochen"
302
282
303−#: qml/Panel/Indicators/MenuItemFactory.qml:758
283+#: qml/Panel/Indicators/MenuItemFactory.qml:801
304msgid "Finished"
284msgid "Finished"
305msgstr "Erledigt"
285msgstr "Erledigt"
306
286
307−#: qml/Panel/Indicators/MenuItemFactory.qml:760
287+#: qml/Panel/Indicators/MenuItemFactory.qml:803
308msgid "Failed, tap to retry"
288msgid "Failed, tap to retry"
309msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
289msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
310
290
@@ -316,49 +296,49 @@ msgstr "SIM-Karte entsperren"
316msgid "Roaming"
296msgid "Roaming"
317msgstr "Roaming"
297msgstr "Roaming"
318
298
319−#: qml/Shell.qml:346
299+#: qml/Shell.qml:367
300+#, qt-format
301+msgid "Enter %1"
302+msgstr "%1 eingeben"
303+
304+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
320msgid "Enter passphrase"
305msgid "Enter passphrase"
321msgstr "Passwort eingeben"
306msgstr "Passwort eingeben"
322
307
323−#: qml/Shell.qml:347
308+#: qml/Shell.qml:369
309+msgid "Enter passcode"
310+msgstr "PIN eingeben"
311+
312+#: qml/Shell.qml:370
313+#, qt-format
314+msgid "Sorry, incorrect %1"
315+msgstr "%1 falsch"
316+
317+#: qml/Shell.qml:371
324msgid "Sorry, incorrect passphrase"
318msgid "Sorry, incorrect passphrase"
325msgstr "Das Passwort ist nicht korrekt"
319msgstr "Das Passwort ist nicht korrekt"
326
320
327−#: qml/Shell.qml:348
321+#: qml/Shell.qml:372
328msgid "Please re-enter"
322msgid "Please re-enter"
329msgstr "Bitte erneut eingeben"
323msgstr "Bitte erneut eingeben"
330
324
331−#: qml/Shell.qml:350
325+#: qml/Shell.qml:373
332−msgid "Enter passcode"
333−msgstr "PIN eingeben"
334−
335−#: qml/Shell.qml:351
336msgid "Sorry, incorrect passcode"
326msgid "Sorry, incorrect passcode"
337msgstr "Falsches Passwort"
327msgstr "Falsches Passwort"
338
328
339−#: qml/Shell.qml:354
329+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
340−#, qt-format
341−msgid "Enter %1"
342−msgstr "%1 eingeben"
343−
344−#: qml/Shell.qml:355
345−#, qt-format
346−msgid "Sorry, incorrect %1"
347−msgstr "%1 falsch"
348−
349−#: qml/Shell.qml:390
350msgid "Sorry, incorrect passphrase."
330msgid "Sorry, incorrect passphrase."
351−msgstr "Falsches Passwort."
331+msgstr "Entschuldigung, falsches Passwort."
352
332
353−#: qml/Shell.qml:391
333+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
354msgid "Sorry, incorrect passcode."
334msgid "Sorry, incorrect passcode."
355msgstr "Falsche PIN"
335msgstr "Falsche PIN"
356
336
357−#: qml/Shell.qml:392
337+#: qml/Shell.qml:469
358msgid "This will be your last attempt."
338msgid "This will be your last attempt."
359msgstr "Dies ist Ihr letzter Versuch."
339msgstr "Dies ist Ihr letzter Versuch."
360
340
361−#: qml/Shell.qml:394
341+#: qml/Shell.qml:471
362msgid ""
342msgid ""
363"If passphrase is entered incorrectly, your phone will conduct a factory "
343"If passphrase is entered incorrectly, your phone will conduct a factory "
364"reset and all personal data will be deleted."
344"reset and all personal data will be deleted."
@@ -366,10 +346,214 @@ msgstr ""
366"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
346"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
367"zurückgesetzt und alle Daten werden gelöscht."
347"zurückgesetzt und alle Daten werden gelöscht."
368
348
369−#: qml/Shell.qml:395
349+#: qml/Shell.qml:472
370msgid ""
350msgid ""
371"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 "
372"and all personal data will be deleted."
352"and all personal data will be deleted."
373msgstr ""
353msgstr ""
374"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
354"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
375"zurückgesetzt und alle Daten werden gelöscht."
355"zurückgesetzt und alle Daten werden gelöscht."
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+
534+#~ msgid "Confirm"
535+#~ msgstr "Bestätigen"
536+
537+#~ msgid "Loading. Please Wait..."
538+#~ msgstr "Wird geladen. Bitte warten …"
539+
540+#~ msgid "Speak Now..."
541+#~ msgstr "Sprechen Sie jetzt …"
542+
543+#~ msgid "Type or say a command"
544+#~ msgstr "Befehl eingeben oder sprechen"
545+
546+#~ msgid "Speaking..."
547+#~ msgstr "Sprechen Sie …"
548+
549+#~ msgid "All"
550+#~ msgstr "Alle"
551+
552+#~ msgid "Done"
553+#~ msgstr "Erledigt"
554+
555+#~ msgid "Favorites"
556+#~ msgstr "Favoriten"
557+
558+#~ msgid "Manage Scopes"
559+#~ msgstr "Filter verwalten"
po/el.po+302−115
@@ -7,82 +7,86 @@ 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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-08-21 12:06+0000\n"
11+"PO-Revision-Date: 2014-11-08 18:38+0000\n"
12−"Last-Translator: Chris Taklis (aka Kailor) <ctaklis@gmail.com>\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-10-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
34#: qml/Components/DelayedLockscreen.qml:47
34#: qml/Components/DelayedLockscreen.qml:47
35msgid "Device Locked"
35msgid "Device Locked"
36−msgstr ""
36+msgstr "Κλειδωμένη συσκευή"
37
37
38#: qml/Components/DelayedLockscreen.qml:62
38#: qml/Components/DelayedLockscreen.qml:62
39msgid "You have been locked out due to too many failed passphrase attempts."
39msgid "You have been locked out due to too many failed passphrase attempts."
40msgstr ""
40msgstr ""
41+"Δεν σας επιτρέπεται η πρόσβαση καθώς προσπαθήσατε επανηλλημένως να "
42+"συνδεθείτε με λάθος κωδικό."
41
43
42#: qml/Components/DelayedLockscreen.qml:63
44#: qml/Components/DelayedLockscreen.qml:63
43msgid "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."
44msgstr ""
46msgstr ""
47+"Δεν σας επιτρέπεται η πρόσβαση καθώς προσπαθήσατε επανηλλημένως να "
48+"συνδεθείτε με λάθος κωδικό."
45
49
46#: qml/Components/DelayedLockscreen.qml:72
50#: qml/Components/DelayedLockscreen.qml:72
47#, qt-format
51#, qt-format
48msgid "Please wait %1 minute and then try again…"
52msgid "Please wait %1 minute and then try again…"
49msgid_plural "Please wait %1 minutes and then try again…"
53msgid_plural "Please wait %1 minutes and then try again…"
50−msgstr[0] ""
54+msgstr[0] "Παρακαλώ περιμένετε %1 λεπτό και δοκιμάστε ξανά..."
51−msgstr[1] ""
55+msgstr[1] "Παρακαλώ περιμένετε %1 λεπτά και δοκιμάστε ξανά..."
52
56
53#: qml/Components/Dialogs.qml:70
57#: qml/Components/Dialogs.qml:70
54msgid "Log out"
58msgid "Log out"
55−msgstr ""
59+msgstr "Αποσύνδεση"
56
60
57#: qml/Components/Dialogs.qml:71
61#: qml/Components/Dialogs.qml:71
58msgid "Are you sure you want to log out?"
62msgid "Are you sure you want to log out?"
59−msgstr ""
63+msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε;"
60
64
61#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
65#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
62#: qml/Components/Dialogs.qml:122
66#: qml/Components/Dialogs.qml:122
63msgid "No"
67msgid "No"
64−msgstr ""
68+msgstr "Όχι"
65
69
66#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
70#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
67#: qml/Components/Dialogs.qml:129
71#: qml/Components/Dialogs.qml:129
68msgid "Yes"
72msgid "Yes"
69−msgstr ""
73+msgstr "Ναι"
70
74
71#: qml/Components/Dialogs.qml:94
75#: qml/Components/Dialogs.qml:94
72msgid "Shut down"
76msgid "Shut down"
73−msgstr ""
77+msgstr "Τερματισμός λειτουργίας"
74
78
75#: qml/Components/Dialogs.qml:95
79#: qml/Components/Dialogs.qml:95
76msgid "Are you sure you want to shut down?"
80msgid "Are you sure you want to shut down?"
77−msgstr ""
81+msgstr "Επιθυμείτε σίγουρα τερματισμό;"
78
82
79#: qml/Components/Dialogs.qml:119
83#: qml/Components/Dialogs.qml:119
80msgid "Reboot"
84msgid "Reboot"
81−msgstr ""
85+msgstr "Επανεκκίνηση"
82
86
83#: qml/Components/Dialogs.qml:120
87#: qml/Components/Dialogs.qml:120
84msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
85−msgstr ""
89+msgstr "Επιθυμείτε σίγουρα επανεκκίνηση;"
86
90
87#: qml/Components/Dialogs.qml:144
91#: qml/Components/Dialogs.qml:144
88msgid "Power"
92msgid "Power"
@@ -93,6 +97,8 @@ msgid ""
93"Are you sure you would like\n"
97"Are you sure you would like\n"
94"to power off?"
98"to power off?"
95msgstr ""
99msgstr ""
100+"Επιθυμείτε σίγουρα τον\n"
101+"τερματισμό λειτουργίας;"
96
102
97#: qml/Components/Dialogs.qml:147
103#: qml/Components/Dialogs.qml:147
98msgid "Power off"
104msgid "Power off"
@@ -100,7 +106,7 @@ msgstr "Τερματισμός"
100
106
101#: qml/Components/Dialogs.qml:157
107#: qml/Components/Dialogs.qml:157
102msgid "Restart"
108msgid "Restart"
103−msgstr ""
109+msgstr "Επανεκκίνηση"
104
110
105#: qml/Components/Dialogs.qml:167
111#: qml/Components/Dialogs.qml:167
106msgid "Cancel"
112msgid "Cancel"
@@ -110,45 +116,45 @@ msgstr "Ακύρωση"
110msgid "Skip intro"
116msgid "Skip intro"
111msgstr "Παράλειψη εισαγωγής"
117msgstr "Παράλειψη εισαγωγής"
112
118
113−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
114msgid "Right edge"
120msgid "Right edge"
115msgstr "Δεξί άκρο"
121msgstr "Δεξί άκρο"
116
122
117−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
118msgid "Try swiping from the right edge to unlock the phone"
124msgid "Try swiping from the right edge to unlock the phone"
119msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"
125msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"
120
126
121−#: qml/Components/EdgeDemo.qml:144
127+#: qml/Components/EdgeDemo.qml:157
122msgid "Top edge"
128msgid "Top edge"
123msgstr "Πάνω άκρο"
129msgstr "Πάνω άκρο"
124
130
125−#: qml/Components/EdgeDemo.qml:145
131+#: qml/Components/EdgeDemo.qml:158
126msgid "Try swiping from the top edge to access the indicators"
132msgid "Try swiping from the top edge to access the indicators"
127msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"
133msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"
128
134
129−#: qml/Components/EdgeDemo.qml:170
135+#: qml/Components/EdgeDemo.qml:183
130msgid "Close"
136msgid "Close"
131msgstr "Κλείσιμο"
137msgstr "Κλείσιμο"
132
138
133−#: qml/Components/EdgeDemo.qml:171
139+#: qml/Components/EdgeDemo.qml:184
134msgid "Swipe up again to close the settings screen"
140msgid "Swipe up again to close the settings screen"
135msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"
141msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"
136
142
137−#: qml/Components/EdgeDemo.qml:198
143+#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
144msgid "Left edge"
139msgstr "Αριστερό άκρο"
145msgstr "Αριστερό άκρο"
140
146
141−#: qml/Components/EdgeDemo.qml:199
147+#: qml/Components/EdgeDemo.qml:215
142msgid "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"
143msgstr ""
149msgstr ""
144"Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "
150"Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "
145"στις εφαρμογές"
151"στις εφαρμογές"
146
152
147−#: qml/Components/EdgeDemo.qml:226
153+#: qml/Components/EdgeDemo.qml:242
148msgid "Well done"
154msgid "Well done"
149msgstr "Συγχαρητήρια"
155msgstr "Συγχαρητήρια"
150
156
151−#: qml/Components/EdgeDemo.qml:227
157+#: qml/Components/EdgeDemo.qml:243
152msgid ""
158msgid ""
153"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 "
154"phone<br><br>Tap on the screen to start"
160"phone<br><br>Tap on the screen to start"
@@ -156,38 +162,46 @@ msgstr ""
156"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
162"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
157"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
163"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
158
164
159−#: qml/Components/Lockscreen.qml:220
165+#: qml/Components/Lockscreen.qml:238
166+msgid "Return to Call"
167+msgstr "Επιστροφή στην κλήση"
168+
169+#: qml/Components/Lockscreen.qml:238
160msgid "Emergency Call"
170msgid "Emergency Call"
161msgstr "Κλήση έκτακτης ανάγκης"
171msgstr "Κλήση έκτακτης ανάγκης"
162
172
163−#: qml/Components/Lockscreen.qml:252
173+#: qml/Components/Lockscreen.qml:270
164msgid "OK"
174msgid "OK"
165msgstr "OK"
175msgstr "OK"
166
176
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
177+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
168msgid "See less"
178msgid "See less"
169msgstr "Λιγότερα"
179msgstr "Λιγότερα"
170
180
171−#: qml/Dash/GenericScopeView.qml:434
181+#: qml/Dash/GenericScopeView.qml:431
172msgid "See all"
182msgid "See all"
173msgstr "Εμφάνιση όλων"
183msgstr "Εμφάνιση όλων"
174
184
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
185+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
176#: qml/Panel/SearchIndicator.qml:27
186#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
187msgid "Search"
178msgstr "Αναζήτηση"
188msgstr "Αναζήτηση"
179
189
180−#: qml/Dash/PageHeader.qml:268
190+#: qml/Dash/PageHeader.qml:260
191+msgid "Store"
192+msgstr "Κατάστημα"
193+
194+#: qml/Dash/PageHeader.qml:277
181msgid "Settings"
195msgid "Settings"
182−msgstr ""
196+msgstr "Ρυθμίσεις"
183
197
184−#: qml/Dash/PageHeader.qml:275
198+#: qml/Dash/PageHeader.qml:284
185msgid "Remove from Favorites"
199msgid "Remove from Favorites"
186−msgstr ""
200+msgstr "Αφαίρεση από τα αγαπημένα"
187
201
188−#: qml/Dash/PageHeader.qml:275
202+#: qml/Dash/PageHeader.qml:284
189msgid "Add to Favorites"
203msgid "Add to Favorites"
190−msgstr ""
204+msgstr "Προσθήκη στα αγαπημένα"
191
205
192#: qml/Dash/Previews/PreviewActionCombo.qml:35
206#: qml/Dash/Previews/PreviewActionCombo.qml:35
193msgid "More..."
207msgid "More..."
@@ -217,87 +231,59 @@ msgstr ""
217msgid "Release to refresh…"
231msgid "Release to refresh…"
218msgstr ""
232msgstr ""
219
233
220−#: qml/Dash/ScopesOverview.qml:206
234+#: qml/Dash/ScopesList.qml:63
221−msgid "Manage Scopes"
235+msgid "Manage"
222msgstr ""
236msgstr ""
223
237
224−#: qml/Dash/ScopesOverview.qml:428
238+#: qml/Dash/ScopesList.qml:107
225−msgid "Done"
226−msgstr "Ολοκληρώθηκε"
227−
228−#: qml/Dash/ScopesOverview.qml:454
229−msgid "Store"
239+msgid "Home"
230−msgstr "Κατάστημα"
231−
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
234−msgstr "Αγαπημένα"
235−
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
238−msgstr "Όλα"
239−
240−#: qml/Greeter/Greeter.qml:157
241−msgid "Unlock"
242msgstr ""
240msgstr ""
243
241
244−#: qml/Hud/HudParametrizedActionsPage.qml:139
242+#: qml/Dash/ScopesList.qml:108
245−msgid "Confirm"
243+msgid "Also installed"
246−msgstr "Επιβεβαίωση"
244+msgstr ""
247−
248−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
249−msgid "Type or say a command"
250−msgstr "Πληκτρολογήστε ή πείτε μια εντολή"
251−
252−#: qml/Hud/Hud.qml:84
253−msgid "Loading. Please Wait..."
254−msgstr "Γίνεται φόρτωση. Παρακαλώ περιμένετε..."
255−
256−#: qml/Hud/Hud.qml:89
257−msgid "Speak Now..."
258−msgstr "Μιλήστε τώρα..."
259
245
260−#: qml/Hud/Hud.qml:94
246+#: qml/Greeter/Greeter.qml:174
261−msgid "Speaking..."
247+msgid "Unlock"
262−msgstr "Ομιλία..."
248+msgstr "Ξεκλείδωμα"
263
249
264−#: qml/Notifications/NotificationMenuItemFactory.qml:116
250+#: qml/Notifications/NotificationMenuItemFactory.qml:128
265msgid "Show password"
251msgid "Show password"
266msgstr "Εμφάνιση κωδικού"
252msgstr "Εμφάνιση κωδικού"
267
253
268−#: qml/Panel/ActiveCallHint.qml:77
254+#: qml/Panel/ActiveCallHint.qml:79
269msgid "Tap to return to call..."
255msgid "Tap to return to call..."
270msgstr "Πατήστε για να γυρίσετε στην κλήση..."
256msgstr "Πατήστε για να γυρίσετε στην κλήση..."
271
257
272−#: qml/Panel/ActiveCallHint.qml:90
258+#: qml/Panel/ActiveCallHint.qml:92
273msgid "Conference"
259msgid "Conference"
274msgstr "Συνδιάσκεψη"
260msgstr "Συνδιάσκεψη"
275
261
276−#: qml/Panel/Indicators/MenuItemFactory.qml:600
262+#: qml/Panel/Indicators/MenuItemFactory.qml:643
277msgid "Nothing is playing"
263msgid "Nothing is playing"
278−msgstr ""
264+msgstr "Δεν αναπαράγεται τίποτα"
279
265
280−#: qml/Panel/Indicators/MenuItemFactory.qml:748
266+#: qml/Panel/Indicators/MenuItemFactory.qml:791
281msgid "In queue…"
267msgid "In queue…"
282msgstr "Στην ουρά..."
268msgstr "Στην ουρά..."
283
269
284−#: qml/Panel/Indicators/MenuItemFactory.qml:752
270+#: qml/Panel/Indicators/MenuItemFactory.qml:795
285msgid "Downloading"
271msgid "Downloading"
286msgstr "Λήψη σε εξέλιξη"
272msgstr "Λήψη σε εξέλιξη"
287
273
288−#: qml/Panel/Indicators/MenuItemFactory.qml:754
274+#: qml/Panel/Indicators/MenuItemFactory.qml:797
289msgid "Paused, tap to resume"
275msgid "Paused, tap to resume"
290msgstr "Σταματημένο, αγγίξτε για συνέχιση"
276msgstr "Σταματημένο, αγγίξτε για συνέχιση"
291
277
292−#: qml/Panel/Indicators/MenuItemFactory.qml:756
278+#: qml/Panel/Indicators/MenuItemFactory.qml:799
293msgid "Canceled"
279msgid "Canceled"
294msgstr "Ακυρώθηκε"
280msgstr "Ακυρώθηκε"
295
281
296−#: qml/Panel/Indicators/MenuItemFactory.qml:758
282+#: qml/Panel/Indicators/MenuItemFactory.qml:801
297msgid "Finished"
283msgid "Finished"
298msgstr "Ολοκληρώθηκε"
284msgstr "Ολοκληρώθηκε"
299
285
300−#: qml/Panel/Indicators/MenuItemFactory.qml:760
286+#: qml/Panel/Indicators/MenuItemFactory.qml:803
301msgid "Failed, tap to retry"
287msgid "Failed, tap to retry"
302msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσετε"
288msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσετε"
303
289
@@ -309,56 +295,257 @@ msgstr "Ξεκλείδωμα SIM"
309msgid "Roaming"
295msgid "Roaming"
310msgstr "Περιαγωγή"
296msgstr "Περιαγωγή"
311
297
312−#: qml/Shell.qml:346
298+#: qml/Shell.qml:367
299+#, qt-format
300+msgid "Enter %1"
301+msgstr "Εισάγετε %1"
302+
303+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313msgid "Enter passphrase"
304msgid "Enter passphrase"
314−msgstr ""
305+msgstr "Εισαγωγή συνθηματικού"
306+
307+#: qml/Shell.qml:369
308+msgid "Enter passcode"
309+msgstr "Εισαγωγή κωδικού"
315
310
316−#: qml/Shell.qml:347
311+#: qml/Shell.qml:370
312+#, qt-format
313+msgid "Sorry, incorrect %1"
314+msgstr "Συγνώμη, μη έγκυρο %1"
315+
316+#: qml/Shell.qml:371
317msgid "Sorry, incorrect passphrase"
317msgid "Sorry, incorrect passphrase"
318−msgstr ""
318+msgstr "Συγνώμη, μη έγκυρο συνθηματικό"
319
319
320−#: qml/Shell.qml:348
320+#: qml/Shell.qml:372
321msgid "Please re-enter"
321msgid "Please re-enter"
322−msgstr ""
322+msgstr "Παρακαλώ πληκτρολογήστε ξανά"
323
323
324−#: qml/Shell.qml:350
324+#: qml/Shell.qml:373
325−msgid "Enter passcode"
326−msgstr ""
327−
328−#: qml/Shell.qml:351
329msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
330msgstr ""
326msgstr ""
331
327
332−#: qml/Shell.qml:354
328+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
333−#, qt-format
334−msgid "Enter %1"
335−msgstr ""
336−
337−#: qml/Shell.qml:355
338−#, qt-format
339−msgid "Sorry, incorrect %1"
340−msgstr ""
341−
342−#: qml/Shell.qml:390
343msgid "Sorry, incorrect passphrase."
329msgid "Sorry, incorrect passphrase."
344msgstr ""
330msgstr ""
345
331
346−#: qml/Shell.qml:391
332+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
347msgid "Sorry, incorrect passcode."
333msgid "Sorry, incorrect passcode."
348msgstr ""
334msgstr ""
349
335
350−#: qml/Shell.qml:392
336+#: qml/Shell.qml:469
351msgid "This will be your last attempt."
337msgid "This will be your last attempt."
352msgstr ""
338msgstr ""
353
339
354−#: qml/Shell.qml:394
340+#: qml/Shell.qml:471
355msgid ""
341msgid ""
356"If passphrase is entered incorrectly, your phone will conduct a factory "
342"If passphrase is entered incorrectly, your phone will conduct a factory "
357"reset and all personal data will be deleted."
343"reset and all personal data will be deleted."
358msgstr ""
344msgstr ""
359
345
360−#: qml/Shell.qml:395
346+#: qml/Shell.qml:472
361msgid ""
347msgid ""
362"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 "
363"and all personal data will be deleted."
349"and all personal data will be deleted."
364msgstr ""
350msgstr ""
351+
352+#: qml/Wizard/Page.qml:89
353+msgid "Back"
354+msgstr ""
355+
356+#: qml/Wizard/Pages/10-welcome.qml:27
357+msgid "Hi!"
358+msgstr ""
359+
360+#: qml/Wizard/Pages/10-welcome.qml:44
361+msgid "Welcome to your Ubuntu phone."
362+msgstr ""
363+
364+#: qml/Wizard/Pages/10-welcome.qml:52
365+msgid "Let’s get started."
366+msgstr ""
367+
368+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
369+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
370+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
371+#: qml/Wizard/Pages/passwd-set.qml:90
372+msgid "Continue"
373+msgstr ""
374+
375+#: qml/Wizard/Pages/20-sim.qml:25
376+msgid "Add a SIM card and restart your device"
377+msgstr ""
378+
379+#: qml/Wizard/Pages/20-sim.qml:55
380+msgid "Without it, you won’t be able to make calls or use text messaging."
381+msgstr ""
382+
383+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
384+msgid "Skip"
385+msgstr ""
386+
387+#: qml/Wizard/Pages/30-passwd-type.qml:39
388+msgid "Lock security"
389+msgstr ""
390+
391+#: qml/Wizard/Pages/30-passwd-type.qml:74
392+msgid "Please select how you’d like to unlock your phone."
393+msgstr ""
394+
395+#: qml/Wizard/Pages/30-passwd-type.qml:97
396+msgid "Swipe"
397+msgstr ""
398+
399+#: qml/Wizard/Pages/30-passwd-type.qml:98
400+msgid "No security"
401+msgstr ""
402+
403+#: qml/Wizard/Pages/30-passwd-type.qml:100
404+msgid "Passcode"
405+msgstr ""
406+
407+#: qml/Wizard/Pages/30-passwd-type.qml:101
408+msgid "4 digits only"
409+msgstr ""
410+
411+#: qml/Wizard/Pages/30-passwd-type.qml:103
412+msgid "Passphrase"
413+msgstr ""
414+
415+#: qml/Wizard/Pages/30-passwd-type.qml:104
416+msgid "Numbers and letters"
417+msgstr ""
418+
419+#: qml/Wizard/Pages/40-wifi.qml:28
420+msgid "Connect to Wi‑Fi"
421+msgstr ""
422+
423+#: qml/Wizard/Pages/40-wifi.qml:147
424+msgid "Available networks…"
425+msgstr ""
426+
427+#: qml/Wizard/Pages/40-wifi.qml:148
428+msgid "No available networks."
429+msgstr ""
430+
431+#: qml/Wizard/Pages/50-location.qml:27
432+msgid "Location"
433+msgstr ""
434+
435+#: qml/Wizard/Pages/50-location.qml:62
436+msgid "Let the phone detect your location:"
437+msgstr ""
438+
439+#: qml/Wizard/Pages/50-location.qml:69
440+msgid "Using GPS only (less accurate)"
441+msgstr ""
442+
443+#: qml/Wizard/Pages/50-location.qml:86
444+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
445+msgstr ""
446+
447+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
448+#: qml/Wizard/Pages/50-location.qml:103
449+msgid ""
450+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
451+"conditions</a>."
452+msgstr ""
453+
454+#: qml/Wizard/Pages/50-location.qml:112
455+msgid "Not at all"
456+msgstr ""
457+
458+#: qml/Wizard/Pages/50-location.qml:124
459+msgid "You can change your mind later in <b>System Settings</b>."
460+msgstr ""
461+
462+#: qml/Wizard/Pages/60-reporting.qml:24
463+msgid "Improving your experience"
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:36
467+msgid ""
468+"Your phone is set up to automatically report errors to Canonical and its "
469+"partners, the makers of the operating system."
470+msgstr ""
471+
472+#: qml/Wizard/Pages/60-reporting.qml:43
473+msgid ""
474+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
475+"Privacy</b>"
476+msgstr ""
477+
478+#: qml/Wizard/Pages/80-finished.qml:24
479+msgid "All done"
480+msgstr ""
481+
482+#: qml/Wizard/Pages/80-finished.qml:39
483+msgid "Nice work!"
484+msgstr ""
485+
486+#: qml/Wizard/Pages/80-finished.qml:46
487+msgid "Your phone is now ready to use."
488+msgstr ""
489+
490+#: qml/Wizard/Pages/80-finished.qml:53
491+msgid "Finish"
492+msgstr ""
493+
494+#: qml/Wizard/Pages/here-terms.qml:27
495+msgid "Terms & Conditions"
496+msgstr ""
497+
498+#: qml/Wizard/Pages/passwd-confirm.qml:49
499+msgid "Confirm passphrase"
500+msgstr ""
501+
502+#: qml/Wizard/Pages/passwd-confirm.qml:50
503+msgid "Confirm passcode"
504+msgstr ""
505+
506+#: qml/Wizard/Pages/passwd-confirm.qml:53
507+#: qml/Wizard/Pages/passwd-confirm.qml:54
508+msgid "Please try again."
509+msgstr ""
510+
511+#: qml/Wizard/Pages/passwd-set.qml:61
512+msgid "Choose your passcode"
513+msgstr ""
514+
515+#: qml/Wizard/Pages/passwd-set.qml:68
516+msgid "Passphrase must be 4 characters long"
517+msgstr ""
518+
519+#: qml/Wizard/StackButton.qml:39
520+#, qt-format
521+msgid "〈 %1"
522+msgstr ""
523+
524+#: qml/Wizard/StackButton.qml:42
525+#, qt-format
526+msgid "%1 〉"
527+msgstr ""
528+
529+#~ msgid "Confirm"
530+#~ msgstr "Επιβεβαίωση"
531+
532+#~ msgid "Type or say a command"
533+#~ msgstr "Πληκτρολογήστε ή πείτε μια εντολή"
534+
535+#~ msgid "Speak Now..."
536+#~ msgstr "Μιλήστε τώρα..."
537+
538+#~ msgid "Speaking..."
539+#~ msgstr "Ομιλία..."
540+
541+#~ msgid "Loading. Please Wait..."
542+#~ msgstr "Γίνεται φόρτωση. Παρακαλώ περιμένετε..."
543+
544+#~ msgid "All"
545+#~ msgstr "Όλα"
546+
547+#~ msgid "Favorites"
548+#~ msgstr "Αγαπημένα"
549+
550+#~ msgid "Done"
551+#~ msgstr "Ολοκληρώθηκε"
po/en_AU.po+278−94
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11"PO-Revision-Date: 2014-10-12 09:41+0000\n"
11"PO-Revision-Date: 2014-10-12 09:41+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"
@@ -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-10-13 06:15+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
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:227
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,36 +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:220
159+#: qml/Components/Lockscreen.qml:238
160+msgid "Return to Call"
161+msgstr ""
162+
163+#: qml/Components/Lockscreen.qml:238
160msgid "Emergency Call"
164msgid "Emergency Call"
161msgstr "Emergency Call"
165msgstr "Emergency Call"
162
166
163−#: qml/Components/Lockscreen.qml:252
167+#: qml/Components/Lockscreen.qml:270
164msgid "OK"
168msgid "OK"
165msgstr "OK"
169msgstr "OK"
166
170
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
168msgid "See less"
172msgid "See less"
169msgstr "See less"
173msgstr "See less"
170
174
171−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:431
172msgid "See all"
176msgid "See all"
173msgstr "See all"
177msgstr "See all"
174
178
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
176#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
181msgid "Search"
178msgstr "Search"
182msgstr "Search"
179
183
180−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:260
185+msgid "Store"
186+msgstr "Store"
187+
188+#: qml/Dash/PageHeader.qml:277
181msgid "Settings"
189msgid "Settings"
182msgstr "Settings"
190msgstr "Settings"
183
191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185msgid "Remove from Favorites"
193msgid "Remove from Favorites"
186msgstr "Remove from Favourites"
194msgstr "Remove from Favourites"
187
195
188−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:284
189msgid "Add to Favorites"
197msgid "Add to Favorites"
190msgstr "Add to Favourites"
198msgstr "Add to Favourites"
191
199
@@ -217,87 +225,59 @@ msgstr "Pull to refresh…"
217msgid "Release to refresh…"
225msgid "Release to refresh…"
218msgstr "Release to refresh…"
226msgstr "Release to refresh…"
219
227
220−#: qml/Dash/ScopesOverview.qml:206
228+#: qml/Dash/ScopesList.qml:63
221−msgid "Manage Scopes"
229+msgid "Manage"
222−msgstr "Manage Scopes"
230+msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:428
225−msgid "Done"
226−msgstr "Done"
227−
228−#: qml/Dash/ScopesOverview.qml:454
229−msgid "Store"
230−msgstr "Store"
231
231
232−#: qml/Dash/ScopesOverviewTab.qml:36
232+#: qml/Dash/ScopesList.qml:107
233−msgid "Favorites"
233+msgid "Home"
234−msgstr "Favourites"
234+msgstr ""
235
235
236−#: qml/Dash/ScopesOverviewTab.qml:54
236+#: qml/Dash/ScopesList.qml:108
237−msgid "All"
237+msgid "Also installed"
238−msgstr "All"
238+msgstr ""
239
239
240−#: qml/Greeter/Greeter.qml:157
240+#: qml/Greeter/Greeter.qml:174
241msgid "Unlock"
241msgid "Unlock"
242msgstr "Unlock"
242msgstr "Unlock"
243
243
244−#: qml/Hud/HudParametrizedActionsPage.qml:139
245−msgid "Confirm"
246−msgstr "Confirm"
247−
248−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
249−msgid "Type or say a command"
250−msgstr "Type or say a command"
251−
252−#: qml/Hud/Hud.qml:84
253−msgid "Loading. Please Wait..."
254−msgstr "Loading. Please Wait..."
255−
256−#: qml/Hud/Hud.qml:89
257−msgid "Speak Now..."
258−msgstr "Speak Now..."
259−
260−#: qml/Hud/Hud.qml:94
261−msgid "Speaking..."
262−msgstr "Speaking..."
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
265msgid "Show password"
245msgid "Show password"
266msgstr "Show password"
246msgstr "Show password"
267
247
268−#: qml/Panel/ActiveCallHint.qml:77
248+#: qml/Panel/ActiveCallHint.qml:79
269msgid "Tap to return to call..."
249msgid "Tap to return to call..."
270msgstr "Tap to return to call..."
250msgstr "Tap to return to call..."
271
251
272−#: qml/Panel/ActiveCallHint.qml:90
252+#: qml/Panel/ActiveCallHint.qml:92
273msgid "Conference"
253msgid "Conference"
274msgstr "Conference"
254msgstr "Conference"
275
255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:600
256+#: qml/Panel/Indicators/MenuItemFactory.qml:643
277msgid "Nothing is playing"
257msgid "Nothing is playing"
278msgstr "Nothing is playing"
258msgstr "Nothing is playing"
279
259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:748
260+#: qml/Panel/Indicators/MenuItemFactory.qml:791
281msgid "In queue…"
261msgid "In queue…"
282msgstr "In queue…"
262msgstr "In queue…"
283
263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:752
264+#: qml/Panel/Indicators/MenuItemFactory.qml:795
285msgid "Downloading"
265msgid "Downloading"
286msgstr "Downloading"
266msgstr "Downloading"
287
267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:754
268+#: qml/Panel/Indicators/MenuItemFactory.qml:797
289msgid "Paused, tap to resume"
269msgid "Paused, tap to resume"
290msgstr "Paused, tap to resume"
270msgstr "Paused, tap to resume"
291
271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:756
272+#: qml/Panel/Indicators/MenuItemFactory.qml:799
293msgid "Canceled"
273msgid "Canceled"
294msgstr "Cancelled"
274msgstr "Cancelled"
295
275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:758
276+#: qml/Panel/Indicators/MenuItemFactory.qml:801
297msgid "Finished"
277msgid "Finished"
298msgstr "Finished"
278msgstr "Finished"
299
279
300−#: qml/Panel/Indicators/MenuItemFactory.qml:760
280+#: qml/Panel/Indicators/MenuItemFactory.qml:803
301msgid "Failed, tap to retry"
281msgid "Failed, tap to retry"
302msgstr "Failed, tap to retry"
282msgstr "Failed, tap to retry"
303
283
@@ -309,49 +289,49 @@ msgstr "Unlock SIM"
309msgid "Roaming"
289msgid "Roaming"
310msgstr "Roaming"
290msgstr "Roaming"
311
291
312−#: qml/Shell.qml:346
292+#: qml/Shell.qml:367
293+#, qt-format
294+msgid "Enter %1"
295+msgstr "Enter %1"
296+
297+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313msgid "Enter passphrase"
298msgid "Enter passphrase"
314msgstr "Enter passphrase"
299msgstr "Enter passphrase"
315
300
316−#: qml/Shell.qml:347
301+#: qml/Shell.qml:369
302+msgid "Enter passcode"
303+msgstr "Enter passcode"
304+
305+#: qml/Shell.qml:370
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr "Sorry, incorrect %1"
309+
310+#: qml/Shell.qml:371
317msgid "Sorry, incorrect passphrase"
311msgid "Sorry, incorrect passphrase"
318msgstr "Sorry, incorrect passphrase"
312msgstr "Sorry, incorrect passphrase"
319
313
320−#: qml/Shell.qml:348
314+#: qml/Shell.qml:372
321msgid "Please re-enter"
315msgid "Please re-enter"
322msgstr "Please re-enter"
316msgstr "Please re-enter"
323
317
324−#: qml/Shell.qml:350
318+#: qml/Shell.qml:373
325−msgid "Enter passcode"
326−msgstr "Enter passcode"
327−
328−#: qml/Shell.qml:351
329msgid "Sorry, incorrect passcode"
319msgid "Sorry, incorrect passcode"
330msgstr "Sorry, incorrect passcode"
320msgstr "Sorry, incorrect passcode"
331
321
332−#: qml/Shell.qml:354
322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
333−#, qt-format
334−msgid "Enter %1"
335−msgstr "Enter %1"
336−
337−#: qml/Shell.qml:355
338−#, qt-format
339−msgid "Sorry, incorrect %1"
340−msgstr "Sorry, incorrect %1"
341−
342−#: qml/Shell.qml:390
343msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
344msgstr "Sorry, incorrect passphrase."
324msgstr "Sorry, incorrect passphrase."
345
325
346−#: qml/Shell.qml:391
326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
347msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
348msgstr "Sorry, incorrect passcode."
328msgstr "Sorry, incorrect passcode."
349
329
350−#: qml/Shell.qml:392
330+#: qml/Shell.qml:469
351msgid "This will be your last attempt."
331msgid "This will be your last attempt."
352msgstr "This will be your last attempt."
332msgstr "This will be your last attempt."
353
333
354−#: qml/Shell.qml:394
334+#: qml/Shell.qml:471
355msgid ""
335msgid ""
356"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
357"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
@@ -359,10 +339,214 @@ msgstr ""
359"If passphrase is entered incorrectly, your phone will conduct a factory "
339"If passphrase is entered incorrectly, your phone will conduct a factory "
360"reset and all personal data will be deleted."
340"reset and all personal data will be deleted."
361
341
362−#: qml/Shell.qml:395
342+#: qml/Shell.qml:472
363msgid ""
343msgid ""
364"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 "
365"and all personal data will be deleted."
345"and all personal data will be deleted."
366msgstr ""
346msgstr ""
367"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 "
368"and all personal data will be deleted."
348"and all personal data will be deleted."
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+
527+#~ msgid "Confirm"
528+#~ msgstr "Confirm"
529+
530+#~ msgid "Type or say a command"
531+#~ msgstr "Type or say a command"
532+
533+#~ msgid "Loading. Please Wait..."
534+#~ msgstr "Loading. Please Wait..."
535+
536+#~ msgid "Speak Now..."
537+#~ msgstr "Speak Now..."
538+
539+#~ msgid "Speaking..."
540+#~ msgstr "Speaking..."
541+
542+#~ msgid "All"
543+#~ msgstr "All"
544+
545+#~ msgid "Favorites"
546+#~ msgstr "Favourites"
547+
548+#~ msgid "Done"
549+#~ msgstr "Done"
550+
551+#~ msgid "Manage Scopes"
552+#~ msgstr "Manage Scopes"
po/en_GB.po+277−99
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-03 12:46+0000\n"
11+"PO-Revision-Date: 2014-11-05 18:59+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-10-09 06:37+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
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:227
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,36 +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:220
159+#: qml/Components/Lockscreen.qml:238
160+msgid "Return to Call"
161+msgstr "Return to Call"
162+
163+#: qml/Components/Lockscreen.qml:238
160msgid "Emergency Call"
164msgid "Emergency Call"
161msgstr "Emergency Call"
165msgstr "Emergency Call"
162
166
163−#: qml/Components/Lockscreen.qml:252
167+#: qml/Components/Lockscreen.qml:270
164msgid "OK"
168msgid "OK"
165msgstr "OK"
169msgstr "OK"
166
170
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
168msgid "See less"
172msgid "See less"
169msgstr "See less"
173msgstr "See less"
170
174
171−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:431
172msgid "See all"
176msgid "See all"
173msgstr "See all"
177msgstr "See all"
174
178
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
176#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
181msgid "Search"
178msgstr "Search"
182msgstr "Search"
179
183
180−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:260
185+msgid "Store"
186+msgstr "Store"
187+
188+#: qml/Dash/PageHeader.qml:277
181msgid "Settings"
189msgid "Settings"
182msgstr "Settings"
190msgstr "Settings"
183
191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185msgid "Remove from Favorites"
193msgid "Remove from Favorites"
186msgstr "Remove from Favourites"
194msgstr "Remove from Favourites"
187
195
188−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:284
189msgid "Add to Favorites"
197msgid "Add to Favorites"
190msgstr "Add to Favourites"
198msgstr "Add to Favourites"
191
199
@@ -217,87 +225,59 @@ msgstr "Pull to refresh…"
217msgid "Release to refresh…"
225msgid "Release to refresh…"
218msgstr "Release to refresh…"
226msgstr "Release to refresh…"
219
227
220−#: qml/Dash/ScopesOverview.qml:206
228+#: qml/Dash/ScopesList.qml:63
221−msgid "Manage Scopes"
229+msgid "Manage"
222−msgstr "Manage Scopes"
230+msgstr "Manage"
223
231
224−#: qml/Dash/ScopesOverview.qml:428
232+#: qml/Dash/ScopesList.qml:107
225−msgid "Done"
233+msgid "Home"
226−msgstr "Done"
234+msgstr "Home"
227
235
228−#: qml/Dash/ScopesOverview.qml:454
236+#: qml/Dash/ScopesList.qml:108
229−msgid "Store"
237+msgid "Also installed"
230−msgstr "Store"
238+msgstr "Also installed"
231−
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
234−msgstr "Favourites"
235
239
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
238−msgstr "All"
239−
240−#: qml/Greeter/Greeter.qml:157
240+#: qml/Greeter/Greeter.qml:174
241msgid "Unlock"
241msgid "Unlock"
242msgstr "Unlock"
242msgstr "Unlock"
243
243
244−#: qml/Hud/HudParametrizedActionsPage.qml:139
245−msgid "Confirm"
246−msgstr "Confirm"
247−
248−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
249−msgid "Type or say a command"
250−msgstr "Type or say a command"
251−
252−#: qml/Hud/Hud.qml:84
253−msgid "Loading. Please Wait..."
254−msgstr "Loading. Please Wait..."
255−
256−#: qml/Hud/Hud.qml:89
257−msgid "Speak Now..."
258−msgstr "Speak Now..."
259−
260−#: qml/Hud/Hud.qml:94
261−msgid "Speaking..."
262−msgstr "Speaking..."
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
265msgid "Show password"
245msgid "Show password"
266msgstr "Show password"
246msgstr "Show password"
267
247
268−#: qml/Panel/ActiveCallHint.qml:77
248+#: qml/Panel/ActiveCallHint.qml:79
269msgid "Tap to return to call..."
249msgid "Tap to return to call..."
270msgstr "Tap to return to call..."
250msgstr "Tap to return to call..."
271
251
272−#: qml/Panel/ActiveCallHint.qml:90
252+#: qml/Panel/ActiveCallHint.qml:92
273msgid "Conference"
253msgid "Conference"
274msgstr "Conference"
254msgstr "Conference"
275
255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:600
256+#: qml/Panel/Indicators/MenuItemFactory.qml:643
277msgid "Nothing is playing"
257msgid "Nothing is playing"
278msgstr "Nothing is playing"
258msgstr "Nothing is playing"
279
259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:748
260+#: qml/Panel/Indicators/MenuItemFactory.qml:791
281msgid "In queue…"
261msgid "In queue…"
282msgstr "In queue…"
262msgstr "In queue…"
283
263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:752
264+#: qml/Panel/Indicators/MenuItemFactory.qml:795
285msgid "Downloading"
265msgid "Downloading"
286msgstr "Downloading"
266msgstr "Downloading"
287
267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:754
268+#: qml/Panel/Indicators/MenuItemFactory.qml:797
289msgid "Paused, tap to resume"
269msgid "Paused, tap to resume"
290msgstr "Paused, tap to resume"
270msgstr "Paused, tap to resume"
291
271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:756
272+#: qml/Panel/Indicators/MenuItemFactory.qml:799
293msgid "Canceled"
273msgid "Canceled"
294msgstr "Cancelled"
274msgstr "Cancelled"
295
275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:758
276+#: qml/Panel/Indicators/MenuItemFactory.qml:801
297msgid "Finished"
277msgid "Finished"
298msgstr "Finished"
278msgstr "Finished"
299
279
300−#: qml/Panel/Indicators/MenuItemFactory.qml:760
280+#: qml/Panel/Indicators/MenuItemFactory.qml:803
301msgid "Failed, tap to retry"
281msgid "Failed, tap to retry"
302msgstr "Failed, tap to retry"
282msgstr "Failed, tap to retry"
303
283
@@ -309,49 +289,49 @@ msgstr "Unlock SIM"
309msgid "Roaming"
289msgid "Roaming"
310msgstr "Roaming"
290msgstr "Roaming"
311
291
312−#: qml/Shell.qml:346
292+#: qml/Shell.qml:367
293+#, qt-format
294+msgid "Enter %1"
295+msgstr "Enter %1"
296+
297+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313msgid "Enter passphrase"
298msgid "Enter passphrase"
314msgstr "Enter passphrase"
299msgstr "Enter passphrase"
315
300
316−#: qml/Shell.qml:347
301+#: qml/Shell.qml:369
302+msgid "Enter passcode"
303+msgstr "Enter passcode"
304+
305+#: qml/Shell.qml:370
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr "Sorry, incorrect %1"
309+
310+#: qml/Shell.qml:371
317msgid "Sorry, incorrect passphrase"
311msgid "Sorry, incorrect passphrase"
318msgstr "Sorry, incorrect passphrase"
312msgstr "Sorry, incorrect passphrase"
319
313
320−#: qml/Shell.qml:348
314+#: qml/Shell.qml:372
321msgid "Please re-enter"
315msgid "Please re-enter"
322msgstr "Please re-enter"
316msgstr "Please re-enter"
323
317
324−#: qml/Shell.qml:350
318+#: qml/Shell.qml:373
325−msgid "Enter passcode"
326−msgstr "Enter passcode"
327−
328−#: qml/Shell.qml:351
329msgid "Sorry, incorrect passcode"
319msgid "Sorry, incorrect passcode"
330msgstr "Sorry, incorrect passcode"
320msgstr "Sorry, incorrect passcode"
331
321
332−#: qml/Shell.qml:354
322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
333−#, qt-format
334−msgid "Enter %1"
335−msgstr "Enter %1"
336−
337−#: qml/Shell.qml:355
338−#, qt-format
339−msgid "Sorry, incorrect %1"
340−msgstr "Sorry, incorrect %1"
341−
342−#: qml/Shell.qml:390
343msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
344msgstr "Sorry, incorrect passphrase."
324msgstr "Sorry, incorrect passphrase."
345
325
346−#: qml/Shell.qml:391
326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
347msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
348msgstr "Sorry, incorrect passcode."
328msgstr "Sorry, incorrect passcode."
349
329
350−#: qml/Shell.qml:392
330+#: qml/Shell.qml:469
351msgid "This will be your last attempt."
331msgid "This will be your last attempt."
352msgstr "This will be your last attempt."
332msgstr "This will be your last attempt."
353
333
354−#: qml/Shell.qml:394
334+#: qml/Shell.qml:471
355msgid ""
335msgid ""
356"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
357"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
@@ -359,7 +339,7 @@ msgstr ""
359"If passphrase is entered incorrectly, your phone will conduct a factory "
339"If passphrase is entered incorrectly, your phone will conduct a factory "
360"reset and all personal data will be deleted."
340"reset and all personal data will be deleted."
361
341
362−#: qml/Shell.qml:395
342+#: qml/Shell.qml:472
363msgid ""
343msgid ""
364"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 "
365"and all personal data will be deleted."
345"and all personal data will be deleted."
@@ -367,8 +347,206 @@ msgstr ""
367"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 "
368"and all personal data will be deleted."
348"and all personal data will be deleted."
369
349
370−#~ msgid "Sorry, incorrect PIN"
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"
371−#~ msgstr "Sorry, incorrect PIN"
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+
527+#~ msgid "Confirm"
528+#~ msgstr "Confirm"
529+
530+#~ msgid "Type or say a command"
531+#~ msgstr "Type or say a command"
532+
533+#~ msgid "Loading. Please Wait..."
534+#~ msgstr "Loading. Please Wait..."
535+
536+#~ msgid "Speak Now..."
537+#~ msgstr "Speak Now..."
538+
539+#~ msgid "Speaking..."
540+#~ msgstr "Speaking..."
541+
542+#~ msgid "All"
543+#~ msgstr "All"
544+
545+#~ msgid "Favorites"
546+#~ msgstr "Favourites"
547+
548+#~ msgid "Done"
549+#~ msgstr "Done"
372
550
373−#~ msgid "Enter SIM PIN"
551+#~ msgid "Manage Scopes"
374−#~ msgstr "Enter SIM PIN"
552+#~ msgstr "Manage Scopes"
po/eo.po+246−89
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+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-10-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -110,78 +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:198
137+#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
138msgid "Left edge"
139msgstr ""
139msgstr ""
140
140
141−#: qml/Components/EdgeDemo.qml:199
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:226
145+#: qml/Components/EdgeDemo.qml:242
146msgid "Well done"
146msgid "Well done"
147msgstr ""
147msgstr ""
148
148
149−#: qml/Components/EdgeDemo.qml:227
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:220
155+#: qml/Components/Lockscreen.qml:238
156+msgid "Return to Call"
157+msgstr ""
158+
159+#: qml/Components/Lockscreen.qml:238
156msgid "Emergency Call"
160msgid "Emergency Call"
157msgstr ""
161msgstr ""
158
162
159−#: qml/Components/Lockscreen.qml:252
163+#: qml/Components/Lockscreen.qml:270
160msgid "OK"
164msgid "OK"
161msgstr ""
165msgstr ""
162
166
163−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
164msgid "See less"
168msgid "See less"
165msgstr ""
169msgstr ""
166
170
167−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:431
168msgid "See all"
172msgid "See all"
169msgstr ""
173msgstr ""
170
174
171−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
172#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
173msgid "Search"
177msgid "Search"
174msgstr ""
178msgstr ""
175
179
176−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:260
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:277
177msgid "Settings"
185msgid "Settings"
178msgstr ""
186msgstr ""
179
187
180−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:284
181msgid "Remove from Favorites"
189msgid "Remove from Favorites"
182msgstr ""
190msgstr ""
183
191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185msgid "Add to Favorites"
193msgid "Add to Favorites"
186msgstr ""
194msgstr ""
187
195
@@ -213,87 +221,59 @@ msgstr ""
213msgid "Release to refresh…"
221msgid "Release to refresh…"
214msgstr ""
222msgstr ""
215
223
216−#: qml/Dash/ScopesOverview.qml:206
224+#: qml/Dash/ScopesList.qml:63
217−msgid "Manage Scopes"
225+msgid "Manage"
218−msgstr ""
219−
220−#: qml/Dash/ScopesOverview.qml:428
221−msgid "Done"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:454
225−msgid "Store"
226msgstr ""
226msgstr ""
227
227
228−#: qml/Dash/ScopesOverviewTab.qml:36
228+#: qml/Dash/ScopesList.qml:107
229−msgid "Favorites"
229+msgid "Home"
230msgstr ""
230msgstr ""
231
231
232−#: qml/Dash/ScopesOverviewTab.qml:54
232+#: qml/Dash/ScopesList.qml:108
233−msgid "All"
233+msgid "Also installed"
234msgstr ""
234msgstr ""
235
235
236−#: qml/Greeter/Greeter.qml:157
236+#: qml/Greeter/Greeter.qml:174
237msgid "Unlock"
237msgid "Unlock"
238msgstr ""
238msgstr ""
239
239
240−#: qml/Hud/HudParametrizedActionsPage.qml:139
241−msgid "Confirm"
242−msgstr ""
243−
244−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
245−msgid "Type or say a command"
246−msgstr ""
247−
248−#: qml/Hud/Hud.qml:84
249−msgid "Loading. Please Wait..."
250−msgstr ""
251−
252−#: qml/Hud/Hud.qml:89
253−msgid "Speak Now..."
254−msgstr ""
255−
256−#: qml/Hud/Hud.qml:94
257−msgid "Speaking..."
258−msgstr ""
259−
260−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
261msgid "Show password"
241msgid "Show password"
262msgstr ""
242msgstr ""
263
243
264−#: qml/Panel/ActiveCallHint.qml:77
244+#: qml/Panel/ActiveCallHint.qml:79
265msgid "Tap to return to call..."
245msgid "Tap to return to call..."
266msgstr ""
246msgstr ""
267
247
268−#: qml/Panel/ActiveCallHint.qml:90
248+#: qml/Panel/ActiveCallHint.qml:92
269msgid "Conference"
249msgid "Conference"
270msgstr ""
250msgstr ""
271
251
272−#: qml/Panel/Indicators/MenuItemFactory.qml:600
252+#: qml/Panel/Indicators/MenuItemFactory.qml:643
273msgid "Nothing is playing"
253msgid "Nothing is playing"
274msgstr ""
254msgstr ""
275
255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:748
256+#: qml/Panel/Indicators/MenuItemFactory.qml:791
277msgid "In queue…"
257msgid "In queue…"
278msgstr ""
258msgstr ""
279
259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:752
260+#: qml/Panel/Indicators/MenuItemFactory.qml:795
281msgid "Downloading"
261msgid "Downloading"
282msgstr ""
262msgstr ""
283
263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:754
264+#: qml/Panel/Indicators/MenuItemFactory.qml:797
285msgid "Paused, tap to resume"
265msgid "Paused, tap to resume"
286msgstr ""
266msgstr ""
287
267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:756
268+#: qml/Panel/Indicators/MenuItemFactory.qml:799
289msgid "Canceled"
269msgid "Canceled"
290msgstr ""
270msgstr ""
291
271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:758
272+#: qml/Panel/Indicators/MenuItemFactory.qml:801
293msgid "Finished"
273msgid "Finished"
294msgstr ""
274msgstr ""
295
275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:760
276+#: qml/Panel/Indicators/MenuItemFactory.qml:803
297msgid "Failed, tap to retry"
277msgid "Failed, tap to retry"
298msgstr ""
278msgstr ""
299
279
@@ -305,56 +285,233 @@ msgstr ""
305msgid "Roaming"
285msgid "Roaming"
306msgstr ""
286msgstr ""
307
287
308−#: qml/Shell.qml:346
288+#: qml/Shell.qml:367
289+#, qt-format
309−msgid "Enter passphrase"
290+msgid "Enter %1"
310msgstr ""
291msgstr ""
311
292
312−#: qml/Shell.qml:347
293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313−msgid "Sorry, incorrect passphrase"
294+msgid "Enter passphrase"
314msgstr ""
295msgstr ""
315
296
316−#: qml/Shell.qml:348
297+#: qml/Shell.qml:369
317−msgid "Please re-enter"
298+msgid "Enter passcode"
318msgstr ""
299msgstr ""
319
300
320−#: qml/Shell.qml:350
301+#: qml/Shell.qml:370
321−msgid "Enter passcode"
302+#, qt-format
303+msgid "Sorry, incorrect %1"
322msgstr ""
304msgstr ""
323
305
324−#: qml/Shell.qml:351
306+#: qml/Shell.qml:371
325−msgid "Sorry, incorrect passcode"
307+msgid "Sorry, incorrect passphrase"
326msgstr ""
308msgstr ""
327
309
328−#: qml/Shell.qml:354
310+#: qml/Shell.qml:372
329−#, qt-format
311+msgid "Please re-enter"
330−msgid "Enter %1"
331msgstr ""
312msgstr ""
332
313
333−#: qml/Shell.qml:355
314+#: qml/Shell.qml:373
334−#, qt-format
335−msgid "Sorry, incorrect %1"
315+msgid "Sorry, incorrect passcode"
336msgstr ""
316msgstr ""
337
317
338−#: qml/Shell.qml:390
318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
339msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
340msgstr ""
320msgstr ""
341
321
342−#: qml/Shell.qml:391
322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
343msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
344msgstr ""
324msgstr ""
345
325
346−#: qml/Shell.qml:392
326+#: qml/Shell.qml:469
347msgid "This will be your last attempt."
327msgid "This will be your last attempt."
348msgstr ""
328msgstr ""
349
329
350−#: qml/Shell.qml:394
330+#: qml/Shell.qml:471
351msgid ""
331msgid ""
352"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
353"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
354msgstr ""
334msgstr ""
355
335
356−#: qml/Shell.qml:395
336+#: qml/Shell.qml:472
357msgid ""
337msgid ""
358"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"and all personal data will be deleted."
339"and all personal data will be deleted."
360msgstr ""
340msgstr ""
341+
342+#: qml/Wizard/Page.qml:89
343+msgid "Back"
344+msgstr ""
345+
346+#: qml/Wizard/Pages/10-welcome.qml:27
347+msgid "Hi!"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:44
351+msgid "Welcome to your Ubuntu phone."
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:52
355+msgid "Let’s get started."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
361+#: qml/Wizard/Pages/passwd-set.qml:90
362+msgid "Continue"
363+msgstr ""
364+
365+#: qml/Wizard/Pages/20-sim.qml:25
366+msgid "Add a SIM card and restart your device"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:55
370+msgid "Without it, you won’t be able to make calls or use text messaging."
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
374+msgid "Skip"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/30-passwd-type.qml:39
378+msgid "Lock security"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:74
382+msgid "Please select how you’d like to unlock your phone."
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:97
386+msgid "Swipe"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:98
390+msgid "No security"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:100
394+msgid "Passcode"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:101
398+msgid "4 digits only"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:103
402+msgid "Passphrase"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:104
406+msgid "Numbers and letters"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/40-wifi.qml:28
410+msgid "Connect to Wi‑Fi"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:147
414+msgid "Available networks…"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:148
418+msgid "No available networks."
419+msgstr ""
420+
421+#: qml/Wizard/Pages/50-location.qml:27
422+msgid "Location"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:62
426+msgid "Let the phone detect your location:"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:69
430+msgid "Using GPS only (less accurate)"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:86
434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
435+msgstr ""
436+
437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
438+#: qml/Wizard/Pages/50-location.qml:103
439+msgid ""
440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
441+"conditions</a>."
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:112
445+msgid "Not at all"
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:124
449+msgid "You can change your mind later in <b>System Settings</b>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/60-reporting.qml:24
453+msgid "Improving your experience"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:36
457+msgid ""
458+"Your phone is set up to automatically report errors to Canonical and its "
459+"partners, the makers of the operating system."
460+msgstr ""
461+
462+#: qml/Wizard/Pages/60-reporting.qml:43
463+msgid ""
464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
465+"Privacy</b>"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/80-finished.qml:24
469+msgid "All done"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:39
473+msgid "Nice work!"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:46
477+msgid "Your phone is now ready to use."
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:53
481+msgid "Finish"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/here-terms.qml:27
485+msgid "Terms & Conditions"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/passwd-confirm.qml:49
489+msgid "Confirm passphrase"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:50
493+msgid "Confirm passcode"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:53
497+#: qml/Wizard/Pages/passwd-confirm.qml:54
498+msgid "Please try again."
499+msgstr ""
500+
501+#: qml/Wizard/Pages/passwd-set.qml:61
502+msgid "Choose your passcode"
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:68
506+msgid "Passphrase must be 4 characters long"
507+msgstr ""
508+
509+#: qml/Wizard/StackButton.qml:39
510+#, qt-format
511+msgid "〈 %1"
512+msgstr ""
513+
514+#: qml/Wizard/StackButton.qml:42
515+#, qt-format
516+msgid "%1 〉"
517+msgstr ""
po/es.po+278−100
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-09 07:43+0000\n"
11+"PO-Revision-Date: 2014-11-08 08:01+0000\n"
12−"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
12+"Last-Translator: Paco Molinero <paco@byasl.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-10-10 05:23+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
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:227
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,36 +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:220
166+#: qml/Components/Lockscreen.qml:238
167+msgid "Return to Call"
168+msgstr "Volver a la llamada"
169+
170+#: qml/Components/Lockscreen.qml:238
167msgid "Emergency Call"
171msgid "Emergency Call"
168msgstr "Llamada de emergencia"
172msgstr "Llamada de emergencia"
169
173
170−#: qml/Components/Lockscreen.qml:252
174+#: qml/Components/Lockscreen.qml:270
171msgid "OK"
175msgid "OK"
172msgstr "Aceptar"
176msgstr "Aceptar"
173
177
174−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
178+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
175msgid "See less"
179msgid "See less"
176msgstr "Ver menos"
180msgstr "Ver menos"
177
181
178−#: qml/Dash/GenericScopeView.qml:434
182+#: qml/Dash/GenericScopeView.qml:431
179msgid "See all"
183msgid "See all"
180msgstr "Ver todo"
184msgstr "Ver todo"
181
185
182−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
186+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
183#: qml/Panel/SearchIndicator.qml:27
187#: qml/Panel/SearchIndicator.qml:27
184msgid "Search"
188msgid "Search"
185msgstr "Buscar"
189msgstr "Buscar"
186
190
187−#: qml/Dash/PageHeader.qml:268
191+#: qml/Dash/PageHeader.qml:260
192+msgid "Store"
193+msgstr "Tienda"
194+
195+#: qml/Dash/PageHeader.qml:277
188msgid "Settings"
196msgid "Settings"
189msgstr "Configuración"
197msgstr "Configuración"
190
198
191−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:284
192msgid "Remove from Favorites"
200msgid "Remove from Favorites"
193msgstr "Quitar de favoritos"
201msgstr "Quitar de favoritos"
194
202
195−#: qml/Dash/PageHeader.qml:275
203+#: qml/Dash/PageHeader.qml:284
196msgid "Add to Favorites"
204msgid "Add to Favorites"
197msgstr "Añadir a favoritos"
205msgstr "Añadir a favoritos"
198
206
@@ -224,87 +232,59 @@ msgstr "Deslice para actualizar…"
224msgid "Release to refresh…"
232msgid "Release to refresh…"
225msgstr "Suelte para actualizar…"
233msgstr "Suelte para actualizar…"
226
234
227−#: qml/Dash/ScopesOverview.qml:206
235+#: qml/Dash/ScopesList.qml:63
228−msgid "Manage Scopes"
236+msgid "Manage"
229−msgstr "Administrar ámbitos"
237+msgstr ""
230−
231−#: qml/Dash/ScopesOverview.qml:428
232−msgid "Done"
233−msgstr "Hecho"
234−
235−#: qml/Dash/ScopesOverview.qml:454
236−msgid "Store"
237−msgstr "Tienda"
238
238
239−#: qml/Dash/ScopesOverviewTab.qml:36
239+#: qml/Dash/ScopesList.qml:107
240−msgid "Favorites"
240+msgid "Home"
241−msgstr "Favoritos"
241+msgstr ""
242
242
243−#: qml/Dash/ScopesOverviewTab.qml:54
243+#: qml/Dash/ScopesList.qml:108
244−msgid "All"
244+msgid "Also installed"
245−msgstr "Todo"
245+msgstr ""
246
246
247−#: qml/Greeter/Greeter.qml:157
247+#: qml/Greeter/Greeter.qml:174
248msgid "Unlock"
248msgid "Unlock"
249msgstr "Desbloquear"
249msgstr "Desbloquear"
250
250
251−#: qml/Hud/HudParametrizedActionsPage.qml:139
252−msgid "Confirm"
253−msgstr "Confirmar"
254−
255−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
256−msgid "Type or say a command"
257−msgstr "Escriba o diga una orden"
258−
259−#: qml/Hud/Hud.qml:84
260−msgid "Loading. Please Wait..."
261−msgstr "Cargando, espere…"
262−
263−#: qml/Hud/Hud.qml:89
264−msgid "Speak Now..."
265−msgstr "Hable ahora…"
266−
267−#: qml/Hud/Hud.qml:94
268−msgid "Speaking..."
269−msgstr "Hablando…"
270−
271−#: qml/Notifications/NotificationMenuItemFactory.qml:116
251+#: qml/Notifications/NotificationMenuItemFactory.qml:128
272msgid "Show password"
252msgid "Show password"
273msgstr "Mostrar contraseña"
253msgstr "Mostrar contraseña"
274
254
275−#: qml/Panel/ActiveCallHint.qml:77
255+#: qml/Panel/ActiveCallHint.qml:79
276msgid "Tap to return to call..."
256msgid "Tap to return to call..."
277msgstr "Toque para volver a llamar..."
257msgstr "Toque para volver a llamar..."
278
258
279−#: qml/Panel/ActiveCallHint.qml:90
259+#: qml/Panel/ActiveCallHint.qml:92
280msgid "Conference"
260msgid "Conference"
281msgstr "Conferencia"
261msgstr "Conferencia"
282
262
283−#: qml/Panel/Indicators/MenuItemFactory.qml:600
263+#: qml/Panel/Indicators/MenuItemFactory.qml:643
284msgid "Nothing is playing"
264msgid "Nothing is playing"
285msgstr "Ningún contenido en reproducción"
265msgstr "Ningún contenido en reproducción"
286
266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:748
267+#: qml/Panel/Indicators/MenuItemFactory.qml:791
288msgid "In queue…"
268msgid "In queue…"
289msgstr "En espera…"
269msgstr "En espera…"
290
270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:752
271+#: qml/Panel/Indicators/MenuItemFactory.qml:795
292msgid "Downloading"
272msgid "Downloading"
293msgstr "Descargando"
273msgstr "Descargando"
294
274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:754
275+#: qml/Panel/Indicators/MenuItemFactory.qml:797
296msgid "Paused, tap to resume"
276msgid "Paused, tap to resume"
297msgstr "Pausado, toque para reanudar"
277msgstr "Pausado, toque para reanudar"
298
278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:756
279+#: qml/Panel/Indicators/MenuItemFactory.qml:799
300msgid "Canceled"
280msgid "Canceled"
301msgstr "Cancelado"
281msgstr "Cancelado"
302
282
303−#: qml/Panel/Indicators/MenuItemFactory.qml:758
283+#: qml/Panel/Indicators/MenuItemFactory.qml:801
304msgid "Finished"
284msgid "Finished"
305msgstr "Finalizado"
285msgstr "Finalizado"
306
286
307−#: qml/Panel/Indicators/MenuItemFactory.qml:760
287+#: qml/Panel/Indicators/MenuItemFactory.qml:803
308msgid "Failed, tap to retry"
288msgid "Failed, tap to retry"
309msgstr "Falló, toque para reintentar"
289msgstr "Falló, toque para reintentar"
310
290
@@ -316,49 +296,49 @@ msgstr "Desbloquear SIM"
316msgid "Roaming"
296msgid "Roaming"
317msgstr "Itinerancia"
297msgstr "Itinerancia"
318
298
319−#: qml/Shell.qml:346
299+#: qml/Shell.qml:367
300+#, qt-format
301+msgid "Enter %1"
302+msgstr "Introduzca %1"
303+
304+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
320msgid "Enter passphrase"
305msgid "Enter passphrase"
321msgstr "Introduzca la contraseña"
306msgstr "Introduzca la contraseña"
322
307
323−#: qml/Shell.qml:347
308+#: qml/Shell.qml:369
309+msgid "Enter passcode"
310+msgstr "Introduzca el código"
311+
312+#: qml/Shell.qml:370
313+#, qt-format
314+msgid "Sorry, incorrect %1"
315+msgstr "Incorrecto (%1)"
316+
317+#: qml/Shell.qml:371
324msgid "Sorry, incorrect passphrase"
318msgid "Sorry, incorrect passphrase"
325msgstr "La contraseña es incorrecta"
319msgstr "La contraseña es incorrecta"
326
320
327−#: qml/Shell.qml:348
321+#: qml/Shell.qml:372
328msgid "Please re-enter"
322msgid "Please re-enter"
329msgstr "Reintroduzca"
323msgstr "Reintroduzca"
330
324
331−#: qml/Shell.qml:350
325+#: qml/Shell.qml:373
332−msgid "Enter passcode"
333−msgstr "Introduzca el código"
334−
335−#: qml/Shell.qml:351
336msgid "Sorry, incorrect passcode"
326msgid "Sorry, incorrect passcode"
337msgstr "El código es incorrecto"
327msgstr "El código es incorrecto"
338
328
339−#: qml/Shell.qml:354
329+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
340−#, qt-format
341−msgid "Enter %1"
342−msgstr "Introduzca %1"
343−
344−#: qml/Shell.qml:355
345−#, qt-format
346−msgid "Sorry, incorrect %1"
347−msgstr "Incorrecto (%1)"
348−
349−#: qml/Shell.qml:390
350msgid "Sorry, incorrect passphrase."
330msgid "Sorry, incorrect passphrase."
351msgstr "La contraseña es incorrecta."
331msgstr "La contraseña es incorrecta."
352
332
353−#: qml/Shell.qml:391
333+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
354msgid "Sorry, incorrect passcode."
334msgid "Sorry, incorrect passcode."
355msgstr "Código de acceso incorrecto."
335msgstr "Código de acceso incorrecto."
356
336
357−#: qml/Shell.qml:392
337+#: qml/Shell.qml:469
358msgid "This will be your last attempt."
338msgid "This will be your last attempt."
359msgstr "Este será su último intento."
339msgstr "Este será su último intento."
360
340
361−#: qml/Shell.qml:394
341+#: qml/Shell.qml:471
362msgid ""
342msgid ""
363"If passphrase is entered incorrectly, your phone will conduct a factory "
343"If passphrase is entered incorrectly, your phone will conduct a factory "
364"reset and all personal data will be deleted."
344"reset and all personal data will be deleted."
@@ -366,7 +346,7 @@ msgstr ""
366"Si se introduce la frase incorrectamente, el teléfono volverá a la "
346"Si se introduce la frase incorrectamente, el teléfono volverá a la "
367"configuración de fábrica y se perderán todos los datos personales."
347"configuración de fábrica y se perderán todos los datos personales."
368
348
369−#: qml/Shell.qml:395
349+#: qml/Shell.qml:472
370msgid ""
350msgid ""
371"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 "
372"and all personal data will be deleted."
352"and all personal data will be deleted."
@@ -374,8 +354,206 @@ msgstr ""
374"Si se introduce el código incorrectamente, el teléfono volverá a la "
354"Si se introduce el código incorrectamente, el teléfono volverá a la "
375"configuración de fábrica y se perderán todos los datos personales."
355"configuración de fábrica y se perderán todos los datos personales."
376
356
357+#: qml/Wizard/Page.qml:89
377−#~ msgid "Enter SIM PIN"
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+
534+#~ msgid "Confirm"
535+#~ msgstr "Confirmar"
536+
537+#~ msgid "Type or say a command"
378−#~ msgstr "Escriba el PIN de la SIM"
538+#~ msgstr "Escriba o diga una orden"
539+
540+#~ msgid "Loading. Please Wait..."
541+#~ msgstr "Cargando, espere…"
542+
543+#~ msgid "Speak Now..."
544+#~ msgstr "Hable ahora…"
545+
546+#~ msgid "Speaking..."
547+#~ msgstr "Hablando…"
548+
549+#~ msgid "All"
550+#~ msgstr "Todo"
551+
552+#~ msgid "Favorites"
553+#~ msgstr "Favoritos"
554+
555+#~ msgid "Done"
556+#~ msgstr "Hecho"
379
557
380−#~ msgid "Sorry, incorrect PIN"
558+#~ msgid "Manage Scopes"
381−#~ msgstr "El PIN es incorrecto"
559+#~ msgstr "Administrar Scopes"
po/eu.po+280−102
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-07 19:21+0000\n"
11+"PO-Revision-Date: 2014-11-08 14:44+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-10-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
151+#: qml/Components/EdgeDemo.qml:242
152msgid "Well done"
152msgid "Well done"
153msgstr "Bikain"
153msgstr "Bikain"
154
154
155−#: qml/Components/EdgeDemo.qml:227
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,36 +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:220
163+#: qml/Components/Lockscreen.qml:238
164+msgid "Return to Call"
165+msgstr "Itzuli deira"
166+
167+#: qml/Components/Lockscreen.qml:238
164msgid "Emergency Call"
168msgid "Emergency Call"
165msgstr "Larrialdi-deia"
169msgstr "Larrialdi-deia"
166
170
167−#: qml/Components/Lockscreen.qml:252
171+#: qml/Components/Lockscreen.qml:270
168msgid "OK"
172msgid "OK"
169msgstr "Ados"
173msgstr "Ados"
170
174
171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
175+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
172msgid "See less"
176msgid "See less"
173msgstr "Ikusi gutxiago"
177msgstr "Ikusi gutxiago"
174
178
175−#: qml/Dash/GenericScopeView.qml:434
179+#: qml/Dash/GenericScopeView.qml:431
176msgid "See all"
180msgid "See all"
177msgstr "Ikusi guztiak"
181msgstr "Ikusi guztiak"
178
182
179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
183+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
180#: qml/Panel/SearchIndicator.qml:27
184#: qml/Panel/SearchIndicator.qml:27
181msgid "Search"
185msgid "Search"
182msgstr "Bilatu"
186msgstr "Bilatu"
183
187
184−#: qml/Dash/PageHeader.qml:268
188+#: qml/Dash/PageHeader.qml:260
189+msgid "Store"
190+msgstr "Denda"
191+
192+#: qml/Dash/PageHeader.qml:277
185msgid "Settings"
193msgid "Settings"
186msgstr "Ezarpenak"
194msgstr "Ezarpenak"
187
195
188−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:284
189msgid "Remove from Favorites"
197msgid "Remove from Favorites"
190msgstr "Kendu gogokoetatik"
198msgstr "Kendu gogokoetatik"
191
199
192−#: qml/Dash/PageHeader.qml:275
200+#: qml/Dash/PageHeader.qml:284
193msgid "Add to Favorites"
201msgid "Add to Favorites"
194msgstr "Gehitu gogokoetara"
202msgstr "Gehitu gogokoetara"
195
203
@@ -221,87 +229,59 @@ msgstr "Tiratu freskatzeko…"
221msgid "Release to refresh…"
229msgid "Release to refresh…"
222msgstr "Askatu freskatzeko…"
230msgstr "Askatu freskatzeko…"
223
231
224−#: qml/Dash/ScopesOverview.qml:206
232+#: qml/Dash/ScopesList.qml:63
225−msgid "Manage Scopes"
233+msgid "Manage"
226−msgstr "Kudeatu eremuak"
234+msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:428
229−msgid "Done"
230−msgstr "Eginda"
231−
232−#: qml/Dash/ScopesOverview.qml:454
233−msgid "Store"
234−msgstr "Denda"
235
235
236−#: qml/Dash/ScopesOverviewTab.qml:36
236+#: qml/Dash/ScopesList.qml:107
237−msgid "Favorites"
237+msgid "Home"
238−msgstr "Gogokoak"
238+msgstr ""
239
239
240−#: qml/Dash/ScopesOverviewTab.qml:54
240+#: qml/Dash/ScopesList.qml:108
241−msgid "All"
241+msgid "Also installed"
242−msgstr "Guztiak"
242+msgstr ""
243
243
244−#: qml/Greeter/Greeter.qml:157
244+#: qml/Greeter/Greeter.qml:174
245msgid "Unlock"
245msgid "Unlock"
246msgstr "Desblokeatu"
246msgstr "Desblokeatu"
247
247
248−#: qml/Hud/HudParametrizedActionsPage.qml:139
249−msgid "Confirm"
250−msgstr "Berretsi"
251−
252−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
253−msgid "Type or say a command"
254−msgstr "Idatzi edo esan agindu bat"
255−
256−#: qml/Hud/Hud.qml:84
257−msgid "Loading. Please Wait..."
258−msgstr "Kargatzen. Itxaron, mesedez..."
259−
260−#: qml/Hud/Hud.qml:89
261−msgid "Speak Now..."
262−msgstr "Hitz egin orain..."
263−
264−#: qml/Hud/Hud.qml:94
265−msgid "Speaking..."
266−msgstr "Hitz egiten..."
267−
268−#: qml/Notifications/NotificationMenuItemFactory.qml:116
248+#: qml/Notifications/NotificationMenuItemFactory.qml:128
269msgid "Show password"
249msgid "Show password"
270msgstr "Erakutsi pasahitza"
250msgstr "Erakutsi pasahitza"
271
251
272−#: qml/Panel/ActiveCallHint.qml:77
252+#: qml/Panel/ActiveCallHint.qml:79
273msgid "Tap to return to call..."
253msgid "Tap to return to call..."
274msgstr "Sakatu deira itzultzeko..."
254msgstr "Sakatu deira itzultzeko..."
275
255
276−#: qml/Panel/ActiveCallHint.qml:90
256+#: qml/Panel/ActiveCallHint.qml:92
277msgid "Conference"
257msgid "Conference"
278msgstr "Konferentzia"
258msgstr "Konferentzia"
279
259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:600
260+#: qml/Panel/Indicators/MenuItemFactory.qml:643
281msgid "Nothing is playing"
261msgid "Nothing is playing"
282msgstr "Ez dago ezer erreproduzitzen"
262msgstr "Ez dago ezer erreproduzitzen"
283
263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:748
264+#: qml/Panel/Indicators/MenuItemFactory.qml:791
285msgid "In queue…"
265msgid "In queue…"
286msgstr "Ilaran..."
266msgstr "Ilaran..."
287
267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:752
268+#: qml/Panel/Indicators/MenuItemFactory.qml:795
289msgid "Downloading"
269msgid "Downloading"
290msgstr "Deskargatzen"
270msgstr "Deskargatzen"
291
271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:754
272+#: qml/Panel/Indicators/MenuItemFactory.qml:797
293msgid "Paused, tap to resume"
273msgid "Paused, tap to resume"
294msgstr "Pausatuta, sakatu jarraitzeko"
274msgstr "Pausatuta, sakatu jarraitzeko"
295
275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:756
276+#: qml/Panel/Indicators/MenuItemFactory.qml:799
297msgid "Canceled"
277msgid "Canceled"
298msgstr "Utzita"
278msgstr "Utzita"
299
279
300−#: qml/Panel/Indicators/MenuItemFactory.qml:758
280+#: qml/Panel/Indicators/MenuItemFactory.qml:801
301msgid "Finished"
281msgid "Finished"
302msgstr "Amaituta"
282msgstr "Amaituta"
303
283
304−#: qml/Panel/Indicators/MenuItemFactory.qml:760
284+#: qml/Panel/Indicators/MenuItemFactory.qml:803
305msgid "Failed, tap to retry"
285msgid "Failed, tap to retry"
306msgstr "Huts egin du, sakatu berriro saiatzeko"
286msgstr "Huts egin du, sakatu berriro saiatzeko"
307
287
@@ -313,49 +293,49 @@ msgstr "Desblokeatu SIMa"
313msgid "Roaming"
293msgid "Roaming"
314msgstr "Ibiltaritza"
294msgstr "Ibiltaritza"
315
295
316−#: qml/Shell.qml:346
296+#: qml/Shell.qml:367
297+#, qt-format
298+msgid "Enter %1"
299+msgstr "Sartu %1"
300+
301+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
317msgid "Enter passphrase"
302msgid "Enter passphrase"
318msgstr "Sartu pasaesaldia"
303msgstr "Sartu pasaesaldia"
319
304
320−#: qml/Shell.qml:347
305+#: qml/Shell.qml:369
306+msgid "Enter passcode"
307+msgstr "Sartu pasakodea"
308+
309+#: qml/Shell.qml:370
310+#, qt-format
311+msgid "Sorry, incorrect %1"
312+msgstr "Sentitzen dugu, %1 okerra da"
313+
314+#: qml/Shell.qml:371
321msgid "Sorry, incorrect passphrase"
315msgid "Sorry, incorrect passphrase"
322msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"
316msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"
323
317
324−#: qml/Shell.qml:348
318+#: qml/Shell.qml:372
325msgid "Please re-enter"
319msgid "Please re-enter"
326msgstr "Errepikatu"
320msgstr "Errepikatu"
327
321
328−#: qml/Shell.qml:350
322+#: qml/Shell.qml:373
329−msgid "Enter passcode"
330−msgstr "Sartu pasakodea"
331−
332−#: qml/Shell.qml:351
333msgid "Sorry, incorrect passcode"
323msgid "Sorry, incorrect passcode"
334−msgstr "Sentitzen dugu, pasakodea okerrekoa da"
324+msgstr "Sentitzen dugu, pasakodea okerra da"
335−
336−#: qml/Shell.qml:354
337−#, qt-format
338−msgid "Enter %1"
339−msgstr "Sartu %1"
340
325
341−#: qml/Shell.qml:355
326+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
342−#, qt-format
343−msgid "Sorry, incorrect %1"
344−msgstr "Sentitzen dugu, %1 okerrekoa da"
345−
346−#: qml/Shell.qml:390
347msgid "Sorry, incorrect passphrase."
327msgid "Sorry, incorrect passphrase."
348−msgstr "Sentitzen dugu, pasaesaldia okerrekoa da."
328+msgstr "Sentitzen dugu, pasaesaldia okerra da."
349
329
350−#: qml/Shell.qml:391
330+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
351msgid "Sorry, incorrect passcode."
331msgid "Sorry, incorrect passcode."
352−msgstr "Sentitzen dugu, pasakodea okerrekoa da."
332+msgstr "Sentitzen dugu, pasakodea okerra da."
353
333
354−#: qml/Shell.qml:392
334+#: qml/Shell.qml:469
355msgid "This will be your last attempt."
335msgid "This will be your last attempt."
356msgstr "Hau duzu azken saiakera."
336msgstr "Hau duzu azken saiakera."
357
337
358−#: qml/Shell.qml:394
338+#: qml/Shell.qml:471
359msgid ""
339msgid ""
360"If passphrase is entered incorrectly, your phone will conduct a factory "
340"If passphrase is entered incorrectly, your phone will conduct a factory "
361"reset and all personal data will be deleted."
341"reset and all personal data will be deleted."
@@ -363,7 +343,7 @@ msgstr ""
363"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "
343"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "
364"berrezarri eta datu pertsonal guztiak ezabatuko dira."
344"berrezarri eta datu pertsonal guztiak ezabatuko dira."
365
345
366−#: qml/Shell.qml:395
346+#: qml/Shell.qml:472
367msgid ""
347msgid ""
368"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 "
369"and all personal data will be deleted."
349"and all personal data will be deleted."
@@ -371,8 +351,206 @@ msgstr ""
371"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "
351"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "
372"berrezarri eta datu pertsonal guztiak ezabatuko dira."
352"berrezarri eta datu pertsonal guztiak ezabatuko dira."
373
353
374−#~ msgid "Sorry, incorrect PIN"
354+#: qml/Wizard/Page.qml:89
375−#~ msgstr "Sentitzen dugu, PINa okerrekoa da"
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+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
386+msgid "Skip"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:39
390+msgid "Lock security"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:74
394+msgid "Please select how you’d like to unlock your phone."
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:97
398+msgid "Swipe"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:98
402+msgid "No security"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:100
406+msgid "Passcode"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:101
410+msgid "4 digits only"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:103
414+msgid "Passphrase"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:104
418+msgid "Numbers and letters"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:28
422+msgid "Connect to Wi‑Fi"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/40-wifi.qml:147
426+msgid "Available networks…"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/40-wifi.qml:148
430+msgid "No available networks."
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:27
434+msgid "Location"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:62
438+msgid "Let the phone detect your location:"
439+msgstr ""
440+
441+#: qml/Wizard/Pages/50-location.qml:69
442+msgid "Using GPS only (less accurate)"
443+msgstr ""
444+
445+#: qml/Wizard/Pages/50-location.qml:86
446+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
447+msgstr ""
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+
456+#: qml/Wizard/Pages/50-location.qml:112
457+msgid "Not at all"
458+msgstr ""
459+
460+#: qml/Wizard/Pages/50-location.qml:124
461+msgid "You can change your mind later in <b>System Settings</b>."
462+msgstr ""
463+
464+#: qml/Wizard/Pages/60-reporting.qml:24
465+msgid "Improving your experience"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/60-reporting.qml:36
469+msgid ""
470+"Your phone is set up to automatically report errors to Canonical and its "
471+"partners, the makers of the operating system."
472+msgstr ""
473+
474+#: qml/Wizard/Pages/60-reporting.qml:43
475+msgid ""
476+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
477+"Privacy</b>"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:24
481+msgid "All done"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:39
485+msgid "Nice work!"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/80-finished.qml:46
489+msgid "Your phone is now ready to use."
490+msgstr ""
491+
492+#: qml/Wizard/Pages/80-finished.qml:53
493+msgid "Finish"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/here-terms.qml:27
497+msgid "Terms & Conditions"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:49
501+msgid "Confirm passphrase"
502+msgstr ""
503+
504+#: qml/Wizard/Pages/passwd-confirm.qml:50
505+msgid "Confirm passcode"
506+msgstr ""
507+
508+#: qml/Wizard/Pages/passwd-confirm.qml:53
509+#: qml/Wizard/Pages/passwd-confirm.qml:54
510+msgid "Please try again."
511+msgstr ""
512+
513+#: qml/Wizard/Pages/passwd-set.qml:61
514+msgid "Choose your passcode"
515+msgstr ""
516+
517+#: qml/Wizard/Pages/passwd-set.qml:68
518+msgid "Passphrase must be 4 characters long"
519+msgstr ""
520+
521+#: qml/Wizard/StackButton.qml:39
522+#, qt-format
523+msgid "〈 %1"
524+msgstr ""
525+
526+#: qml/Wizard/StackButton.qml:42
527+#, qt-format
528+msgid "%1 〉"
529+msgstr ""
530+
531+#~ msgid "Type or say a command"
532+#~ msgstr "Idatzi edo esan agindu bat"
533+
534+#~ msgid "Speak Now..."
535+#~ msgstr "Hitz egin orain..."
536+
537+#~ msgid "Loading. Please Wait..."
538+#~ msgstr "Kargatzen. Itxaron, mesedez..."
539+
540+#~ msgid "Speaking..."
541+#~ msgstr "Hitz egiten..."
542+
543+#~ msgid "Done"
544+#~ msgstr "Eginda"
545+
546+#~ msgid "All"
547+#~ msgstr "Guztiak"
548+
549+#~ msgid "Favorites"
550+#~ msgstr "Gogokoak"
551+
552+#~ msgid "Confirm"
553+#~ msgstr "Berretsi"
376
554
377−#~ msgid "Enter SIM PIN"
555+#~ msgid "Manage Scopes"
378−#~ msgstr "Sartu SIMaren PINa"
556+#~ msgstr "Kudeatu eremuak"
po/fa.po+279−95
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-11 23:41+0000\n"
11+"PO-Revision-Date: 2014-12-10 12:53+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-10-12 06:55+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
139+#: qml/Components/EdgeDemo.qml:214
140msgid "Left edge"
140msgid "Left edge"
141msgstr "لبه‌ی چپ"
141msgstr "لبه‌ی چپ"
142
142
143−#: qml/Components/EdgeDemo.qml:199
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:226
147+#: qml/Components/EdgeDemo.qml:242
148msgid "Well done"
148msgid "Well done"
149msgstr "عالی بود"
149msgstr "عالی بود"
150
150
151−#: qml/Components/EdgeDemo.qml:227
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,36 +156,44 @@ msgstr ""
156"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
156"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
157"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
157"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
158
158
159−#: qml/Components/Lockscreen.qml:220
159+#: qml/Components/Lockscreen.qml:238
160+msgid "Return to Call"
161+msgstr "بازگشت به تماس"
162+
163+#: qml/Components/Lockscreen.qml:238
160msgid "Emergency Call"
164msgid "Emergency Call"
161msgstr "تماس اضطراری"
165msgstr "تماس اضطراری"
162
166
163−#: qml/Components/Lockscreen.qml:252
167+#: qml/Components/Lockscreen.qml:270
164msgid "OK"
168msgid "OK"
165msgstr "قبول"
169msgstr "قبول"
166
170
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
168msgid "See less"
172msgid "See less"
169msgstr "کم‌تر ببینید"
173msgstr "کم‌تر ببینید"
170
174
171−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:431
172msgid "See all"
176msgid "See all"
173msgstr "دیدن همه"
177msgstr "دیدن همه"
174
178
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
176#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
181msgid "Search"
178msgstr "جست‌وجو"
182msgstr "جست‌وجو"
179
183
180−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:260
185+msgid "Store"
186+msgstr "فروشگاه"
187+
188+#: qml/Dash/PageHeader.qml:277
181msgid "Settings"
189msgid "Settings"
182msgstr "تنظیمات"
190msgstr "تنظیمات"
183
191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185msgid "Remove from Favorites"
193msgid "Remove from Favorites"
186msgstr "برداشتن از برگزیده‌ها"
194msgstr "برداشتن از برگزیده‌ها"
187
195
188−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:284
189msgid "Add to Favorites"
197msgid "Add to Favorites"
190msgstr "افزودن به برگزیده‌ها"
198msgstr "افزودن به برگزیده‌ها"
191
199
@@ -217,87 +225,59 @@ msgstr "برای تازه‌سازی بکشید…"
217msgid "Release to refresh…"
225msgid "Release to refresh…"
218msgstr "برای تازه‌سازی رها کنید…"
226msgstr "برای تازه‌سازی رها کنید…"
219
227
220−#: qml/Dash/ScopesOverview.qml:206
228+#: qml/Dash/ScopesList.qml:63
221−msgid "Manage Scopes"
229+msgid "Manage"
222−msgstr "مدیریت حوزه‌ها"
230+msgstr "مدیریت"
223
231
224−#: qml/Dash/ScopesOverview.qml:428
232+#: qml/Dash/ScopesList.qml:107
225−msgid "Done"
233+msgid "Home"
226−msgstr "انجام شد"
234+msgstr "خانه"
227
235
228−#: qml/Dash/ScopesOverview.qml:454
236+#: qml/Dash/ScopesList.qml:108
229−msgid "Store"
237+msgid "Also installed"
230−msgstr "فروشگاه"
238+msgstr "هم‌چنین نصب شده"
231−
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
234−msgstr "برگزیده‌ها"
235
239
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
238−msgstr "همه"
239−
240−#: qml/Greeter/Greeter.qml:157
240+#: qml/Greeter/Greeter.qml:174
241msgid "Unlock"
241msgid "Unlock"
242msgstr "بازکردن قفل"
242msgstr "بازکردن قفل"
243
243
244−#: qml/Hud/HudParametrizedActionsPage.qml:139
245−msgid "Confirm"
246−msgstr "تأیید"
247−
248−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
249−msgid "Type or say a command"
250−msgstr "دستوری را بنویسید یا بگویید"
251−
252−#: qml/Hud/Hud.qml:84
253−msgid "Loading. Please Wait..."
254−msgstr "در حال بار کردن. لطفاً صبر کنید…"
255−
256−#: qml/Hud/Hud.qml:89
257−msgid "Speak Now..."
258−msgstr "اکنون صحبت کنید…"
259−
260−#: qml/Hud/Hud.qml:94
261−msgid "Speaking..."
262−msgstr "در حال صحبت کردن…"
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
265msgid "Show password"
245msgid "Show password"
266msgstr "نمایش گذرواژه"
246msgstr "نمایش گذرواژه"
267
247
268−#: qml/Panel/ActiveCallHint.qml:77
248+#: qml/Panel/ActiveCallHint.qml:79
269msgid "Tap to return to call..."
249msgid "Tap to return to call..."
270msgstr "برای بازگشت به تماس ضربه بزنید…"
250msgstr "برای بازگشت به تماس ضربه بزنید…"
271
251
272−#: qml/Panel/ActiveCallHint.qml:90
252+#: qml/Panel/ActiveCallHint.qml:92
273msgid "Conference"
253msgid "Conference"
274msgstr "کنفرانس"
254msgstr "کنفرانس"
275
255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:600
256+#: qml/Panel/Indicators/MenuItemFactory.qml:643
277msgid "Nothing is playing"
257msgid "Nothing is playing"
278msgstr "هیچ چیزی در حال پخش نیست"
258msgstr "هیچ چیزی در حال پخش نیست"
279
259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:748
260+#: qml/Panel/Indicators/MenuItemFactory.qml:791
281msgid "In queue…"
261msgid "In queue…"
282msgstr "در صف…"
262msgstr "در صف…"
283
263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:752
264+#: qml/Panel/Indicators/MenuItemFactory.qml:795
285msgid "Downloading"
265msgid "Downloading"
286msgstr "در حال بارگیری"
266msgstr "در حال بارگیری"
287
267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:754
268+#: qml/Panel/Indicators/MenuItemFactory.qml:797
289msgid "Paused, tap to resume"
269msgid "Paused, tap to resume"
290msgstr "مکث شد، برای از سر گیری ضربه بزنید"
270msgstr "مکث شد، برای از سر گیری ضربه بزنید"
291
271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:756
272+#: qml/Panel/Indicators/MenuItemFactory.qml:799
293msgid "Canceled"
273msgid "Canceled"
294msgstr "لغو شد"
274msgstr "لغو شد"
295
275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:758
276+#: qml/Panel/Indicators/MenuItemFactory.qml:801
297msgid "Finished"
277msgid "Finished"
298msgstr "پایان یافت"
278msgstr "پایان یافت"
299
279
300−#: qml/Panel/Indicators/MenuItemFactory.qml:760
280+#: qml/Panel/Indicators/MenuItemFactory.qml:803
301msgid "Failed, tap to retry"
281msgid "Failed, tap to retry"
302msgstr "شکست خورد، برای تلاش دوباره ضربه بزنید"
282msgstr "شکست خورد، برای تلاش دوباره ضربه بزنید"
303
283
@@ -309,49 +289,49 @@ msgstr "باز کردن قفل سیم‌کارت"
309msgid "Roaming"
289msgid "Roaming"
310msgstr "رومینگ"
290msgstr "رومینگ"
311
291
312−#: qml/Shell.qml:346
292+#: qml/Shell.qml:367
293+#, qt-format
294+msgid "Enter %1"
295+msgstr "%1 را وارد کنید"
296+
297+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313msgid "Enter passphrase"
298msgid "Enter passphrase"
314msgstr "عبارت‌عبور را وارد کنید"
299msgstr "عبارت‌عبور را وارد کنید"
315
300
316−#: qml/Shell.qml:347
301+#: qml/Shell.qml:369
302+msgid "Enter passcode"
303+msgstr "رمزعبور را وارد کنید"
304+
305+#: qml/Shell.qml:370
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr "متأسّفیم، %1 نادرست بود"
309+
310+#: qml/Shell.qml:371
317msgid "Sorry, incorrect passphrase"
311msgid "Sorry, incorrect passphrase"
318msgstr "متأسّفیم، عبارت‌عبور نادرست بود"
312msgstr "متأسّفیم، عبارت‌عبور نادرست بود"
319
313
320−#: qml/Shell.qml:348
314+#: qml/Shell.qml:372
321msgid "Please re-enter"
315msgid "Please re-enter"
322msgstr "لطفاً دوباره وارد کنید"
316msgstr "لطفاً دوباره وارد کنید"
323
317
324−#: qml/Shell.qml:350
318+#: qml/Shell.qml:373
325−msgid "Enter passcode"
326−msgstr "رمزعبور را وارد کنید"
327−
328−#: qml/Shell.qml:351
329msgid "Sorry, incorrect passcode"
319msgid "Sorry, incorrect passcode"
330msgstr "متأسّفیم، رمزعبور نادرست بود"
320msgstr "متأسّفیم، رمزعبور نادرست بود"
331
321
332−#: qml/Shell.qml:354
322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
333−#, qt-format
334−msgid "Enter %1"
335−msgstr "%1 را وارد کنید"
336−
337−#: qml/Shell.qml:355
338−#, qt-format
339−msgid "Sorry, incorrect %1"
340−msgstr "متأسّفیم، %1 نادرست بود"
341−
342−#: qml/Shell.qml:390
343msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
344msgstr "متأسّفیم، عبارت‌عبور نادرست است."
324msgstr "متأسّفیم، عبارت‌عبور نادرست است."
345
325
346−#: qml/Shell.qml:391
326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
347msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
348msgstr "متأسّفیم، رمزعبور نادرست است."
328msgstr "متأسّفیم، رمزعبور نادرست است."
349
329
350−#: qml/Shell.qml:392
330+#: qml/Shell.qml:469
351msgid "This will be your last attempt."
331msgid "This will be your last attempt."
352msgstr "این آخرین تلاش شما خواهد بود."
332msgstr "این آخرین تلاش شما خواهد بود."
353
333
354−#: qml/Shell.qml:394
334+#: qml/Shell.qml:471
355msgid ""
335msgid ""
356"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
357"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
@@ -359,10 +339,214 @@ msgstr ""
359"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
339"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
360"اطّلاعات شخصی حذف خواهند شد."
340"اطّلاعات شخصی حذف خواهند شد."
361
341
362−#: qml/Shell.qml:395
342+#: qml/Shell.qml:472
363msgid ""
343msgid ""
364"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 "
365"and all personal data will be deleted."
345"and all personal data will be deleted."
366msgstr ""
346msgstr ""
367"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
347"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
368"اطّلاعات شخصی حذف خواهند شد."
348"اطّلاعات شخصی حذف خواهند شد."
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+
527+#~ msgid "Type or say a command"
528+#~ msgstr "دستوری را بنویسید یا بگویید"
529+
530+#~ msgid "Confirm"
531+#~ msgstr "تأیید"
532+
533+#~ msgid "Loading. Please Wait..."
534+#~ msgstr "در حال بار کردن. لطفاً صبر کنید…"
535+
536+#~ msgid "Speaking..."
537+#~ msgstr "در حال صحبت کردن…"
538+
539+#~ msgid "Speak Now..."
540+#~ msgstr "اکنون صحبت کنید…"
541+
542+#~ msgid "All"
543+#~ msgstr "همه"
544+
545+#~ msgid "Favorites"
546+#~ msgstr "برگزیده‌ها"
547+
548+#~ msgid "Done"
549+#~ msgstr "انجام شد"
550+
551+#~ msgid "Manage Scopes"
552+#~ msgstr "مدیریت حوزه‌ها"
po/fi.po+284−99
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-07 13:10+0000\n"
11+"PO-Revision-Date: 2014-12-14 15:37+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-10-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-15 06:34+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
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:227
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,36 +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:220
161+#: qml/Components/Lockscreen.qml:238
162+msgid "Return to Call"
163+msgstr "Palaa puheluun"
164+
165+#: qml/Components/Lockscreen.qml:238
162msgid "Emergency Call"
166msgid "Emergency Call"
163msgstr "Hätäpuhelu"
167msgstr "Hätäpuhelu"
164
168
165−#: qml/Components/Lockscreen.qml:252
169+#: qml/Components/Lockscreen.qml:270
166msgid "OK"
170msgid "OK"
167msgstr "OK"
171msgstr "OK"
168
172
169−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
173+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
170msgid "See less"
174msgid "See less"
171msgstr "Näytä vähemmän"
175msgstr "Näytä vähemmän"
172
176
173−#: qml/Dash/GenericScopeView.qml:434
177+#: qml/Dash/GenericScopeView.qml:431
174msgid "See all"
178msgid "See all"
175msgstr "Näytä kaikki"
179msgstr "Näytä kaikki"
176
180
177−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
181+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
178#: qml/Panel/SearchIndicator.qml:27
182#: qml/Panel/SearchIndicator.qml:27
179msgid "Search"
183msgid "Search"
180msgstr "Hae"
184msgstr "Hae"
181
185
182−#: qml/Dash/PageHeader.qml:268
186+#: qml/Dash/PageHeader.qml:260
187+msgid "Store"
188+msgstr "Kauppa"
189+
190+#: qml/Dash/PageHeader.qml:277
183msgid "Settings"
191msgid "Settings"
184msgstr "Asetukset"
192msgstr "Asetukset"
185
193
186−#: qml/Dash/PageHeader.qml:275
194+#: qml/Dash/PageHeader.qml:284
187msgid "Remove from Favorites"
195msgid "Remove from Favorites"
188msgstr "Poista suosikeista"
196msgstr "Poista suosikeista"
189
197
190−#: qml/Dash/PageHeader.qml:275
198+#: qml/Dash/PageHeader.qml:284
191msgid "Add to Favorites"
199msgid "Add to Favorites"
192msgstr "Lisää suosikkeihin"
200msgstr "Lisää suosikkeihin"
193
201
@@ -219,87 +227,59 @@ msgstr "Vedä päivittääksesi…"
219msgid "Release to refresh…"
227msgid "Release to refresh…"
220msgstr "Vapauta päivittääksesi…"
228msgstr "Vapauta päivittääksesi…"
221
229
222−#: qml/Dash/ScopesOverview.qml:206
230+#: qml/Dash/ScopesList.qml:63
223−msgid "Manage Scopes"
231+msgid "Manage"
224−msgstr "Näkymien hallinta"
232+msgstr "Hallitse"
225−
226−#: qml/Dash/ScopesOverview.qml:428
227−msgid "Done"
228−msgstr "Valmis"
229−
230−#: qml/Dash/ScopesOverview.qml:454
231−msgid "Store"
232−msgstr "Kauppa"
233
233
234−#: qml/Dash/ScopesOverviewTab.qml:36
234+#: qml/Dash/ScopesList.qml:107
235−msgid "Favorites"
235+msgid "Home"
236−msgstr "Suosikit"
236+msgstr "Koti"
237
237
238−#: qml/Dash/ScopesOverviewTab.qml:54
238+#: qml/Dash/ScopesList.qml:108
239−msgid "All"
239+msgid "Also installed"
240−msgstr "Kaikki"
240+msgstr "Myös asennettu"
241
241
242−#: qml/Greeter/Greeter.qml:157
242+#: qml/Greeter/Greeter.qml:174
243msgid "Unlock"
243msgid "Unlock"
244msgstr "Avaa lukitus"
244msgstr "Avaa lukitus"
245
245
246−#: qml/Hud/HudParametrizedActionsPage.qml:139
247−msgid "Confirm"
248−msgstr "Hyväksy"
249−
250−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
251−msgid "Type or say a command"
252−msgstr "Kirjoita tai sano komento"
253−
254−#: qml/Hud/Hud.qml:84
255−msgid "Loading. Please Wait..."
256−msgstr "Ladataan, pieni hetki..."
257−
258−#: qml/Hud/Hud.qml:89
259−msgid "Speak Now..."
260−msgstr "Puhu nyt..."
261−
262−#: qml/Hud/Hud.qml:94
263−msgid "Speaking..."
264−msgstr "Puhutaan..."
265−
266−#: qml/Notifications/NotificationMenuItemFactory.qml:116
246+#: qml/Notifications/NotificationMenuItemFactory.qml:128
267msgid "Show password"
247msgid "Show password"
268msgstr "Näytä salasana"
248msgstr "Näytä salasana"
269
249
270−#: qml/Panel/ActiveCallHint.qml:77
250+#: qml/Panel/ActiveCallHint.qml:79
271msgid "Tap to return to call..."
251msgid "Tap to return to call..."
272msgstr "Napauta palataksesi puheluun..."
252msgstr "Napauta palataksesi puheluun..."
273
253
274−#: qml/Panel/ActiveCallHint.qml:90
254+#: qml/Panel/ActiveCallHint.qml:92
275msgid "Conference"
255msgid "Conference"
276msgstr "Ryhmäpuhelu"
256msgstr "Ryhmäpuhelu"
277
257
278−#: qml/Panel/Indicators/MenuItemFactory.qml:600
258+#: qml/Panel/Indicators/MenuItemFactory.qml:643
279msgid "Nothing is playing"
259msgid "Nothing is playing"
280msgstr "Mitään ei toisteta juuri nyt"
260msgstr "Mitään ei toisteta juuri nyt"
281
261
282−#: qml/Panel/Indicators/MenuItemFactory.qml:748
262+#: qml/Panel/Indicators/MenuItemFactory.qml:791
283msgid "In queue…"
263msgid "In queue…"
284msgstr "Jonossa…"
264msgstr "Jonossa…"
285
265
286−#: qml/Panel/Indicators/MenuItemFactory.qml:752
266+#: qml/Panel/Indicators/MenuItemFactory.qml:795
287msgid "Downloading"
267msgid "Downloading"
288msgstr "Ladataan"
268msgstr "Ladataan"
289
269
290−#: qml/Panel/Indicators/MenuItemFactory.qml:754
270+#: qml/Panel/Indicators/MenuItemFactory.qml:797
291msgid "Paused, tap to resume"
271msgid "Paused, tap to resume"
292msgstr "Keskeytetty, napauta palauttaaksesi"
272msgstr "Keskeytetty, napauta palauttaaksesi"
293
273
294−#: qml/Panel/Indicators/MenuItemFactory.qml:756
274+#: qml/Panel/Indicators/MenuItemFactory.qml:799
295msgid "Canceled"
275msgid "Canceled"
296msgstr "Peruttu"
276msgstr "Peruttu"
297
277
298−#: qml/Panel/Indicators/MenuItemFactory.qml:758
278+#: qml/Panel/Indicators/MenuItemFactory.qml:801
299msgid "Finished"
279msgid "Finished"
300msgstr "Valmistunut"
280msgstr "Valmistunut"
301
281
302−#: qml/Panel/Indicators/MenuItemFactory.qml:760
282+#: qml/Panel/Indicators/MenuItemFactory.qml:803
303msgid "Failed, tap to retry"
283msgid "Failed, tap to retry"
304msgstr "Epäonnistunut, napauta yrittääksesi uudelleen"
284msgstr "Epäonnistunut, napauta yrittääksesi uudelleen"
305
285
@@ -311,49 +291,49 @@ msgstr "Avaa SIM-kortin lukitus"
311msgid "Roaming"
291msgid "Roaming"
312msgstr "Verkkovierailu"
292msgstr "Verkkovierailu"
313
293
314−#: qml/Shell.qml:346
294+#: qml/Shell.qml:367
295+#, qt-format
296+msgid "Enter %1"
297+msgstr "Anna %1"
298+
299+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
315msgid "Enter passphrase"
300msgid "Enter passphrase"
316msgstr "Anna tunnuslause"
301msgstr "Anna tunnuslause"
317
302
318−#: qml/Shell.qml:347
303+#: qml/Shell.qml:369
304+msgid "Enter passcode"
305+msgstr "Anna suojakoodi"
306+
307+#: qml/Shell.qml:370
308+#, qt-format
309+msgid "Sorry, incorrect %1"
310+msgstr "Väärä %1"
311+
312+#: qml/Shell.qml:371
319msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
320msgstr "Virheellinen tunnuslause"
314msgstr "Virheellinen tunnuslause"
321
315
322−#: qml/Shell.qml:348
316+#: qml/Shell.qml:372
323msgid "Please re-enter"
317msgid "Please re-enter"
324msgstr "Anna uudelleen"
318msgstr "Anna uudelleen"
325
319
326−#: qml/Shell.qml:350
320+#: qml/Shell.qml:373
327−msgid "Enter passcode"
328−msgstr "Anna suojakoodi"
329−
330−#: qml/Shell.qml:351
331msgid "Sorry, incorrect passcode"
321msgid "Sorry, incorrect passcode"
332msgstr "Väärä suojakoodi"
322msgstr "Väärä suojakoodi"
333
323
334−#: qml/Shell.qml:354
324+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
335−#, qt-format
336−msgid "Enter %1"
337−msgstr "Anna %1"
338−
339−#: qml/Shell.qml:355
340−#, qt-format
341−msgid "Sorry, incorrect %1"
342−msgstr "Väärä %1"
343−
344−#: qml/Shell.qml:390
345msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
346msgstr "Virheellinen tunnuslause."
326msgstr "Virheellinen tunnuslause."
347
327
348−#: qml/Shell.qml:391
328+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
349msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
350msgstr "Virheellinen suojakoodi."
330msgstr "Virheellinen suojakoodi."
351
331
352−#: qml/Shell.qml:392
332+#: qml/Shell.qml:469
353msgid "This will be your last attempt."
333msgid "This will be your last attempt."
354msgstr "Tämä on viimeinen yritys."
334msgstr "Tämä on viimeinen yritys."
355
335
356−#: qml/Shell.qml:394
336+#: qml/Shell.qml:471
357msgid ""
337msgid ""
358"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
359"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -361,7 +341,7 @@ msgstr ""
361"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
341"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
362"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
342"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
363
343
364−#: qml/Shell.qml:395
344+#: qml/Shell.qml:472
365msgid ""
345msgid ""
366"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 "
367"and all personal data will be deleted."
347"and all personal data will be deleted."
@@ -369,8 +349,213 @@ msgstr ""
369"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "
349"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "
370"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
350"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
371
351
372−#~ msgid "Sorry, incorrect PIN"
352+#: qml/Wizard/Page.qml:89
373−#~ msgstr "Väärä PIN-koodi"
353+msgid "Back"
354+msgstr "Takaisin"
355+
356+#: qml/Wizard/Pages/10-welcome.qml:27
357+msgid "Hi!"
358+msgstr "Hei!"
359+
360+#: qml/Wizard/Pages/10-welcome.qml:44
361+msgid "Welcome to your Ubuntu phone."
362+msgstr "Tervetuloa Ubuntu-puhelimen pariin."
363+
364+#: qml/Wizard/Pages/10-welcome.qml:52
365+msgid "Let’s get started."
366+msgstr "Aloitetaanpa."
367+
368+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
369+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
370+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
371+#: qml/Wizard/Pages/passwd-set.qml:90
372+msgid "Continue"
373+msgstr "Jatka"
374+
375+#: qml/Wizard/Pages/20-sim.qml:25
376+msgid "Add a SIM card and restart your device"
377+msgstr "Lisää SIM-kortti ja käynnistä laite uudelleen"
378+
379+#: qml/Wizard/Pages/20-sim.qml:55
380+msgid "Without it, you won’t be able to make calls or use text messaging."
381+msgstr ""
382+"Ilman sitä et voi soittaa tai vastaanottaa puheluja tai käyttää "
383+"tekstiviestejä."
384+
385+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
386+msgid "Skip"
387+msgstr "Ohita"
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:39
390+msgid "Lock security"
391+msgstr "Lukitusturva"
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:74
394+msgid "Please select how you’d like to unlock your phone."
395+msgstr "Valitse puhelimen lukituksen avaustapa."
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:97
398+msgid "Swipe"
399+msgstr "Pyyhkäisy"
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:98
402+msgid "No security"
403+msgstr "Ei suojausta"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:100
406+msgid "Passcode"
407+msgstr "Suojakoodi"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:101
410+msgid "4 digits only"
411+msgstr "Vain 4 numeroa"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:103
414+msgid "Passphrase"
415+msgstr "Salasana"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:104
418+msgid "Numbers and letters"
419+msgstr "Numerot ja kirjaimet"
420+
421+#: qml/Wizard/Pages/40-wifi.qml:28
422+msgid "Connect to Wi‑Fi"
423+msgstr "Yhdistä wifi-verkkoon"
424+
425+#: qml/Wizard/Pages/40-wifi.qml:147
426+msgid "Available networks…"
427+msgstr "Käytettävissä olevat verkot…"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:148
430+msgid "No available networks."
431+msgstr "Ei käytettävissä olevia verkkoja."
432+
433+#: qml/Wizard/Pages/50-location.qml:27
434+msgid "Location"
435+msgstr "Sijainti"
436+
437+#: qml/Wizard/Pages/50-location.qml:62
438+msgid "Let the phone detect your location:"
439+msgstr "Salli puhelimen havaita sijaintisi:"
440+
441+#: qml/Wizard/Pages/50-location.qml:69
442+msgid "Using GPS only (less accurate)"
443+msgstr "Vain GPS:llä (epätarkempi)"
444+
445+#: qml/Wizard/Pages/50-location.qml:86
446+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
447+msgstr "GPS:llä, wifi- ja matkapuhelinverkon tiedoin (suositeltu)"
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+"Valitsemalla tämän hyväksyt Nokia HERE -palvelun <a href='#'>käyttöehdot</a>."
456+
457+#: qml/Wizard/Pages/50-location.qml:112
458+msgid "Not at all"
459+msgstr "Ei mitään"
460+
461+#: qml/Wizard/Pages/50-location.qml:124
462+msgid "You can change your mind later in <b>System Settings</b>."
463+msgstr "Voit vaihtaa valintaasi myöhemmin <b>Järjestelmän asetuksissa</b>."
464+
465+#: qml/Wizard/Pages/60-reporting.qml:24
466+msgid "Improving your experience"
467+msgstr "Käyttökokemuksen parantaminen"
468+
469+#: qml/Wizard/Pages/60-reporting.qml:36
470+msgid ""
471+"Your phone is set up to automatically report errors to Canonical and its "
472+"partners, the makers of the operating system."
473+msgstr ""
474+"Puhelimesi on asetettu ilmoittamaan virheistä automaattisesti Canonicalille "
475+"ja partnereille, eli käyttöjärjestelmän kehittäjille."
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+"Tämä on mahdollista poistaa käytöstä <b>Järjestelmän asetukset</b> -osion "
483+"kohdasta <b>Turvallisuus ja yksityisyys</b>"
484+
485+#: qml/Wizard/Pages/80-finished.qml:24
486+msgid "All done"
487+msgstr "Kaikki valmiina"
488+
489+#: qml/Wizard/Pages/80-finished.qml:39
490+msgid "Nice work!"
491+msgstr "Hyvä!"
492+
493+#: qml/Wizard/Pages/80-finished.qml:46
494+msgid "Your phone is now ready to use."
495+msgstr "Puhelimesi on nyt valmis käytettäväksi."
496+
497+#: qml/Wizard/Pages/80-finished.qml:53
498+msgid "Finish"
499+msgstr "Valmis"
500+
501+#: qml/Wizard/Pages/here-terms.qml:27
502+msgid "Terms & Conditions"
503+msgstr "Käyttöehdot"
504+
505+#: qml/Wizard/Pages/passwd-confirm.qml:49
506+msgid "Confirm passphrase"
507+msgstr "Vahvista salasana"
508+
509+#: qml/Wizard/Pages/passwd-confirm.qml:50
510+msgid "Confirm passcode"
511+msgstr "Vahvista suojakoodi"
512+
513+#: qml/Wizard/Pages/passwd-confirm.qml:53
514+#: qml/Wizard/Pages/passwd-confirm.qml:54
515+msgid "Please try again."
516+msgstr "Yritä uudelleen."
517+
518+#: qml/Wizard/Pages/passwd-set.qml:61
519+msgid "Choose your passcode"
520+msgstr "Valitse suojakoodi"
521+
522+#: qml/Wizard/Pages/passwd-set.qml:68
523+msgid "Passphrase must be 4 characters long"
524+msgstr "Salasanan tulee olla neljä merkkiä pitkä"
525+
526+#: qml/Wizard/StackButton.qml:39
527+#, qt-format
528+msgid "〈 %1"
529+msgstr "〈 %1"
530+
531+#: qml/Wizard/StackButton.qml:42
532+#, qt-format
533+msgid "%1 〉"
534+msgstr "%1 〉"
535+
536+#~ msgid "Confirm"
537+#~ msgstr "Hyväksy"
538+
539+#~ msgid "Type or say a command"
540+#~ msgstr "Kirjoita tai sano komento"
541+
542+#~ msgid "Speak Now..."
543+#~ msgstr "Puhu nyt..."
544+
545+#~ msgid "Speaking..."
546+#~ msgstr "Puhutaan..."
547+
548+#~ msgid "Loading. Please Wait..."
549+#~ msgstr "Ladataan, pieni hetki..."
550+
551+#~ msgid "All"
552+#~ msgstr "Kaikki"
553+
554+#~ msgid "Favorites"
555+#~ msgstr "Suosikit"
556+
557+#~ msgid "Done"
558+#~ msgstr "Valmis"
374
559
375−#~ msgid "Enter SIM PIN"
560+#~ msgid "Manage Scopes"
376−#~ msgstr "Anna SIM-kortin PIN-koodi"
561+#~ msgstr "Näkymien hallinta"
po/fo.po+261−89
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+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-10-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -110,78 +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:198
137+#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
138msgid "Left edge"
139msgstr ""
139msgstr ""
140
140
141−#: qml/Components/EdgeDemo.qml:199
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:226
145+#: qml/Components/EdgeDemo.qml:242
146msgid "Well done"
146msgid "Well done"
147msgstr ""
147msgstr ""
148
148
149−#: qml/Components/EdgeDemo.qml:227
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:220
155+#: qml/Components/Lockscreen.qml:238
156+msgid "Return to Call"
157+msgstr ""
158+
159+#: qml/Components/Lockscreen.qml:238
156msgid "Emergency Call"
160msgid "Emergency Call"
157msgstr ""
161msgstr ""
158
162
159−#: qml/Components/Lockscreen.qml:252
163+#: qml/Components/Lockscreen.qml:270
160msgid "OK"
164msgid "OK"
161msgstr ""
165msgstr ""
162
166
163−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
164msgid "See less"
168msgid "See less"
165msgstr ""
169msgstr ""
166
170
167−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:431
168msgid "See all"
172msgid "See all"
169msgstr ""
173msgstr ""
170
174
171−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
172#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
173msgid "Search"
177msgid "Search"
174msgstr "Leita"
178msgstr "Leita"
175
179
176−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:260
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:277
177msgid "Settings"
185msgid "Settings"
178msgstr ""
186msgstr ""
179
187
180−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:284
181msgid "Remove from Favorites"
189msgid "Remove from Favorites"
182msgstr ""
190msgstr ""
183
191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185msgid "Add to Favorites"
193msgid "Add to Favorites"
186msgstr ""
194msgstr ""
187
195
@@ -213,87 +221,59 @@ msgstr ""
213msgid "Release to refresh…"
221msgid "Release to refresh…"
214msgstr ""
222msgstr ""
215
223
216−#: qml/Dash/ScopesOverview.qml:206
224+#: qml/Dash/ScopesList.qml:63
217−msgid "Manage Scopes"
225+msgid "Manage"
218−msgstr ""
219−
220−#: qml/Dash/ScopesOverview.qml:428
221−msgid "Done"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:454
225−msgid "Store"
226msgstr ""
226msgstr ""
227
227
228−#: qml/Dash/ScopesOverviewTab.qml:36
228+#: qml/Dash/ScopesList.qml:107
229−msgid "Favorites"
229+msgid "Home"
230msgstr ""
230msgstr ""
231
231
232−#: qml/Dash/ScopesOverviewTab.qml:54
232+#: qml/Dash/ScopesList.qml:108
233−msgid "All"
233+msgid "Also installed"
234msgstr ""
234msgstr ""
235
235
236−#: qml/Greeter/Greeter.qml:157
236+#: qml/Greeter/Greeter.qml:174
237msgid "Unlock"
237msgid "Unlock"
238msgstr ""
238msgstr ""
239
239
240−#: qml/Hud/HudParametrizedActionsPage.qml:139
241−msgid "Confirm"
242−msgstr "Vátta"
243−
244−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
245−msgid "Type or say a command"
246−msgstr "Skriva ella sig eini stýriboð"
247−
248−#: qml/Hud/Hud.qml:84
249−msgid "Loading. Please Wait..."
250−msgstr "Løðar. Vinarliga bíða..."
251−
252−#: qml/Hud/Hud.qml:89
253−msgid "Speak Now..."
254−msgstr "Snakka nú..."
255−
256−#: qml/Hud/Hud.qml:94
257−msgid "Speaking..."
258−msgstr "Snakkar..."
259−
260−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
261msgid "Show password"
241msgid "Show password"
262msgstr ""
242msgstr ""
263
243
264−#: qml/Panel/ActiveCallHint.qml:77
244+#: qml/Panel/ActiveCallHint.qml:79
265msgid "Tap to return to call..."
245msgid "Tap to return to call..."
266msgstr ""
246msgstr ""
267
247
268−#: qml/Panel/ActiveCallHint.qml:90
248+#: qml/Panel/ActiveCallHint.qml:92
269msgid "Conference"
249msgid "Conference"
270msgstr ""
250msgstr ""
271
251
272−#: qml/Panel/Indicators/MenuItemFactory.qml:600
252+#: qml/Panel/Indicators/MenuItemFactory.qml:643
273msgid "Nothing is playing"
253msgid "Nothing is playing"
274msgstr ""
254msgstr ""
275
255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:748
256+#: qml/Panel/Indicators/MenuItemFactory.qml:791
277msgid "In queue…"
257msgid "In queue…"
278msgstr ""
258msgstr ""
279
259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:752
260+#: qml/Panel/Indicators/MenuItemFactory.qml:795
281msgid "Downloading"
261msgid "Downloading"
282msgstr ""
262msgstr ""
283
263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:754
264+#: qml/Panel/Indicators/MenuItemFactory.qml:797
285msgid "Paused, tap to resume"
265msgid "Paused, tap to resume"
286msgstr ""
266msgstr ""
287
267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:756
268+#: qml/Panel/Indicators/MenuItemFactory.qml:799
289msgid "Canceled"
269msgid "Canceled"
290msgstr ""
270msgstr ""
291
271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:758
272+#: qml/Panel/Indicators/MenuItemFactory.qml:801
293msgid "Finished"
273msgid "Finished"
294msgstr ""
274msgstr ""
295
275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:760
276+#: qml/Panel/Indicators/MenuItemFactory.qml:803
297msgid "Failed, tap to retry"
277msgid "Failed, tap to retry"
298msgstr ""
278msgstr ""
299
279
@@ -305,56 +285,248 @@ msgstr ""
305msgid "Roaming"
285msgid "Roaming"
306msgstr ""
286msgstr ""
307
287
308−#: qml/Shell.qml:346
288+#: qml/Shell.qml:367
289+#, qt-format
309−msgid "Enter passphrase"
290+msgid "Enter %1"
310msgstr ""
291msgstr ""
311
292
312−#: qml/Shell.qml:347
293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313−msgid "Sorry, incorrect passphrase"
294+msgid "Enter passphrase"
314msgstr ""
295msgstr ""
315
296
316−#: qml/Shell.qml:348
297+#: qml/Shell.qml:369
317−msgid "Please re-enter"
298+msgid "Enter passcode"
318msgstr ""
299msgstr ""
319
300
320−#: qml/Shell.qml:350
301+#: qml/Shell.qml:370
321−msgid "Enter passcode"
302+#, qt-format
303+msgid "Sorry, incorrect %1"
322msgstr ""
304msgstr ""
323
305
324−#: qml/Shell.qml:351
306+#: qml/Shell.qml:371
325−msgid "Sorry, incorrect passcode"
307+msgid "Sorry, incorrect passphrase"
326msgstr ""
308msgstr ""
327
309
328−#: qml/Shell.qml:354
310+#: qml/Shell.qml:372
329−#, qt-format
311+msgid "Please re-enter"
330−msgid "Enter %1"
331msgstr ""
312msgstr ""
332
313
333−#: qml/Shell.qml:355
314+#: qml/Shell.qml:373
334−#, qt-format
335−msgid "Sorry, incorrect %1"
315+msgid "Sorry, incorrect passcode"
336msgstr ""
316msgstr ""
337
317
338−#: qml/Shell.qml:390
318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
339msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
340msgstr ""
320msgstr ""
341
321
342−#: qml/Shell.qml:391
322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
343msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
344msgstr ""
324msgstr ""
345
325
346−#: qml/Shell.qml:392
326+#: qml/Shell.qml:469
347msgid "This will be your last attempt."
327msgid "This will be your last attempt."
348msgstr ""
328msgstr ""
349
329
350−#: qml/Shell.qml:394
330+#: qml/Shell.qml:471
351msgid ""
331msgid ""
352"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
353"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
354msgstr ""
334msgstr ""
355
335
356−#: qml/Shell.qml:395
336+#: qml/Shell.qml:472
357msgid ""
337msgid ""
358"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"and all personal data will be deleted."
339"and all personal data will be deleted."
360msgstr ""
340msgstr ""
341+
342+#: qml/Wizard/Page.qml:89
343+msgid "Back"
344+msgstr ""
345+
346+#: qml/Wizard/Pages/10-welcome.qml:27
347+msgid "Hi!"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:44
351+msgid "Welcome to your Ubuntu phone."
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:52
355+msgid "Let’s get started."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
361+#: qml/Wizard/Pages/passwd-set.qml:90
362+msgid "Continue"
363+msgstr ""
364+
365+#: qml/Wizard/Pages/20-sim.qml:25
366+msgid "Add a SIM card and restart your device"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:55
370+msgid "Without it, you won’t be able to make calls or use text messaging."
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
374+msgid "Skip"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/30-passwd-type.qml:39
378+msgid "Lock security"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:74
382+msgid "Please select how you’d like to unlock your phone."
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:97
386+msgid "Swipe"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:98
390+msgid "No security"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:100
394+msgid "Passcode"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:101
398+msgid "4 digits only"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:103
402+msgid "Passphrase"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:104
406+msgid "Numbers and letters"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/40-wifi.qml:28
410+msgid "Connect to Wi‑Fi"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:147
414+msgid "Available networks…"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:148
418+msgid "No available networks."
419+msgstr ""
420+
421+#: qml/Wizard/Pages/50-location.qml:27
422+msgid "Location"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:62
426+msgid "Let the phone detect your location:"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:69
430+msgid "Using GPS only (less accurate)"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:86
434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
435+msgstr ""
436+
437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
438+#: qml/Wizard/Pages/50-location.qml:103
439+msgid ""
440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
441+"conditions</a>."
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:112
445+msgid "Not at all"
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:124
449+msgid "You can change your mind later in <b>System Settings</b>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/60-reporting.qml:24
453+msgid "Improving your experience"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:36
457+msgid ""
458+"Your phone is set up to automatically report errors to Canonical and its "
459+"partners, the makers of the operating system."
460+msgstr ""
461+
462+#: qml/Wizard/Pages/60-reporting.qml:43
463+msgid ""
464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
465+"Privacy</b>"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/80-finished.qml:24
469+msgid "All done"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:39
473+msgid "Nice work!"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:46
477+msgid "Your phone is now ready to use."
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:53
481+msgid "Finish"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/here-terms.qml:27
485+msgid "Terms & Conditions"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/passwd-confirm.qml:49
489+msgid "Confirm passphrase"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:50
493+msgid "Confirm passcode"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:53
497+#: qml/Wizard/Pages/passwd-confirm.qml:54
498+msgid "Please try again."
499+msgstr ""
500+
501+#: qml/Wizard/Pages/passwd-set.qml:61
502+msgid "Choose your passcode"
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:68
506+msgid "Passphrase must be 4 characters long"
507+msgstr ""
508+
509+#: qml/Wizard/StackButton.qml:39
510+#, qt-format
511+msgid "〈 %1"
512+msgstr ""
513+
514+#: qml/Wizard/StackButton.qml:42
515+#, qt-format
516+msgid "%1 〉"
517+msgstr ""
518+
519+#~ msgid "Confirm"
520+#~ msgstr "Vátta"
521+
522+#~ msgid "Type or say a command"
523+#~ msgstr "Skriva ella sig eini stýriboð"
524+
525+#~ msgid "Loading. Please Wait..."
526+#~ msgstr "Løðar. Vinarliga bíða..."
527+
528+#~ msgid "Speak Now..."
529+#~ msgstr "Snakka nú..."
530+
531+#~ msgid "Speaking..."
532+#~ msgstr "Snakkar..."
po/fr.po+278−100
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-09 19:00+0000\n"
11+"PO-Revision-Date: 2014-12-10 22:01+0000\n"
12−"Last-Translator: Anne <anneonyme017@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-10-10 05:23+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
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:227
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,36 +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:220
170+#: qml/Components/Lockscreen.qml:238
171+msgid "Return to Call"
172+msgstr "Retourner à l'appel"
173+
174+#: qml/Components/Lockscreen.qml:238
171msgid "Emergency Call"
175msgid "Emergency Call"
172msgstr "Appel d'urgence"
176msgstr "Appel d'urgence"
173
177
174−#: qml/Components/Lockscreen.qml:252
178+#: qml/Components/Lockscreen.qml:270
175msgid "OK"
179msgid "OK"
176msgstr "OK"
180msgstr "OK"
177
181
178−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
182+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
179msgid "See less"
183msgid "See less"
180msgstr "Voir moins"
184msgstr "Voir moins"
181
185
182−#: qml/Dash/GenericScopeView.qml:434
186+#: qml/Dash/GenericScopeView.qml:431
183msgid "See all"
187msgid "See all"
184msgstr "Tout voir"
188msgstr "Tout voir"
185
189
186−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
190+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
187#: qml/Panel/SearchIndicator.qml:27
191#: qml/Panel/SearchIndicator.qml:27
188msgid "Search"
192msgid "Search"
189msgstr "Rechercher"
193msgstr "Rechercher"
190
194
191−#: qml/Dash/PageHeader.qml:268
195+#: qml/Dash/PageHeader.qml:260
196+msgid "Store"
197+msgstr "Logithèque"
198+
199+#: qml/Dash/PageHeader.qml:277
192msgid "Settings"
200msgid "Settings"
193msgstr "Paramètres"
201msgstr "Paramètres"
194
202
195−#: qml/Dash/PageHeader.qml:275
203+#: qml/Dash/PageHeader.qml:284
196msgid "Remove from Favorites"
204msgid "Remove from Favorites"
197msgstr "Retirer des favoris"
205msgstr "Retirer des favoris"
198
206
199−#: qml/Dash/PageHeader.qml:275
207+#: qml/Dash/PageHeader.qml:284
200msgid "Add to Favorites"
208msgid "Add to Favorites"
201msgstr "Ajouter aux favoris"
209msgstr "Ajouter aux favoris"
202
210
@@ -228,87 +236,59 @@ msgstr "Tirer pour actualiser..."
228msgid "Release to refresh…"
236msgid "Release to refresh…"
229msgstr "Relâcher pour actualiser..."
237msgstr "Relâcher pour actualiser..."
230
238
231−#: qml/Dash/ScopesOverview.qml:206
239+#: qml/Dash/ScopesList.qml:63
232−msgid "Manage Scopes"
240+msgid "Manage"
233−msgstr "Gérer les moteurs de recherche"
241+msgstr ""
234−
235−#: qml/Dash/ScopesOverview.qml:428
236−msgid "Done"
237−msgstr "Terminé"
238−
239−#: qml/Dash/ScopesOverview.qml:454
240−msgid "Store"
241−msgstr "Logithèque"
242
242
243−#: qml/Dash/ScopesOverviewTab.qml:36
243+#: qml/Dash/ScopesList.qml:107
244−msgid "Favorites"
244+msgid "Home"
245−msgstr "Favorites"
245+msgstr ""
246
246
247−#: qml/Dash/ScopesOverviewTab.qml:54
247+#: qml/Dash/ScopesList.qml:108
248−msgid "All"
248+msgid "Also installed"
249−msgstr "Toutes"
249+msgstr "Également installées"
250
250
251−#: qml/Greeter/Greeter.qml:157
251+#: qml/Greeter/Greeter.qml:174
252msgid "Unlock"
252msgid "Unlock"
253msgstr "Déverrouiller"
253msgstr "Déverrouiller"
254
254
255−#: qml/Hud/HudParametrizedActionsPage.qml:139
256−msgid "Confirm"
257−msgstr "Confirmez"
258−
259−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
260−msgid "Type or say a command"
261−msgstr "Rédigez ou dictez une commande"
262−
263−#: qml/Hud/Hud.qml:84
264−msgid "Loading. Please Wait..."
265−msgstr "Chargement. Veuillez patienter…"
266−
267−#: qml/Hud/Hud.qml:89
268−msgid "Speak Now..."
269−msgstr "Parlez maintenant…"
270−
271−#: qml/Hud/Hud.qml:94
272−msgid "Speaking..."
273−msgstr "En cours d'écoute..."
274−
275−#: qml/Notifications/NotificationMenuItemFactory.qml:116
255+#: qml/Notifications/NotificationMenuItemFactory.qml:128
276msgid "Show password"
256msgid "Show password"
277msgstr "Afficher le mot de passe"
257msgstr "Afficher le mot de passe"
278
258
279−#: qml/Panel/ActiveCallHint.qml:77
259+#: qml/Panel/ActiveCallHint.qml:79
280msgid "Tap to return to call..."
260msgid "Tap to return to call..."
281msgstr "Appuyez pour revenir à l'appel…"
261msgstr "Appuyez pour revenir à l'appel…"
282
262
283−#: qml/Panel/ActiveCallHint.qml:90
263+#: qml/Panel/ActiveCallHint.qml:92
284msgid "Conference"
264msgid "Conference"
285msgstr "Conférence"
265msgstr "Conférence"
286
266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:600
267+#: qml/Panel/Indicators/MenuItemFactory.qml:643
288msgid "Nothing is playing"
268msgid "Nothing is playing"
289msgstr "Rien n'est en cours de lecture"
269msgstr "Rien n'est en cours de lecture"
290
270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:748
271+#: qml/Panel/Indicators/MenuItemFactory.qml:791
292msgid "In queue…"
272msgid "In queue…"
293msgstr "Dans la file d'attente..."
273msgstr "Dans la file d'attente..."
294
274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:752
275+#: qml/Panel/Indicators/MenuItemFactory.qml:795
296msgid "Downloading"
276msgid "Downloading"
297msgstr "Téléchargement en cours"
277msgstr "Téléchargement en cours"
298
278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:754
279+#: qml/Panel/Indicators/MenuItemFactory.qml:797
300msgid "Paused, tap to resume"
280msgid "Paused, tap to resume"
301msgstr "En pause, appuyez pour reprendre"
281msgstr "En pause, appuyez pour reprendre"
302
282
303−#: qml/Panel/Indicators/MenuItemFactory.qml:756
283+#: qml/Panel/Indicators/MenuItemFactory.qml:799
304msgid "Canceled"
284msgid "Canceled"
305msgstr "Annulé"
285msgstr "Annulé"
306
286
307−#: qml/Panel/Indicators/MenuItemFactory.qml:758
287+#: qml/Panel/Indicators/MenuItemFactory.qml:801
308msgid "Finished"
288msgid "Finished"
309msgstr "Terminé"
289msgstr "Terminé"
310
290
311−#: qml/Panel/Indicators/MenuItemFactory.qml:760
291+#: qml/Panel/Indicators/MenuItemFactory.qml:803
312msgid "Failed, tap to retry"
292msgid "Failed, tap to retry"
313msgstr "Échec, appuyez pour réessayer"
293msgstr "Échec, appuyez pour réessayer"
314
294
@@ -320,49 +300,49 @@ msgstr "Déverrouiller la carte SIM"
320msgid "Roaming"
300msgid "Roaming"
321msgstr "Roaming"
301msgstr "Roaming"
322
302
323−#: qml/Shell.qml:346
303+#: qml/Shell.qml:367
304+#, qt-format
305+msgid "Enter %1"
306+msgstr "Saisissez %1"
307+
308+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
324msgid "Enter passphrase"
309msgid "Enter passphrase"
325msgstr "Saisissez la phrase de passe"
310msgstr "Saisissez la phrase de passe"
326
311
327−#: qml/Shell.qml:347
312+#: qml/Shell.qml:369
313+msgid "Enter passcode"
314+msgstr "Saisissez le mot de passe"
315+
316+#: qml/Shell.qml:370
317+#, qt-format
318+msgid "Sorry, incorrect %1"
319+msgstr "Désolé, %1 incorrect"
320+
321+#: qml/Shell.qml:371
328msgid "Sorry, incorrect passphrase"
322msgid "Sorry, incorrect passphrase"
329msgstr "Désolé, phrase secrète incorrecte"
323msgstr "Désolé, phrase secrète incorrecte"
330
324
331−#: qml/Shell.qml:348
325+#: qml/Shell.qml:372
332msgid "Please re-enter"
326msgid "Please re-enter"
333msgstr "Veuillez ressaisir"
327msgstr "Veuillez ressaisir"
334
328
335−#: qml/Shell.qml:350
329+#: qml/Shell.qml:373
336−msgid "Enter passcode"
337−msgstr "Saisissez le mot de passe"
338−
339−#: qml/Shell.qml:351
340msgid "Sorry, incorrect passcode"
330msgid "Sorry, incorrect passcode"
341msgstr "Désolé, code incorrect"
331msgstr "Désolé, code incorrect"
342
332
343−#: qml/Shell.qml:354
333+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
344−#, qt-format
345−msgid "Enter %1"
346−msgstr "Saisissez %1"
347−
348−#: qml/Shell.qml:355
349−#, qt-format
350−msgid "Sorry, incorrect %1"
351−msgstr "Désolé, %1 incorrect"
352−
353−#: qml/Shell.qml:390
354msgid "Sorry, incorrect passphrase."
334msgid "Sorry, incorrect passphrase."
355msgstr "Désolé, phrase secrète incorrecte."
335msgstr "Désolé, phrase secrète incorrecte."
356
336
357−#: qml/Shell.qml:391
337+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
358msgid "Sorry, incorrect passcode."
338msgid "Sorry, incorrect passcode."
359msgstr "Désolé, code incorrect."
339msgstr "Désolé, code incorrect."
360
340
361−#: qml/Shell.qml:392
341+#: qml/Shell.qml:469
362msgid "This will be your last attempt."
342msgid "This will be your last attempt."
363msgstr "Ceci sera votre dernière tentative."
343msgstr "Ceci sera votre dernière tentative."
364
344
365−#: qml/Shell.qml:394
345+#: qml/Shell.qml:471
366msgid ""
346msgid ""
367"If passphrase is entered incorrectly, your phone will conduct a factory "
347"If passphrase is entered incorrectly, your phone will conduct a factory "
368"reset and all personal data will be deleted."
348"reset and all personal data will be deleted."
@@ -371,7 +351,7 @@ msgstr ""
371"effectuera une réinitialisation aux paramètres d'usine et toutes les données "
351"effectuera une réinitialisation aux paramètres d'usine et toutes les données "
372"personnelles seront supprimées."
352"personnelles seront supprimées."
373
353
374−#: qml/Shell.qml:395
354+#: qml/Shell.qml:472
375msgid ""
355msgid ""
376"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 "
377"and all personal data will be deleted."
357"and all personal data will be deleted."
@@ -380,8 +360,206 @@ msgstr ""
380"réinitialisation aux paramètres d'usine et toutes les données personnelles "
360"réinitialisation aux paramètres d'usine et toutes les données personnelles "
381"seront supprimées."
361"seront supprimées."
382
362
383−#~ msgid "Sorry, incorrect PIN"
363+#: qml/Wizard/Page.qml:89
384−#~ msgstr "Désolé, code PIN incorrect"
364+msgid "Back"
365+msgstr ""
366+
367+#: qml/Wizard/Pages/10-welcome.qml:27
368+msgid "Hi!"
369+msgstr ""
370+
371+#: qml/Wizard/Pages/10-welcome.qml:44
372+msgid "Welcome to your Ubuntu phone."
373+msgstr ""
374+
375+#: qml/Wizard/Pages/10-welcome.qml:52
376+msgid "Let’s get started."
377+msgstr ""
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 ""
385+
386+#: qml/Wizard/Pages/20-sim.qml:25
387+msgid "Add a SIM card and restart your device"
388+msgstr ""
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 ""
393+
394+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
395+msgid "Skip"
396+msgstr ""
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:39
399+msgid "Lock security"
400+msgstr ""
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+
406+#: qml/Wizard/Pages/30-passwd-type.qml:97
407+msgid "Swipe"
408+msgstr ""
409+
410+#: qml/Wizard/Pages/30-passwd-type.qml:98
411+msgid "No security"
412+msgstr ""
413+
414+#: qml/Wizard/Pages/30-passwd-type.qml:100
415+msgid "Passcode"
416+msgstr ""
417+
418+#: qml/Wizard/Pages/30-passwd-type.qml:101
419+msgid "4 digits only"
420+msgstr ""
421+
422+#: qml/Wizard/Pages/30-passwd-type.qml:103
423+msgid "Passphrase"
424+msgstr ""
425+
426+#: qml/Wizard/Pages/30-passwd-type.qml:104
427+msgid "Numbers and letters"
428+msgstr ""
429+
430+#: qml/Wizard/Pages/40-wifi.qml:28
431+msgid "Connect to Wi‑Fi"
432+msgstr ""
433+
434+#: qml/Wizard/Pages/40-wifi.qml:147
435+msgid "Available networks…"
436+msgstr ""
437+
438+#: qml/Wizard/Pages/40-wifi.qml:148
439+msgid "No available networks."
440+msgstr ""
441+
442+#: qml/Wizard/Pages/50-location.qml:27
443+msgid "Location"
444+msgstr ""
445+
446+#: qml/Wizard/Pages/50-location.qml:62
447+msgid "Let the phone detect your location:"
448+msgstr ""
449+
450+#: qml/Wizard/Pages/50-location.qml:69
451+msgid "Using GPS only (less accurate)"
452+msgstr ""
453+
454+#: qml/Wizard/Pages/50-location.qml:86
455+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
456+msgstr ""
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+
465+#: qml/Wizard/Pages/50-location.qml:112
466+msgid "Not at all"
467+msgstr ""
468+
469+#: qml/Wizard/Pages/50-location.qml:124
470+msgid "You can change your mind later in <b>System Settings</b>."
471+msgstr ""
472+
473+#: qml/Wizard/Pages/60-reporting.qml:24
474+msgid "Improving your experience"
475+msgstr ""
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+
483+#: qml/Wizard/Pages/60-reporting.qml:43
484+msgid ""
485+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
486+"Privacy</b>"
487+msgstr ""
488+
489+#: qml/Wizard/Pages/80-finished.qml:24
490+msgid "All done"
491+msgstr ""
492+
493+#: qml/Wizard/Pages/80-finished.qml:39
494+msgid "Nice work!"
495+msgstr ""
496+
497+#: qml/Wizard/Pages/80-finished.qml:46
498+msgid "Your phone is now ready to use."
499+msgstr ""
500+
501+#: qml/Wizard/Pages/80-finished.qml:53
502+msgid "Finish"
503+msgstr ""
504+
505+#: qml/Wizard/Pages/here-terms.qml:27
506+msgid "Terms & Conditions"
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-confirm.qml:49
510+msgid "Confirm passphrase"
511+msgstr ""
512+
513+#: qml/Wizard/Pages/passwd-confirm.qml:50
514+msgid "Confirm passcode"
515+msgstr ""
516+
517+#: qml/Wizard/Pages/passwd-confirm.qml:53
518+#: qml/Wizard/Pages/passwd-confirm.qml:54
519+msgid "Please try again."
520+msgstr ""
521+
522+#: qml/Wizard/Pages/passwd-set.qml:61
523+msgid "Choose your passcode"
524+msgstr ""
525+
526+#: qml/Wizard/Pages/passwd-set.qml:68
527+msgid "Passphrase must be 4 characters long"
528+msgstr ""
529+
530+#: qml/Wizard/StackButton.qml:39
531+#, qt-format
532+msgid "〈 %1"
533+msgstr ""
534+
535+#: qml/Wizard/StackButton.qml:42
536+#, qt-format
537+msgid "%1 〉"
538+msgstr ""
539+
540+#~ msgid "Speaking..."
541+#~ msgstr "En cours d'écoute..."
542+
543+#~ msgid "Loading. Please Wait..."
544+#~ msgstr "Chargement. Veuillez patienter…"
545+
546+#~ msgid "Confirm"
547+#~ msgstr "Confirmez"
548+
549+#~ msgid "Type or say a command"
550+#~ msgstr "Rédigez ou dictez une commande"
551+
552+#~ msgid "Speak Now..."
553+#~ msgstr "Parlez maintenant…"
554+
555+#~ msgid "All"
556+#~ msgstr "Toutes"
557+
558+#~ msgid "Done"
559+#~ msgstr "Terminé"
560+
561+#~ msgid "Favorites"
562+#~ msgstr "Favorites"
385
563
386−#~ msgid "Enter SIM PIN"
564+#~ msgid "Manage Scopes"
387−#~ msgstr "Entrez le code PIN de la SIM"
565+#~ msgstr "Gérer les moteurs de recherche"
po/gd.po+277−99
@@ -7,8 +7,8 @@ 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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-09 18:09+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"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\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-10-10 05:23+0000\n"
19+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
20−"X-Generator: Launchpad (build 17196)\n"
20+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
161+#: qml/Components/EdgeDemo.qml:242
162msgid "Well done"
162msgid "Well done"
163msgstr "Gasta!"
163msgstr "Gasta!"
164
164
165−#: qml/Components/EdgeDemo.qml:227
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,36 +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:220
173+#: qml/Components/Lockscreen.qml:238
174+msgid "Return to Call"
175+msgstr "Till dhan ghairm"
176+
177+#: qml/Components/Lockscreen.qml:238
174msgid "Emergency Call"
178msgid "Emergency Call"
175msgstr "Gairm èiginn"
179msgstr "Gairm èiginn"
176
180
177−#: qml/Components/Lockscreen.qml:252
181+#: qml/Components/Lockscreen.qml:270
178msgid "OK"
182msgid "OK"
179msgstr "Ceart ma-thà"
183msgstr "Ceart ma-thà"
180
184
181−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
185+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
182msgid "See less"
186msgid "See less"
183msgstr "Seall nas lugha"
187msgstr "Seall nas lugha"
184
188
185−#: qml/Dash/GenericScopeView.qml:434
189+#: qml/Dash/GenericScopeView.qml:431
186msgid "See all"
190msgid "See all"
187msgstr "Seall na h-uile"
191msgstr "Seall na h-uile"
188
192
189−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
193+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
190#: qml/Panel/SearchIndicator.qml:27
194#: qml/Panel/SearchIndicator.qml:27
191msgid "Search"
195msgid "Search"
192msgstr "Lorg"
196msgstr "Lorg"
193
197
194−#: qml/Dash/PageHeader.qml:268
198+#: qml/Dash/PageHeader.qml:260
199+msgid "Store"
200+msgstr "Am bùth"
201+
202+#: qml/Dash/PageHeader.qml:277
195msgid "Settings"
203msgid "Settings"
196msgstr "Roghainnean"
204msgstr "Roghainnean"
197
205
198−#: qml/Dash/PageHeader.qml:275
206+#: qml/Dash/PageHeader.qml:284
199msgid "Remove from Favorites"
207msgid "Remove from Favorites"
200msgstr "Thoir air falbh o na h-annsachdan"
208msgstr "Thoir air falbh o na h-annsachdan"
201
209
202−#: qml/Dash/PageHeader.qml:275
210+#: qml/Dash/PageHeader.qml:284
203msgid "Add to Favorites"
211msgid "Add to Favorites"
204msgstr "Cuir ris na h-annsachdan"
212msgstr "Cuir ris na h-annsachdan"
205
213
@@ -231,87 +239,59 @@ msgstr "Tarraing airson ath-nuadhachadh…"
231msgid "Release to refresh…"
239msgid "Release to refresh…"
232msgstr "Leig às airson ath-nuadhachadh…"
240msgstr "Leig às airson ath-nuadhachadh…"
233
241
234−#: qml/Dash/ScopesOverview.qml:206
242+#: qml/Dash/ScopesList.qml:63
235−msgid "Manage Scopes"
243+msgid "Manage"
236−msgstr "Stiùirich na sgòpaichean"
244+msgstr ""
237−
238−#: qml/Dash/ScopesOverview.qml:428
239−msgid "Done"
240−msgstr "Deiseil"
241−
242−#: qml/Dash/ScopesOverview.qml:454
243−msgid "Store"
244−msgstr "Am bùth"
245
245
246−#: qml/Dash/ScopesOverviewTab.qml:36
246+#: qml/Dash/ScopesList.qml:107
247−msgid "Favorites"
247+msgid "Home"
248−msgstr "Annsachdan"
248+msgstr ""
249
249
250−#: qml/Dash/ScopesOverviewTab.qml:54
250+#: qml/Dash/ScopesList.qml:108
251−msgid "All"
251+msgid "Also installed"
252−msgstr "Na h-uile"
252+msgstr ""
253
253
254−#: qml/Greeter/Greeter.qml:157
254+#: qml/Greeter/Greeter.qml:174
255msgid "Unlock"
255msgid "Unlock"
256msgstr "Thoir a' ghlas dheth"
256msgstr "Thoir a' ghlas dheth"
257
257
258−#: qml/Hud/HudParametrizedActionsPage.qml:139
259−msgid "Confirm"
260−msgstr "Dearbhaich"
261−
262−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
263−msgid "Type or say a command"
264−msgstr "Sgrìobh no can àithne"
265−
266−#: qml/Hud/Hud.qml:84
267−msgid "Loading. Please Wait..."
268−msgstr "'Ga luchdadh, fuirich ort..."
269−
270−#: qml/Hud/Hud.qml:89
271−msgid "Speak Now..."
272−msgstr "Can rud a-nis..."
273−
274−#: qml/Hud/Hud.qml:94
275−msgid "Speaking..."
276−msgstr "A' bruidhinn..."
277−
278−#: qml/Notifications/NotificationMenuItemFactory.qml:116
258+#: qml/Notifications/NotificationMenuItemFactory.qml:128
279msgid "Show password"
259msgid "Show password"
280msgstr "Seall am facal-faire"
260msgstr "Seall am facal-faire"
281
261
282−#: qml/Panel/ActiveCallHint.qml:77
262+#: qml/Panel/ActiveCallHint.qml:79
283msgid "Tap to return to call..."
263msgid "Tap to return to call..."
284msgstr "Gnog gus tilleadh dhan ghairm..."
264msgstr "Gnog gus tilleadh dhan ghairm..."
285
265
286−#: qml/Panel/ActiveCallHint.qml:90
266+#: qml/Panel/ActiveCallHint.qml:92
287msgid "Conference"
267msgid "Conference"
288msgstr "Gairm co-labhairt"
268msgstr "Gairm co-labhairt"
289
269
290−#: qml/Panel/Indicators/MenuItemFactory.qml:600
270+#: qml/Panel/Indicators/MenuItemFactory.qml:643
291msgid "Nothing is playing"
271msgid "Nothing is playing"
292msgstr "Chan eil dad 'ga chluich"
272msgstr "Chan eil dad 'ga chluich"
293
273
294−#: qml/Panel/Indicators/MenuItemFactory.qml:748
274+#: qml/Panel/Indicators/MenuItemFactory.qml:791
295msgid "In queue…"
275msgid "In queue…"
296msgstr "Air a' chiudha…"
276msgstr "Air a' chiudha…"
297
277
298−#: qml/Panel/Indicators/MenuItemFactory.qml:752
278+#: qml/Panel/Indicators/MenuItemFactory.qml:795
299msgid "Downloading"
279msgid "Downloading"
300msgstr "'Ga luchdadh a-nuas"
280msgstr "'Ga luchdadh a-nuas"
301
281
302−#: qml/Panel/Indicators/MenuItemFactory.qml:754
282+#: qml/Panel/Indicators/MenuItemFactory.qml:797
303msgid "Paused, tap to resume"
283msgid "Paused, tap to resume"
304msgstr "'Na stad, thoir gnogag gus leantainn air"
284msgstr "'Na stad, thoir gnogag gus leantainn air"
305
285
306−#: qml/Panel/Indicators/MenuItemFactory.qml:756
286+#: qml/Panel/Indicators/MenuItemFactory.qml:799
307msgid "Canceled"
287msgid "Canceled"
308msgstr "Air a sgur dheth"
288msgstr "Air a sgur dheth"
309
289
310−#: qml/Panel/Indicators/MenuItemFactory.qml:758
290+#: qml/Panel/Indicators/MenuItemFactory.qml:801
311msgid "Finished"
291msgid "Finished"
312msgstr "Coileanta"
292msgstr "Coileanta"
313
293
314−#: qml/Panel/Indicators/MenuItemFactory.qml:760
294+#: qml/Panel/Indicators/MenuItemFactory.qml:803
315msgid "Failed, tap to retry"
295msgid "Failed, tap to retry"
316msgstr "Dh'fhàillig leis, thoir gnogag gus feuchainn a-rithist"
296msgstr "Dh'fhàillig leis, thoir gnogag gus feuchainn a-rithist"
317
297
@@ -323,49 +303,49 @@ msgstr "Thoir a' ghlas far an SIM"
323msgid "Roaming"
303msgid "Roaming"
324msgstr "Air fàrsan"
304msgstr "Air fàrsan"
325
305
326−#: qml/Shell.qml:346
306+#: qml/Shell.qml:367
307+#, qt-format
308+msgid "Enter %1"
309+msgstr "Cuir a-steach %1"
310+
311+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
327msgid "Enter passphrase"
312msgid "Enter passphrase"
328msgstr "Cuir abairt-fhaire a-steach"
313msgstr "Cuir abairt-fhaire a-steach"
329
314
330−#: qml/Shell.qml:347
315+#: qml/Shell.qml:369
316+msgid "Enter passcode"
317+msgstr "Cuir còd-faire a-steach"
318+
319+#: qml/Shell.qml:370
320+#, qt-format
321+msgid "Sorry, incorrect %1"
322+msgstr "Duilich ach tha a' %1 cearr"
323+
324+#: qml/Shell.qml:371
331msgid "Sorry, incorrect passphrase"
325msgid "Sorry, incorrect passphrase"
332msgstr "Duilich ach tha an abairt-fhaire cearr"
326msgstr "Duilich ach tha an abairt-fhaire cearr"
333
327
334−#: qml/Shell.qml:348
328+#: qml/Shell.qml:372
335msgid "Please re-enter"
329msgid "Please re-enter"
336msgstr "Cuir a-steach e a-rithist"
330msgstr "Cuir a-steach e a-rithist"
337
331
338−#: qml/Shell.qml:350
332+#: qml/Shell.qml:373
339−msgid "Enter passcode"
340−msgstr "Cuir còd-faire a-steach"
341−
342−#: qml/Shell.qml:351
343msgid "Sorry, incorrect passcode"
333msgid "Sorry, incorrect passcode"
344msgstr "Duilich ach tha an còd-faire cearr"
334msgstr "Duilich ach tha an còd-faire cearr"
345
335
346−#: qml/Shell.qml:354
336+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
347−#, qt-format
348−msgid "Enter %1"
349−msgstr "Cuir a-steach %1"
350−
351−#: qml/Shell.qml:355
352−#, qt-format
353−msgid "Sorry, incorrect %1"
354−msgstr "Duilich ach tha a' %1 cearr"
355−
356−#: qml/Shell.qml:390
357msgid "Sorry, incorrect passphrase."
337msgid "Sorry, incorrect passphrase."
358msgstr "Duilich ach tha an abairt-fhaire cearr."
338msgstr "Duilich ach tha an abairt-fhaire cearr."
359
339
360−#: qml/Shell.qml:391
340+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
361msgid "Sorry, incorrect passcode."
341msgid "Sorry, incorrect passcode."
362msgstr "Duilich ach tha an còd-faire cearr."
342msgstr "Duilich ach tha an còd-faire cearr."
363
343
364−#: qml/Shell.qml:392
344+#: qml/Shell.qml:469
365msgid "This will be your last attempt."
345msgid "This will be your last attempt."
366msgstr "Seo an oidhirp mu dheireadh agad."
346msgstr "Seo an oidhirp mu dheireadh agad."
367
347
368−#: qml/Shell.qml:394
348+#: qml/Shell.qml:471
369msgid ""
349msgid ""
370"If passphrase is entered incorrectly, your phone will conduct a factory "
350"If passphrase is entered incorrectly, your phone will conduct a factory "
371"reset and all personal data will be deleted."
351"reset and all personal data will be deleted."
@@ -374,7 +354,7 @@ msgstr ""
374"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "
354"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "
375"pearsanta a sguabadh às."
355"pearsanta a sguabadh às."
376
356
377−#: qml/Shell.qml:395
357+#: qml/Shell.qml:472
378msgid ""
358msgid ""
379"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 "
380"and all personal data will be deleted."
360"and all personal data will be deleted."
@@ -383,8 +363,206 @@ msgstr ""
383"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "
363"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "
384"a sguabadh às."
364"a sguabadh às."
385
365
366+#: qml/Wizard/Page.qml:89
386−#~ msgid "Enter SIM PIN"
367+msgid "Back"
387−#~ msgstr "Cuir a-steach PIN an t-SIM"
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 "Confirm"
544+#~ msgstr "Dearbhaich"
545+
546+#~ msgid "Loading. Please Wait..."
547+#~ msgstr "'Ga luchdadh, fuirich ort..."
548+
549+#~ msgid "Type or say a command"
550+#~ msgstr "Sgrìobh no can àithne"
551+
552+#~ msgid "Speaking..."
553+#~ msgstr "A' bruidhinn..."
554+
555+#~ msgid "Speak Now..."
556+#~ msgstr "Can rud a-nis..."
557+
558+#~ msgid "All"
559+#~ msgstr "Na h-uile"
560+
561+#~ msgid "Favorites"
562+#~ msgstr "Annsachdan"
563+
564+#~ msgid "Done"
565+#~ msgstr "Deiseil"
388
566
389−#~ msgid "Sorry, incorrect PIN"
567+#~ msgid "Manage Scopes"
390−#~ msgstr "Duilich ach tha a' PIN cearr"
568+#~ msgstr "Stiùirich na sgòpaichean"
po/gl.po+284−99
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-07 10:01+0000\n"
11+"PO-Revision-Date: 2014-12-13 10:46+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-10-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-14 06:14+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
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:227
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,36 +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:220
159+#: qml/Components/Lockscreen.qml:238
160+msgid "Return to Call"
161+msgstr "Volver á chamada"
162+
163+#: qml/Components/Lockscreen.qml:238
160msgid "Emergency Call"
164msgid "Emergency Call"
161msgstr "Chamada de emerxencia"
165msgstr "Chamada de emerxencia"
162
166
163−#: qml/Components/Lockscreen.qml:252
167+#: qml/Components/Lockscreen.qml:270
164msgid "OK"
168msgid "OK"
165msgstr "Aceptar"
169msgstr "Aceptar"
166
170
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
168msgid "See less"
172msgid "See less"
169msgstr "Ver menos"
173msgstr "Ver menos"
170
174
171−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:431
172msgid "See all"
176msgid "See all"
173msgstr "Ver todo"
177msgstr "Ver todo"
174
178
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
176#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
181msgid "Search"
178msgstr "Buscar"
182msgstr "Buscar"
179
183
180−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:260
185+msgid "Store"
186+msgstr "Tenda"
187+
188+#: qml/Dash/PageHeader.qml:277
181msgid "Settings"
189msgid "Settings"
182msgstr "Axustes"
190msgstr "Axustes"
183
191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185msgid "Remove from Favorites"
193msgid "Remove from Favorites"
186msgstr "Eliminar dos favoritos"
194msgstr "Eliminar dos favoritos"
187
195
188−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:284
189msgid "Add to Favorites"
197msgid "Add to Favorites"
190msgstr "Engadir aos favoritos"
198msgstr "Engadir aos favoritos"
191
199
@@ -217,87 +225,59 @@ msgstr "Tirar para actualizar..."
217msgid "Release to refresh…"
225msgid "Release to refresh…"
218msgstr "Soltar para actualizar"
226msgstr "Soltar para actualizar"
219
227
220−#: qml/Dash/ScopesOverview.qml:206
228+#: qml/Dash/ScopesList.qml:63
221−msgid "Manage Scopes"
229+msgid "Manage"
222−msgstr "Xestionar os Ámbitos"
230+msgstr "Xestionar"
223−
224−#: qml/Dash/ScopesOverview.qml:428
225−msgid "Done"
226−msgstr "Feito"
227−
228−#: qml/Dash/ScopesOverview.qml:454
229−msgid "Store"
230−msgstr "Tenda"
231
231
232−#: qml/Dash/ScopesOverviewTab.qml:36
232+#: qml/Dash/ScopesList.qml:107
233−msgid "Favorites"
233+msgid "Home"
234−msgstr "Favoritos"
234+msgstr "Inicio"
235
235
236−#: qml/Dash/ScopesOverviewTab.qml:54
236+#: qml/Dash/ScopesList.qml:108
237−msgid "All"
237+msgid "Also installed"
238−msgstr "Todos"
238+msgstr "Tamén instalado"
239
239
240−#: qml/Greeter/Greeter.qml:157
240+#: qml/Greeter/Greeter.qml:174
241msgid "Unlock"
241msgid "Unlock"
242msgstr "Desbloquear"
242msgstr "Desbloquear"
243
243
244−#: qml/Hud/HudParametrizedActionsPage.qml:139
245−msgid "Confirm"
246−msgstr "Confirmar"
247−
248−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
249−msgid "Type or say a command"
250−msgstr "Escriba ou diga unha orde"
251−
252−#: qml/Hud/Hud.qml:84
253−msgid "Loading. Please Wait..."
254−msgstr "Cargando, agarde…"
255−
256−#: qml/Hud/Hud.qml:89
257−msgid "Speak Now..."
258−msgstr "Fale agora…"
259−
260−#: qml/Hud/Hud.qml:94
261−msgid "Speaking..."
262−msgstr "Falando…"
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
265msgid "Show password"
245msgid "Show password"
266msgstr "Mostrar contrasinal"
246msgstr "Mostrar contrasinal"
267
247
268−#: qml/Panel/ActiveCallHint.qml:77
248+#: qml/Panel/ActiveCallHint.qml:79
269msgid "Tap to return to call..."
249msgid "Tap to return to call..."
270msgstr "Toque para volver a chamar..."
250msgstr "Toque para volver a chamar..."
271
251
272−#: qml/Panel/ActiveCallHint.qml:90
252+#: qml/Panel/ActiveCallHint.qml:92
273msgid "Conference"
253msgid "Conference"
274msgstr "Conferencia"
254msgstr "Conferencia"
275
255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:600
256+#: qml/Panel/Indicators/MenuItemFactory.qml:643
277msgid "Nothing is playing"
257msgid "Nothing is playing"
278msgstr "Non hai nada en reprodución"
258msgstr "Non hai nada en reprodución"
279
259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:748
260+#: qml/Panel/Indicators/MenuItemFactory.qml:791
281msgid "In queue…"
261msgid "In queue…"
282msgstr "Na cola..."
262msgstr "Na cola..."
283
263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:752
264+#: qml/Panel/Indicators/MenuItemFactory.qml:795
285msgid "Downloading"
265msgid "Downloading"
286msgstr "Descargando"
266msgstr "Descargando"
287
267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:754
268+#: qml/Panel/Indicators/MenuItemFactory.qml:797
289msgid "Paused, tap to resume"
269msgid "Paused, tap to resume"
290msgstr "Detido, toque para continuar"
270msgstr "Detido, toque para continuar"
291
271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:756
272+#: qml/Panel/Indicators/MenuItemFactory.qml:799
293msgid "Canceled"
273msgid "Canceled"
294msgstr "Cancelado"
274msgstr "Cancelado"
295
275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:758
276+#: qml/Panel/Indicators/MenuItemFactory.qml:801
297msgid "Finished"
277msgid "Finished"
298msgstr "Rematado"
278msgstr "Rematado"
299
279
300−#: qml/Panel/Indicators/MenuItemFactory.qml:760
280+#: qml/Panel/Indicators/MenuItemFactory.qml:803
301msgid "Failed, tap to retry"
281msgid "Failed, tap to retry"
302msgstr "Fallou, toque para reintentar"
282msgstr "Fallou, toque para reintentar"
303
283
@@ -309,49 +289,49 @@ msgstr "Desbloquear a SIM"
309msgid "Roaming"
289msgid "Roaming"
310msgstr "Itinerancia"
290msgstr "Itinerancia"
311
291
312−#: qml/Shell.qml:346
292+#: qml/Shell.qml:367
293+#, qt-format
294+msgid "Enter %1"
295+msgstr "Introducir %1"
296+
297+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313msgid "Enter passphrase"
298msgid "Enter passphrase"
314msgstr "Introduza a frase secreta"
299msgstr "Introduza a frase secreta"
315
300
316−#: qml/Shell.qml:347
301+#: qml/Shell.qml:369
302+msgid "Enter passcode"
303+msgstr "Introduza a clave"
304+
305+#: qml/Shell.qml:370
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr "Sentímolo, %1 non coincide"
309+
310+#: qml/Shell.qml:371
317msgid "Sorry, incorrect passphrase"
311msgid "Sorry, incorrect passphrase"
318msgstr "Sentímolo a frase é incorrecta"
312msgstr "Sentímolo a frase é incorrecta"
319
313
320−#: qml/Shell.qml:348
314+#: qml/Shell.qml:372
321msgid "Please re-enter"
315msgid "Please re-enter"
322msgstr "Introducir de novo"
316msgstr "Introducir de novo"
323
317
324−#: qml/Shell.qml:350
318+#: qml/Shell.qml:373
325−msgid "Enter passcode"
326−msgstr "Introduza a clave"
327−
328−#: qml/Shell.qml:351
329msgid "Sorry, incorrect passcode"
319msgid "Sorry, incorrect passcode"
330msgstr "Sentímolo, a clave é incorrecta"
320msgstr "Sentímolo, a clave é incorrecta"
331
321
332−#: qml/Shell.qml:354
322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
333−#, qt-format
334−msgid "Enter %1"
335−msgstr "Introducir %1"
336−
337−#: qml/Shell.qml:355
338−#, qt-format
339−msgid "Sorry, incorrect %1"
340−msgstr "Sentímolo, %1 non coincide"
341−
342−#: qml/Shell.qml:390
343msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
344msgstr "Sentímolo a frase é incorrecta."
324msgstr "Sentímolo a frase é incorrecta."
345
325
346−#: qml/Shell.qml:391
326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
347msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
348msgstr "Sentímolo, a clave é incorrecta."
328msgstr "Sentímolo, a clave é incorrecta."
349
329
350−#: qml/Shell.qml:392
330+#: qml/Shell.qml:469
351msgid "This will be your last attempt."
331msgid "This will be your last attempt."
352msgstr "Este será o seu último intento."
332msgstr "Este será o seu último intento."
353
333
354−#: qml/Shell.qml:394
334+#: qml/Shell.qml:471
355msgid ""
335msgid ""
356"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
357"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
@@ -359,7 +339,7 @@ msgstr ""
359"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "
339"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "
360"valores de fábrica e perderá todos os datos persoais."
340"valores de fábrica e perderá todos os datos persoais."
361
341
362−#: qml/Shell.qml:395
342+#: qml/Shell.qml:472
363msgid ""
343msgid ""
364"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 "
365"and all personal data will be deleted."
345"and all personal data will be deleted."
@@ -367,8 +347,213 @@ msgstr ""
367"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "
347"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "
368"fábrica e perderá todos os datos persoais."
348"fábrica e perderá todos os datos persoais."
369
349
370−#~ msgid "Sorry, incorrect PIN"
350+#: qml/Wizard/Page.qml:89
371−#~ msgstr "Sentímolo, o PIN é incorrecto"
351+msgid "Back"
352+msgstr "Volver"
353+
354+#: qml/Wizard/Pages/10-welcome.qml:27
355+msgid "Hi!"
356+msgstr "Boas!"
357+
358+#: qml/Wizard/Pages/10-welcome.qml:44
359+msgid "Welcome to your Ubuntu phone."
360+msgstr "Benvido/a ao seu teléfono Ubuntu."
361+
362+#: qml/Wizard/Pages/10-welcome.qml:52
363+msgid "Let’s get started."
364+msgstr "Comezamos."
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 "Continuar"
372+
373+#: qml/Wizard/Pages/20-sim.qml:25
374+msgid "Add a SIM card and restart your device"
375+msgstr "Engada unha tarxeta SIM e reinicie o dispositivo"
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+"Sen ela, non poderá realizar chamadas nin usar a mensaxería de texto."
381+
382+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
383+msgid "Skip"
384+msgstr "Saltar"
385+
386+#: qml/Wizard/Pages/30-passwd-type.qml:39
387+msgid "Lock security"
388+msgstr "Seguranza do bloqueo"
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:74
391+msgid "Please select how you’d like to unlock your phone."
392+msgstr "Por favor, seleccione a forma de desbloquear o teléfono."
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:97
395+msgid "Swipe"
396+msgstr "Esvarar o dedo"
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:98
399+msgid "No security"
400+msgstr "Sen seguranza"
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:100
403+msgid "Passcode"
404+msgstr "Clave"
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:101
407+msgid "4 digits only"
408+msgstr "Só 4 díxitos"
409+
410+#: qml/Wizard/Pages/30-passwd-type.qml:103
411+msgid "Passphrase"
412+msgstr "Frase secreta"
413+
414+#: qml/Wizard/Pages/30-passwd-type.qml:104
415+msgid "Numbers and letters"
416+msgstr "Números e letras"
417+
418+#: qml/Wizard/Pages/40-wifi.qml:28
419+msgid "Connect to Wi‑Fi"
420+msgstr "Conectar a unha wifi"
421+
422+#: qml/Wizard/Pages/40-wifi.qml:147
423+msgid "Available networks…"
424+msgstr "Redes dispoñíbeis..."
425+
426+#: qml/Wizard/Pages/40-wifi.qml:148
427+msgid "No available networks."
428+msgstr "Non hai redes dispoñíbeis."
429+
430+#: qml/Wizard/Pages/50-location.qml:27
431+msgid "Location"
432+msgstr "Localización"
433+
434+#: qml/Wizard/Pages/50-location.qml:62
435+msgid "Let the phone detect your location:"
436+msgstr "Permitir ao teléfono detectar a localizacón:"
437+
438+#: qml/Wizard/Pages/50-location.qml:69
439+msgid "Using GPS only (less accurate)"
440+msgstr "Usar só GPS (menos exacta)"
441+
442+#: qml/Wizard/Pages/50-location.qml:86
443+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
444+msgstr "Usar GPS, wifi anónimo e información da rede móbil (recomendado)"
445+
446+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
447+#: qml/Wizard/Pages/50-location.qml:103
448+msgid ""
449+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
450+"conditions</a>."
451+msgstr ""
452+"Seleccionando esta opción acepta os <a href='#'>termos e condicións</a> do "
453+"HERE de Nokia."
454+
455+#: qml/Wizard/Pages/50-location.qml:112
456+msgid "Not at all"
457+msgstr "De ningún xeito"
458+
459+#: qml/Wizard/Pages/50-location.qml:124
460+msgid "You can change your mind later in <b>System Settings</b>."
461+msgstr "Pode cambialo máis tarde nos <b>Axustes do sistema</b>."
462+
463+#: qml/Wizard/Pages/60-reporting.qml:24
464+msgid "Improving your experience"
465+msgstr "Mellorando a súa experiencia"
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+"O teléfono configurouse para informar dos erros automaticamente a Canonical "
473+"e os seus socios, os creadores do sistema operativo."
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+"Pode desactivalo nos <b>Axustes do sistema</b> en <b>Seguranza e "
481+"privacidade</b>"
482+
483+#: qml/Wizard/Pages/80-finished.qml:24
484+msgid "All done"
485+msgstr "Rematado"
486+
487+#: qml/Wizard/Pages/80-finished.qml:39
488+msgid "Nice work!"
489+msgstr "Bo traballo!"
490+
491+#: qml/Wizard/Pages/80-finished.qml:46
492+msgid "Your phone is now ready to use."
493+msgstr "Xa ten o teléfono listo para o seu uso."
494+
495+#: qml/Wizard/Pages/80-finished.qml:53
496+msgid "Finish"
497+msgstr "Rematar"
498+
499+#: qml/Wizard/Pages/here-terms.qml:27
500+msgid "Terms & Conditions"
501+msgstr "Termos e condicións"
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:49
504+msgid "Confirm passphrase"
505+msgstr "Confirmar a frase secreta"
506+
507+#: qml/Wizard/Pages/passwd-confirm.qml:50
508+msgid "Confirm passcode"
509+msgstr "Confirmar a clave"
510+
511+#: qml/Wizard/Pages/passwd-confirm.qml:53
512+#: qml/Wizard/Pages/passwd-confirm.qml:54
513+msgid "Please try again."
514+msgstr "Ténteo de novo."
515+
516+#: qml/Wizard/Pages/passwd-set.qml:61
517+msgid "Choose your passcode"
518+msgstr "Escolla unha clave"
519+
520+#: qml/Wizard/Pages/passwd-set.qml:68
521+msgid "Passphrase must be 4 characters long"
522+msgstr "A frase secreta debe ter 4 caracteres"
523+
524+#: qml/Wizard/StackButton.qml:39
525+#, qt-format
526+msgid "〈 %1"
527+msgstr "〈 %1"
528+
529+#: qml/Wizard/StackButton.qml:42
530+#, qt-format
531+msgid "%1 〉"
532+msgstr "%1 〉"
533+
534+#~ msgid "Confirm"
535+#~ msgstr "Confirmar"
536+
537+#~ msgid "Type or say a command"
538+#~ msgstr "Escriba ou diga unha orde"
539+
540+#~ msgid "Speak Now..."
541+#~ msgstr "Fale agora…"
542+
543+#~ msgid "Speaking..."
544+#~ msgstr "Falando…"
545+
546+#~ msgid "Loading. Please Wait..."
547+#~ msgstr "Cargando, agarde…"
548+
549+#~ msgid "All"
550+#~ msgstr "Todos"
551+
552+#~ msgid "Favorites"
553+#~ msgstr "Favoritos"
554+
555+#~ msgid "Done"
556+#~ msgstr "Feito"
372
557
373−#~ msgid "Enter SIM PIN"
558+#~ msgid "Manage Scopes"
374−#~ msgstr "Introduza o PIN da SIM"
559+#~ msgstr "Xestionar os Ámbitos"
po/he.po+273−92
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+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-10-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
137+#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
138msgid "Left edge"
139msgstr "שול שמאלי"
139msgstr "שול שמאלי"
140
140
141−#: qml/Components/EdgeDemo.qml:199
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:226
145+#: qml/Components/EdgeDemo.qml:242
146msgid "Well done"
146msgid "Well done"
147msgstr "כל הכבוד"
147msgstr "כל הכבוד"
148
148
149−#: qml/Components/EdgeDemo.qml:227
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,36 +154,44 @@ msgstr ""
154"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
154"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
155"לגעת במסך כדי להתחיל"
155"לגעת במסך כדי להתחיל"
156
156
157−#: qml/Components/Lockscreen.qml:220
157+#: qml/Components/Lockscreen.qml:238
158+msgid "Return to Call"
159+msgstr ""
160+
161+#: qml/Components/Lockscreen.qml:238
158msgid "Emergency Call"
162msgid "Emergency Call"
159msgstr "שיחת חירום"
163msgstr "שיחת חירום"
160
164
161−#: qml/Components/Lockscreen.qml:252
165+#: qml/Components/Lockscreen.qml:270
162msgid "OK"
166msgid "OK"
163msgstr "אישור"
167msgstr "אישור"
164
168
165−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
169+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
166msgid "See less"
170msgid "See less"
167msgstr "לראות פחות"
171msgstr "לראות פחות"
168
172
169−#: qml/Dash/GenericScopeView.qml:434
173+#: qml/Dash/GenericScopeView.qml:431
170msgid "See all"
174msgid "See all"
171msgstr "להציג הכול"
175msgstr "להציג הכול"
172
176
173−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
177+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
174#: qml/Panel/SearchIndicator.qml:27
178#: qml/Panel/SearchIndicator.qml:27
175msgid "Search"
179msgid "Search"
176msgstr "חיפוש"
180msgstr "חיפוש"
177
181
178−#: qml/Dash/PageHeader.qml:268
182+#: qml/Dash/PageHeader.qml:260
183+msgid "Store"
184+msgstr "אחסון"
185+
186+#: qml/Dash/PageHeader.qml:277
179msgid "Settings"
187msgid "Settings"
180msgstr ""
188msgstr ""
181
189
182−#: qml/Dash/PageHeader.qml:275
190+#: qml/Dash/PageHeader.qml:284
183msgid "Remove from Favorites"
191msgid "Remove from Favorites"
184msgstr ""
192msgstr ""
185
193
186−#: qml/Dash/PageHeader.qml:275
194+#: qml/Dash/PageHeader.qml:284
187msgid "Add to Favorites"
195msgid "Add to Favorites"
188msgstr ""
196msgstr ""
189
197
@@ -215,87 +223,59 @@ msgstr ""
215msgid "Release to refresh…"
223msgid "Release to refresh…"
216msgstr ""
224msgstr ""
217
225
218−#: qml/Dash/ScopesOverview.qml:206
226+#: qml/Dash/ScopesList.qml:63
219−msgid "Manage Scopes"
227+msgid "Manage"
220msgstr ""
228msgstr ""
221
229
222−#: qml/Dash/ScopesOverview.qml:428
230+#: qml/Dash/ScopesList.qml:107
223−msgid "Done"
224−msgstr "סיימתי"
225−
226−#: qml/Dash/ScopesOverview.qml:454
227−msgid "Store"
228−msgstr "אחסון"
229−
230−#: qml/Dash/ScopesOverviewTab.qml:36
231−msgid "Favorites"
231+msgid "Home"
232−msgstr "מועדפים"
232+msgstr ""
233
233
234−#: qml/Dash/ScopesOverviewTab.qml:54
234+#: qml/Dash/ScopesList.qml:108
235−msgid "All"
235+msgid "Also installed"
236−msgstr "הכול"
236+msgstr ""
237
237
238−#: qml/Greeter/Greeter.qml:157
238+#: qml/Greeter/Greeter.qml:174
239msgid "Unlock"
239msgid "Unlock"
240msgstr ""
240msgstr ""
241
241
242−#: qml/Hud/HudParametrizedActionsPage.qml:139
243−msgid "Confirm"
244−msgstr "אישור"
245−
246−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
247−msgid "Type or say a command"
248−msgstr "ניתן להקליד או לומר פקודה"
249−
250−#: qml/Hud/Hud.qml:84
251−msgid "Loading. Please Wait..."
252−msgstr "בטעינה. נא להמתין..."
253−
254−#: qml/Hud/Hud.qml:89
255−msgid "Speak Now..."
256−msgstr "יש לדבר כעת..."
257−
258−#: qml/Hud/Hud.qml:94
259−msgid "Speaking..."
260−msgstr "הדיבור מושמע…"
261−
262−#: qml/Notifications/NotificationMenuItemFactory.qml:116
242+#: qml/Notifications/NotificationMenuItemFactory.qml:128
263msgid "Show password"
243msgid "Show password"
264msgstr "הצגת הססמה"
244msgstr "הצגת הססמה"
265
245
266−#: qml/Panel/ActiveCallHint.qml:77
246+#: qml/Panel/ActiveCallHint.qml:79
267msgid "Tap to return to call..."
247msgid "Tap to return to call..."
268msgstr "יש לגעת כדי להחזיר שיחה…"
248msgstr "יש לגעת כדי להחזיר שיחה…"
269
249
270−#: qml/Panel/ActiveCallHint.qml:90
250+#: qml/Panel/ActiveCallHint.qml:92
271msgid "Conference"
251msgid "Conference"
272msgstr "ועידה"
252msgstr "ועידה"
273
253
274−#: qml/Panel/Indicators/MenuItemFactory.qml:600
254+#: qml/Panel/Indicators/MenuItemFactory.qml:643
275msgid "Nothing is playing"
255msgid "Nothing is playing"
276msgstr ""
256msgstr ""
277
257
278−#: qml/Panel/Indicators/MenuItemFactory.qml:748
258+#: qml/Panel/Indicators/MenuItemFactory.qml:791
279msgid "In queue…"
259msgid "In queue…"
280msgstr "בתור…"
260msgstr "בתור…"
281
261
282−#: qml/Panel/Indicators/MenuItemFactory.qml:752
262+#: qml/Panel/Indicators/MenuItemFactory.qml:795
283msgid "Downloading"
263msgid "Downloading"
284msgstr "בהורדה"
264msgstr "בהורדה"
285
265
286−#: qml/Panel/Indicators/MenuItemFactory.qml:754
266+#: qml/Panel/Indicators/MenuItemFactory.qml:797
287msgid "Paused, tap to resume"
267msgid "Paused, tap to resume"
288msgstr "מושהה, יש לגעת כדי להמשיך"
268msgstr "מושהה, יש לגעת כדי להמשיך"
289
269
290−#: qml/Panel/Indicators/MenuItemFactory.qml:756
270+#: qml/Panel/Indicators/MenuItemFactory.qml:799
291msgid "Canceled"
271msgid "Canceled"
292msgstr "בוטל"
272msgstr "בוטל"
293
273
294−#: qml/Panel/Indicators/MenuItemFactory.qml:758
274+#: qml/Panel/Indicators/MenuItemFactory.qml:801
295msgid "Finished"
275msgid "Finished"
296msgstr "הושלם"
276msgstr "הושלם"
297
277
298−#: qml/Panel/Indicators/MenuItemFactory.qml:760
278+#: qml/Panel/Indicators/MenuItemFactory.qml:803
299msgid "Failed, tap to retry"
279msgid "Failed, tap to retry"
300msgstr "נכשל, יש לגעת כדי לנסות שוב"
280msgstr "נכשל, יש לגעת כדי לנסות שוב"
301
281
@@ -307,56 +287,257 @@ msgstr ""
307msgid "Roaming"
287msgid "Roaming"
308msgstr "נדידה"
288msgstr "נדידה"
309
289
310−#: qml/Shell.qml:346
290+#: qml/Shell.qml:367
291+#, qt-format
311−msgid "Enter passphrase"
292+msgid "Enter %1"
312msgstr ""
293msgstr ""
313
294
314−#: qml/Shell.qml:347
295+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
315−msgid "Sorry, incorrect passphrase"
296+msgid "Enter passphrase"
316−msgstr "מילת הצופן שגויה, עמך הסליחה."
317−
318−#: qml/Shell.qml:348
319−msgid "Please re-enter"
320msgstr ""
297msgstr ""
321
298
322−#: qml/Shell.qml:350
299+#: qml/Shell.qml:369
323msgid "Enter passcode"
300msgid "Enter passcode"
324msgstr ""
301msgstr ""
325
302
326−#: qml/Shell.qml:351
303+#: qml/Shell.qml:370
304+#, qt-format
327−msgid "Sorry, incorrect passcode"
305+msgid "Sorry, incorrect %1"
328msgstr ""
306msgstr ""
329
307
330−#: qml/Shell.qml:354
308+#: qml/Shell.qml:371
331−#, qt-format
309+msgid "Sorry, incorrect passphrase"
332−msgid "Enter %1"
310+msgstr "מילת הצופן שגויה, עמך הסליחה."
311+
312+#: qml/Shell.qml:372
313+msgid "Please re-enter"
333msgstr ""
314msgstr ""
334
315
335−#: qml/Shell.qml:355
316+#: qml/Shell.qml:373
336−#, qt-format
337−msgid "Sorry, incorrect %1"
317+msgid "Sorry, incorrect passcode"
338msgstr ""
318msgstr ""
339
319
340−#: qml/Shell.qml:390
320+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
341msgid "Sorry, incorrect passphrase."
321msgid "Sorry, incorrect passphrase."
342msgstr "מילת הצופן שגויה, עמך הסליחה."
322msgstr "מילת הצופן שגויה, עמך הסליחה."
343
323
344−#: qml/Shell.qml:391
324+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
345msgid "Sorry, incorrect passcode."
325msgid "Sorry, incorrect passcode."
346msgstr "הצופן שגוי, עם הסליחה."
326msgstr "הצופן שגוי, עם הסליחה."
347
327
348−#: qml/Shell.qml:392
328+#: qml/Shell.qml:469
349msgid "This will be your last attempt."
329msgid "This will be your last attempt."
350msgstr "זה יהיה הניסיון האחרון שלך."
330msgstr "זה יהיה הניסיון האחרון שלך."
351
331
352−#: qml/Shell.qml:394
332+#: qml/Shell.qml:471
353msgid ""
333msgid ""
354"If passphrase is entered incorrectly, your phone will conduct a factory "
334"If passphrase is entered incorrectly, your phone will conduct a factory "
355"reset and all personal data will be deleted."
335"reset and all personal data will be deleted."
356msgstr ""
336msgstr ""
357
337
358−#: qml/Shell.qml:395
338+#: qml/Shell.qml:472
359msgid ""
339msgid ""
360"If passcode is entered incorrectly, your phone will conduct a factory reset "
340"If passcode is entered incorrectly, your phone will conduct a factory reset "
361"and all personal data will be deleted."
341"and all personal data will be deleted."
362msgstr ""
342msgstr ""
343+
344+#: qml/Wizard/Page.qml:89
345+msgid "Back"
346+msgstr ""
347+
348+#: qml/Wizard/Pages/10-welcome.qml:27
349+msgid "Hi!"
350+msgstr ""
351+
352+#: qml/Wizard/Pages/10-welcome.qml:44
353+msgid "Welcome to your Ubuntu phone."
354+msgstr ""
355+
356+#: qml/Wizard/Pages/10-welcome.qml:52
357+msgid "Let’s get started."
358+msgstr ""
359+
360+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
361+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
362+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
363+#: qml/Wizard/Pages/passwd-set.qml:90
364+msgid "Continue"
365+msgstr ""
366+
367+#: qml/Wizard/Pages/20-sim.qml:25
368+msgid "Add a SIM card and restart your device"
369+msgstr ""
370+
371+#: qml/Wizard/Pages/20-sim.qml:55
372+msgid "Without it, you won’t be able to make calls or use text messaging."
373+msgstr ""
374+
375+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
376+msgid "Skip"
377+msgstr ""
378+
379+#: qml/Wizard/Pages/30-passwd-type.qml:39
380+msgid "Lock security"
381+msgstr ""
382+
383+#: qml/Wizard/Pages/30-passwd-type.qml:74
384+msgid "Please select how you’d like to unlock your phone."
385+msgstr ""
386+
387+#: qml/Wizard/Pages/30-passwd-type.qml:97
388+msgid "Swipe"
389+msgstr ""
390+
391+#: qml/Wizard/Pages/30-passwd-type.qml:98
392+msgid "No security"
393+msgstr ""
394+
395+#: qml/Wizard/Pages/30-passwd-type.qml:100
396+msgid "Passcode"
397+msgstr ""
398+
399+#: qml/Wizard/Pages/30-passwd-type.qml:101
400+msgid "4 digits only"
401+msgstr ""
402+
403+#: qml/Wizard/Pages/30-passwd-type.qml:103
404+msgid "Passphrase"
405+msgstr ""
406+
407+#: qml/Wizard/Pages/30-passwd-type.qml:104
408+msgid "Numbers and letters"
409+msgstr ""
410+
411+#: qml/Wizard/Pages/40-wifi.qml:28
412+msgid "Connect to Wi‑Fi"
413+msgstr ""
414+
415+#: qml/Wizard/Pages/40-wifi.qml:147
416+msgid "Available networks…"
417+msgstr ""
418+
419+#: qml/Wizard/Pages/40-wifi.qml:148
420+msgid "No available networks."
421+msgstr ""
422+
423+#: qml/Wizard/Pages/50-location.qml:27
424+msgid "Location"
425+msgstr ""
426+
427+#: qml/Wizard/Pages/50-location.qml:62
428+msgid "Let the phone detect your location:"
429+msgstr ""
430+
431+#: qml/Wizard/Pages/50-location.qml:69
432+msgid "Using GPS only (less accurate)"
433+msgstr ""
434+
435+#: qml/Wizard/Pages/50-location.qml:86
436+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
437+msgstr ""
438+
439+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
440+#: qml/Wizard/Pages/50-location.qml:103
441+msgid ""
442+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
443+"conditions</a>."
444+msgstr ""
445+
446+#: qml/Wizard/Pages/50-location.qml:112
447+msgid "Not at all"
448+msgstr ""
449+
450+#: qml/Wizard/Pages/50-location.qml:124
451+msgid "You can change your mind later in <b>System Settings</b>."
452+msgstr ""
453+
454+#: qml/Wizard/Pages/60-reporting.qml:24
455+msgid "Improving your experience"
456+msgstr ""
457+
458+#: qml/Wizard/Pages/60-reporting.qml:36
459+msgid ""
460+"Your phone is set up to automatically report errors to Canonical and its "
461+"partners, the makers of the operating system."
462+msgstr ""
463+
464+#: qml/Wizard/Pages/60-reporting.qml:43
465+msgid ""
466+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
467+"Privacy</b>"
468+msgstr ""
469+
470+#: qml/Wizard/Pages/80-finished.qml:24
471+msgid "All done"
472+msgstr ""
473+
474+#: qml/Wizard/Pages/80-finished.qml:39
475+msgid "Nice work!"
476+msgstr ""
477+
478+#: qml/Wizard/Pages/80-finished.qml:46
479+msgid "Your phone is now ready to use."
480+msgstr ""
481+
482+#: qml/Wizard/Pages/80-finished.qml:53
483+msgid "Finish"
484+msgstr ""
485+
486+#: qml/Wizard/Pages/here-terms.qml:27
487+msgid "Terms & Conditions"
488+msgstr ""
489+
490+#: qml/Wizard/Pages/passwd-confirm.qml:49
491+msgid "Confirm passphrase"
492+msgstr ""
493+
494+#: qml/Wizard/Pages/passwd-confirm.qml:50
495+msgid "Confirm passcode"
496+msgstr ""
497+
498+#: qml/Wizard/Pages/passwd-confirm.qml:53
499+#: qml/Wizard/Pages/passwd-confirm.qml:54
500+msgid "Please try again."
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-set.qml:61
504+msgid "Choose your passcode"
505+msgstr ""
506+
507+#: qml/Wizard/Pages/passwd-set.qml:68
508+msgid "Passphrase must be 4 characters long"
509+msgstr ""
510+
511+#: qml/Wizard/StackButton.qml:39
512+#, qt-format
513+msgid "〈 %1"
514+msgstr ""
515+
516+#: qml/Wizard/StackButton.qml:42
517+#, qt-format
518+msgid "%1 〉"
519+msgstr ""
520+
521+#~ msgid "Confirm"
522+#~ msgstr "אישור"
523+
524+#~ msgid "Type or say a command"
525+#~ msgstr "ניתן להקליד או לומר פקודה"
526+
527+#~ msgid "Loading. Please Wait..."
528+#~ msgstr "בטעינה. נא להמתין..."
529+
530+#~ msgid "Speak Now..."
531+#~ msgstr "יש לדבר כעת..."
532+
533+#~ msgid "Speaking..."
534+#~ msgstr "הדיבור מושמע…"
535+
536+#~ msgid "Done"
537+#~ msgstr "סיימתי"
538+
539+#~ msgid "All"
540+#~ msgstr "הכול"
541+
542+#~ msgid "Favorites"
543+#~ msgstr "מועדפים"
po/hi.po+255−89
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+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-10-09 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -110,78 +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:198
137+#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
138msgid "Left edge"
139msgstr "बायाँ किनारा"
139msgstr "बायाँ किनारा"
140
140
141−#: qml/Components/EdgeDemo.qml:199
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:226
145+#: qml/Components/EdgeDemo.qml:242
146msgid "Well done"
146msgid "Well done"
147msgstr "शाबाश"
147msgstr "शाबाश"
148
148
149−#: qml/Components/EdgeDemo.qml:227
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:220
155+#: qml/Components/Lockscreen.qml:238
156+msgid "Return to Call"
157+msgstr ""
158+
159+#: qml/Components/Lockscreen.qml:238
156msgid "Emergency Call"
160msgid "Emergency Call"
157msgstr "आपातकालीन कॉल"
161msgstr "आपातकालीन कॉल"
158
162
159−#: qml/Components/Lockscreen.qml:252
163+#: qml/Components/Lockscreen.qml:270
160msgid "OK"
164msgid "OK"
161msgstr ""
165msgstr ""
162
166
163−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
164msgid "See less"
168msgid "See less"
165msgstr ""
169msgstr ""
166
170
167−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:431
168msgid "See all"
172msgid "See all"
169msgstr ""
173msgstr ""
170
174
171−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
172#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
173msgid "Search"
177msgid "Search"
174msgstr "खोजें"
178msgstr "खोजें"
175
179
176−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:260
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:277
177msgid "Settings"
185msgid "Settings"
178msgstr ""
186msgstr ""
179
187
180−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:284
181msgid "Remove from Favorites"
189msgid "Remove from Favorites"
182msgstr ""
190msgstr ""
183
191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185msgid "Add to Favorites"
193msgid "Add to Favorites"
186msgstr ""
194msgstr ""
187
195
@@ -213,87 +221,59 @@ msgstr ""
213msgid "Release to refresh…"
221msgid "Release to refresh…"
214msgstr ""
222msgstr ""
215
223
216−#: qml/Dash/ScopesOverview.qml:206
224+#: qml/Dash/ScopesList.qml:63
217−msgid "Manage Scopes"
225+msgid "Manage"
218−msgstr ""
219−
220−#: qml/Dash/ScopesOverview.qml:428
221−msgid "Done"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:454
225−msgid "Store"
226msgstr ""
226msgstr ""
227
227
228−#: qml/Dash/ScopesOverviewTab.qml:36
228+#: qml/Dash/ScopesList.qml:107
229−msgid "Favorites"
229+msgid "Home"
230msgstr ""
230msgstr ""
231
231
232−#: qml/Dash/ScopesOverviewTab.qml:54
232+#: qml/Dash/ScopesList.qml:108
233−msgid "All"
233+msgid "Also installed"
234msgstr ""
234msgstr ""
235
235
236−#: qml/Greeter/Greeter.qml:157
236+#: qml/Greeter/Greeter.qml:174
237msgid "Unlock"
237msgid "Unlock"
238msgstr ""
238msgstr ""
239
239
240−#: qml/Hud/HudParametrizedActionsPage.qml:139
241−msgid "Confirm"
242−msgstr ""
243−
244−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
245−msgid "Type or say a command"
246−msgstr ""
247−
248−#: qml/Hud/Hud.qml:84
249−msgid "Loading. Please Wait..."
250−msgstr "काम कर रहा है | कृपया प्रतीक्षा करे |"
251−
252−#: qml/Hud/Hud.qml:89
253−msgid "Speak Now..."
254−msgstr "अब बात करें"
255−
256−#: qml/Hud/Hud.qml:94
257−msgid "Speaking..."
258−msgstr "अब बोल रहे हैं"
259−
260−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
261msgid "Show password"
241msgid "Show password"
262msgstr ""
242msgstr ""
263
243
264−#: qml/Panel/ActiveCallHint.qml:77
244+#: qml/Panel/ActiveCallHint.qml:79
265msgid "Tap to return to call..."
245msgid "Tap to return to call..."
266msgstr ""
246msgstr ""
267
247
268−#: qml/Panel/ActiveCallHint.qml:90
248+#: qml/Panel/ActiveCallHint.qml:92
269msgid "Conference"
249msgid "Conference"
270msgstr ""
250msgstr ""
271
251
272−#: qml/Panel/Indicators/MenuItemFactory.qml:600
252+#: qml/Panel/Indicators/MenuItemFactory.qml:643
273msgid "Nothing is playing"
253msgid "Nothing is playing"
274msgstr ""
254msgstr ""
275
255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:748
256+#: qml/Panel/Indicators/MenuItemFactory.qml:791
277msgid "In queue…"
257msgid "In queue…"
278msgstr ""
258msgstr ""
279
259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:752
260+#: qml/Panel/Indicators/MenuItemFactory.qml:795
281msgid "Downloading"
261msgid "Downloading"
282msgstr ""
262msgstr ""
283
263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:754
264+#: qml/Panel/Indicators/MenuItemFactory.qml:797
285msgid "Paused, tap to resume"
265msgid "Paused, tap to resume"
286msgstr ""
266msgstr ""
287
267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:756
268+#: qml/Panel/Indicators/MenuItemFactory.qml:799
289msgid "Canceled"
269msgid "Canceled"
290msgstr ""
270msgstr ""
291
271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:758
272+#: qml/Panel/Indicators/MenuItemFactory.qml:801
293msgid "Finished"
273msgid "Finished"
294msgstr ""
274msgstr ""
295
275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:760
276+#: qml/Panel/Indicators/MenuItemFactory.qml:803
297msgid "Failed, tap to retry"
277msgid "Failed, tap to retry"
298msgstr ""
278msgstr ""
299
279
@@ -305,56 +285,242 @@ msgstr ""
305msgid "Roaming"
285msgid "Roaming"
306msgstr ""
286msgstr ""
307
287
308−#: qml/Shell.qml:346
288+#: qml/Shell.qml:367
289+#, qt-format
309−msgid "Enter passphrase"
290+msgid "Enter %1"
310msgstr ""
291msgstr ""
311
292
312−#: qml/Shell.qml:347
293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313−msgid "Sorry, incorrect passphrase"
294+msgid "Enter passphrase"
314msgstr ""
295msgstr ""
315
296
316−#: qml/Shell.qml:348
297+#: qml/Shell.qml:369
317−msgid "Please re-enter"
298+msgid "Enter passcode"
318msgstr ""
299msgstr ""
319
300
320−#: qml/Shell.qml:350
301+#: qml/Shell.qml:370
321−msgid "Enter passcode"
302+#, qt-format
303+msgid "Sorry, incorrect %1"
322msgstr ""
304msgstr ""
323
305
324−#: qml/Shell.qml:351
306+#: qml/Shell.qml:371
325−msgid "Sorry, incorrect passcode"
307+msgid "Sorry, incorrect passphrase"
326msgstr ""
308msgstr ""
327
309
328−#: qml/Shell.qml:354
310+#: qml/Shell.qml:372
329−#, qt-format
311+msgid "Please re-enter"
330−msgid "Enter %1"
331msgstr ""
312msgstr ""
332
313
333−#: qml/Shell.qml:355
314+#: qml/Shell.qml:373
334−#, qt-format
335−msgid "Sorry, incorrect %1"
315+msgid "Sorry, incorrect passcode"
336msgstr ""
316msgstr ""
337
317
338−#: qml/Shell.qml:390
318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
339msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
340msgstr ""
320msgstr ""
341
321
342−#: qml/Shell.qml:391
322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
343msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
344msgstr ""
324msgstr ""
345
325
346−#: qml/Shell.qml:392
326+#: qml/Shell.qml:469
347msgid "This will be your last attempt."
327msgid "This will be your last attempt."
348msgstr ""
328msgstr ""
349
329
350−#: qml/Shell.qml:394
330+#: qml/Shell.qml:471
351msgid ""
331msgid ""
352"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
353"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
354msgstr ""
334msgstr ""
355
335
356−#: qml/Shell.qml:395
336+#: qml/Shell.qml:472
357msgid ""
337msgid ""
358"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"and all personal data will be deleted."
339"and all personal data will be deleted."
360msgstr ""
340msgstr ""
341+
342+#: qml/Wizard/Page.qml:89
343+msgid "Back"
344+msgstr ""
345+
346+#: qml/Wizard/Pages/10-welcome.qml:27
347+msgid "Hi!"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:44
351+msgid "Welcome to your Ubuntu phone."
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:52
355+msgid "Let’s get started."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
361+#: qml/Wizard/Pages/passwd-set.qml:90
362+msgid "Continue"
363+msgstr ""
364+
365+#: qml/Wizard/Pages/20-sim.qml:25
366+msgid "Add a SIM card and restart your device"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:55
370+msgid "Without it, you won’t be able to make calls or use text messaging."
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
374+msgid "Skip"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/30-passwd-type.qml:39
378+msgid "Lock security"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:74
382+msgid "Please select how you’d like to unlock your phone."
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:97
386+msgid "Swipe"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:98
390+msgid "No security"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:100
394+msgid "Passcode"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:101
398+msgid "4 digits only"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:103
402+msgid "Passphrase"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:104
406+msgid "Numbers and letters"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/40-wifi.qml:28
410+msgid "Connect to Wi‑Fi"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:147
414+msgid "Available networks…"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:148
418+msgid "No available networks."
419+msgstr ""
420+
421+#: qml/Wizard/Pages/50-location.qml:27
422+msgid "Location"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:62
426+msgid "Let the phone detect your location:"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:69
430+msgid "Using GPS only (less accurate)"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:86
434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
435+msgstr ""
436+
437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
438+#: qml/Wizard/Pages/50-location.qml:103
439+msgid ""
440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
441+"conditions</a>."
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:112
445+msgid "Not at all"
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:124
449+msgid "You can change your mind later in <b>System Settings</b>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/60-reporting.qml:24
453+msgid "Improving your experience"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:36
457+msgid ""
458+"Your phone is set up to automatically report errors to Canonical and its "
459+"partners, the makers of the operating system."
460+msgstr ""
461+
462+#: qml/Wizard/Pages/60-reporting.qml:43
463+msgid ""
464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
465+"Privacy</b>"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/80-finished.qml:24
469+msgid "All done"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:39
473+msgid "Nice work!"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:46
477+msgid "Your phone is now ready to use."
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:53
481+msgid "Finish"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/here-terms.qml:27
485+msgid "Terms & Conditions"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/passwd-confirm.qml:49
489+msgid "Confirm passphrase"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:50
493+msgid "Confirm passcode"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:53
497+#: qml/Wizard/Pages/passwd-confirm.qml:54
498+msgid "Please try again."
499+msgstr ""
500+
501+#: qml/Wizard/Pages/passwd-set.qml:61
502+msgid "Choose your passcode"
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:68
506+msgid "Passphrase must be 4 characters long"
507+msgstr ""
508+
509+#: qml/Wizard/StackButton.qml:39
510+#, qt-format
511+msgid "〈 %1"
512+msgstr ""
513+
514+#: qml/Wizard/StackButton.qml:42
515+#, qt-format
516+msgid "%1 〉"
517+msgstr ""
518+
519+#~ msgid "Speaking..."
520+#~ msgstr "अब बोल रहे हैं"
521+
522+#~ msgid "Speak Now..."
523+#~ msgstr "अब बात करें"
524+
525+#~ msgid "Loading. Please Wait..."
526+#~ msgstr "काम कर रहा है | कृपया प्रतीक्षा करे |"
po/hr.po+261−89
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+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-10-09 06:36+0000\n"
19+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
20−"X-Generator: Launchpad (build 17196)\n"
20+"X-Generator: Launchpad (build 17286)\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
@@ -111,78 +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:198
138+#: qml/Components/EdgeDemo.qml:214
139msgid "Left edge"
139msgid "Left edge"
140msgstr ""
140msgstr ""
141
141
142−#: qml/Components/EdgeDemo.qml:199
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:226
146+#: qml/Components/EdgeDemo.qml:242
147msgid "Well done"
147msgid "Well done"
148msgstr ""
148msgstr ""
149
149
150−#: qml/Components/EdgeDemo.qml:227
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:220
156+#: qml/Components/Lockscreen.qml:238
157+msgid "Return to Call"
158+msgstr ""
159+
160+#: qml/Components/Lockscreen.qml:238
157msgid "Emergency Call"
161msgid "Emergency Call"
158msgstr ""
162msgstr ""
159
163
160−#: qml/Components/Lockscreen.qml:252
164+#: qml/Components/Lockscreen.qml:270
161msgid "OK"
165msgid "OK"
162msgstr ""
166msgstr ""
163
167
164−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
165msgid "See less"
169msgid "See less"
166msgstr ""
170msgstr ""
167
171
168−#: qml/Dash/GenericScopeView.qml:434
172+#: qml/Dash/GenericScopeView.qml:431
169msgid "See all"
173msgid "See all"
170msgstr ""
174msgstr ""
171
175
172−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
173#: qml/Panel/SearchIndicator.qml:27
177#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
178msgid "Search"
175msgstr "Pretraživanje"
179msgstr "Pretraživanje"
176
180
177−#: qml/Dash/PageHeader.qml:268
181+#: qml/Dash/PageHeader.qml:260
182+msgid "Store"
183+msgstr ""
184+
185+#: qml/Dash/PageHeader.qml:277
178msgid "Settings"
186msgid "Settings"
179msgstr ""
187msgstr ""
180
188
181−#: qml/Dash/PageHeader.qml:275
189+#: qml/Dash/PageHeader.qml:284
182msgid "Remove from Favorites"
190msgid "Remove from Favorites"
183msgstr ""
191msgstr ""
184
192
185−#: qml/Dash/PageHeader.qml:275
193+#: qml/Dash/PageHeader.qml:284
186msgid "Add to Favorites"
194msgid "Add to Favorites"
187msgstr ""
195msgstr ""
188
196
@@ -214,87 +222,59 @@ msgstr ""
214msgid "Release to refresh…"
222msgid "Release to refresh…"
215msgstr ""
223msgstr ""
216
224
217−#: qml/Dash/ScopesOverview.qml:206
225+#: qml/Dash/ScopesList.qml:63
218−msgid "Manage Scopes"
226+msgid "Manage"
219−msgstr ""
220−
221−#: qml/Dash/ScopesOverview.qml:428
222−msgid "Done"
223−msgstr ""
224−
225−#: qml/Dash/ScopesOverview.qml:454
226−msgid "Store"
227msgstr ""
227msgstr ""
228
228
229−#: qml/Dash/ScopesOverviewTab.qml:36
229+#: qml/Dash/ScopesList.qml:107
230−msgid "Favorites"
230+msgid "Home"
231msgstr ""
231msgstr ""
232
232
233−#: qml/Dash/ScopesOverviewTab.qml:54
233+#: qml/Dash/ScopesList.qml:108
234−msgid "All"
234+msgid "Also installed"
235msgstr ""
235msgstr ""
236
236
237−#: qml/Greeter/Greeter.qml:157
237+#: qml/Greeter/Greeter.qml:174
238msgid "Unlock"
238msgid "Unlock"
239msgstr ""
239msgstr ""
240
240
241−#: qml/Hud/HudParametrizedActionsPage.qml:139
242−msgid "Confirm"
243−msgstr "Potvrdi"
244−
245−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
246−msgid "Type or say a command"
247−msgstr "Upišite ili izgovorite naredbu"
248−
249−#: qml/Hud/Hud.qml:84
250−msgid "Loading. Please Wait..."
251−msgstr "Učitavanje. Molim pričekajte..."
252−
253−#: qml/Hud/Hud.qml:89
254−msgid "Speak Now..."
255−msgstr "Recite..."
256−
257−#: qml/Hud/Hud.qml:94
258−msgid "Speaking..."
259−msgstr "Govor..."
260−
261−#: qml/Notifications/NotificationMenuItemFactory.qml:116
241+#: qml/Notifications/NotificationMenuItemFactory.qml:128
262msgid "Show password"
242msgid "Show password"
263msgstr ""
243msgstr ""
264
244
265−#: qml/Panel/ActiveCallHint.qml:77
245+#: qml/Panel/ActiveCallHint.qml:79
266msgid "Tap to return to call..."
246msgid "Tap to return to call..."
267msgstr ""
247msgstr ""
268
248
269−#: qml/Panel/ActiveCallHint.qml:90
249+#: qml/Panel/ActiveCallHint.qml:92
270msgid "Conference"
250msgid "Conference"
271msgstr ""
251msgstr ""
272
252
273−#: qml/Panel/Indicators/MenuItemFactory.qml:600
253+#: qml/Panel/Indicators/MenuItemFactory.qml:643
274msgid "Nothing is playing"
254msgid "Nothing is playing"
275msgstr ""
255msgstr ""
276
256
277−#: qml/Panel/Indicators/MenuItemFactory.qml:748
257+#: qml/Panel/Indicators/MenuItemFactory.qml:791
278msgid "In queue…"
258msgid "In queue…"
279msgstr ""
259msgstr ""
280
260
281−#: qml/Panel/Indicators/MenuItemFactory.qml:752
261+#: qml/Panel/Indicators/MenuItemFactory.qml:795
282msgid "Downloading"
262msgid "Downloading"
283msgstr ""
263msgstr ""
284
264
285−#: qml/Panel/Indicators/MenuItemFactory.qml:754
265+#: qml/Panel/Indicators/MenuItemFactory.qml:797
286msgid "Paused, tap to resume"
266msgid "Paused, tap to resume"
287msgstr ""
267msgstr ""
288
268
289−#: qml/Panel/Indicators/MenuItemFactory.qml:756
269+#: qml/Panel/Indicators/MenuItemFactory.qml:799
290msgid "Canceled"
270msgid "Canceled"
291msgstr ""
271msgstr ""
292
272
293−#: qml/Panel/Indicators/MenuItemFactory.qml:758
273+#: qml/Panel/Indicators/MenuItemFactory.qml:801
294msgid "Finished"
274msgid "Finished"
295msgstr ""
275msgstr ""
296
276
297−#: qml/Panel/Indicators/MenuItemFactory.qml:760
277+#: qml/Panel/Indicators/MenuItemFactory.qml:803
298msgid "Failed, tap to retry"
278msgid "Failed, tap to retry"
299msgstr ""
279msgstr ""
300
280
@@ -306,56 +286,248 @@ msgstr ""
306msgid "Roaming"
286msgid "Roaming"
307msgstr ""
287msgstr ""
308
288
309−#: qml/Shell.qml:346
289+#: qml/Shell.qml:367
290+#, qt-format
310−msgid "Enter passphrase"
291+msgid "Enter %1"
311msgstr ""
292msgstr ""
312
293
313−#: qml/Shell.qml:347
294+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
314−msgid "Sorry, incorrect passphrase"
295+msgid "Enter passphrase"
315msgstr ""
296msgstr ""
316
297
317−#: qml/Shell.qml:348
298+#: qml/Shell.qml:369
318−msgid "Please re-enter"
299+msgid "Enter passcode"
319msgstr ""
300msgstr ""
320
301
321−#: qml/Shell.qml:350
302+#: qml/Shell.qml:370
322−msgid "Enter passcode"
303+#, qt-format
304+msgid "Sorry, incorrect %1"
323msgstr ""
305msgstr ""
324
306
325−#: qml/Shell.qml:351
307+#: qml/Shell.qml:371
326−msgid "Sorry, incorrect passcode"
308+msgid "Sorry, incorrect passphrase"
327msgstr ""
309msgstr ""
328
310
329−#: qml/Shell.qml:354
311+#: qml/Shell.qml:372
330−#, qt-format
312+msgid "Please re-enter"
331−msgid "Enter %1"
332msgstr ""
313msgstr ""
333
314
334−#: qml/Shell.qml:355
315+#: qml/Shell.qml:373
335−#, qt-format
336−msgid "Sorry, incorrect %1"
316+msgid "Sorry, incorrect passcode"
337msgstr ""
317msgstr ""
338
318
339−#: qml/Shell.qml:390
319+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
340msgid "Sorry, incorrect passphrase."
320msgid "Sorry, incorrect passphrase."
341msgstr ""
321msgstr ""
342
322
343−#: qml/Shell.qml:391
323+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
344msgid "Sorry, incorrect passcode."
324msgid "Sorry, incorrect passcode."
345msgstr ""
325msgstr ""
346
326
347−#: qml/Shell.qml:392
327+#: qml/Shell.qml:469
348msgid "This will be your last attempt."
328msgid "This will be your last attempt."
349msgstr ""
329msgstr ""
350
330
351−#: qml/Shell.qml:394
331+#: qml/Shell.qml:471
352msgid ""
332msgid ""
353"If passphrase is entered incorrectly, your phone will conduct a factory "
333"If passphrase is entered incorrectly, your phone will conduct a factory "
354"reset and all personal data will be deleted."
334"reset and all personal data will be deleted."
355msgstr ""
335msgstr ""
356
336
357−#: qml/Shell.qml:395
337+#: qml/Shell.qml:472
358msgid ""
338msgid ""
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"If passcode is entered incorrectly, your phone will conduct a factory reset "
360"and all personal data will be deleted."
340"and all personal data will be deleted."
361msgstr ""
341msgstr ""
342+
343+#: qml/Wizard/Page.qml:89
344+msgid "Back"
345+msgstr ""
346+
347+#: qml/Wizard/Pages/10-welcome.qml:27
348+msgid "Hi!"
349+msgstr ""
350+
351+#: qml/Wizard/Pages/10-welcome.qml:44
352+msgid "Welcome to your Ubuntu phone."
353+msgstr ""
354+
355+#: qml/Wizard/Pages/10-welcome.qml:52
356+msgid "Let’s get started."
357+msgstr ""
358+
359+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
360+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
361+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
362+#: qml/Wizard/Pages/passwd-set.qml:90
363+msgid "Continue"
364+msgstr ""
365+
366+#: qml/Wizard/Pages/20-sim.qml:25
367+msgid "Add a SIM card and restart your device"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/20-sim.qml:55
371+msgid "Without it, you won’t be able to make calls or use text messaging."
372+msgstr ""
373+
374+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
375+msgid "Skip"
376+msgstr ""
377+
378+#: qml/Wizard/Pages/30-passwd-type.qml:39
379+msgid "Lock security"
380+msgstr ""
381+
382+#: qml/Wizard/Pages/30-passwd-type.qml:74
383+msgid "Please select how you’d like to unlock your phone."
384+msgstr ""
385+
386+#: qml/Wizard/Pages/30-passwd-type.qml:97
387+msgid "Swipe"
388+msgstr ""
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:98
391+msgid "No security"
392+msgstr ""
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:100
395+msgid "Passcode"
396+msgstr ""
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:101
399+msgid "4 digits only"
400+msgstr ""
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:103
403+msgid "Passphrase"
404+msgstr ""
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:104
407+msgid "Numbers and letters"
408+msgstr ""
409+
410+#: qml/Wizard/Pages/40-wifi.qml:28
411+msgid "Connect to Wi‑Fi"
412+msgstr ""
413+
414+#: qml/Wizard/Pages/40-wifi.qml:147
415+msgid "Available networks…"
416+msgstr ""
417+
418+#: qml/Wizard/Pages/40-wifi.qml:148
419+msgid "No available networks."
420+msgstr ""
421+
422+#: qml/Wizard/Pages/50-location.qml:27
423+msgid "Location"
424+msgstr ""
425+
426+#: qml/Wizard/Pages/50-location.qml:62
427+msgid "Let the phone detect your location:"
428+msgstr ""
429+
430+#: qml/Wizard/Pages/50-location.qml:69
431+msgid "Using GPS only (less accurate)"
432+msgstr ""
433+
434+#: qml/Wizard/Pages/50-location.qml:86
435+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
436+msgstr ""
437+
438+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
439+#: qml/Wizard/Pages/50-location.qml:103
440+msgid ""
441+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
442+"conditions</a>."
443+msgstr ""
444+
445+#: qml/Wizard/Pages/50-location.qml:112
446+msgid "Not at all"
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:124
450+msgid "You can change your mind later in <b>System Settings</b>."
451+msgstr ""
452+
453+#: qml/Wizard/Pages/60-reporting.qml:24
454+msgid "Improving your experience"
455+msgstr ""
456+
457+#: qml/Wizard/Pages/60-reporting.qml:36
458+msgid ""
459+"Your phone is set up to automatically report errors to Canonical and its "
460+"partners, the makers of the operating system."
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:43
464+msgid ""
465+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
466+"Privacy</b>"
467+msgstr ""
468+
469+#: qml/Wizard/Pages/80-finished.qml:24
470+msgid "All done"
471+msgstr ""
472+
473+#: qml/Wizard/Pages/80-finished.qml:39
474+msgid "Nice work!"
475+msgstr ""
476+
477+#: qml/Wizard/Pages/80-finished.qml:46
478+msgid "Your phone is now ready to use."
479+msgstr ""
480+
481+#: qml/Wizard/Pages/80-finished.qml:53
482+msgid "Finish"
483+msgstr ""
484+
485+#: qml/Wizard/Pages/here-terms.qml:27
486+msgid "Terms & Conditions"
487+msgstr ""
488+
489+#: qml/Wizard/Pages/passwd-confirm.qml:49
490+msgid "Confirm passphrase"
491+msgstr ""
492+
493+#: qml/Wizard/Pages/passwd-confirm.qml:50
494+msgid "Confirm passcode"
495+msgstr ""
496+
497+#: qml/Wizard/Pages/passwd-confirm.qml:53
498+#: qml/Wizard/Pages/passwd-confirm.qml:54
499+msgid "Please try again."
500+msgstr ""
501+
502+#: qml/Wizard/Pages/passwd-set.qml:61
503+msgid "Choose your passcode"
504+msgstr ""
505+
506+#: qml/Wizard/Pages/passwd-set.qml:68
507+msgid "Passphrase must be 4 characters long"
508+msgstr ""
509+
510+#: qml/Wizard/StackButton.qml:39
511+#, qt-format
512+msgid "〈 %1"
513+msgstr ""
514+
515+#: qml/Wizard/StackButton.qml:42
516+#, qt-format
517+msgid "%1 〉"
518+msgstr ""
519+
520+#~ msgid "Confirm"
521+#~ msgstr "Potvrdi"
522+
523+#~ msgid "Type or say a command"
524+#~ msgstr "Upišite ili izgovorite naredbu"
525+
526+#~ msgid "Loading. Please Wait..."
527+#~ msgstr "Učitavanje. Molim pričekajte..."
528+
529+#~ msgid "Speak Now..."
530+#~ msgstr "Recite..."
531+
532+#~ msgid "Speaking..."
533+#~ msgstr "Govor..."
po/hu.po+287−95
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-11 10:50+0000\n"
11+"PO-Revision-Date: 2014-12-15 15:26+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-10-12 06:55+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-16 07:34+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -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:198
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:199
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:226
149+#: qml/Components/EdgeDemo.qml:242
150msgid "Well done"
150msgid "Well done"
151msgstr "Rendben"
151msgstr "Rendben"
152
152
153−#: qml/Components/EdgeDemo.qml:227
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,36 +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:220
161+#: qml/Components/Lockscreen.qml:238
162+msgid "Return to Call"
163+msgstr "Vissza a híváshoz"
164+
165+#: qml/Components/Lockscreen.qml:238
162msgid "Emergency Call"
166msgid "Emergency Call"
163msgstr "Vészhívás"
167msgstr "Vészhívás"
164
168
165−#: qml/Components/Lockscreen.qml:252
169+#: qml/Components/Lockscreen.qml:270
166msgid "OK"
170msgid "OK"
167msgstr "Ok"
171msgstr "Ok"
168
172
169−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
173+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
170msgid "See less"
174msgid "See less"
171msgstr "Kevesebb"
175msgstr "Kevesebb"
172
176
173−#: qml/Dash/GenericScopeView.qml:434
177+#: qml/Dash/GenericScopeView.qml:431
174msgid "See all"
178msgid "See all"
175msgstr "Összes megtekintése"
179msgstr "Összes megtekintése"
176
180
177−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
181+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
178#: qml/Panel/SearchIndicator.qml:27
182#: qml/Panel/SearchIndicator.qml:27
179msgid "Search"
183msgid "Search"
180msgstr "Keresés"
184msgstr "Keresés"
181
185
182−#: qml/Dash/PageHeader.qml:268
186+#: qml/Dash/PageHeader.qml:260
187+msgid "Store"
188+msgstr "Áruház"
189+
190+#: qml/Dash/PageHeader.qml:277
183msgid "Settings"
191msgid "Settings"
184msgstr "Beállítások"
192msgstr "Beállítások"
185
193
186−#: qml/Dash/PageHeader.qml:275
194+#: qml/Dash/PageHeader.qml:284
187msgid "Remove from Favorites"
195msgid "Remove from Favorites"
188msgstr "Eltávolítás a kedvencek közül"
196msgstr "Eltávolítás a kedvencek közül"
189
197
190−#: qml/Dash/PageHeader.qml:275
198+#: qml/Dash/PageHeader.qml:284
191msgid "Add to Favorites"
199msgid "Add to Favorites"
192msgstr "Hozzáadás a kedvencekhez"
200msgstr "Hozzáadás a kedvencekhez"
193
201
@@ -219,87 +227,59 @@ msgstr "Húzza a frissítéshez…"
219msgid "Release to refresh…"
227msgid "Release to refresh…"
220msgstr "Engedje el a frissítéshez…"
228msgstr "Engedje el a frissítéshez…"
221
229
222−#: qml/Dash/ScopesOverview.qml:206
230+#: qml/Dash/ScopesList.qml:63
223−msgid "Manage Scopes"
231+msgid "Manage"
224−msgstr "Lencsék kezelése"
232+msgstr ""
225−
226−#: qml/Dash/ScopesOverview.qml:428
227−msgid "Done"
228−msgstr "Kész"
229−
230−#: qml/Dash/ScopesOverview.qml:454
231−msgid "Store"
232−msgstr "Áruház"
233
233
234−#: qml/Dash/ScopesOverviewTab.qml:36
234+#: qml/Dash/ScopesList.qml:107
235−msgid "Favorites"
235+msgid "Home"
236−msgstr "Kedvencek"
236+msgstr ""
237
237
238−#: qml/Dash/ScopesOverviewTab.qml:54
238+#: qml/Dash/ScopesList.qml:108
239−msgid "All"
239+msgid "Also installed"
240−msgstr "Összes"
240+msgstr "Szintén telepítve"
241
241
242−#: qml/Greeter/Greeter.qml:157
242+#: qml/Greeter/Greeter.qml:174
243msgid "Unlock"
243msgid "Unlock"
244msgstr "Feloldás"
244msgstr "Feloldás"
245
245
246−#: qml/Hud/HudParametrizedActionsPage.qml:139
247−msgid "Confirm"
248−msgstr "Megerősítés"
249−
250−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
251−msgid "Type or say a command"
252−msgstr "Írjon be vagy mondjon ki egy parancsot"
253−
254−#: qml/Hud/Hud.qml:84
255−msgid "Loading. Please Wait..."
256−msgstr "Betöltés, kis türelmet…"
257−
258−#: qml/Hud/Hud.qml:89
259−msgid "Speak Now..."
260−msgstr "Most beszéljen…"
261−
262−#: qml/Hud/Hud.qml:94
263−msgid "Speaking..."
264−msgstr "Beszéd…"
265−
266−#: qml/Notifications/NotificationMenuItemFactory.qml:116
246+#: qml/Notifications/NotificationMenuItemFactory.qml:128
267msgid "Show password"
247msgid "Show password"
268msgstr "Jelszó megjelenítése"
248msgstr "Jelszó megjelenítése"
269
249
270−#: qml/Panel/ActiveCallHint.qml:77
250+#: qml/Panel/ActiveCallHint.qml:79
271msgid "Tap to return to call..."
251msgid "Tap to return to call..."
272msgstr "Érintse meg, hogy visszatérjen a híváshoz..."
252msgstr "Érintse meg, hogy visszatérjen a híváshoz..."
273
253
274−#: qml/Panel/ActiveCallHint.qml:90
254+#: qml/Panel/ActiveCallHint.qml:92
275msgid "Conference"
255msgid "Conference"
276msgstr "Konferencia"
256msgstr "Konferencia"
277
257
278−#: qml/Panel/Indicators/MenuItemFactory.qml:600
258+#: qml/Panel/Indicators/MenuItemFactory.qml:643
279msgid "Nothing is playing"
259msgid "Nothing is playing"
280msgstr "Nincs lejátszás"
260msgstr "Nincs lejátszás"
281
261
282−#: qml/Panel/Indicators/MenuItemFactory.qml:748
262+#: qml/Panel/Indicators/MenuItemFactory.qml:791
283msgid "In queue…"
263msgid "In queue…"
284msgstr "Sorban…"
264msgstr "Sorban…"
285
265
286−#: qml/Panel/Indicators/MenuItemFactory.qml:752
266+#: qml/Panel/Indicators/MenuItemFactory.qml:795
287msgid "Downloading"
267msgid "Downloading"
288msgstr "Letöltés"
268msgstr "Letöltés"
289
269
290−#: qml/Panel/Indicators/MenuItemFactory.qml:754
270+#: qml/Panel/Indicators/MenuItemFactory.qml:797
291msgid "Paused, tap to resume"
271msgid "Paused, tap to resume"
292msgstr "Szüneteltetve, koppintson a folytatáshoz"
272msgstr "Szüneteltetve, koppintson a folytatáshoz"
293
273
294−#: qml/Panel/Indicators/MenuItemFactory.qml:756
274+#: qml/Panel/Indicators/MenuItemFactory.qml:799
295msgid "Canceled"
275msgid "Canceled"
296msgstr "Megszakítva"
276msgstr "Megszakítva"
297
277
298−#: qml/Panel/Indicators/MenuItemFactory.qml:758
278+#: qml/Panel/Indicators/MenuItemFactory.qml:801
299msgid "Finished"
279msgid "Finished"
300msgstr "Befejeződött"
280msgstr "Befejeződött"
301
281
302−#: qml/Panel/Indicators/MenuItemFactory.qml:760
282+#: qml/Panel/Indicators/MenuItemFactory.qml:803
303msgid "Failed, tap to retry"
283msgid "Failed, tap to retry"
304msgstr "Sikertelen, koppintson az újrapróbáláshoz"
284msgstr "Sikertelen, koppintson az újrapróbáláshoz"
305
285
@@ -311,49 +291,49 @@ msgstr "SIM feloldása"
311msgid "Roaming"
291msgid "Roaming"
312msgstr "Barangolás"
292msgstr "Barangolás"
313
293
314−#: qml/Shell.qml:346
294+#: qml/Shell.qml:367
295+#, qt-format
296+msgid "Enter %1"
297+msgstr "Adja meg: %1"
298+
299+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
315msgid "Enter passphrase"
300msgid "Enter passphrase"
316msgstr "Jelmondat megadása"
301msgstr "Jelmondat megadása"
317
302
318−#: qml/Shell.qml:347
303+#: qml/Shell.qml:369
304+msgid "Enter passcode"
305+msgstr "Jelkód megadása"
306+
307+#: qml/Shell.qml:370
308+#, qt-format
309+msgid "Sorry, incorrect %1"
310+msgstr "Sajnáljuk, helytelen %1"
311+
312+#: qml/Shell.qml:371
319msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
320msgstr "Sajnáljuk, helytelen jelmondat"
314msgstr "Sajnáljuk, helytelen jelmondat"
321
315
322−#: qml/Shell.qml:348
316+#: qml/Shell.qml:372
323msgid "Please re-enter"
317msgid "Please re-enter"
324msgstr "Kérjük próbálja újra"
318msgstr "Kérjük próbálja újra"
325
319
326−#: qml/Shell.qml:350
320+#: qml/Shell.qml:373
327−msgid "Enter passcode"
328−msgstr "Jelkód megadása"
329−
330−#: qml/Shell.qml:351
331msgid "Sorry, incorrect passcode"
321msgid "Sorry, incorrect passcode"
332msgstr "Sajnáljuk, helytelen jelkód"
322msgstr "Sajnáljuk, helytelen jelkód"
333
323
334−#: qml/Shell.qml:354
324+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
335−#, qt-format
336−msgid "Enter %1"
337−msgstr "Adja meg: %1"
338−
339−#: qml/Shell.qml:355
340−#, qt-format
341−msgid "Sorry, incorrect %1"
342−msgstr "Sajnáljuk, helytelen %1"
343−
344−#: qml/Shell.qml:390
345msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
346msgstr "Sajnáljuk, helytelen jelmondat."
326msgstr "Sajnáljuk, helytelen jelmondat."
347
327
348−#: qml/Shell.qml:391
328+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
349msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
350msgstr "Sajnáljuk, helytelen jelkód."
330msgstr "Sajnáljuk, helytelen jelkód."
351
331
352−#: qml/Shell.qml:392
332+#: qml/Shell.qml:469
353msgid "This will be your last attempt."
333msgid "This will be your last attempt."
354msgstr "Ez az utolsó próbálkozási lehetősége."
334msgstr "Ez az utolsó próbálkozási lehetősége."
355
335
356−#: qml/Shell.qml:394
336+#: qml/Shell.qml:471
357msgid ""
337msgid ""
358"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
359"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -361,10 +341,222 @@ msgstr ""
361"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
341"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
362"beállításokat és törli minden személyes adatát."
342"beállításokat és törli minden személyes adatát."
363
343
364−#: qml/Shell.qml:395
344+#: qml/Shell.qml:472
365msgid ""
345msgid ""
366"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 "
367"and all personal data will be deleted."
347"and all personal data will be deleted."
368msgstr ""
348msgstr ""
369"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "
349"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "
370"beállításokat és törli minden személyes adatát."
350"beállításokat és törli minden személyes adatát."
351+
352+#: qml/Wizard/Page.qml:89
353+msgid "Back"
354+msgstr "Vissza"
355+
356+#: qml/Wizard/Pages/10-welcome.qml:27
357+msgid "Hi!"
358+msgstr "Üdv!"
359+
360+#: qml/Wizard/Pages/10-welcome.qml:44
361+msgid "Welcome to your Ubuntu phone."
362+msgstr "Üdvözöljük az Ubuntu telefonos változatában."
363+
364+#: qml/Wizard/Pages/10-welcome.qml:52
365+msgid "Let’s get started."
366+msgstr "Kezdjünk is bele."
367+
368+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
369+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
370+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
371+#: qml/Wizard/Pages/passwd-set.qml:90
372+msgid "Continue"
373+msgstr "Folytatás"
374+
375+#: qml/Wizard/Pages/20-sim.qml:25
376+msgid "Add a SIM card and restart your device"
377+msgstr "Helyezzen be egy SIM kártyát és indítsa újra az eszközét"
378+
379+#: qml/Wizard/Pages/20-sim.qml:55
380+msgid "Without it, you won’t be able to make calls or use text messaging."
381+msgstr ""
382+"Anélkül nem indíthat vagy fogadhat hívásokat és nem küldhet vagy fogadhat "
383+"üzeneteket."
384+
385+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
386+msgid "Skip"
387+msgstr "Kihagyás"
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:39
390+msgid "Lock security"
391+msgstr "Képernyőzárolás"
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:74
394+msgid "Please select how you’d like to unlock your phone."
395+msgstr "Válassza ki, hogy milyen módon kívánja feloldani a telefonját."
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:97
398+msgid "Swipe"
399+msgstr "Csúsztatás"
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:98
402+msgid "No security"
403+msgstr "Nem biztonságos"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:100
406+msgid "Passcode"
407+msgstr "Jelkód"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:101
410+msgid "4 digits only"
411+msgstr "4 számjegy"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:103
414+msgid "Passphrase"
415+msgstr "Jelmondat"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:104
418+msgid "Numbers and letters"
419+msgstr "Betűk és számok"
420+
421+#: qml/Wizard/Pages/40-wifi.qml:28
422+msgid "Connect to Wi‑Fi"
423+msgstr "Csatlakozás Wi-Fi hálózathoz"
424+
425+#: qml/Wizard/Pages/40-wifi.qml:147
426+msgid "Available networks…"
427+msgstr "Elérhető hálózatok…"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:148
430+msgid "No available networks."
431+msgstr "Nincsenek elérhető hálózatok."
432+
433+#: qml/Wizard/Pages/50-location.qml:27
434+msgid "Location"
435+msgstr "Tartózkodási hely"
436+
437+#: qml/Wizard/Pages/50-location.qml:62
438+msgid "Let the phone detect your location:"
439+msgstr "A telefon megpróbálja megállapítani az Ön tartózkodási helyét:"
440+
441+#: qml/Wizard/Pages/50-location.qml:69
442+msgid "Using GPS only (less accurate)"
443+msgstr "Csak GPS használata (kevésbé pontos)"
444+
445+#: qml/Wizard/Pages/50-location.qml:86
446+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
447+msgstr "GPS és névtelen Wi-Fi és mobilhálózati adatok (ajánlott)"
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+"A lehetőség kiválasztásával elfogadja a Nokia HERE <a href='#'>felhasználási "
456+"feltételeit</a>."
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 "Ezt később a <b>Rendszerbeállítások</b> alatt módosíthatja."
465+
466+#: qml/Wizard/Pages/60-reporting.qml:24
467+msgid "Improving your experience"
468+msgstr "Javítson az élményen"
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+"A telefonja automatikus hibajelentéseket küld az operációs rendszert készítő "
476+"Canonical, és annak partnerei felé."
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+"Ezt kikapcsolhatja a <b>Rendszerbeállítások</b> alatt található <b>Biztonság "
484+"és adatvédelem</b> alatt"
485+
486+#: qml/Wizard/Pages/80-finished.qml:24
487+msgid "All done"
488+msgstr "Készen van"
489+
490+#: qml/Wizard/Pages/80-finished.qml:39
491+msgid "Nice work!"
492+msgstr "Szép munka!"
493+
494+#: qml/Wizard/Pages/80-finished.qml:46
495+msgid "Your phone is now ready to use."
496+msgstr "A telefonja készen áll a használatra."
497+
498+#: qml/Wizard/Pages/80-finished.qml:53
499+msgid "Finish"
500+msgstr "Befejezés"
501+
502+#: qml/Wizard/Pages/here-terms.qml:27
503+msgid "Terms & Conditions"
504+msgstr "Felhasználási feltételek"
505+
506+#: qml/Wizard/Pages/passwd-confirm.qml:49
507+msgid "Confirm passphrase"
508+msgstr "Jelmondat megerősítése"
509+
510+#: qml/Wizard/Pages/passwd-confirm.qml:50
511+msgid "Confirm passcode"
512+msgstr "Jelkód megerősítése"
513+
514+#: qml/Wizard/Pages/passwd-confirm.qml:53
515+#: qml/Wizard/Pages/passwd-confirm.qml:54
516+msgid "Please try again."
517+msgstr "Próbálja újra."
518+
519+#: qml/Wizard/Pages/passwd-set.qml:61
520+msgid "Choose your passcode"
521+msgstr "Jelkód kiválasztása"
522+
523+#: qml/Wizard/Pages/passwd-set.qml:68
524+msgid "Passphrase must be 4 characters long"
525+msgstr "A jelmondat legalább 4 karakter hosszú legyen"
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+
537+#~ msgid "Confirm"
538+#~ msgstr "Megerősítés"
539+
540+#~ msgid "Type or say a command"
541+#~ msgstr "Írjon be vagy mondjon ki egy parancsot"
542+
543+#~ msgid "Loading. Please Wait..."
544+#~ msgstr "Betöltés, kis türelmet…"
545+
546+#~ msgid "Speaking..."
547+#~ msgstr "Beszéd…"
548+
549+#~ msgid "Speak Now..."
550+#~ msgstr "Most beszéljen…"
551+
552+#~ msgid "All"
553+#~ msgstr "Összes"
554+
555+#~ msgid "Favorites"
556+#~ msgstr "Kedvencek"
557+
558+#~ msgid "Done"
559+#~ msgstr "Kész"
560+
561+#~ msgid "Manage Scopes"
562+#~ msgstr "Lencsék kezelése"
po/hy.po+274−93
@@ -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-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+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-10-29 07:27+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
19−"X-Generator: Launchpad (build 17203)\n"
19+"X-Generator: Launchpad (build 17286)\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
@@ -114,78 +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:198
141+#: qml/Components/EdgeDemo.qml:214
142msgid "Left edge"
142msgid "Left edge"
143msgstr "Ձախ եզրը"
143msgstr "Ձախ եզրը"
144
144
145−#: qml/Components/EdgeDemo.qml:199
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:226
149+#: qml/Components/EdgeDemo.qml:242
150msgid "Well done"
150msgid "Well done"
151msgstr "Լավ է"
151msgstr "Լավ է"
152
152
153−#: qml/Components/EdgeDemo.qml:227
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:220
159+#: qml/Components/Lockscreen.qml:238
160+msgid "Return to Call"
161+msgstr ""
162+
163+#: qml/Components/Lockscreen.qml:238
160msgid "Emergency Call"
164msgid "Emergency Call"
161msgstr ""
165msgstr ""
162
166
163−#: qml/Components/Lockscreen.qml:252
167+#: qml/Components/Lockscreen.qml:270
164msgid "OK"
168msgid "OK"
165msgstr ""
169msgstr ""
166
170
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
168msgid "See less"
172msgid "See less"
169msgstr ""
173msgstr ""
170
174
171−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:431
172msgid "See all"
176msgid "See all"
173msgstr "Տեսնել բոլորը"
177msgstr "Տեսնել բոլորը"
174
178
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
176#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
181msgid "Search"
178msgstr "Որոնում"
182msgstr "Որոնում"
179
183
180−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:260
185+msgid "Store"
186+msgstr "Խանութ"
187+
188+#: qml/Dash/PageHeader.qml:277
181msgid "Settings"
189msgid "Settings"
182msgstr "Կարգավորումներ"
190msgstr "Կարգավորումներ"
183
191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185msgid "Remove from Favorites"
193msgid "Remove from Favorites"
186msgstr "Հեռացնել ընտրյալների ցուցակից"
194msgstr "Հեռացնել ընտրյալների ցուցակից"
187
195
188−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:284
189msgid "Add to Favorites"
197msgid "Add to Favorites"
190msgstr "Ավելացնել ընտրյալների ցուցակում"
198msgstr "Ավելացնել ընտրյալների ցուցակում"
191
199
@@ -217,87 +225,59 @@ msgstr ""
217msgid "Release to refresh…"
225msgid "Release to refresh…"
218msgstr ""
226msgstr ""
219
227
220−#: qml/Dash/ScopesOverview.qml:206
228+#: qml/Dash/ScopesList.qml:63
221−msgid "Manage Scopes"
229+msgid "Manage"
222msgstr ""
230msgstr ""
223
231
224−#: qml/Dash/ScopesOverview.qml:428
232+#: qml/Dash/ScopesList.qml:107
225−msgid "Done"
226−msgstr "Կատարված է"
227−
228−#: qml/Dash/ScopesOverview.qml:454
229−msgid "Store"
230−msgstr "Խանութ"
231−
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
233+msgid "Home"
234−msgstr "Նախընտրելի"
234+msgstr ""
235
235
236−#: qml/Dash/ScopesOverviewTab.qml:54
236+#: qml/Dash/ScopesList.qml:108
237−msgid "All"
237+msgid "Also installed"
238−msgstr "Բոլորը"
238+msgstr ""
239
239
240−#: qml/Greeter/Greeter.qml:157
240+#: qml/Greeter/Greeter.qml:174
241msgid "Unlock"
241msgid "Unlock"
242msgstr "Ապաբլոկավորել"
242msgstr "Ապաբլոկավորել"
243
243
244−#: qml/Hud/HudParametrizedActionsPage.qml:139
245−msgid "Confirm"
246−msgstr "Հաստատել"
247−
248−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
249−msgid "Type or say a command"
250−msgstr "Գրիր կամ ասա կոմմենտը"
251−
252−#: qml/Hud/Hud.qml:84
253−msgid "Loading. Please Wait..."
254−msgstr "Բեռնվում է: Խնդրում ենք սպասել..."
255−
256−#: qml/Hud/Hud.qml:89
257−msgid "Speak Now..."
258−msgstr "Հիմա խոսեք..."
259−
260−#: qml/Hud/Hud.qml:94
261−msgid "Speaking..."
262−msgstr "Խոսում եմ..."
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
265msgid "Show password"
245msgid "Show password"
266msgstr "Ցույց տալ գաղտնաբառը"
246msgstr "Ցույց տալ գաղտնաբառը"
267
247
268−#: qml/Panel/ActiveCallHint.qml:77
248+#: qml/Panel/ActiveCallHint.qml:79
269msgid "Tap to return to call..."
249msgid "Tap to return to call..."
270msgstr ""
250msgstr ""
271
251
272−#: qml/Panel/ActiveCallHint.qml:90
252+#: qml/Panel/ActiveCallHint.qml:92
273msgid "Conference"
253msgid "Conference"
274msgstr ""
254msgstr ""
275
255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:600
256+#: qml/Panel/Indicators/MenuItemFactory.qml:643
277msgid "Nothing is playing"
257msgid "Nothing is playing"
278msgstr ""
258msgstr ""
279
259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:748
260+#: qml/Panel/Indicators/MenuItemFactory.qml:791
281msgid "In queue…"
261msgid "In queue…"
282msgstr "Հերթում..."
262msgstr "Հերթում..."
283
263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:752
264+#: qml/Panel/Indicators/MenuItemFactory.qml:795
285msgid "Downloading"
265msgid "Downloading"
286msgstr "Ներբեռնում"
266msgstr "Ներբեռնում"
287
267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:754
268+#: qml/Panel/Indicators/MenuItemFactory.qml:797
289msgid "Paused, tap to resume"
269msgid "Paused, tap to resume"
290msgstr ""
270msgstr ""
291
271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:756
272+#: qml/Panel/Indicators/MenuItemFactory.qml:799
293msgid "Canceled"
273msgid "Canceled"
294msgstr "Չեղյալ է համարված"
274msgstr "Չեղյալ է համարված"
295
275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:758
276+#: qml/Panel/Indicators/MenuItemFactory.qml:801
297msgid "Finished"
277msgid "Finished"
298msgstr "Ավարտված է"
278msgstr "Ավարտված է"
299
279
300−#: qml/Panel/Indicators/MenuItemFactory.qml:760
280+#: qml/Panel/Indicators/MenuItemFactory.qml:803
301msgid "Failed, tap to retry"
281msgid "Failed, tap to retry"
302msgstr ""
282msgstr ""
303
283
@@ -309,56 +289,257 @@ msgstr "Ապաբլոկավորել SIM-ը"
309msgid "Roaming"
289msgid "Roaming"
310msgstr "Ռոումինգ"
290msgstr "Ռոումինգ"
311
291
312−#: qml/Shell.qml:346
292+#: qml/Shell.qml:367
293+#, qt-format
294+msgid "Enter %1"
295+msgstr "Մուտքագրեք %1"
296+
297+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313msgid "Enter passphrase"
298msgid "Enter passphrase"
314msgstr "Մուտքագրե՛ք անցաբառը"
299msgstr "Մուտքագրե՛ք անցաբառը"
315
300
316−#: qml/Shell.qml:347
301+#: qml/Shell.qml:369
302+msgid "Enter passcode"
303+msgstr "Մոտքագրեք ծածկագիրը"
304+
305+#: qml/Shell.qml:370
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr "Ներեցեք, սխալ %1"
309+
310+#: qml/Shell.qml:371
317msgid "Sorry, incorrect passphrase"
311msgid "Sorry, incorrect passphrase"
318msgstr "Ներեցեք, սխալ անցաբառ է"
312msgstr "Ներեցեք, սխալ անցաբառ է"
319
313
320−#: qml/Shell.qml:348
314+#: qml/Shell.qml:372
321msgid "Please re-enter"
315msgid "Please re-enter"
322msgstr "Խնդրում ենք նորից մուտքագրել"
316msgstr "Խնդրում ենք նորից մուտքագրել"
323
317
324−#: qml/Shell.qml:350
318+#: qml/Shell.qml:373
325−msgid "Enter passcode"
326−msgstr "Մոտքագրեք ծածկագիրը"
327−
328−#: qml/Shell.qml:351
329msgid "Sorry, incorrect passcode"
319msgid "Sorry, incorrect passcode"
330msgstr "Ներեցեք, սխալ ծածկագիր է"
320msgstr "Ներեցեք, սխալ ծածկագիր է"
331
321
332−#: qml/Shell.qml:354
322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
333−#, qt-format
334−msgid "Enter %1"
335−msgstr "Մուտքագրեք %1"
336−
337−#: qml/Shell.qml:355
338−#, qt-format
339−msgid "Sorry, incorrect %1"
340−msgstr "Ներեցեք, սխալ %1"
341−
342−#: qml/Shell.qml:390
343msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
344msgstr "Ներեցեք, սխալ անցաբառ է"
324msgstr "Ներեցեք, սխալ անցաբառ է"
345
325
346−#: qml/Shell.qml:391
326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
347msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
348msgstr "Ներեցեք, սխալ ծածկագիր է:"
328msgstr "Ներեցեք, սխալ ծածկագիր է:"
349
329
350−#: qml/Shell.qml:392
330+#: qml/Shell.qml:469
351msgid "This will be your last attempt."
331msgid "This will be your last attempt."
352msgstr "Սա կլինի ձեր վերջին փորձը"
332msgstr "Սա կլինի ձեր վերջին փորձը"
353
333
354−#: qml/Shell.qml:394
334+#: qml/Shell.qml:471
355msgid ""
335msgid ""
356"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
357"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
358msgstr ""
338msgstr ""
359
339
360−#: qml/Shell.qml:395
340+#: qml/Shell.qml:472
361msgid ""
341msgid ""
362"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 "
363"and all personal data will be deleted."
343"and all personal data will be deleted."
364msgstr ""
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 ""
522+
523+#~ msgid "Confirm"
524+#~ msgstr "Հաստատել"
525+
526+#~ msgid "Type or say a command"
527+#~ msgstr "Գրիր կամ ասա կոմմենտը"
528+
529+#~ msgid "Speaking..."
530+#~ msgstr "Խոսում եմ..."
531+
532+#~ msgid "Favorites"
533+#~ msgstr "Նախընտրելի"
534+
535+#~ msgid "Done"
536+#~ msgstr "Կատարված է"
537+
538+#~ msgid "Loading. Please Wait..."
539+#~ msgstr "Բեռնվում է: Խնդրում ենք սպասել..."
540+
541+#~ msgid "Speak Now..."
542+#~ msgstr "Հիմա խոսեք..."
543+
544+#~ msgid "All"
545+#~ msgstr "Բոլորը"
po/id.po+334−141

This diff is too big to show here.

po/is.po+283−101

This diff is too big to show here.

po/it.po+288−106

This diff is too big to show here.

po/ja.po+286−109

This diff is too big to show here.

po/km.po+272−97

This diff is too big to show here.

po/kn.po+261−89

This diff is too big to show here.

po/ko.po+276−98

This diff is too big to show here.

po/ku.po+272−97

This diff is too big to show here.

po/ky.po+261−89

This diff is too big to show here.

po/lo.po+255−89

This diff is too big to show here.

po/lt.po+261−89

This diff is too big to show here.

po/lv.po+272−94

This diff is too big to show here.

po/ml.po+261−89

This diff is too big to show here.

po/mr.po+246−89

This diff is too big to show here.

po/ms.po+325−133

This diff is too big to show here.

po/my.po+261−89

This diff is too big to show here.

po/nb.po+278−100

This diff is too big to show here.

po/nl.po+278−100

This diff is too big to show here.

po/pa.po+246−89

This diff is too big to show here.

po/pl.po+261−89

This diff is too big to show here.

po/pt.po+289−110

This diff is too big to show here.

po/pt_BR.po+276−98

This diff is too big to show here.

po/ro.po+277−99

This diff is too big to show here.

po/ru.po+290−107

This diff is too big to show here.

po/shn.po+246−89

This diff is too big to show here.

po/si.po+246−89

This diff is too big to show here.

po/sl.po+274−99

This diff is too big to show here.

po/sq.po+246−89

This diff is too big to show here.

po/sr.po+272−97

This diff is too big to show here.

po/sv.po+276−98

This diff is too big to show here.

po/sw.po+249−89

This diff is too big to show here.

po/ta.po+261−89

This diff is too big to show here.

po/te.po+258−89

This diff is too big to show here.

po/th.po+246−89

This diff is too big to show here.

po/tr.po+265−93

This diff is too big to show here.

po/ug.po+276−98

This diff is too big to show here.

po/uk.po+281−99

This diff is too big to show here.

po/unity8.pot+244−87

This diff is too big to show here.

po/update-unity-pot+1

This diff is too big to show here.

po/vi.po+246−89

This diff is too big to show here.

po/xh.po+246−89

This diff is too big to show here.

po/zh_CN.po+275−94

This diff is too big to show here.

po/zh_HK.po+261−89

This diff is too big to show here.

po/zh_TW.po+279−98

This diff is too big to show here.

qml/CMakeLists.txt+2−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/EdgeDragEvaluator.qml+11−5

This diff is too big to show here.

qml/Components/Lockscreen.qml+15

This diff is too big to show here.

qml/Hud/ToolBarIcon.qml → qml/Components/PanelState/PanelState.qmlrenamed+9−12

This diff is too big to show here.

qml/Components/PanelState/qmldirnew file+1

This diff is too big to show here.

qml/Components/ResponsiveFlowView.qmldeleted−74

This diff is too big to show here.

qml/Components/ResponsiveVerticalJournal.qml+1

This diff is too big to show here.

qml/Components/ScreenGrabber.qmlnew file+72

This diff is too big to show here.

tests/mocks/HudClient/fake_hud_plugin.cpp → qml/Components/ShellDialog.qmlrenamed+15−17

This diff is too big to show here.

qml/Components/Showable.qml+13

This diff is too big to show here.

qml/Components/VolumeKeyFilter.qmlnew file+63

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

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

This diff is too big to show here.

qml/Dash/CardTool.qml+1−1

This diff is too big to show here.

qml/Dash/CardVerticalJournal.qml+1−1

This diff is too big to show here.

qml/Dash/Dash.qml+103−133

This diff is too big to show here.

qml/Dash/DashContent.qml+13−1

This diff is too big to show here.

qml/Dash/DashNavigationButton.qml+28−23

This diff is too big to show here.

qml/Dash/DashRenderer.qml+2−4

This diff is too big to show here.

qml/Dash/GenericScopeView.qml+47−24

This diff is too big to show here.

qml/Dash/PageHeader.qml+20−4

This diff is too big to show here.

qml/Dash/Previews/PreviewActions.qml+2−1

This diff is too big to show here.

qml/Dash/Previews/PreviewPayments.qml+1−1

This diff is too big to show here.

qml/Dash/Previews/PreviewZoomableImage.qml+1

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

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

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

This diff is too big to show here.

qml/Greeter/Greeter.qml+92−83

This diff is too big to show here.

qml/Greeter/GreeterContent.qml+6−18

This diff is too big to show here.

qml/Greeter/Infographics.qml+20−18

This diff is too big to show here.

qml/Greeter/LoginList.qml−1

This diff is too big to show here.

qml/Hud/Hud.qmldeleted−496

This diff is too big to show here.

qml/Hud/HudParametrizedActionsPage.qmldeleted−179

This diff is too big to show here.

qml/Hud/Result.qmldeleted−84

This diff is too big to show here.

qml/Hud/ResultList.qmldeleted−106

This diff is too big to show here.

qml/Hud/SearchBar.qmldeleted−100

This diff is too big to show here.

qml/Hud/ShowingAnimation.qmldeleted−54

This diff is too big to show here.

qml/Hud/SliderLabel.qmldeleted−76

This diff is too big to show here.

qml/Hud/SoundAmplitudeDelegate.qmldeleted−52

This diff is too big to show here.

qml/Hud/SoundAmplitudeVisual.qmldeleted−146

This diff is too big to show here.

qml/Hud/graphics/divider@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/divider@20.scideleted−5

This diff is too big to show here.

qml/Hud/graphics/help@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/hud_bg@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/hud_handlearrow@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/hud_handlebar@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/icon_arrow@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/icon_clear@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/icon_search@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/microphone@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/popup_triangle@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/settings@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/undo@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/view-fullscreen@20.pngdeleted

Binary file not shown.

qml/Launcher/Launcher.qml+37−19

This diff is too big to show here.

qml/Launcher/LauncherPanel.qml+51−23

This diff is too big to show here.

qml/Launcher/graphics/quicklist_tooltip@30.png

Binary file not shown.

qml/Notifications/Notification.qml+30−102

This diff is too big to show here.

qml/Notifications/NotificationMenuItemFactory.qml+20−2

This diff is too big to show here.

qml/Notifications/OptionToggle.qmlnew file+123

This diff is too big to show here.

qml/Notifications/ShapedIcon.qml+1−1

This diff is too big to show here.

qml/Notifications/SwipeToAct.qmlnew file+309

This diff is too big to show here.

qml/Panel/IndicatorItem.qml+1−2

This diff is too big to show here.

qml/Panel/IndicatorPage.qml+12−1

This diff is too big to show here.

qml/Panel/Indicators/MenuItemFactory.qml+36−8

This diff is too big to show here.

qml/Panel/IndicatorsBar.qml+29−20

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+117−64

This diff is too big to show here.

qml/Stages/ApplicationWindow.qml+1

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

This diff is too big to show here.

qml/Stages/PhoneStage.qml+19−35

This diff is too big to show here.

qml/Stages/SessionContainer.qml+4

This diff is too big to show here.

qml/Stages/SpreadDelegate.qml+20−3

This diff is too big to show here.

qml/Stages/SurfaceContainer.qml+1

This diff is too big to show here.

qml/Stages/TabletStage.qml+7−16

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/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+136

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

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.

qml/graphics/applicationIcons/dash@18.png → qml/graphics/applicationIcons/dash.pngrenamed

Binary file not shown.

src/CMakeLists.txt+4−1

This diff is too big to show here.

src/CachingNetworkManagerFactory.cpp+2−11

This diff is too big to show here.

src/CachingNetworkManagerFactory.h+2−6

This diff is too big to show here.

src/Dash/CMakeLists.txt+1−1

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+1−1

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/dash.py+23−9

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/hud.pydeleted−94

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/main_window.py−13

This diff is too big to show here.

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

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/disabled_test_hud.pydeleted−225

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_emulators.py+10−47

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_notifications.py−51

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+2−1

This diff is too big to show here.

tests/mocks/HudClient/CMakeLists.txtdeleted−38

This diff is too big to show here.

tests/mocks/HudClient/HudClient.qmltypesdeleted−113

This diff is too big to show here.

tests/mocks/HudClient/fake_libhud_client.cppdeleted−247

This diff is too big to show here.

tests/mocks/HudClient/libhud_client_stub.cppdeleted−93

This diff is too big to show here.

tests/mocks/HudClient/libhud_client_stub.hdeleted−64

This diff is too big to show here.

tests/mocks/HudClient/qmldirdeleted−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/Unity/Notifications/notification.js → tests/mocks/MeeGo/QOfono/MockOfonoManager.qmlrenamed+7−7

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.

plugins/HudClient/plugin.cpp → tests/mocks/MeeGo/QOfono/plugin.cpprenamed+12−15

This diff is too big to show here.

plugins/HudClient/plugin.h → tests/mocks/MeeGo/QOfono/plugin.hrenamed+6−6

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

This diff is too big to show here.

tests/mocks/QMenuModel/QDBusActionGroup.qml+12

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

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/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qmlnew file+23

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/Ubuntu/SystemSettings/SecurityPrivacy/plugin.cppnew file+26

This diff is too big to show here.

tests/mocks/HudClient/fake_hud_plugin.h → tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.hrenamed+6−6

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/Application/Session.h+1−1

This diff is too big to show here.

tests/mocks/Unity/CMakeLists.txt+2−6

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+5

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.h+3

This diff is too big to show here.

tests/mocks/Unity/Notifications/CMakeLists.txt+15−1

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockActionModel.cppnew file+72

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockActionModel.hnew file+51

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotificationTypes.cppnew file+26

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotificationTypes.hnew file+36

This diff is too big to show here.

tests/mocks/Unity/Notifications/plugin.cppnew file+31

This diff is too big to show here.

tests/mocks/Unity/Notifications/plugin.hnew file+35

This diff is too big to show here.

tests/mocks/Unity/Notifications/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/CMakeLists.txt+1

This diff is too big to show here.

tests/plugins/Dash/cardcreator/1.res+4−4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/2.res+2−3

This diff is too big to show here.

tests/plugins/Dash/cardcreator/3.res+10−10

This diff is too big to show here.

tests/plugins/Dash/cardcreator/4.res+3−4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/5.res+10−10

This diff is too big to show here.

tests/plugins/Dash/cardcreator/6.res+1−1

This diff is too big to show here.

tests/plugins/Dash/cardcreator/7.res+2−3

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/tst_CroppedImageMinimumSourceSize.qmlnew file+56

This diff is too big to show here.

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

This diff is too big to show here.

tests/plugins/Dash/verticaljournaltest.qml+1

This diff is too big to show here.

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

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.h+2

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchDispatcher.cpp+59

This diff is too big to show here.

tests/plugins/Unity/Launcher/CMakeLists.txt+1−1

This diff is too big to show here.

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

This diff is too big to show here.

tests/plugins/Unity/Launcher/gsettings.h+1

This diff is too big to show here.

tests/plugins/Unity/Launcher/launchermodeltest.cpp+14−2

This diff is too big to show here.

tests/plugins/Utils/qsortfilterproxymodeltest.cpp+1−1

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+4−3

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_ResponsiveFlowView.qmldeleted−191

This diff is too big to show here.

tests/qmltests/Dash/tst_Card.qml−22

This diff is too big to show here.

tests/qmltests/Dash/tst_Dash.qml+240−145

This diff is too big to show here.

tests/qmltests/Dash/tst_DashContent.qml+13−6

This diff is too big to show here.

tests/qmltests/Dash/tst_GenericScopeView.qml+4−2

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_MultiGreeter.qml+15−15

This diff is too big to show here.

tests/qmltests/Greeter/tst_SingleGreeter.qml+163−32

This diff is too big to show here.

tests/qmltests/Hud/tst_Hud.qmldeleted−239

This diff is too big to show here.

tests/qmltests/Hud/tst_Result.qmldeleted−98

This diff is too big to show here.

tests/qmltests/Launcher/tst_Launcher.qml+46−11

This diff is too big to show here.

tests/qmltests/Notifications/tst_Notifications.qml+506−552

This diff is too big to show here.

tests/qmltests/Notifications/tst_OptionToggle.qmlnew file+286

This diff is too big to show here.

tests/qmltests/Notifications/tst_SwipeToAct.qmlnew file+276

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Panel/tst_IndicatorPage.qml+54−9

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_IndicatorsMenu.qml+3−3

This diff is too big to show here.

tests/qmltests/Panel/tst_Panel.qml+5−10

This diff is too big to show here.

tests/qmltests/Stages/tst_PhoneStage.qml+41−6

This diff is too big to show here.

tests/qmltests/Stages/tst_SessionContainer.qml+35

This diff is too big to show here.

tests/qmltests/Stages/tst_SpreadDelegate.qml+11−5

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

This diff is too big to show here.

tests/qmltests/tst_Shell.qml+8−11

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml+86

This diff is too big to show here.

tests/qmltests/tst_TabletShell.qml+18−14

This diff is too big to show here.

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

This diff is too big to show here.