git.iko.soy/unity8

on xenial help sign in

CMakeLists.txt+5

@@ -61,6 +61,11 @@ include(GNUInstallDirs)

6161set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)

6262set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)

6363

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+

6469execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir_suffix unity-shell-api OUTPUT_VARIABLE SHELL_INSTALL_QML OUTPUT_STRIP_TRAILING_WHITESPACE)

6570if(SHELL_INSTALL_QML STREQUAL "")

6671 message(FATAL_ERROR "Could not determine plugin installation dir.")

build.sh+1

@@ -54,6 +54,7 @@ install_dependencies() {

5454 qtdeclarative5-unity-notifications-plugin \

5555 qml-module-ubuntu-connectivity \

5656 ubuntu-mobile-icons \

57+ ubuntu-system-settings \

5758 unity-plugin-scopes \

5859 xvfb \

5960 || exit 5

cmake/modules/QmlTest.cmake+3

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

153153

154154macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)

155155 set(testCommand

156+ ${ENVVAR}

156157 LD_LIBRARY_PATH=${LD_PATH}

158+ dbus-launch

157159 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

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

159161 -o -,txt)

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

171173 ${ENVVAR}

172174 LD_LIBRARY_PATH=${LD_PATH}

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

176+ dbus-launch

174177 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

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

176179 -o -,txt)

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

@@ -1,3 +1,188 @@

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

2+

3+ [ Michał Sawicz ]

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

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

6+ enabled by a complete PAM interaction.

7+

8+ [ Leo Arias ]

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

10+

11+ [ Nick Dedekind ]

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

13+

14+ [ Albert Astals ]

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

16+ * QSortFilterProxyModelQML -> UnitySortFilterProxyModelQML

17+ * Clip the Scopes List header

18+ * Fix ScopesList not being under finger

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

20+ * Disable Dash horizontal scroll while Navigation InverseMouseArea is

21+ pressed (LP: #1403048)

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

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

24+ backButton

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

26+

27+ [ Michael Terry ]

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

29+ the background image.

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

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

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

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

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

35+ enabled by a complete PAM interaction.

36+

37+ [ Martin Pitt ]

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

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

40+

41+ [ Rodney Dawes ]

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

43+ (LP: #1353855)

44+

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

46+

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

48+

49+ [ Ubuntu daily release ]

50+ * New rebuild forced

51+

52+ [ Albert Astals ]

53+ * Need to wait until loaded is true to use the count property

54+ * Manage Dash: Ellide properly

55+

56+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 16 Dec 2014 11:03:37 +0000

57+

58+unity8 (8.02+15.04.20141215.3-0ubuntu1) vivid; urgency=low

59+

60+ [ Albert Astals Cid ]

61+ * ScopesList: Use the default scope style for the header

62+

63+ [ Daniel d'Andrada ]

64+ * Refactor Dialogs.qml to use proper in-scene dialogs

65+ * Make Greeter nicely handle being resized

66+

67+ [ Albert Astals ]

68+ * Rework how we set the ranges so we get some more asynchronousity

69+ from item views (LP: #1384374)

70+ * clickscope is back to being unfavoritable (LP: #1400762)

71+ * Fix clicking on the manage dash list after having moved the current

72+ scope

73+ * Make the drag range be a multiple of the drag "rate" value.

74+ Workarounds https://bugs.launchpad.net/mir/+bug/1399690

75+

76+ [ Gerry Boland ]

77+ * MockAppMan: emit SIGSTOP so AP test apps are run (LP: #1394208)

78+

79+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 15 Dec 2014 22:43:16 +0000

80+

81+unity8 (8.02+15.04.20141212.1-0ubuntu1) vivid; urgency=low

82+

83+ [ Ubuntu daily release ]

84+ * New rebuild forced

85+

86+ [ Albert Astals ]

87+ * Make Navigation work when "jumping" to the non root

88+

89+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 12 Dec 2014 12:28:10 +0000

90+

91+unity8 (8.02+15.04.20141211.2-0ubuntu1) vivid; urgency=medium

92+

93+ [ Michał Sawicz ]

94+ * Bump version due to new Manage Dash

95+

96+ [ Gerry Boland ]

97+ * [indicators] Fix positioning on panel resize.

98+

99+ [ Nick Dedekind ]

100+ * [indicators] Fix positioning on panel resize.

101+

102+ [ Albert Astals ]

103+ * Fix the Dash Header hamburger menu background color

104+ * Fix tests (LP: #1400449)

105+ * Allow pulling manage dash if there's no favorite scopes (LP:

106+ #1400774)

107+ * Manage Dash: Make store button work even if you have no favorites

108+ (LP: #1400771)

109+ * Make pot_file

110+

111+ [ CI Train Bot ]

112+ * Resync trunk

113+

114+ [ Andrea Cimitan ]

115+ * Remove dismiss timer in Launcher (LP: #1368778)

116+

117+ [ Michael Zanetti ]

118+ * decrease opacity changes in spread, move it to a separate surface.

119+ * Add an initial, rudimentary DesktopStage to get started

120+ * Uninvert Launcher in Desktop Mode

121+ * Add support for Wallpaper in Desktop stage

122+ * Add window control buttons to panel for fullscreen applications

123+

124+ [ Rodney Dawes ]

125+ * Add dependency on gir1.2-notify-0.7 to unity8-autopilot package.

126+ (LP: #1400437)

127+

128+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 11 Dec 2014 13:25:44 +0000

129+

130+unity8 (8.01+15.04.20141205-0ubuntu1) vivid; urgency=low

131+

132+ [ CI Train Bot ]

133+ * Resync trunk

134+

135+ [ Albert Astals ]

136+ * Replace Scopes Overview by the new Manage Dash (LP: #1386698,

137+ #1368670)

138+

139+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 05 Dec 2014 10:55:50 +0000

140+

141+unity8 (8.01+15.04.20141204-0ubuntu1) vivid; urgency=low

142+

143+ [ Michael Terry ]

144+ * Import wizard code from ubuntu-system-settings.

145+ * Convert the welcome wizard from a separate executable into a qml

146+ plugin (with a small C++ plugin for support).

147+ * Add tests for welcome wizard.

148+

149+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 04 Dec 2014 20:55:11 +0000

150+

151+unity8 (8.01+15.04.20141202-0ubuntu1) vivid; urgency=low

152+

153+ [ Michael Terry ]

154+ * Make sure that there is no window of opportunity for swiping away

155+ greeter before the lockscreen appears.

156+ * Don't allow dragging the greeter out from the left edge if it's

157+ hidden there. (LP: #1372952)

158+

159+ [ Michał Sawicz ]

160+ * Move from Theme colour to direct UbuntuColors.orange for activity

161+ indicator and preview buttons

162+

163+ [ Albert Astals ]

164+ * Use QImageReader not to load the image into memory twice (LP:

165+ #1384374)

166+ * Don't create the whole current scope delegates, just height * 3 (LP:

167+ #1384393, #1384374)

168+ * Make CroppedImageSizer async

169+ * Use ubuntu::connectivity::NetworkingStatus instead of

170+ QNetworkConfigurationManager

171+ * Compile with Qt 5.4 (LP: #1395636)

172+

173+ [ Michael Zanetti ]

174+ * close previews and temp scopes on left edge/BFB (LP: #1391798)

175+ * make spread reversible (LP: #1368668, #1355284, #1368677)

176+

177+ [ Andrea Cimitan ]

178+ * Different drag behaviour for not closable apps in spread (LP:

179+ #1368287)

180+

181+ [ Daniel d'Andrada ]

182+ * Make UnityTestCase.touchFlick properly map event coordinates

183+

184+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 02 Dec 2014 09:26:49 +0000

185+

1186unity8 (8.01+15.04.20141125.2-0ubuntu1) vivid; urgency=low

2187

3188 [ Michael Zanetti ]

debian/control+17−7

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

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

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

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

13−# version.

14− g++-4.9,

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

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

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

16+ g++-4.9:native,

17+ libconnectivity-qt1-dev,

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

1619 libgl1-mesa-dri,

1720 libgles2-mesa-dev[armhf],

@@ -21,9 +24,10 @@ Build-Depends: cmake,

2124 libpam0g-dev,

2225 libpay2-dev,

2326 libpulse-dev,

24− libqmenumodel-dev (>= 0.2.8),

27+ libqmenumodel-dev (>= 0.2.9),

2528 libqt5xmlpatterns5-dev,

26− libunity-api-dev (>= 7.93),

29+ libsystemsettings-dev,

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

2731 libusermetricsoutput1-dev,

2832 libxcb1-dev,

2933 pkg-config,

@@ -31,6 +35,7 @@ Build-Depends: cmake,

3135 python3-all:any,

3236 python3-setuptools,

3337 python:any (>= 2.7),

38+ qml-module-qt-labs-folderlistmodel,

3439 qml-module-qtquick-layouts,

3540 qml-module-qtquick-xmllistmodel,

3641 qml-module-qtquick2,

@@ -45,6 +50,7 @@ Build-Depends: cmake,

4550 qtdeclarative5-qtmultimedia-plugin,

4651 qtdeclarative5-ubuntu-settings-components (>= 0.4),

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

53+ qtdeclarative5-ubuntu-web-plugin,

4854 ttf-ubuntu-font-family,

4955Standards-Version: 3.9.4

5056Homepage: http://launchpad.net/unity

@@ -57,7 +63,7 @@ X-Ubuntu-Use-Langpack: yes

5763

5864Package: indicators-client

5965Architecture: amd64 armhf i386

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

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

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

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

6369 ${misc:Depends},

@@ -81,11 +87,14 @@ Provides: indicator-renderer,

8187Depends: gsettings-desktop-schemas,

8288 libcap2-bin,

8389 libglib2.0-bin,

84− qmenumodel-qml (>= 0.2.8),

90+ qmenumodel-qml (>= 0.2.9),

91+ qml-module-qt-labs-folderlistmodel,

8592 qml-module-qtquick-xmllistmodel,

8693 qtdeclarative5-gsettings1.0,

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

8895 qtdeclarative5-ubuntu-telephony0.1,

96+ qtdeclarative5-ubuntu-web-plugin,

97+ ubuntu-system-settings,

8998 unity-launcher-impl-4,

9099 unity8-common (= ${source:Version}),

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

@@ -100,6 +109,7 @@ Breaks: indicator-network (<< 0.5.1+14.10.20141014),

100109 unity8-greeter (<< 7.89),

101110Replaces: ubuntu-touch-session (<< 0.82~),

102111 unity8-greeter (<< 7.89),

112+Conflicts: ubuntu-system-settings-wizard,

103113Description: Unity 8 shell

104114 The Unity 8 shell is the primary user interface for Ubuntu devices.

105115

@@ -128,6 +138,7 @@ Description: Unity 8 shell (common files)

128138Package: unity8-autopilot

129139Architecture: all

130140Depends: gir1.2-glib-2.0,

141+ gir1.2-notify-0.7,

131142 libautopilot-qt (>= 1.4),

132143 libqt5test5,

133144 libqt5widgets5,

@@ -173,7 +184,6 @@ Depends: accountsservice-ubuntu-schemas (>= 0.0.3),

173184 libhardware2,

174185 unity-schemas (>= 7.3.1+14.10.20140915),

175186 pay-service,

176− qml-module-ubuntu-connectivity,

177187 ${misc:Depends},

178188 ${shlibs:Depends},

179189Provides: unity-launcher-impl,

debian/unity8-common.install+2

@@ -3,3 +3,5 @@ usr/share/unity8/Components

33usr/share/unity8/Dash

44usr/share/unity8/Notifications

55usr/share/unity8/graphics

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

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

debian/unity8-private.install+1

@@ -9,6 +9,7 @@ usr/lib/*/unity8/qml/ScreenGrabber

99usr/lib/*/unity8/qml/Ubuntu

1010usr/lib/*/unity8/qml/Unity

1111usr/lib/*/unity8/qml/Utils

12+usr/lib/*/unity8/qml/Wizard

1213usr/lib/*/unity8/libUbuntuGestures*

1314usr/share/accountsservice/interfaces

1415usr/share/dbus-1/interfaces

debian/unity8.install+1

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

1010usr/share/unity8/Panel

1111usr/share/unity8/Shell.qml

1212usr/share/unity8/Stages

13+usr/share/unity8/Wizard

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

include/paths.h.in+2

@@ -71,9 +71,11 @@ inline QStringList fallbackImportPaths() {

7171 QStringList paths;

7272 if (isRunningInstalled()) {

7373 paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");

74+ paths << QString("@USS_PRIVATE_PLUGINDIR@");

7475 paths << QString("@SHELL_PLUGINDIR@");

7576 paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");

7677 } else {

78+ paths << QString("@USS_PRIVATE_PLUGINDIR@");

7779 paths << QString("@SHELL_PLUGINDIR@");

7880 paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");

7981 }

plugins/AccountsService/AccountsService.cpp+61−2

@@ -19,23 +19,28 @@

1919#include "AccountsService.h"

2020#include "AccountsServiceDBusAdaptor.h"

2121

22+#include <QFile>

2223#include <QStringList>

2324

2425AccountsService::AccountsService(QObject* parent)

2526 : QObject(parent),

2627 m_service(new AccountsServiceDBusAdaptor(this)),

27− m_user(qgetenv("USER")),

28+ m_user(""),

2829 m_demoEdges(false),

2930 m_enableLauncherWhileLocked(false),

3031 m_enableIndicatorsWhileLocked(false),

3132 m_statsWelcomeScreen(false),

3233 m_passwordDisplayHint(Keyboard),

33− m_failedLogins(0)

34+ m_failedLogins(0),

35+ m_hereEnabled(false),

36+ m_hereLicensePath() // null means not set yet

3437{

3538 connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),

3639 this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));

3740 connect(m_service, SIGNAL(maybeChanged(const QString &)),

3841 this, SLOT(maybeChanged(const QString &)));

42+

43+ setUser(qgetenv("USER"));

3944}

4045

4146QString AccountsService::user() const

@@ -45,6 +50,9 @@ QString AccountsService::user() const

4550

4651void AccountsService::setUser(const QString &user)

4752{

53+ if (user.isEmpty() || m_user == user)

54+ return;

55+

4856 m_user = user;

4957 Q_EMIT userChanged();

5058

@@ -55,6 +63,8 @@ void AccountsService::setUser(const QString &user)

5563 updateStatsWelcomeScreen();

5664 updatePasswordDisplayHint();

5765 updateFailedLogins();

66+ updateHereEnabled();

67+ updateHereLicensePath();

5868}

5969

6070bool AccountsService::demoEdges() const

@@ -93,6 +103,26 @@ AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() cons

93103 return m_passwordDisplayHint;

94104}

95105

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+

96126void AccountsService::updateDemoEdges()

97127{

98128 auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();

@@ -156,6 +186,28 @@ void AccountsService::updateFailedLogins()

156186 }

157187}

158188

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+

159211uint AccountsService::failedLogins() const

160212{

161213 return m_failedLogins;

@@ -195,6 +247,13 @@ void AccountsService::propertiesChanged(const QString &user, const QString &inte

195247 if (changed.contains("EnableIndicatorsWhileLocked")) {

196248 updateEnableIndicatorsWhileLocked();

197249 }

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

198257 }

199258}

200259

plugins/AccountsService/AccountsService.h+20

@@ -55,6 +55,16 @@ class AccountsService: public QObject

5555 READ failedLogins

5656 WRITE setFailedLogins

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

5868

5969public:

6070 enum PasswordDisplayHint {

@@ -75,6 +85,10 @@ public:

7585 PasswordDisplayHint passwordDisplayHint() const;

7686 uint failedLogins() const;

7787 void setFailedLogins(uint failedLogins);

88+ bool hereEnabled() const;

89+ void setHereEnabled(bool enabled);

90+ QString hereLicensePath() const;

91+ bool hereLicensePathValid() const;

7892

7993Q_SIGNALS:

8094 void userChanged();

@@ -85,6 +99,8 @@ Q_SIGNALS:

8599 void statsWelcomeScreenChanged();

86100 void passwordDisplayHintChanged();

87101 void failedLoginsChanged();

102+ void hereEnabledChanged();

103+ void hereLicensePathChanged();

88104

89105private Q_SLOTS:

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

@@ -98,6 +114,8 @@ private:

98114 void updateStatsWelcomeScreen();

99115 void updatePasswordDisplayHint();

100116 void updateFailedLogins();

117+ void updateHereEnabled();

118+ void updateHereLicensePath();

101119

102120 AccountsServiceDBusAdaptor *m_service;

103121 QString m_user;

@@ -108,6 +126,8 @@ private:

108126 bool m_statsWelcomeScreen;

109127 PasswordDisplayHint m_passwordDisplayHint;

110128 uint m_failedLogins;

129+ bool m_hereEnabled;

130+ QString m_hereLicensePath;

111131};

112132

113133#endif

plugins/CMakeLists.txt+1

@@ -21,3 +21,4 @@ add_subdirectory(ScreenGrabber)

2121add_subdirectory(Ubuntu)

2222add_subdirectory(Unity)

2323add_subdirectory(Utils)

24+add_subdirectory(Wizard)

plugins/Dash/CMakeLists.txt+3−2

@@ -11,7 +11,6 @@ include_directories(

1111 ${CMAKE_CURRENT_SOURCE_DIR}

1212 ${CMAKE_CURRENT_BINARY_DIR}

1313 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

14− ${Qt5Quick_INCLUDE_DIRS}

1514 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

1615 ${Qt5V8_PRIVATE_INCLUDE_DIR}

1716)

@@ -25,6 +24,8 @@ set(QMLPLUGIN_SRC

2524 verticaljournal.cpp

2625 horizontaljournal.cpp

2726 organicgrid.cpp

27+ croppedimagesizer.cpp

28+ croppedimagesizerasyncworker.cpp

2829 )

2930

3031add_library(Dash-qml MODULE

@@ -36,6 +37,6 @@ target_link_libraries(Dash-qml

3637 ${Qt5Quick_LIBRARIES}

3738 )

3839

39−qt5_use_modules(Dash-qml Qml Quick)

40+qt5_use_modules(Dash-qml Qml Quick Concurrent)

4041

4142add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)

plugins/Dash/CardCreator.js+8−10

@@ -82,16 +82,16 @@ var kArtShapeHolderCode = 'Item { \n\

8282 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); \n\

8383 } \n\

8484 } \n\

85− image: CroppedImageMinimumSourceSize { \n\

85+ CroppedImageMinimumSourceSize { \n\

86+ id: artImage; \n\

8687 objectName: "artImage"; \n\

87− property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\

88− source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; } \n\

89− cache: true; \n\

88+ source: cardData && cardData["art"] || ""; \n\

9089 asynchronous: root.asynchronous; \n\

9190 visible: false; \n\

9291 width: %2; \n\

9392 height: %3; \n\

9493 } \n\

94+ image: artImage.image; \n\

9595 } \n\

9696 } \n\

9797 }\n';

@@ -181,11 +181,11 @@ var kMascotShapeLoaderCode = 'Loader { \n\

181181 id: mascotShapeLoader; \n\

182182 objectName: "mascotShapeLoader"; \n\

183183 asynchronous: root.asynchronous; \n\

184− active: mascotImage.status === Image.Ready; \n\

184+ active: mascotImage.image.status === Image.Ready; \n\

185185 visible: showHeader && active && status == Loader.Ready; \n\

186186 width: units.gu(6); \n\

187187 height: units.gu(5.625); \n\

188− sourceComponent: UbuntuShape { image: mascotImage } \n\

188+ sourceComponent: UbuntuShape { image: mascotImage.image } \n\

189189 anchors { %1 } \n\

190190 }\n';

191191

@@ -195,8 +195,7 @@ var kMascotImageCode = 'CroppedImageMinimumSourceSize { \n\

195195 id: mascotImage; \n\

196196 objectName: "mascotImage"; \n\

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

200199 width: units.gu(6); \n\

201200 height: units.gu(5.625); \n\

202201 horizontalAlignment: Image.AlignHCenter; \n\

@@ -435,7 +434,7 @@ function cardString(template, components) {

435434 mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);

436435 }

437436

438− var mascotImageVisible = useMascotShape ? 'false' : 'showHeader && resized';

437+ var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';

439438 mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);

440439 }

441440

@@ -655,7 +654,6 @@ function createCardComponent(parent, template, components) {

655654 var imports = 'import QtQuick 2.2; \n\

656655 import Ubuntu.Components 1.1; \n\

657656 import Ubuntu.Settings.Components 0.1; \n\

658− import Ubuntu.Connectivity 1.0; \n\

659657 import Dash 0.1;\n\

660658 import Utils 0.1;\n';

661659 var card = cardString(template, components);

plugins/Dash/CroppedImageMinimumSourceSize.qml+24−18

@@ -15,24 +15,30 @@

1515 */

1616

1717import QtQuick 2.3

18+import Dash 0.1

1819

19−Image {

20− property bool resized: false

21− property bool resizing: false

22− fillMode: Image.PreserveAspectCrop

23− visible: resized

24− onSourceSizeChanged: {

25− if (!resized && !resizing) {

26− resizing = true;

27− var ar = width / height;

28− var ssar = sourceSize.width / sourceSize.height;

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

20+Item {

21+ id: root

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

40+ fillMode: Image.PreserveAspectCrop

41+ sourceSize: sizer.sourceSize.width == 0 && sizer.sourceSize.height == 0 ? undefined : sizer.sourceSize

42+ source: sizer.sourceSize.width == -1 && sizer.sourceSize.height == -1 ? "" : root.source

3743 }

3844}

plugins/Dash/ScopeStyle.qml+1−1

@@ -70,7 +70,7 @@ QtObject {

7070 readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"

7171

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

7474

7575 //! @cond

7676 property var d: QtObject {

plugins/Dash/abstractdashview.cpp+24−5

@@ -16,13 +16,12 @@

1616

1717#include "abstractdashview.h"

1818

19−static const qreal bufferRatio = 0.5;

20−

2119AbstractDashView::AbstractDashView()

2220 : m_delegateModel(nullptr)

2321 , m_asyncRequestedIndex(-1)

2422 , m_columnSpacing(0)

2523 , m_rowSpacing(0)

24+ , m_buffer(320) // Same value used in qquickitemview.cpp in Qt 5.4

2625 , m_displayMarginBeginning(0)

2726 , m_displayMarginEnd(0)

2827 , m_needsRelayout(false)

@@ -112,6 +111,27 @@ void AbstractDashView::setRowSpacing(qreal rowSpacing)

112111 }

113112}

114113

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+

115135qreal AbstractDashView::displayMarginBeginning() const

116136{

117137 return m_displayMarginBeginning;

@@ -160,9 +180,8 @@ void AbstractDashView::refill()

160180

161181 const qreal from = -m_displayMarginBeginning;

162182 const qreal to = height() + m_displayMarginEnd;

163− const qreal buffer = (to - from) * bufferRatio;

164− const qreal bufferFrom = from - buffer;

165− const qreal bufferTo = to + buffer;

183+ const qreal bufferFrom = from - m_buffer;

184+ const qreal bufferTo = to + m_buffer;

166185

167186 bool added = addVisibleItems(from, to, false);

168187 bool removed = removeNonVisibleItems(bufferFrom, bufferTo);

plugins/Dash/abstractdashview.h+10

@@ -35,6 +35,7 @@ class AbstractDashView : public QQuickItem

3535 Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)

3636 Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setColumnSpacing NOTIFY columnSpacingChanged)

3737 Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setRowSpacing NOTIFY rowSpacingChanged)

38+ Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)

3839 Q_PROPERTY(qreal displayMarginBeginning READ displayMarginBeginning

3940 WRITE setDisplayMarginBeginning

4041 NOTIFY displayMarginBeginningChanged)

@@ -61,6 +62,9 @@ public:

6162 qreal rowSpacing() const;

6263 void setRowSpacing(qreal rowSpacing);

6364

65+ int cacheBuffer() const;

66+ void setCacheBuffer(int);

67+

6468 qreal displayMarginBeginning() const;

6569 void setDisplayMarginBeginning(qreal);

6670

@@ -72,6 +76,7 @@ Q_SIGNALS:

7276 void delegateChanged();

7377 void columnSpacingChanged();

7478 void rowSpacingChanged();

79+ void cacheBufferChanged();

7580 void displayMarginBeginningChanged();

7681 void displayMarginEndChanged();

7782

@@ -104,7 +109,11 @@ private:

104109 virtual void doRelayout() = 0;

105110 virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;

106111 virtual void calculateImplicitHeight() = 0;

112+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))

107113 virtual void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) = 0;

114+#else

115+ virtual void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) = 0;

116+#endif

108117

109118 QQmlDelegateModel *m_delegateModel;

110119

@@ -113,6 +122,7 @@ private:

113122

114123 int m_columnSpacing;

115124 int m_rowSpacing;

125+ int m_buffer;

116126 qreal m_displayMarginBeginning;

117127 qreal m_displayMarginEnd;

118128 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/Dash/croppedimagesizerasyncworker.hnew file+47

@@ -0,0 +1,47 @@

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 CROPPEDIMAGESIZERASYNCWORKER_H

18+#define CROPPEDIMAGESIZERASYNCWORKER_H

19+

20+#include <QMutex>

21+#include <QObject>

22+

23+class CroppedImageSizer;

24+

25+class QNetworkReply;

26+

27+class CroppedImageSizerAsyncWorker : public QObject

28+{

29+ Q_OBJECT

30+public:

31+ CroppedImageSizerAsyncWorker(CroppedImageSizer *sizer, QNetworkReply *reply);

32+

33+ void abort();

34+

35+private Q_SLOTS:

36+ void requestFinished();

37+

38+private:

39+ static void processRequestFinished(CroppedImageSizerAsyncWorker *worker);

40+

41+ QMutex m_mutex;

42+ CroppedImageSizer *m_sizer;

43+ QNetworkReply *m_reply;

44+ bool m_ignoreAbort;

45+};

46+

47+#endif

plugins/Dash/horizontaljournal.cpp+5−1

@@ -184,9 +184,13 @@ void HorizontalJournal::calculateImplicitHeight()

184184 }

185185}

186186

187+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))

187188void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

189+#else

190+void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)

191+#endif

188192{

189− Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

193+ Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {

190194 for (int i = remove.count - 1; i >= 0; --i) {

191195 const int indexToRemove = remove.index + i;

192196 // We only support removing from the end so

plugins/Dash/horizontaljournal.h+4

@@ -52,7 +52,11 @@ private:

5252 void calculateImplicitHeight() override;

5353 void doRelayout() override;

5454 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

55+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))

5556 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

57+#else

58+ void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;

59+#endif

5660

5761 int m_firstVisibleIndex;

5862 QList<QQuickItem*> m_visibleItems;

plugins/Dash/listviewwithpageheader.cpp+9−4

@@ -334,13 +334,18 @@ qreal ListViewWithPageHeader::headerItemShownHeight() const

334334 return m_headerItemShownHeight;

335335}

336336

337−qreal ListViewWithPageHeader::cacheBuffer() const

337+int ListViewWithPageHeader::cacheBuffer() const

338338{

339339 return m_cacheBuffer;

340340}

341341

342−void ListViewWithPageHeader::setCacheBuffer(qreal cacheBuffer)

342+void ListViewWithPageHeader::setCacheBuffer(int cacheBuffer)

343343{

344+ if (cacheBuffer < 0) {

345+ qmlInfo(this) << "Cannot set a negative cache buffer";

346+ return;

347+ }

348+

344349 if (cacheBuffer != m_cacheBuffer) {

345350 m_cacheBuffer = cacheBuffer;

346351 Q_EMIT cacheBufferChanged();

@@ -936,7 +941,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool

936941// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;

937942 const auto oldFirstVisibleIndex = m_firstVisibleIndex;

938943

939− Q_FOREACH(const QQmlChangeSet::Remove &remove, changeSet.removes()) {

944+ Q_FOREACH(const QQmlChangeSet::Change &remove, changeSet.removes()) {

940945// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;

941946 if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {

942947 const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();

@@ -990,7 +995,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool

990995 }

991996 }

992997

993− Q_FOREACH(const QQmlChangeSet::Insert &insert, changeSet.inserts()) {

998+ Q_FOREACH(const QQmlChangeSet::Change &insert, changeSet.inserts()) {

994999// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;

9951000 const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();

9961001 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

5454 Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)

5555 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)

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

5858

5959 friend class ListViewWithPageHeaderTest;

6060 friend class ListViewWithPageHeaderTestSection;

@@ -85,8 +85,8 @@ public:

8585 int stickyHeaderHeight() const;

8686 qreal headerItemShownHeight() const;

8787

88− qreal cacheBuffer() const;

89− void setCacheBuffer(qreal cacheBuffer);

88+ int cacheBuffer() const;

89+ void setCacheBuffer(int cacheBuffer);

9090

9191 Q_INVOKABLE void positionAtBeginning();

9292 Q_INVOKABLE void showHeader();

@@ -204,7 +204,7 @@ private:

204204 bool m_forceNoClip;

205205 bool m_inLayout;

206206 bool m_inContentHeightKeepHeaderShown;

207− qreal m_cacheBuffer;

207+ int m_cacheBuffer;

208208

209209 // Qt 5.0 doesn't like releasing the items just after itemCreated

210210 // so we delay the releasing until the next updatePolish

plugins/Dash/organicgrid.cpp+5−1

@@ -237,9 +237,13 @@ void OrganicGrid::calculateImplicitHeight()

237237 }

238238}

239239

240+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))

240241void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

242+#else

243+void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)

244+#endif

241245{

242− Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

246+ Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {

243247 for (int i = remove.count - 1; i >= 0; --i) {

244248 const int indexToRemove = remove.index + i;

245249 // We only support removing from the end

plugins/Dash/organicgrid.h+4

@@ -79,7 +79,11 @@ private:

7979 void doRelayout() override;

8080 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

8181 void calculateImplicitHeight() override;

82+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))

8283 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

84+#else

85+ void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;

86+#endif

8387

8488 QSizeF m_smallDelegateSize;

8589 QSizeF m_bigDelegateSize;

plugins/Dash/plugin.cpp+2

@@ -17,6 +17,7 @@

1717

1818#include "plugin.h"

1919

20+#include "croppedimagesizer.h"

2021#include "horizontaljournal.h"

2122#include "listviewwithpageheader.h"

2223#include "organicgrid.h"

@@ -32,4 +33,5 @@ void DashPlugin::registerTypes(const char *uri)

3233 qmlRegisterType<ListViewWithPageHeader>(uri, 0, 1, "ListViewWithPageHeader");

3334 qmlRegisterType<OrganicGrid>(uri, 0, 1, "OrganicGrid");

3435 qmlRegisterType<VerticalJournal>(uri, 0, 1, "VerticalJournal");

36+ qmlRegisterType<CroppedImageSizer>(uri, 0, 1, "CroppedImageSizer");

3537}

plugins/Dash/verticaljournal.cpp+5−1

@@ -239,9 +239,13 @@ void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)

239239 }

240240}

241241

242+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))

242243void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

244+#else

245+void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)

246+#endif

243247{

244− Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

248+ Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {

245249 for (int i = remove.count - 1; i >= 0; --i) {

246250 const int indexToRemove = remove.index + i;

247251 // Since we only support removing from the end, indexToRemove

plugins/Dash/verticaljournal.h+4

@@ -90,7 +90,11 @@ private:

9090 void calculateImplicitHeight() override;

9191 void doRelayout() override;

9292 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

93+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))

9394 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

95+#else

96+ void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;

97+#endif

9498

9599 QVector<QList<ViewItem>> m_columnVisibleItems;

96100 QHash<int, int> m_indexColumnMap;

plugins/LightDM/CMakeLists.txt+1−1

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

1515)

1616

1717set(QMLPLUGIN_SRC

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

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

1919 DBusGreeter.cpp

2020 DBusGreeterList.cpp

2121 Greeter.cpp

plugins/LightDM/UsersModel.cpp+1−1

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

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

5959

6060UsersModel::UsersModel(QObject* parent)

61− : QSortFilterProxyModelQML(parent)

61+ : UnitySortFilterProxyModelQML(parent)

6262{

6363 setModel(new MangleModel(this));

6464 setSortCaseSensitivity(Qt::CaseInsensitive);

plugins/LightDM/UsersModel.h+2−2

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

2323#ifndef UNITY_USERSMODEL_H

2424#define UNITY_USERSMODEL_H

2525

26−#include <qsortfilterproxymodelqml.h>

26+#include <unitysortfilterproxymodelqml.h>

2727#include <QtCore/QObject>

2828

29−class UsersModel : public QSortFilterProxyModelQML

29+class UsersModel : public UnitySortFilterProxyModelQML

3030{

3131 Q_OBJECT

3232

plugins/Lights/Lights.cpp+9−24

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

4444

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

4646{

47+ if (!init()) {

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

49+ return;

50+ }

51+

4752 if (m_state != newState) {

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

4954 turnOn();

5055 } else {

5156 turnOff();

5257 }

58+

59+ m_state = newState;

60+ Q_EMIT stateChanged(m_state);

5361 }

5462}

5563

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

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

116124 if (err == 0) {

117125 m_lightDevice = (light_device_t*)device;

126+ turnOff();

118127 return true;

119128 } else {

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

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

127136

128137void Lights::turnOn()

129138{

130− if (!init()) {

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

132− return;

133− }

134−

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

136− return;

137− }

138−

139139 // pulse

140140 light_state_t state;

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

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

147147

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

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

150− } else {

151− m_state = Lights::On;

152− Q_EMIT stateChanged(m_state);

153150 }

154151}

155152

156153void Lights::turnOff()

157154{

158− if (!init()) {

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

160− return;

161− }

162−

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

164− return;

165− }

166−

167155 light_state_t state;

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

169157 state.color = 0x00000000;

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

174162

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

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

177− } else {

178− m_state = Lights::Off;

179− Q_EMIT stateChanged(m_state);

180165 }

181166}

plugins/Ubuntu/Gestures/Direction.cpp+6−2

@@ -18,7 +18,9 @@

1818

1919bool Direction::isHorizontal(Direction::Type type)

2020{

21− return type == Direction::Leftwards || type == Direction::Rightwards;

21+ return type == Direction::Leftwards

22+ || type == Direction::Rightwards

23+ || type == Direction::Horizontal;

2224}

2325

2426bool Direction::isVertical(Direction::Type type)

@@ -28,5 +30,7 @@ bool Direction::isVertical(Direction::Type type)

2830

2931bool Direction::isPositive(Direction::Type type)

3032{

31− return type == Rightwards || type == Downwards;

33+ return type == Rightwards

34+ || type == Downwards

35+ || type == Horizontal;

3236}

plugins/Ubuntu/Gestures/Direction.h+2−1

@@ -33,7 +33,8 @@ public:

3333 Rightwards, // Along the positive direction of the X axis

3434 Leftwards, // Along the negative direction of the X axis

3535 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

3738 };

3839

3940 Q_INVOKABLE static bool isHorizontal(Direction::Type type);

plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+27−37

@@ -36,7 +36,7 @@

3636using namespace UbuntuGestures;

3737

3838#if DIRECTIONALDRAGAREA_DEBUG

39−#define DDA_DEBUG(msg) qDebug("[DDA] " msg)

39+#define ddaDebug(params) qDebug().nospace() << "[DDA(" << qPrintable(objectName()) << ")] " << params

4040#include "DebugHelpers.h"

4141

4242namespace {

@@ -53,7 +53,7 @@ const char *statusToString(DirectionalDragArea::Status status)

5353

5454} // namespace {

5555#else // DIRECTIONALDRAGAREA_DEBUG

56−#define DDA_DEBUG(msg) do{}while(0)

56+#define ddaDebug(params) ((void)0)

5757#endif // DIRECTIONALDRAGAREA_DEBUG

5858

5959

@@ -253,7 +253,7 @@ void DirectionalDragArea::touchOwnershipEvent(TouchOwnershipEvent *event)

253253 if (event->gained()) {

254254 QVector<int> ids;

255255 ids.append(event->touchId());

256− DDA_DEBUG("grabbing touch");

256+ ddaDebug("grabbing touch");

257257 grabTouchPoints(ids);

258258

259259 // Work around for Qt bug. If we grab a touch that is being used for mouse pointer

@@ -265,7 +265,7 @@ void DirectionalDragArea::touchOwnershipEvent(TouchOwnershipEvent *event)

265265 if (window()) {

266266 QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(window());

267267 if (windowPrivate->touchMouseId == event->touchId() && window()->mouseGrabberItem()) {

268− DDA_DEBUG("removing mouse grabber");

268+ ddaDebug("removing mouse grabber");

269269 window()->mouseGrabberItem()->ungrabMouse();

270270 }

271271 }

@@ -283,11 +283,7 @@ void DirectionalDragArea::unownedTouchEvent(UnownedTouchEvent *unownedTouchEvent

283283

284284 Q_ASSERT(!event->touchPointStates().testFlag(Qt::TouchPointPressed));

285285

286− #if DIRECTIONALDRAGAREA_DEBUG

287− // TODO Consider using qCDebug() when available (Qt 5.2)

288− qDebug() << "[DDA] Unowned" << m_timeSource->msecsSinceReference()

289− << qPrintable(touchEventToString(event));

290− #endif

286+ ddaDebug("Unowned " << m_timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));

291287

292288 switch (m_status) {

293289 case WaitingForTouch:

@@ -322,7 +318,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned

322318

323319 if (touchPoint->state() == Qt::TouchPointReleased) {

324320 // touch has ended before recognition concluded

325− DDA_DEBUG("Touch has ended before recognition concluded");

321+ ddaDebug("Touch has ended before recognition concluded");

326322 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);

327323 emitSignalIfTapped();

328324 setStatus(WaitingForTouch);

@@ -335,7 +331,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned

335331 updateVelocityCalculator(touchScenePos);

336332

337333 if (!pointInsideAllowedArea()) {

338− DDA_DEBUG("Rejecting gesture because touch point is outside allowed area.");

334+ ddaDebug("Rejecting gesture because touch point is outside allowed area.");

339335 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);

340336 // We still wanna know when it ends for keeping the composition time window up-to-date

341337 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);

@@ -344,7 +340,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned

344340 }

345341

346342 if (!movingInRightDirection()) {

347− DDA_DEBUG("Rejecting gesture because touch point is moving in the wrong direction.");

343+ ddaDebug("Rejecting gesture because touch point is moving in the wrong direction.");

348344 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);

349345 // We still wanna know when it ends for keeping the composition time window up-to-date

350346 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);

@@ -358,7 +354,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned

358354 if (isWithinTouchCompositionWindow()) {

359355 // There's still time for some new touch to appear and ruin our party as it would be combined

360356 // with our m_touchId one and therefore deny the possibility of a single-finger gesture.

361− DDA_DEBUG("Sill within composition window. Let's wait more.");

357+ ddaDebug("Sill within composition window. Let's wait more.");

362358 return;

363359 }

364360

@@ -366,7 +362,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned

366362 TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);

367363 setStatus(Recognized);

368364 } else {

369− DDA_DEBUG("Didn't move far enough yet. Let's wait more.");

365+ ddaDebug("Didn't move far enough yet. Let's wait more.");

370366 }

371367}

372368

@@ -375,11 +371,7 @@ void DirectionalDragArea::touchEvent(QTouchEvent *event)

375371 // TODO: Consider when more than one touch starts in the same event (although it's not possible

376372 // with Mir's android-input). Have to track them all. Consider it a plus/bonus.

377373

378− #if DIRECTIONALDRAGAREA_DEBUG

379− // TODO Consider using qCDebug() when available (Qt 5.2)

380− qDebug() << "[DDA]" << m_timeSource->msecsSinceReference()

381− << qPrintable(touchEventToString(event));

382− #endif

374+ ddaDebug(m_timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));

383375

384376 if (!isEnabled() || !isVisible()) {

385377 QQuickItem::touchEvent(event);

@@ -416,9 +408,7 @@ void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)

416408 if (isWithinTouchCompositionWindow()) {

417409 // too close to the last touch start. So we consider them as starting roughly at the same time.

418410 // Can't be a single-touch gesture.

419− #if DIRECTIONALDRAGAREA_DEBUG

420− qDebug("[DDA] A new touch point came in but we're still within time composition window. Ignoring it.");

421− #endif

411+ ddaDebug("A new touch point came in but we're still within time composition window. Ignoring it.");

422412 allGood = false;

423413 }

424414

@@ -456,6 +446,7 @@ void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)

456446

457447 if (recognitionIsDisabled()) {

458448 // Behave like a dumb TouchArea

449+ ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");

459450 TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);

460451 setStatus(Recognized);

461452 event->accept();

@@ -487,7 +478,7 @@ void DirectionalDragArea::touchEvent_undecided(QTouchEvent *event)

487478

488479 if (event->touchPointStates().testFlag(Qt::TouchPointPressed) && isWithinTouchCompositionWindow()) {

489480 // multi-finger drags are not accepted

490− DDA_DEBUG("Multi-finger drags are not accepted");

481+ ddaDebug("Multi-finger drags are not accepted");

491482

492483 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);

493484 // We still wanna know when it ends for keeping the composition time window up-to-date

@@ -581,12 +572,16 @@ bool DirectionalDragArea::pointInsideAllowedArea() const

581572

582573bool DirectionalDragArea::movingInRightDirection() const

583574{

584− QPointF movementVector(m_dampedScenePos.x() - m_previousDampedScenePos.x(),

585− m_dampedScenePos.y() - m_previousDampedScenePos.y());

575+ if (m_direction == Direction::Horizontal) {

576+ return true;

577+ } else {

578+ QPointF movementVector(m_dampedScenePos.x() - m_previousDampedScenePos.x(),

579+ m_dampedScenePos.y() - m_previousDampedScenePos.y());

586580

587− qreal scalarProjection = projectOntoDirectionVector(movementVector);

581+ qreal scalarProjection = projectOntoDirectionVector(movementVector);

588582

589− return scalarProjection >= 0.;

583+ return scalarProjection >= 0.;

584+ }

590585}

591586

592587bool DirectionalDragArea::movedFarEnough(const QPointF &point) const

@@ -614,7 +609,7 @@ void DirectionalDragArea::checkSpeed()

614609 qreal minSpeedMsecs = m_minSpeed / 1000.0;

615610

616611 if (speed < minSpeedMsecs) {

617− DDA_DEBUG("Rejecting gesture because it's below minimum speed.");

612+ ddaDebug("Rejecting gesture because it's below minimum speed.");

618613 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);

619614 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);

620615 setStatus(WaitingForTouch);

@@ -625,7 +620,7 @@ void DirectionalDragArea::checkSpeed()

625620 m_silenceTime += m_recognitionTimer->interval();

626621

627622 if (m_silenceTime > m_maxSilenceTime) {

628− DDA_DEBUG("Rejecting gesture because its silence time has been exceeded.");

623+ ddaDebug("Rejecting gesture because its silence time has been exceeded.");

629624 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);

630625 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);

631626 setStatus(WaitingForTouch);

@@ -646,7 +641,7 @@ void DirectionalDragArea::giveUpIfDisabledOrInvisible()

646641 }

647642

648643 if (m_status != WaitingForTouch) {

649− DDA_DEBUG("Resetting status because got disabled or made invisible");

644+ ddaDebug("Resetting status because got disabled or made invisible");

650645 setStatus(WaitingForTouch);

651646 }

652647 }

@@ -666,9 +661,7 @@ void DirectionalDragArea::setStatus(DirectionalDragArea::Status newStatus)

666661 m_status = newStatus;

667662 Q_EMIT statusChanged(m_status);

668663

669− #if DIRECTIONALDRAGAREA_DEBUG

670− qDebug() << "[DDA]" << statusToString(oldStatus) << "->" << statusToString(newStatus);

671− #endif

664+ ddaDebug(statusToString(oldStatus) << " -> " << statusToString(newStatus));

672665

673666 switch (newStatus) {

674667 case WaitingForTouch:

@@ -875,7 +868,7 @@ void DirectionalDragArea::updateSceneDirectionVector()

875868 localDirection.rx() = -1.;

876869 localDirection.ry() = 0.;

877870 break;

878− default: // Direction::Rightwards:

871+ default: // Direction::Rightwards || Direction.Horizontal

879872 localDirection.rx() = 1.;

880873 localDirection.ry() = 0.;

881874 break;

@@ -891,6 +884,3 @@ qreal DirectionalDragArea::projectOntoDirectionVector(const QPointF &sceneVector

891884 return sceneVector.x() * m_sceneDirectionVector.x() +

892885 sceneVector.y() * m_sceneDirectionVector.y();

893886}

894−

895−// Because we are defining a new QObject-based class (RecognitionTimer) here.

896−#include "DirectionalDragArea.moc"

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

@@ -16,14 +16,16 @@ include_directories(

1616)

1717

1818set(IndicatorsQML_SOURCES

19+ actionrootstate.cpp

1920 indicator.cpp

2021 indicators.h

2122 indicatorsmanager.cpp

2223 indicatorsmodel.cpp

2324 menucontentactivator.cpp

25+ modelactionrootstate.cpp

2426 modelprinter.cpp

2527 plugin.cpp

26− rootactionstate.cpp

28+ rootstateparser.cpp

2729 sharedunitymenumodel.cpp

2830 unitymenumodelcache.cpp

2931 unitymenumodelstack.cpp

plugins/Unity/Indicators/Indicators.qmltypes+18−7

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

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

88

99Module {

10+ Component {

11+ name: "ActionRootState"

12+ prototype: "RootStateObject"

13+ exports: ["Unity.Indicators/ActionRootState 0.1"]

14+ exportMetaObjectRevisions: [0]

15+ Property { name: "actionGroup"; type: "QDBusActionGroup"; isPointer: true }

16+ Property { name: "actionName"; type: "string" }

17+ }

1018 Component {

1119 name: "ActionState"

1220 prototype: "QObject"

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

2331 }

2432 }

2533 }

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

2734 Component {

2835 name: "FlatMenuProxyModelRole"

2936 prototype: "QObject"

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

146153 exportMetaObjectRevisions: [0]

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

148155 }

156+ Component {

157+ name: "ModelActionRootState"

158+ prototype: "RootStateObject"

159+ exports: ["Unity.Indicators/ModelActionRootState 0.1"]

160+ exportMetaObjectRevisions: [0]

161+ Property { name: "menu"; type: "UnityMenuModel"; isPointer: true }

162+ Signal { name: "indexChanged" }

163+ }

149164 Component {

150165 name: "ModelPrinter"

151166 prototype: "QObject"

@@ -192,11 +207,8 @@ Module {

192207 }

193208 Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }

194209 Component {

195− name: "RootActionState"

196− prototype: "ActionStateParser"

197− exports: ["Unity.Indicators/RootActionState 0.1"]

198− exportMetaObjectRevisions: [0]

199− Property { name: "menu"; type: "UnityMenuModel"; isPointer: true }

210+ name: "RootStateObject"

211+ prototype: "QObject"

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

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

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

@@ -205,7 +217,6 @@ Module {

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

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

207219 Signal { name: "updated" }

208− Signal { name: "indexChanged" }

209220 }

210221 Component {

211222 name: "SharedUnityMenuModel"

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

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

1+/*

2+ * Copyright 2014 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#include "actionrootstate.h"

18+

19+#include <qdbusactiongroup.h>

20+#include <QDebug>

21+

22+ActionRootState::ActionRootState(QObject *parent)

23+ : RootStateObject(parent)

24+ , m_actionGroup(nullptr)

25+{

26+}

27+

28+QDBusActionGroup *ActionRootState::actionGroup() const

29+{

30+ return m_actionGroup;

31+}

32+

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

34+{

35+ if (m_actionGroup != actionGroup) {

36+ bool wasValid = valid();

37+

38+ if (m_actionGroup) {

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

40+ }

41+ m_actionGroup = actionGroup;

42+

43+ if (m_actionGroup) {

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

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

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

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

48+

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

50+ }

51+ updateActionState();

52+ Q_EMIT actionGroupChanged();

53+

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

55+ }

56+}

57+

58+QString ActionRootState::actionName() const

59+{

60+ return m_actionName;

61+}

62+

63+void ActionRootState::setActionName(const QString &actionName)

64+{

65+ if (m_actionName != actionName) {

66+ bool wasValid = valid();

67+

68+ m_actionName = actionName;

69+ updateActionState();

70+

71+ Q_EMIT actionNameChanged();

72+

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

74+ }

75+}

76+

77+bool ActionRootState::valid() const

78+{

79+ return m_actionGroup && m_actionGroup->status() == DBusEnums::Connected &&

80+ !m_actionName.isEmpty() && m_actionGroup->hasAction(m_actionName);

81+}

82+

83+void ActionRootState::updateActionState()

84+{

85+ if (valid()) {

86+ ActionStateParser* oldParser = m_actionGroup->actionStateParser();

87+ m_actionGroup->setActionStateParser(&m_parser);

88+

89+ QVariantMap state = m_actionGroup->actionState(m_actionName).toMap();

90+

91+ m_actionGroup->setActionStateParser(oldParser);

92+

93+ setCurrentState(state);

94+ } else {

95+ setCurrentState(QVariantMap());

96+ }

97+}

plugins/Unity/Indicators/actionrootstate.hnew file+55

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

1+/*

2+ * Copyright 2014 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#ifndef ACTIONROOTSTATE_H

18+#define ACTIONROOTSTATE_H

19+

20+#include "unityindicatorsglobal.h"

21+

22+#include "rootstateparser.h"

23+

24+class QDBusActionGroup;

25+

26+class UNITYINDICATORS_EXPORT ActionRootState : public RootStateObject

27+{

28+ Q_OBJECT

29+ Q_PROPERTY(QDBusActionGroup* actionGroup READ actionGroup WRITE setActionGroup NOTIFY actionGroupChanged)

30+ Q_PROPERTY(QString actionName READ actionName WRITE setActionName NOTIFY actionNameChanged)

31+

32+public:

33+ ActionRootState(QObject *parent = 0);

34+

35+ QDBusActionGroup *actionGroup() const;

36+ void setActionGroup(QDBusActionGroup *actionGroup);

37+

38+ QString actionName() const;

39+ void setActionName(const QString& actionName);

40+

41+ bool valid() const override;

42+

43+Q_SIGNALS:

44+ void actionGroupChanged();

45+ void actionNameChanged();

46+

47+private Q_SLOTS:

48+ void updateActionState();

49+

50+private:

51+ QDBusActionGroup* m_actionGroup;

52+ QString m_actionName;

53+};

54+

55+#endif // ACTIONROOTSTATE_H

plugins/Unity/Indicators/modelactionrootstate.cppnew file+127

@@ -0,0 +1,127 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+#include "modelactionrootstate.h"

21+#include "indicators.h"

22+

23+#include <unitymenumodel.h>

24+#include <QVariant>

25+#include <QIcon>

26+

27+extern "C" {

28+#include <glib.h>

29+#include <gio/gio.h>

30+}

31+

32+ModelActionRootState::ModelActionRootState(QObject *parent)

33+ : RootStateObject(parent),

34+ m_menu(nullptr)

35+{

36+}

37+

38+ModelActionRootState::~ModelActionRootState()

39+{

40+}

41+

42+UnityMenuModel* ModelActionRootState::menu() const

43+{

44+ return m_menu;

45+}

46+

47+void ModelActionRootState::setMenu(UnityMenuModel* menu)

48+{

49+ if (m_menu != menu) {

50+ bool wasValid = valid();

51+

52+ if (m_menu) {

53+ m_menu->disconnect(this);

54+ }

55+ m_menu = menu;

56+

57+ if (m_menu) {

58+ connect(m_menu, SIGNAL(rowsInserted(const QModelIndex&, int, int)), SLOT(onModelRowsAdded(const QModelIndex&, int, int)));

59+ connect(m_menu, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SLOT(onModelRowsRemoved(const QModelIndex&, int, int)));

60+ connect(m_menu, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)), SLOT(onModelDataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));

61+

62+ connect(m_menu, SIGNAL(destroyed()), SLOT(reset()));

63+ }

64+ updateActionState();

65+ Q_EMIT menuChanged();

66+

67+ if (wasValid != valid())

68+ Q_EMIT validChanged();

69+ }

70+}

71+

72+bool ModelActionRootState::valid() const

73+{

74+ return m_menu && m_menu->rowCount() > 0;

75+}

76+

77+void ModelActionRootState::onModelRowsAdded(const QModelIndex& parent, int start, int end)

78+{

79+ Q_UNUSED(parent);

80+ if (start == 0 && end >= 0) {

81+ updateActionState();

82+ }

83+}

84+

85+void ModelActionRootState::onModelRowsRemoved(const QModelIndex& parent, int start, int end)

86+{

87+ Q_UNUSED(parent);

88+ if (start == 0 && end >= 0) {

89+ updateActionState();

90+ }

91+}

92+

93+void ModelActionRootState::onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)

94+{

95+ Q_UNUSED(roles);

96+ if (!topLeft.isValid() || !bottomRight.isValid()) {

97+ return;

98+ }

99+

100+ if (topLeft.row() <= 0 && bottomRight.row() >= 0) {

101+ updateActionState();

102+ }

103+}

104+

105+void ModelActionRootState::reset()

106+{

107+ m_menu = nullptr;

108+

109+ Q_EMIT menuChanged();

110+ setCurrentState(QVariantMap());

111+}

112+

113+void ModelActionRootState::updateActionState()

114+{

115+ if (m_menu && m_menu->rowCount() > 0) {

116+ ActionStateParser* oldParser = m_menu->actionStateParser();

117+ m_menu->setActionStateParser(&m_parser);

118+

119+ QVariantMap state = m_menu->get(0, "actionState").toMap();

120+

121+ m_menu->setActionStateParser(oldParser);

122+

123+ setCurrentState(state);

124+ } else {

125+ setCurrentState(QVariantMap());

126+ }

127+}

plugins/Unity/Indicators/modelactionrootstate.hnew file+61

@@ -0,0 +1,61 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+#ifndef MODELACTIONROOTSTATE_H

21+#define MODELACTIONROOTSTATE_H

22+

23+#include "unityindicatorsglobal.h"

24+

25+#include "rootstateparser.h"

26+

27+class UnityMenuModel;

28+

29+class UNITYINDICATORS_EXPORT ModelActionRootState : public RootStateObject

30+{

31+ Q_OBJECT

32+ Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)

33+public:

34+ ModelActionRootState(QObject *parent = 0);

35+ virtual ~ModelActionRootState();

36+

37+ UnityMenuModel* menu() const;

38+ void setMenu(UnityMenuModel* menu);

39+

40+ int index() const;

41+ void setIndex(int index);

42+

43+ bool valid() const override;

44+

45+Q_SIGNALS:

46+ void menuChanged();

47+ void indexChanged();

48+

49+private Q_SLOTS:

50+ void onModelRowsAdded(const QModelIndex& parent, int start, int end);

51+ void onModelRowsRemoved(const QModelIndex& parent, int start, int end);

52+ void onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>&);

53+ void reset();

54+

55+private:

56+ void updateActionState();

57+

58+ UnityMenuModel* m_menu;

59+};

60+

61+#endif // MODELACTIONROOTSTATE_H

plugins/Unity/Indicators/plugin.cpp+4−2

@@ -24,12 +24,13 @@

2424#include "plugin.h"

2525

2626// local

27+#include "actionrootstate.h"

2728#include "indicators.h"

2829#include "indicatorsmanager.h"

2930#include "indicatorsmodel.h"

3031#include "menucontentactivator.h"

32+#include "modelactionrootstate.h"

3133#include "modelprinter.h"

32−#include "rootactionstate.h"

3334#include "sharedunitymenumodel.h"

3435#include "unitymenumodelcache.h"

3536#include "unitymenumodelstack.h"

@@ -51,7 +52,8 @@ void IndicatorsPlugin::registerTypes(const char *uri)

5152 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");

5253 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");

5354 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");

54− qmlRegisterType<RootActionState>(uri, 0, 1, "RootActionState");

55+ qmlRegisterType<ModelActionRootState>(uri, 0, 1, "ModelActionRootState");

56+ qmlRegisterType<ActionRootState>(uri, 0, 1, "ActionRootState");

5557 qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");

5658 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

5759 qmlRegisterType<SharedUnityMenuModel>(uri, 0, 1, "SharedUnityMenuModel");

plugins/Unity/Indicators/rootactionstate.cpp → plugins/Unity/Indicators/rootstateparser.cpprenamed+74−141

@@ -12,155 +12,18 @@

1212 *

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

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

15− *

16− * Authors:

17− * Nick Dedekind <nick.dedekind@canonical.com>

1815 */

1916

20−#include "rootactionstate.h"

21−#include "indicators.h"

22−

23−#include <unitymenumodel.h>

24−#include <QVariant>

25−#include <QIcon>

17+#include "rootstateparser.h"

2618

2719extern "C" {

2820#include <glib.h>

2921#include <gio/gio.h>

3022}

3123

32−RootActionState::RootActionState(QObject *parent)

33− : ActionStateParser(parent),

34− m_menu(nullptr)

35−{

36−}

37−

38−RootActionState::~RootActionState()

39−{

40−}

41−

42−UnityMenuModel* RootActionState::menu() const

43−{

44− return m_menu;

45−}

46−

47−void RootActionState::setMenu(UnityMenuModel* menu)

48−{

49− if (m_menu != menu) {

50− if (m_menu) {

51− m_menu->disconnect(this);

52− }

53− m_menu = menu;

54−

55− if (m_menu) {

56− connect(m_menu, SIGNAL(rowsInserted(const QModelIndex&, int, int)), SLOT(onModelRowsAdded(const QModelIndex&, int, int)));

57− connect(m_menu, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SLOT(onModelRowsRemoved(const QModelIndex&, int, int)));

58− connect(m_menu, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)), SLOT(onModelDataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));

59−

60− connect(m_menu, SIGNAL(destroyed()), SLOT(reset()));

61− }

62− updateActionState();

63− Q_EMIT menuChanged();

64− }

65−}

66−

67−void RootActionState::onModelRowsAdded(const QModelIndex& parent, int start, int end)

24+RootStateParser::RootStateParser(QObject* parent)

25+ : ActionStateParser(parent)

6826{

69− Q_UNUSED(parent);

70− if (start == 0 && end >= 0) {

71− updateActionState();

72− }

73−}

74−

75−void RootActionState::onModelRowsRemoved(const QModelIndex& parent, int start, int end)

76−{

77− Q_UNUSED(parent);

78− if (start == 0 && end >= 0) {

79− updateActionState();

80− }

81−}

82−

83−void RootActionState::onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)

84−{

85− Q_UNUSED(roles);

86− if (!topLeft.isValid() || !bottomRight.isValid()) {

87− return;

88− }

89−

90− if (topLeft.row() <= 0 && bottomRight.row() >= 0) {

91− updateActionState();

92− }

93−}

94−

95−void RootActionState::reset()

96−{

97− m_cachedState.clear();

98− m_menu = nullptr;

99−

100− Q_EMIT menuChanged();

101− Q_EMIT updated();

102−}

103−

104−void RootActionState::updateActionState()

105−{

106− if (m_menu && m_menu->rowCount() > 0) {

107− ActionStateParser* oldParser = m_menu->actionStateParser();

108− m_menu->setActionStateParser(this);

109−

110− m_cachedState = m_menu->get(0, "actionState").toMap();

111−

112− m_menu->setActionStateParser(oldParser);

113− } else {

114− m_cachedState.clear();

115− }

116− Q_EMIT updated();

117−}

118−

119−bool RootActionState::isValid() const

120−{

121− return m_menu && m_menu->rowCount() > 0;

122−}

123−

124−QString RootActionState::title() const

125−{

126− if (!isValid()) return QString();

127−

128− return m_cachedState.value("title", QVariant::fromValue(QString())).toString();

129−}

130−

131−QString RootActionState::leftLabel() const

132−{

133− if (!isValid()) return QString();

134−

135− return m_cachedState.value("pre-label", QVariant::fromValue(QString())).toString();

136−}

137−

138−QString RootActionState::rightLabel() const

139−{

140− if (!isValid()) return QString();

141−

142− return m_cachedState.value("label", QVariant::fromValue(QString())).toString();

143−}

144−

145−QStringList RootActionState::icons() const

146−{

147− if (!isValid()) return QStringList();

148−

149− return m_cachedState.value("icons", QVariant::fromValue(QStringList())).toStringList();

150−}

151−

152−QString RootActionState::accessibleName() const

153−{

154− if (!isValid()) return QString();

155−

156− return m_cachedState.value("accessible-desc", QVariant::fromValue(QString())).toString();

157−}

158−

159−bool RootActionState::indicatorVisible() const

160−{

161− if (!isValid()) return false;

162−

163− return m_cachedState.value("visible", QVariant::fromValue(true)).toBool();

16427}

16528

16629static QString iconUri(GIcon *icon)

@@ -209,7 +72,7 @@ static QString iconUri(GIcon *icon)

20972 return uri;

21073}

21174

212−QVariant RootActionState::toQVariant(GVariant* state) const

75+QVariant RootStateParser::toQVariant(GVariant* state) const

21376{

21477 if (!state) {

21578 return QVariant();

@@ -296,3 +159,73 @@ QVariant RootActionState::toQVariant(GVariant* state) const

296159 }

297160 return ActionStateParser::toQVariant(state);

298161}

162+

163+

164+RootStateObject::RootStateObject(QObject* parent)

165+ : QObject(parent)

166+{

167+}

168+

169+QString RootStateObject::title() const

170+{

171+ if (!valid()) return QString();

172+

173+ return m_currentState.value("title", QVariant::fromValue(QString())).toString();

174+}

175+

176+QString RootStateObject::leftLabel() const

177+{

178+ if (!valid()) return QString();

179+

180+ return m_currentState.value("pre-label", QVariant::fromValue(QString())).toString();

181+}

182+

183+QString RootStateObject::rightLabel() const

184+{

185+ if (!valid()) return QString();

186+

187+ return m_currentState.value("label", QVariant::fromValue(QString())).toString();

188+}

189+

190+QStringList RootStateObject::icons() const

191+{

192+ if (!valid()) return QStringList();

193+

194+ return m_currentState.value("icons", QVariant::fromValue(QStringList())).toStringList();

195+}

196+

197+QString RootStateObject::accessibleName() const

198+{

199+ if (!valid()) return QString();

200+

201+ return m_currentState.value("accessible-desc", QVariant::fromValue(QString())).toString();

202+}

203+

204+bool RootStateObject::indicatorVisible() const

205+{

206+ if (!valid()) return false;

207+

208+ return m_currentState.value("visible", QVariant::fromValue(true)).toBool();

209+}

210+

211+void RootStateObject::setCurrentState(const QVariantMap& newState)

212+{

213+ QString oldTitle = title();

214+ QString oldLeftLabel = leftLabel();

215+ QString oldRightLabel = rightLabel();

216+ QStringList oldIcons = icons();

217+ QString oldAccessibleName = accessibleName();

218+ bool oldIndicatorVisible = indicatorVisible();

219+

220+ if (m_currentState != newState) {

221+ m_currentState = newState;

222+ Q_EMIT updated();

223+

224+ if (oldTitle != title()) Q_EMIT titleChanged();

225+ if (oldLeftLabel != leftLabel()) Q_EMIT leftLabelChanged();

226+ if (oldRightLabel != rightLabel()) Q_EMIT rightLabelChanged();

227+ if (oldIcons != icons()) Q_EMIT iconsChanged();

228+ if (oldAccessibleName != accessibleName()) Q_EMIT accessibleNameChanged();

229+ if (oldIndicatorVisible != indicatorVisible()) Q_EMIT indicatorVisibleChanged();

230+ }

231+}

plugins/Unity/Indicators/rootactionstate.h → plugins/Unity/Indicators/rootstateparser.hrenamed+18−34

@@ -12,26 +12,27 @@

1212 *

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

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

15− *

16− * Authors:

17− * Nick Dedekind <nick.dedekind@canonical.com>

1815 */

1916

20−#ifndef ROOTACTIONSTATE_H

21−#define ROOTACTIONSTATE_H

17+#ifndef ROOTSTATEPARSER_H

18+#define ROOTSTATEPARSER_H

2219

2320#include "unityindicatorsglobal.h"

2421

2522#include <actionstateparser.h>

2623

27−class UnityMenuModel;

24+class UNITYINDICATORS_EXPORT RootStateParser : public ActionStateParser

25+{

26+public:

27+ RootStateParser(QObject* parent = nullptr);

28+ virtual QVariant toQVariant(GVariant* state) const override;

29+};

2830

29−class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser

31+class UNITYINDICATORS_EXPORT RootStateObject : public QObject

3032{

3133 Q_OBJECT

32− Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)

3334

34− Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)

35+ Q_PROPERTY(bool valid READ valid NOTIFY validChanged)

3536 Q_PROPERTY(QString title READ title NOTIFY titleChanged)

3637 Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)

3738 Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)

@@ -39,16 +40,10 @@ class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser

3940 Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)

4041 Q_PROPERTY(bool indicatorVisible READ indicatorVisible NOTIFY indicatorVisibleChanged)

4142public:

42− RootActionState(QObject *parent = 0);

43− virtual ~RootActionState();

43+ RootStateObject(QObject* parent = 0);

4444

45− UnityMenuModel* menu() const;

46− void setMenu(UnityMenuModel* menu);

45+ virtual bool valid() const = 0;

4746

48− int index() const;

49− void setIndex(int index);

50−

51− bool isValid() const;

5247 QString title() const;

5348 QString leftLabel() const;

5449 QString rightLabel() const;

@@ -56,15 +51,12 @@ public:

5651 QString accessibleName() const;

5752 bool indicatorVisible() const;

5853

59− // from ActionStateParser

60− virtual QVariant toQVariant(GVariant* state) const override;

54+ QVariantMap currentState() const { return m_currentState; }

55+ void setCurrentState(const QVariantMap& currentState);

6156

6257Q_SIGNALS:

6358 void updated();

6459

65− void menuChanged();

66− void indexChanged();

67−

6860 void validChanged();

6961 void titleChanged();

7062 void leftLabelChanged();

@@ -73,17 +65,9 @@ Q_SIGNALS:

7365 void accessibleNameChanged();

7466 void indicatorVisibleChanged();

7567

76−private Q_SLOTS:

77− void onModelRowsAdded(const QModelIndex& parent, int start, int end);

78− void onModelRowsRemoved(const QModelIndex& parent, int start, int end);

79− void onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>&);

80− void reset();

81−

82−private:

83− void updateActionState();

84−

85− UnityMenuModel* m_menu;

86− QVariantMap m_cachedState;

68+protected:

69+ RootStateParser m_parser;

70+ QVariantMap m_currentState;

8771};

8872

89−#endif // ROOTACTIONSTATE_H

73+#endif // ROOTSTATEPARSER_H

plugins/Unity/Launcher/desktopfilehandler.cpp+1−1

@@ -110,7 +110,7 @@ QString DesktopFileHandler::displayName() const

110110 settings.beginGroup("Desktop Entry");

111111

112112 // First try to find Name[xx_YY] and Name[xx] in .desktop file

113− QString locale = QLocale::system().name();

113+ QString locale = QLocale().name();

114114 QString shortLocale = locale.split('_').first();

115115

116116 if (locale != shortLocale && settings.contains(QString("Name[%1]").arg(locale))) {

plugins/Unity/Launcher/launcheritem.cpp+11−4

@@ -60,6 +60,10 @@ void LauncherItem::setName(const QString &name)

6060{

6161 if (m_name != name) {

6262 m_name = name;

63+ QuickListEntry entry;

64+ entry.setActionId("launch_item");

65+ entry.setText(m_name);

66+ m_quickList->updateAction(entry);

6367 Q_EMIT nameChanged(name);

6468 }

6569}

@@ -86,12 +90,15 @@ void LauncherItem::setPinned(bool pinned)

8690{

8791 if (m_pinned != pinned) {

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

9393 Q_EMIT pinnedChanged(pinned);

9494 }

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

95102}

96103

97104bool LauncherItem::running() const

plugins/Unity/Launcher/launchermodel.cpp+1

@@ -370,6 +370,7 @@ void LauncherModel::refresh()

370370 int idx = m_list.indexOf(item);

371371 item->setName(desktopFile.displayName());

372372 item->setIcon(desktopFile.icon());

373+ item->setPinned(item->pinned()); // update pinned text if needed

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

374375 }

375376 }

plugins/Unity/Launcher/launchermodel.h+1−1

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

5858

5959public Q_SLOTS:

6060 void requestRemove(const QString &appId);

61+ Q_INVOKABLE void refresh();

6162

6263private:

6364 void storeAppList();

@@ -68,7 +69,6 @@ private Q_SLOTS:

6869 void countChanged(const QString &appId, int count);

6970 void countVisibleChanged(const QString &appId, int count);

7071 void progressChanged(const QString &appId, int progress);

71− void refresh();

7272

7373 void applicationAdded(const QModelIndex &parent, int row);

7474 void applicationRemoved(const QModelIndex &parent, int row);

plugins/Unity/Session/dbusunitysessionservice.h+5

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

3535 DBusUnitySessionService();

3636 ~DBusUnitySessionService();

3737

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+

3843Q_SIGNALS:

3944 /**

4045 * logoutRequested signal

plugins/Utils/CMakeLists.txt+1−1

@@ -12,7 +12,7 @@ include_directories(

1212

1313set(QMLPLUGIN_SRC

1414 qlimitproxymodelqml.cpp

15− qsortfilterproxymodelqml.cpp

15+ unitysortfilterproxymodelqml.cpp

1616 relativetimeformatter.cpp

1717 timeformatter.cpp

1818 unitymenumodelpaths.cpp

plugins/Utils/plugin.cpp+2−2

@@ -27,7 +27,7 @@

2727

2828// local

2929#include "qlimitproxymodelqml.h"

30−#include "qsortfilterproxymodelqml.h"

30+#include "unitysortfilterproxymodelqml.h"

3131#include "relativetimeformatter.h"

3232#include "timeformatter.h"

3333#include "unitymenumodelpaths.h"

@@ -39,7 +39,7 @@ void UtilsPlugin::registerTypes(const char *uri)

3939 Q_ASSERT(uri == QLatin1String("Utils"));

4040 qmlRegisterType<QAbstractItemModel>();

4141 qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");

42− qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");

42+ qmlRegisterType<UnitySortFilterProxyModelQML>(uri, 0, 1, "UnitySortFilterProxyModel");

4343 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");

4444 qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");

4545 qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");

plugins/Utils/qsortfilterproxymodelqml.cpp → plugins/Utils/unitysortfilterproxymodelqml.cpprenamed+15−15

@@ -15,12 +15,12 @@

1515 */

1616

1717// self

18−#include "qsortfilterproxymodelqml.h"

18+#include "unitysortfilterproxymodelqml.h"

1919

2020// Qt

2121#include <QDebug>

2222

23−QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)

23+UnitySortFilterProxyModelQML::UnitySortFilterProxyModelQML(QObject *parent)

2424 : QSortFilterProxyModel(parent)

2525 , m_invertMatch(false)

2626{

@@ -32,7 +32,7 @@ QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)

3232/*

3333 * Enter row index of filtered/sorted model, returns row index of source model

3434 */

35−int QSortFilterProxyModelQML::mapRowToSource(int row)

35+int UnitySortFilterProxyModelQML::mapRowToSource(int row)

3636{

3737 if (sourceModel() == nullptr)

3838 return -1;

@@ -40,13 +40,13 @@ int QSortFilterProxyModelQML::mapRowToSource(int row)

4040 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();

4141}

4242

43−QHash<int, QByteArray> QSortFilterProxyModelQML::roleNames() const

43+QHash<int, QByteArray> UnitySortFilterProxyModelQML::roleNames() const

4444{

4545 return sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();

4646}

4747

4848void

49−QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)

49+UnitySortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)

5050{

5151 if (itemModel == nullptr) {

5252 return;

@@ -69,7 +69,7 @@ QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)

6969}

7070

7171QVariantMap

72−QSortFilterProxyModelQML::get(int row)

72+UnitySortFilterProxyModelQML::get(int row)

7373{

7474 QVariantMap res;

7575 const QHash<int, QByteArray> roles = roleNames();

@@ -81,7 +81,7 @@ QSortFilterProxyModelQML::get(int row)

8181}

8282

8383QVariant

84−QSortFilterProxyModelQML::data(int row, int role)

84+UnitySortFilterProxyModelQML::data(int row, int role)

8585{

8686 if (sourceModel() == nullptr) {

8787 return QVariant();

@@ -91,7 +91,7 @@ QSortFilterProxyModelQML::data(int row, int role)

9191}

9292

9393int

94−QSortFilterProxyModelQML::totalCount() const

94+UnitySortFilterProxyModelQML::totalCount() const

9595{

9696 if (sourceModel() != nullptr) {

9797 return sourceModel()->rowCount();

@@ -101,19 +101,19 @@ QSortFilterProxyModelQML::totalCount() const

101101}

102102

103103int

104−QSortFilterProxyModelQML::count()

104+UnitySortFilterProxyModelQML::count()

105105{

106106 return rowCount();

107107}

108108

109109bool

110−QSortFilterProxyModelQML::invertMatch() const

110+UnitySortFilterProxyModelQML::invertMatch() const

111111{

112112 return m_invertMatch;

113113}

114114

115115void

116−QSortFilterProxyModelQML::setInvertMatch(bool invertMatch)

116+UnitySortFilterProxyModelQML::setInvertMatch(bool invertMatch)

117117{

118118 if (invertMatch != m_invertMatch) {

119119 m_invertMatch = invertMatch;

@@ -123,7 +123,7 @@ QSortFilterProxyModelQML::setInvertMatch(bool invertMatch)

123123}

124124

125125bool

126−QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,

126+UnitySortFilterProxyModelQML::filterAcceptsRow(int sourceRow,

127127 const QModelIndex &sourceParent) const

128128{

129129 // If there's no regexp set, always accept all rows indepenently of the invertMatch setting

@@ -136,7 +136,7 @@ QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,

136136}

137137

138138int

139−QSortFilterProxyModelQML::findFirst(int role, const QVariant& value) const

139+UnitySortFilterProxyModelQML::findFirst(int role, const QVariant& value) const

140140{

141141 QModelIndexList matches = match(index(0, 0), role, value, 1, Qt::MatchExactly);

142142 if (!matches.isEmpty()) {

@@ -147,7 +147,7 @@ QSortFilterProxyModelQML::findFirst(int role, const QVariant& value) const

147147}

148148

149149int

150−QSortFilterProxyModelQML::mapFromSource(int row)

150+UnitySortFilterProxyModelQML::mapFromSource(int row)

151151{

152152 if (sourceModel() != nullptr) {

153153 return QSortFilterProxyModel::mapFromSource(sourceModel()->index(row, 0)).row();

@@ -157,7 +157,7 @@ QSortFilterProxyModelQML::mapFromSource(int row)

157157}

158158

159159int

160−QSortFilterProxyModelQML::mapToSource(int row)

160+UnitySortFilterProxyModelQML::mapToSource(int row)

161161{

162162 if (sourceModel() != nullptr) {

163163 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();

plugins/Utils/qsortfilterproxymodelqml.h → plugins/Utils/unitysortfilterproxymodelqml.hrenamed+5−5

@@ -14,12 +14,12 @@

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

1515 */

1616

17−#ifndef QSORTFILTERPROXYMODELQML_H

18−#define QSORTFILTERPROXYMODELQML_H

17+#ifndef UNITYSORTFILTERPROXYMODELQML_H

18+#define UNITYSORTFILTERPROXYMODELQML_H

1919

2020#include <QSortFilterProxyModel>

2121

22−class QSortFilterProxyModelQML : public QSortFilterProxyModel

22+class UnitySortFilterProxyModelQML : public QSortFilterProxyModel

2323{

2424 Q_OBJECT

2525

@@ -29,7 +29,7 @@ class QSortFilterProxyModelQML : public QSortFilterProxyModel

2929 Q_PROPERTY(bool invertMatch READ invertMatch WRITE setInvertMatch NOTIFY invertMatchChanged)

3030

3131public:

32− explicit QSortFilterProxyModelQML(QObject *parent = 0);

32+ explicit UnitySortFilterProxyModelQML(QObject *parent = 0);

3333

3434 Q_INVOKABLE QVariantMap get(int row); // Use with caution, it can be slow to query all the roles

3535 Q_INVOKABLE QVariant data(int row, int role);

@@ -60,4 +60,4 @@ private:

6060 bool m_invertMatch;

6161};

6262

63−#endif // QSORTFILTERPROXYMODELQML_H

63+#endif // UNITYSORTFILTERPROXYMODELQML_H

plugins/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+237−49

@@ -7,16 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

11−"PO-Revision-Date: 2014-11-06 00:53+0000\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11+"PO-Revision-Date: 2014-12-27 19:44+0000\n"

1212"Last-Translator: samson <Unknown>\n"

1313"Language-Team: Amharic <am@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-28 06:07+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

@@ -175,20 +175,24 @@ msgstr "አነስተኛ መመልከቻ"

175175msgid "See all"

176176msgstr "ሁሉንም መመልከቻ"

177177

178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

178+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268

179179#: qml/Panel/SearchIndicator.qml:27

180180msgid "Search"

181181msgstr "መፈለጊያ"

182182

183−#: qml/Dash/PageHeader.qml:268

183+#: qml/Dash/PageHeader.qml:261

184+msgid "Store"

185+msgstr "ማስቀመጫ"

186+

187+#: qml/Dash/PageHeader.qml:278

184188msgid "Settings"

185189msgstr "ማሰናጃ"

186190

187−#: qml/Dash/PageHeader.qml:275

191+#: qml/Dash/PageHeader.qml:285

188192msgid "Remove from Favorites"

189193msgstr "ከምወዳቸው ማስወገጃ"

190194

191−#: qml/Dash/PageHeader.qml:275

195+#: qml/Dash/PageHeader.qml:285

192196msgid "Add to Favorites"

193197msgstr "ወደምወዳቸው መጨመሪያ"

194198

@@ -220,31 +224,23 @@ msgstr "ይሳቡ ለማነቃቃት…"

220224msgid "Release to refresh…"

221225msgstr "ይልቀቁ ለማነቃቃት…"

222226

223−#: qml/Dash/ScopesOverview.qml:215

224−msgid "Manage Scopes"

225−msgstr "የ ክልል አስተዳዳሪ"

226−

227−#: qml/Dash/ScopesOverview.qml:437

228−msgid "Done"

229−msgstr "ጨርሷል"

230−

231−#: qml/Dash/ScopesOverview.qml:463

232−msgid "Store"

233−msgstr "ማስቀመጫ"

227+#: qml/Dash/ScopesList.qml:63

228+msgid "Manage"

229+msgstr "አስተዳዳሪ"

234230

235−#: qml/Dash/ScopesOverviewTab.qml:36

236−msgid "Favorites"

237−msgstr "የምወዳቸው"

231+#: qml/Dash/ScopesList.qml:107

232+msgid "Home"

233+msgstr "ቤት"

238234

239−#: qml/Dash/ScopesOverviewTab.qml:54

240−msgid "All"

241−msgstr "ሁሉንም"

235+#: qml/Dash/ScopesList.qml:108

236+msgid "Also installed"

237+msgstr "እንዲሁም የተገጠሙ"

242238

243239#: qml/Greeter/Greeter.qml:174

244240msgid "Unlock"

245241msgstr "መክፈቻ"

246242

247−#: qml/Notifications/NotificationMenuItemFactory.qml:116

243+#: qml/Notifications/NotificationMenuItemFactory.qml:128

248244msgid "Show password"

249245msgstr "የመግቢያ ቃል ማሳያ"

250246

@@ -292,49 +288,49 @@ msgstr "ሲም መክፈቻ"

292288msgid "Roaming"

293289msgstr "ማዘዋወሪያ"

294290

295−#: qml/Shell.qml:391

291+#: qml/Shell.qml:402

292+#, qt-format

293+msgid "Enter %1"

294+msgstr "ማስገቢያ %1"

295+

296+#: qml/Shell.qml:394

296297msgid "Enter passphrase"

297298msgstr "የ ማለፊያ ሀረግ ያስገቡ"

298299

299−#: qml/Shell.qml:392

300+#: qml/Shell.qml:398

301+msgid "Enter passcode"

302+msgstr "የ ማለፊያ ኮድ ያስገቡ"

303+

304+#: qml/Shell.qml:403

305+#, qt-format

306+msgid "Sorry, incorrect %1"

307+msgstr "አዝናለሁ: የተሳሳተ%1"

308+

309+#: qml/Shell.qml:395

300310msgid "Sorry, incorrect passphrase"

301311msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"

302312

303−#: qml/Shell.qml:393

313+#: qml/Shell.qml:396

304314msgid "Please re-enter"

305315msgstr "እባክዎን እንደገና-ያስገቡ"

306316

307−#: qml/Shell.qml:395

308−msgid "Enter passcode"

309−msgstr "የ ማለፊያ ኮድ ያስገቡ"

310−

311−#: qml/Shell.qml:396

317+#: qml/Shell.qml:399

312318msgid "Sorry, incorrect passcode"

313319msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"

314320

315−#: qml/Shell.qml:399

316−#, qt-format

317−msgid "Enter %1"

318−msgstr "ማስገቢያ %1"

319−

320−#: qml/Shell.qml:400

321−#, qt-format

322−msgid "Sorry, incorrect %1"

323−msgstr "አዝናለሁ: የተሳሳተ%1"

324−

325−#: qml/Shell.qml:441

321+#: qml/Shell.qml:444

326322msgid "Sorry, incorrect passphrase."

327323msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"

328324

329−#: qml/Shell.qml:442

325+#: qml/Shell.qml:445

330326msgid "Sorry, incorrect passcode."

331327msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"

332328

333−#: qml/Shell.qml:443

329+#: qml/Shell.qml:446

334330msgid "This will be your last attempt."

335331msgstr "ይህ የመጨረሻ ሙከራዎ ነው"

336332

337−#: qml/Shell.qml:445

333+#: qml/Shell.qml:448

338334msgid ""

339335"If passphrase is entered incorrectly, your phone will conduct a factory "

340336"reset and all personal data will be deleted."

@@ -342,7 +338,7 @@ msgstr ""

342338"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

343339"ይጠፋል"

344340

345−#: qml/Shell.qml:446

341+#: qml/Shell.qml:449

346342msgid ""

347343"If passcode is entered incorrectly, your phone will conduct a factory reset "

348344"and all personal data will be deleted."

@@ -350,6 +346,186 @@ msgstr ""

350346"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

351347"ይጠፋል"

352348

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 "4 ዲጂትስ ብቻ"

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 "ይህን ምርጫ በመምረጥ ተስማምቻለሁ ከ Nokia HERE <a href='#'>ውሎች እና ሁኔታዎች ጋር</a>."

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 "እርስዎ በኋላ መቀየር ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b>."

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+"የ እርስዎ ስልክ ራሱ በራሱ የ ስህተት መግለጫዎች ወደ Canonical and its partners, የ መስሪያ ስርአት "

469+"አምራቾች"

470+

471+#: qml/Wizard/Pages/60-reporting.qml:43

472+msgid ""

473+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

474+"Privacy</b>"

475+msgstr ""

476+"ይህን ግልጋሎት ማሰናከል ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b> under <b>Security &amp; Privacy</b>"

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 "የ ማለፊያ ሀረግ ቢያንስ 4 ባህሪዎች መሆን አለበት"

518+

519+#: qml/Wizard/StackButton.qml:39

520+#, qt-format

521+msgid "〈 %1"

522+msgstr "〈 %1"

523+

524+#: qml/Wizard/StackButton.qml:42

525+#, qt-format

526+msgid "%1 〉"

527+msgstr "%1 〉"

528+

353529#~ msgid "Type or say a command"

354530#~ msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"

355531

@@ -364,3 +540,15 @@ msgstr ""

364540

365541#~ msgid "Confirm"

366542#~ msgstr "ማረጋገጫ"

543+

544+#~ msgid "Favorites"

545+#~ msgstr "የምወዳቸው"

546+

547+#~ msgid "All"

548+#~ msgstr "ሁሉንም"

549+

550+#~ msgid "Done"

551+#~ msgstr "ጨርሷል"

552+

553+#~ msgid "Manage Scopes"

554+#~ msgstr "የ ክልል አስተዳዳሪ"

po/ar.po+248−75

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-05-22 08:22+0000\n"

1212"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"

1313"Language-Team: Arabic <ar@li.org>\n"

@@ -16,19 +16,19 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "

1818"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"

19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

20−"X-Generator: Launchpad (build 17231)\n"

19+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

20+"X-Generator: Launchpad (build 17286)\n"

2121

2222#: plugins/LightDM/Greeter.cpp:130

2323msgid "Password: "

2424msgstr ""

2525

2626#: plugins/Unity/Launcher/launcheritem.cpp:45

27−#: plugins/Unity/Launcher/launcheritem.cpp:91

27+#: plugins/Unity/Launcher/launcheritem.cpp:100

2828msgid "Pin shortcut"

2929msgstr ""

3030

31−#: plugins/Unity/Launcher/launcheritem.cpp:91

31+#: plugins/Unity/Launcher/launcheritem.cpp:100

3232msgid "Unpin shortcut"

3333msgstr ""

3434

@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5151msgstr[0] ""

5252msgstr[1] ""

5353

54−#: qml/Components/Dialogs.qml:74

54+#: qml/Components/Dialogs.qml:70

5555msgid "Log out"

5656msgstr ""

5757

58−#: qml/Components/Dialogs.qml:75

58+#: qml/Components/Dialogs.qml:71

5959msgid "Are you sure you want to log out?"

6060msgstr ""

6161

62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

63−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63+#: qml/Components/Dialogs.qml:122

6464msgid "No"

6565msgstr ""

6666

67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

68−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68+#: qml/Components/Dialogs.qml:129

6969msgid "Yes"

7070msgstr ""

7171

72−#: qml/Components/Dialogs.qml:98

72+#: qml/Components/Dialogs.qml:94

7373msgid "Shut down"

7474msgstr ""

7575

76−#: qml/Components/Dialogs.qml:99

76+#: qml/Components/Dialogs.qml:95

7777msgid "Are you sure you want to shut down?"

7878msgstr ""

7979

80−#: qml/Components/Dialogs.qml:123

80+#: qml/Components/Dialogs.qml:119

8181msgid "Reboot"

8282msgstr ""

8383

84−#: qml/Components/Dialogs.qml:124

84+#: qml/Components/Dialogs.qml:120

8585msgid "Are you sure you want to reboot?"

8686msgstr ""

8787

88−#: qml/Components/Dialogs.qml:148

88+#: qml/Components/Dialogs.qml:144

8989msgid "Power"

9090msgstr ""

9191

92−#: qml/Components/Dialogs.qml:149

92+#: qml/Components/Dialogs.qml:145

9393msgid ""

9494"Are you sure you would like\n"

9595"to power off?"

9696msgstr ""

9797

98−#: qml/Components/Dialogs.qml:151

98+#: qml/Components/Dialogs.qml:147

9999msgid "Power off"

100100msgstr ""

101101

102−#: qml/Components/Dialogs.qml:161

102+#: qml/Components/Dialogs.qml:157

103103msgid "Restart"

104104msgstr ""

105105

106−#: qml/Components/Dialogs.qml:171

106+#: qml/Components/Dialogs.qml:167

107107msgid "Cancel"

108108msgstr ""

109109

@@ -111,44 +111,44 @@ msgstr ""

111111msgid "Skip intro"

112112msgstr "تخطي المقدمة"

113113

114−#: qml/Components/EdgeDemo.qml:112

114+#: qml/Components/EdgeDemo.qml:125

115115msgid "Right edge"

116116msgstr "الحافة اليمنى"

117117

118−#: qml/Components/EdgeDemo.qml:113

118+#: qml/Components/EdgeDemo.qml:126

119119msgid "Try swiping from the right edge to unlock the phone"

120120msgstr "اسحب اصبعك من الحافة اليمنى لفتح قفل الهاتف"

121121

122−#: qml/Components/EdgeDemo.qml:144

122+#: qml/Components/EdgeDemo.qml:157

123123msgid "Top edge"

124124msgstr "الحافة العلوية"

125125

126−#: qml/Components/EdgeDemo.qml:145

126+#: qml/Components/EdgeDemo.qml:158

127127msgid "Try swiping from the top edge to access the indicators"

128128msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"

129129

130−#: qml/Components/EdgeDemo.qml:170

130+#: qml/Components/EdgeDemo.qml:183

131131msgid "Close"

132132msgstr "أغلق"

133133

134−#: qml/Components/EdgeDemo.qml:171

134+#: qml/Components/EdgeDemo.qml:184

135135msgid "Swipe up again to close the settings screen"

136136msgstr "اسحب اصعبك لأعلى مرة أخرى لغلق شاشة الإعدادات"

137137

138−#: qml/Components/EdgeDemo.qml:201

138+#: qml/Components/EdgeDemo.qml:214

139139msgid "Left edge"

140140msgstr "الحافة اليسرى"

141141

142−#: qml/Components/EdgeDemo.qml:202

142+#: qml/Components/EdgeDemo.qml:215

143143msgid "Swipe from the left to reveal the launcher for quick access to apps"

144144msgstr ""

145145"اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"

146146

147−#: qml/Components/EdgeDemo.qml:229

147+#: qml/Components/EdgeDemo.qml:242

148148msgid "Well done"

149149msgstr "أحسنت!"

150150

151−#: qml/Components/EdgeDemo.qml:230

151+#: qml/Components/EdgeDemo.qml:243

152152msgid ""

153153"You have now mastered the edge gestures and can start using the "

154154"phone<br><br>Tap on the screen to start"

@@ -156,40 +156,44 @@ msgstr ""

156156"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "

157157"الشاشة للبدء"

158158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160160msgid "Return to Call"

161161msgstr ""

162162

163−#: qml/Components/Lockscreen.qml:223

163+#: qml/Components/Lockscreen.qml:238

164164msgid "Emergency Call"

165165msgstr "مكالمة طوارئ"

166166

167−#: qml/Components/Lockscreen.qml:255

167+#: qml/Components/Lockscreen.qml:270

168168msgid "OK"

169169msgstr ""

170170

171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

172172msgid "See less"

173173msgstr "شاهد أقل"

174174

175−#: qml/Dash/GenericScopeView.qml:434

175+#: qml/Dash/GenericScopeView.qml:431

176176msgid "See all"

177177msgstr ""

178178

179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

180180#: qml/Panel/SearchIndicator.qml:27

181181msgid "Search"

182182msgstr "ابحث"

183183

184−#: qml/Dash/PageHeader.qml:268

184+#: qml/Dash/PageHeader.qml:260

185+msgid "Store"

186+msgstr ""

187+

188+#: qml/Dash/PageHeader.qml:277

185189msgid "Settings"

186190msgstr ""

187191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189193msgid "Remove from Favorites"

190194msgstr ""

191195

192−#: qml/Dash/PageHeader.qml:275

196+#: qml/Dash/PageHeader.qml:284

193197msgid "Add to Favorites"

194198msgstr ""

195199

@@ -221,31 +225,23 @@ msgstr ""

221225msgid "Release to refresh…"

222226msgstr ""

223227

224−#: qml/Dash/ScopesOverview.qml:215

225−msgid "Manage Scopes"

226−msgstr ""

227−

228−#: qml/Dash/ScopesOverview.qml:437

229−msgid "Done"

230−msgstr ""

231−

232−#: qml/Dash/ScopesOverview.qml:463

233−msgid "Store"

228+#: qml/Dash/ScopesList.qml:63

229+msgid "Manage"

234230msgstr ""

235231

236−#: qml/Dash/ScopesOverviewTab.qml:36

237−msgid "Favorites"

232+#: qml/Dash/ScopesList.qml:107

233+msgid "Home"

238234msgstr ""

239235

240−#: qml/Dash/ScopesOverviewTab.qml:54

241−msgid "All"

236+#: qml/Dash/ScopesList.qml:108

237+msgid "Also installed"

242238msgstr ""

243239

244240#: qml/Greeter/Greeter.qml:174

245241msgid "Unlock"

246242msgstr ""

247243

248−#: qml/Notifications/NotificationMenuItemFactory.qml:116

244+#: qml/Notifications/NotificationMenuItemFactory.qml:128

249245msgid "Show password"

250246msgstr "عرض كلمة السر"

251247

@@ -293,60 +289,237 @@ msgstr ""

293289msgid "Roaming"

294290msgstr ""

295291

296−#: qml/Shell.qml:391

297−msgid "Enter passphrase"

292+#: qml/Shell.qml:367

293+#, qt-format

294+msgid "Enter %1"

298295msgstr ""

299296

300−#: qml/Shell.qml:392

301−msgid "Sorry, incorrect passphrase"

297+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

298+msgid "Enter passphrase"

302299msgstr ""

303300

304−#: qml/Shell.qml:393

305−msgid "Please re-enter"

301+#: qml/Shell.qml:369

302+msgid "Enter passcode"

306303msgstr ""

307304

308−#: qml/Shell.qml:395

309−msgid "Enter passcode"

305+#: qml/Shell.qml:370

306+#, qt-format

307+msgid "Sorry, incorrect %1"

310308msgstr ""

311309

312−#: qml/Shell.qml:396

313−msgid "Sorry, incorrect passcode"

310+#: qml/Shell.qml:371

311+msgid "Sorry, incorrect passphrase"

314312msgstr ""

315313

316−#: qml/Shell.qml:399

317−#, qt-format

318−msgid "Enter %1"

314+#: qml/Shell.qml:372

315+msgid "Please re-enter"

319316msgstr ""

320317

321−#: qml/Shell.qml:400

322−#, qt-format

323−msgid "Sorry, incorrect %1"

318+#: qml/Shell.qml:373

319+msgid "Sorry, incorrect passcode"

324320msgstr ""

325321

326−#: qml/Shell.qml:441

322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

327323msgid "Sorry, incorrect passphrase."

328324msgstr ""

329325

330−#: qml/Shell.qml:442

326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

331327msgid "Sorry, incorrect passcode."

332328msgstr ""

333329

334−#: qml/Shell.qml:443

330+#: qml/Shell.qml:469

335331msgid "This will be your last attempt."

336332msgstr ""

337333

338−#: qml/Shell.qml:445

334+#: qml/Shell.qml:471

339335msgid ""

340336"If passphrase is entered incorrectly, your phone will conduct a factory "

341337"reset and all personal data will be deleted."

342338msgstr ""

343339

344−#: qml/Shell.qml:446

340+#: qml/Shell.qml:472

345341msgid ""

346342"If passcode is entered incorrectly, your phone will conduct a factory reset "

347343"and all personal data will be deleted."

348344msgstr ""

349345

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+

350523#~ msgid "Confirm"

351524#~ msgstr "التأكيد"

352525

po/ast.po+265−80

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-11-08 18:24+0000\n"

1212"Last-Translator: ivarela <ivarela@ubuntu.com>\n"

1313"Language-Team: Asturian <ast@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Contraseña: "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Anclar"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Desanclar"

3333

@@ -51,45 +51,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

5151msgstr[0] "Espera %1 minutu y vuelvi a intentalo…"

5252msgstr[1] "Espera %1 minutos y vuelvi a intentalo…"

5353

54−#: qml/Components/Dialogs.qml:74

54+#: qml/Components/Dialogs.qml:70

5555msgid "Log out"

5656msgstr "Zarrar sesión"

5757

58−#: qml/Components/Dialogs.qml:75

58+#: qml/Components/Dialogs.qml:71

5959msgid "Are you sure you want to log out?"

6060msgstr "De xuru que quies zarrar la sesión?"

6161

62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

63−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63+#: qml/Components/Dialogs.qml:122

6464msgid "No"

6565msgstr "Non"

6666

67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

68−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68+#: qml/Components/Dialogs.qml:129

6969msgid "Yes"

7070msgstr "Sí"

7171

72−#: qml/Components/Dialogs.qml:98

72+#: qml/Components/Dialogs.qml:94

7373msgid "Shut down"

7474msgstr "Apagar"

7575

76−#: qml/Components/Dialogs.qml:99

76+#: qml/Components/Dialogs.qml:95

7777msgid "Are you sure you want to shut down?"

7878msgstr "De xuru que quies apagar?"

7979

80−#: qml/Components/Dialogs.qml:123

80+#: qml/Components/Dialogs.qml:119

8181msgid "Reboot"

8282msgstr "Reaniciar"

8383

84−#: qml/Components/Dialogs.qml:124

84+#: qml/Components/Dialogs.qml:120

8585msgid "Are you sure you want to reboot?"

8686msgstr "De xuru que quies reaniciar?"

8787

88−#: qml/Components/Dialogs.qml:148

88+#: qml/Components/Dialogs.qml:144

8989msgid "Power"

9090msgstr "Enerxía"

9191

92−#: qml/Components/Dialogs.qml:149

92+#: qml/Components/Dialogs.qml:145

9393msgid ""

9494"Are you sure you would like\n"

9595"to power off?"

@@ -97,15 +97,15 @@ msgstr ""

9797"De xuru que quies\n"

9898"apagar?"

9999

100−#: qml/Components/Dialogs.qml:151

100+#: qml/Components/Dialogs.qml:147

101101msgid "Power off"

102102msgstr "Apagar"

103103

104−#: qml/Components/Dialogs.qml:161

104+#: qml/Components/Dialogs.qml:157

105105msgid "Restart"

106106msgstr "Reaniciar"

107107

108−#: qml/Components/Dialogs.qml:171

108+#: qml/Components/Dialogs.qml:167

109109msgid "Cancel"

110110msgstr "Encaboxar"

111111

@@ -113,45 +113,45 @@ msgstr "Encaboxar"

113113msgid "Skip intro"

114114msgstr "Omitir la intro"

115115

116−#: qml/Components/EdgeDemo.qml:112

116+#: qml/Components/EdgeDemo.qml:125

117117msgid "Right edge"

118118msgstr "Berbesu drechu"

119119

120−#: qml/Components/EdgeDemo.qml:113

120+#: qml/Components/EdgeDemo.qml:126

121121msgid "Try swiping from the right edge to unlock the phone"

122122msgstr "Esliza'l deu dende'l berbesu drechu pa desbloquiar el teléfonu"

123123

124−#: qml/Components/EdgeDemo.qml:144

124+#: qml/Components/EdgeDemo.qml:157

125125msgid "Top edge"

126126msgstr "Berbesu superior"

127127

128−#: qml/Components/EdgeDemo.qml:145

128+#: qml/Components/EdgeDemo.qml:158

129129msgid "Try swiping from the top edge to access the indicators"

130130msgstr "Esliza'l deu dende'l berbesu superior p'acceder a los menús"

131131

132−#: qml/Components/EdgeDemo.qml:170

132+#: qml/Components/EdgeDemo.qml:183

133133msgid "Close"

134134msgstr "Zarrar"

135135

136−#: qml/Components/EdgeDemo.qml:171

136+#: qml/Components/EdgeDemo.qml:184

137137msgid "Swipe up again to close the settings screen"

138138msgstr "Esliza hacia arriba pa zarrar la pantalla d'axustes"

139139

140−#: qml/Components/EdgeDemo.qml:201

140+#: qml/Components/EdgeDemo.qml:214

141141msgid "Left edge"

142142msgstr "Berbesu esquierdu"

143143

144−#: qml/Components/EdgeDemo.qml:202

144+#: qml/Components/EdgeDemo.qml:215

145145msgid "Swipe from the left to reveal the launcher for quick access to apps"

146146msgstr ""

147147"Esliza'l deu dende la esquierda p'amosar el llanzador y acceder rápidamente "

148148"a les aplicaciones"

149149

150−#: qml/Components/EdgeDemo.qml:229

150+#: qml/Components/EdgeDemo.qml:242

151151msgid "Well done"

152152msgstr "Bien fecho"

153153

154−#: qml/Components/EdgeDemo.qml:230

154+#: qml/Components/EdgeDemo.qml:243

155155msgid ""

156156"You have now mastered the edge gestures and can start using the "

157157"phone<br><br>Tap on the screen to start"

@@ -159,40 +159,44 @@ msgstr ""

159159"Agora yá domines los xestos de los berbesos y pues entamar a usar el "

160160"teléfonu<br><br>Toca la pantalla pa comenzar"

161161

162−#: qml/Components/Lockscreen.qml:223

162+#: qml/Components/Lockscreen.qml:238

163163msgid "Return to Call"

164164msgstr "Tornar a la llamada"

165165

166−#: qml/Components/Lockscreen.qml:223

166+#: qml/Components/Lockscreen.qml:238

167167msgid "Emergency Call"

168168msgstr "Llamada d'emerxencia"

169169

170−#: qml/Components/Lockscreen.qml:255

170+#: qml/Components/Lockscreen.qml:270

171171msgid "OK"

172172msgstr "Aceutar"

173173

174−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

174+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

175175msgid "See less"

176176msgstr "Ver menos"

177177

178−#: qml/Dash/GenericScopeView.qml:434

178+#: qml/Dash/GenericScopeView.qml:431

179179msgid "See all"

180180msgstr "Ver too"

181181

182−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

182+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

183183#: qml/Panel/SearchIndicator.qml:27

184184msgid "Search"

185185msgstr "Guetar"

186186

187−#: qml/Dash/PageHeader.qml:268

187+#: qml/Dash/PageHeader.qml:260

188+msgid "Store"

189+msgstr "Tienda"

190+

191+#: qml/Dash/PageHeader.qml:277

188192msgid "Settings"

189193msgstr "Axustes"

190194

191−#: qml/Dash/PageHeader.qml:275

195+#: qml/Dash/PageHeader.qml:284

192196msgid "Remove from Favorites"

193197msgstr "Desaniciar de favoritos"

194198

195−#: qml/Dash/PageHeader.qml:275

199+#: qml/Dash/PageHeader.qml:284

196200msgid "Add to Favorites"

197201msgstr "Amestar a favoritos"

198202

@@ -224,31 +228,23 @@ msgstr "Tirar p'anovar..."

224228msgid "Release to refresh…"

225229msgstr "Soltar p'anovar..."

226230

227−#: qml/Dash/ScopesOverview.qml:215

228−msgid "Manage Scopes"

229−msgstr "Xestionar ámbitos"

230−

231−#: qml/Dash/ScopesOverview.qml:437

232−msgid "Done"

233−msgstr "Fecho"

234−

235−#: qml/Dash/ScopesOverview.qml:463

236−msgid "Store"

237−msgstr "Tienda"

231+#: qml/Dash/ScopesList.qml:63

232+msgid "Manage"

233+msgstr ""

238234

239−#: qml/Dash/ScopesOverviewTab.qml:36

240−msgid "Favorites"

241−msgstr "Favoritos"

235+#: qml/Dash/ScopesList.qml:107

236+msgid "Home"

237+msgstr ""

242238

243−#: qml/Dash/ScopesOverviewTab.qml:54

244−msgid "All"

245−msgstr "Too"

239+#: qml/Dash/ScopesList.qml:108

240+msgid "Also installed"

241+msgstr ""

246242

247243#: qml/Greeter/Greeter.qml:174

248244msgid "Unlock"

249245msgstr "Desbloquiar"

250246

251−#: qml/Notifications/NotificationMenuItemFactory.qml:116

247+#: qml/Notifications/NotificationMenuItemFactory.qml:128

252248msgid "Show password"

253249msgstr "Amosar contraseña"

254250

@@ -296,49 +292,49 @@ msgstr "Desbloquiar SIM"

296292msgid "Roaming"

297293msgstr "Roaming"

298294

299−#: qml/Shell.qml:391

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

300301msgid "Enter passphrase"

301302msgstr "Escribi la frase contraseña"

302303

303−#: qml/Shell.qml:392

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

304314msgid "Sorry, incorrect passphrase"

305315msgstr "Sentímoslo, contraseña incorreuta"

306316

307−#: qml/Shell.qml:393

317+#: qml/Shell.qml:372

308318msgid "Please re-enter"

309319msgstr "Vuelvi a escribila"

310320

311−#: qml/Shell.qml:395

312−msgid "Enter passcode"

313−msgstr "Escribi'l códigu de pasu"

314−

315−#: qml/Shell.qml:396

321+#: qml/Shell.qml:373

316322msgid "Sorry, incorrect passcode"

317323msgstr "Sentímoslo, códigu de pasu incorreutu"

318324

319−#: qml/Shell.qml:399

320−#, qt-format

321−msgid "Enter %1"

322−msgstr "Escribi %1"

323−

324−#: qml/Shell.qml:400

325−#, qt-format

326−msgid "Sorry, incorrect %1"

327−msgstr "Sentímoslo, %1 incorreutu"

328−

329−#: qml/Shell.qml:441

325+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

330326msgid "Sorry, incorrect passphrase."

331327msgstr "Fras de pasu incorreuta"

332328

333−#: qml/Shell.qml:442

329+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

334330msgid "Sorry, incorrect passcode."

335331msgstr "Códigu de pasu incorreutu"

336332

337−#: qml/Shell.qml:443

333+#: qml/Shell.qml:469

338334msgid "This will be your last attempt."

339335msgstr "Esti ye'l caberu intentu."

340336

341−#: qml/Shell.qml:445

337+#: qml/Shell.qml:471

342338msgid ""

343339"If passphrase is entered incorrectly, your phone will conduct a factory "

344340"reset and all personal data will be deleted."

@@ -346,7 +342,7 @@ msgstr ""

346342"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "

347343"configuración de fábrica y van perdese tolos datos personales."

348344

349−#: qml/Shell.qml:446

345+#: qml/Shell.qml:472

350346msgid ""

351347"If passcode is entered incorrectly, your phone will conduct a factory reset "

352348"and all personal data will be deleted."

@@ -354,6 +350,183 @@ msgstr ""

354350"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "

355351"configuración de fábrica y van perdese tolos datos personales."

356352

353+#: qml/Wizard/Page.qml:89

354+msgid "Back"

355+msgstr ""

356+

357+#: qml/Wizard/Pages/10-welcome.qml:27

358+msgid "Hi!"

359+msgstr ""

360+

361+#: qml/Wizard/Pages/10-welcome.qml:44

362+msgid "Welcome to your Ubuntu phone."

363+msgstr ""

364+

365+#: qml/Wizard/Pages/10-welcome.qml:52

366+msgid "Let’s get started."

367+msgstr ""

368+

369+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

370+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

371+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

372+#: qml/Wizard/Pages/passwd-set.qml:90

373+msgid "Continue"

374+msgstr ""

375+

376+#: qml/Wizard/Pages/20-sim.qml:25

377+msgid "Add a SIM card and restart your device"

378+msgstr ""

379+

380+#: qml/Wizard/Pages/20-sim.qml:55

381+msgid "Without it, you won’t be able to make calls or use text messaging."

382+msgstr ""

383+

384+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

385+msgid "Skip"

386+msgstr ""

387+

388+#: qml/Wizard/Pages/30-passwd-type.qml:39

389+msgid "Lock security"

390+msgstr ""

391+

392+#: qml/Wizard/Pages/30-passwd-type.qml:74

393+msgid "Please select how you’d like to unlock your phone."

394+msgstr ""

395+

396+#: qml/Wizard/Pages/30-passwd-type.qml:97

397+msgid "Swipe"

398+msgstr ""

399+

400+#: qml/Wizard/Pages/30-passwd-type.qml:98

401+msgid "No security"

402+msgstr ""

403+

404+#: qml/Wizard/Pages/30-passwd-type.qml:100

405+msgid "Passcode"

406+msgstr ""

407+

408+#: qml/Wizard/Pages/30-passwd-type.qml:101

409+msgid "4 digits only"

410+msgstr ""

411+

412+#: qml/Wizard/Pages/30-passwd-type.qml:103

413+msgid "Passphrase"

414+msgstr ""

415+

416+#: qml/Wizard/Pages/30-passwd-type.qml:104

417+msgid "Numbers and letters"

418+msgstr ""

419+

420+#: qml/Wizard/Pages/40-wifi.qml:28

421+msgid "Connect to Wi‑Fi"

422+msgstr ""

423+

424+#: qml/Wizard/Pages/40-wifi.qml:147

425+msgid "Available networks…"

426+msgstr ""

427+

428+#: qml/Wizard/Pages/40-wifi.qml:148

429+msgid "No available networks."

430+msgstr ""

431+

432+#: qml/Wizard/Pages/50-location.qml:27

433+msgid "Location"

434+msgstr ""

435+

436+#: qml/Wizard/Pages/50-location.qml:62

437+msgid "Let the phone detect your location:"

438+msgstr ""

439+

440+#: qml/Wizard/Pages/50-location.qml:69

441+msgid "Using GPS only (less accurate)"

442+msgstr ""

443+

444+#: qml/Wizard/Pages/50-location.qml:86

445+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

446+msgstr ""

447+

448+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

449+#: qml/Wizard/Pages/50-location.qml:103

450+msgid ""

451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

452+"conditions</a>."

453+msgstr ""

454+

455+#: qml/Wizard/Pages/50-location.qml:112

456+msgid "Not at all"

457+msgstr ""

458+

459+#: qml/Wizard/Pages/50-location.qml:124

460+msgid "You can change your mind later in <b>System Settings</b>."

461+msgstr ""

462+

463+#: qml/Wizard/Pages/60-reporting.qml:24

464+msgid "Improving your experience"

465+msgstr ""

466+

467+#: qml/Wizard/Pages/60-reporting.qml:36

468+msgid ""

469+"Your phone is set up to automatically report errors to Canonical and its "

470+"partners, the makers of the operating system."

471+msgstr ""

472+

473+#: qml/Wizard/Pages/60-reporting.qml:43

474+msgid ""

475+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

476+"Privacy</b>"

477+msgstr ""

478+

479+#: qml/Wizard/Pages/80-finished.qml:24

480+msgid "All done"

481+msgstr ""

482+

483+#: qml/Wizard/Pages/80-finished.qml:39

484+msgid "Nice work!"

485+msgstr ""

486+

487+#: qml/Wizard/Pages/80-finished.qml:46

488+msgid "Your phone is now ready to use."

489+msgstr ""

490+

491+#: qml/Wizard/Pages/80-finished.qml:53

492+msgid "Finish"

493+msgstr ""

494+

495+#: qml/Wizard/Pages/here-terms.qml:27

496+msgid "Terms & Conditions"

497+msgstr ""

498+

499+#: qml/Wizard/Pages/passwd-confirm.qml:49

500+msgid "Confirm passphrase"

501+msgstr ""

502+

503+#: qml/Wizard/Pages/passwd-confirm.qml:50

504+msgid "Confirm passcode"

505+msgstr ""

506+

507+#: qml/Wizard/Pages/passwd-confirm.qml:53

508+#: qml/Wizard/Pages/passwd-confirm.qml:54

509+msgid "Please try again."

510+msgstr ""

511+

512+#: qml/Wizard/Pages/passwd-set.qml:61

513+msgid "Choose your passcode"

514+msgstr ""

515+

516+#: qml/Wizard/Pages/passwd-set.qml:68

517+msgid "Passphrase must be 4 characters long"

518+msgstr ""

519+

520+#: qml/Wizard/StackButton.qml:39

521+#, qt-format

522+msgid "〈 %1"

523+msgstr ""

524+

525+#: qml/Wizard/StackButton.qml:42

526+#, qt-format

527+msgid "%1 〉"

528+msgstr ""

529+

357530#~ msgid "Confirm"

358531#~ msgstr "Confirmar"

359532

@@ -368,3 +541,15 @@ msgstr ""

368541

369542#~ msgid "Speak Now..."

370543#~ msgstr "Fala agora…"

544+

545+#~ msgid "Done"

546+#~ msgstr "Fecho"

547+

548+#~ msgid "Favorites"

549+#~ msgstr "Favoritos"

550+

551+#~ msgid "All"

552+#~ msgstr "Too"

553+

554+#~ msgid "Manage Scopes"

555+#~ msgstr "Xestionar ámbitos"

po/az.po+260−78

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-09-03 16:39+0000\n"

1212"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"

1313"Language-Team: Azerbaijani <az@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Şifrә: "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Pin qısayolu"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Açma qısayolu"

3333

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] ""

5151msgstr[1] ""

5252

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

5454msgid "Log out"

5555msgstr "Çıxış"

5656

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

5858msgid "Are you sure you want to log out?"

5959msgstr "Çıxmaq istәdiyinizdәn әminsiniz?"

6060

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62−#: qml/Components/Dialogs.qml:126

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:122

6363msgid "No"

6464msgstr "Yox"

6565

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67−#: qml/Components/Dialogs.qml:133

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:129

6868msgid "Yes"

6969msgstr "Hə"

7070

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

7272msgid "Shut down"

7373msgstr "Sistemi Söndür"

7474

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

7676msgid "Are you sure you want to shut down?"

7777msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"

7878

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

8080msgid "Reboot"

8181msgstr "Yenidən yüklə"

8282

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

8484msgid "Are you sure you want to reboot?"

8585msgstr "Yenidәn başlatmaq istәdiyinizә әminsiniz?"

8686

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

8888msgid "Power"

8989msgstr ""

9090

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

9292msgid ""

9393"Are you sure you would like\n"

9494"to power off?"

9595msgstr ""

9696

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

9898msgid "Power off"

9999msgstr "Söndür"

100100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102102msgid "Restart"

103103msgstr ""

104104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106106msgid "Cancel"

107107msgstr "İmtina"

108108

@@ -110,44 +110,44 @@ msgstr "İmtina"

110110msgid "Skip intro"

111111msgstr "Tәqdimatı keç"

112112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114114msgid "Right edge"

115115msgstr "Sağ Künc"

116116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118118msgid "Try swiping from the right edge to unlock the phone"

119119msgstr "Kilidi açmaq üçün sağ küncdən sürüşdürün"

120120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122122msgid "Top edge"

123123msgstr "Yuxarı künc"

124124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126126msgid "Try swiping from the top edge to access the indicators"

127127msgstr "Göstəriciləri görmәk üçün yuxarı küncdən sürüşdürün"

128128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130130msgid "Close"

131131msgstr "Bağla"

132132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134134msgid "Swipe up again to close the settings screen"

135135msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı sürüşdürün"

136136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138138msgid "Left edge"

139139msgstr "Sol künc"

140140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143143msgstr ""

144144"Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"

145145

146−#: qml/Components/EdgeDemo.qml:229

146+#: qml/Components/EdgeDemo.qml:242

147147msgid "Well done"

148148msgstr "Təbriklər"

149149

150−#: qml/Components/EdgeDemo.qml:230

150+#: qml/Components/EdgeDemo.qml:243

151151msgid ""

152152"You have now mastered the edge gestures and can start using the "

153153"phone<br><br>Tap on the screen to start"

@@ -155,40 +155,44 @@ msgstr ""

155155"Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "

156156"bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"

157157

158−#: qml/Components/Lockscreen.qml:223

158+#: qml/Components/Lockscreen.qml:238

159159msgid "Return to Call"

160160msgstr ""

161161

162−#: qml/Components/Lockscreen.qml:223

162+#: qml/Components/Lockscreen.qml:238

163163msgid "Emergency Call"

164164msgstr "Zərurət zəngi"

165165

166−#: qml/Components/Lockscreen.qml:255

166+#: qml/Components/Lockscreen.qml:270

167167msgid "OK"

168168msgstr "Oldu"

169169

170−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

170+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

171171msgid "See less"

172172msgstr "Daha azını gör"

173173

174−#: qml/Dash/GenericScopeView.qml:434

174+#: qml/Dash/GenericScopeView.qml:431

175175msgid "See all"

176176msgstr "Hamısını gör"

177177

178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

178+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

179179#: qml/Panel/SearchIndicator.qml:27

180180msgid "Search"

181181msgstr "Axtar"

182182

183−#: qml/Dash/PageHeader.qml:268

183+#: qml/Dash/PageHeader.qml:260

184+msgid "Store"

185+msgstr ""

186+

187+#: qml/Dash/PageHeader.qml:277

184188msgid "Settings"

185189msgstr "Tənzimləmələr"

186190

187−#: qml/Dash/PageHeader.qml:275

191+#: qml/Dash/PageHeader.qml:284

188192msgid "Remove from Favorites"

189193msgstr "Seçilmişlәrdәn çıxart"

190194

191−#: qml/Dash/PageHeader.qml:275

195+#: qml/Dash/PageHeader.qml:284

192196msgid "Add to Favorites"

193197msgstr "Seçilmişlәrә әlavә et"

194198

@@ -220,31 +224,23 @@ msgstr ""

220224msgid "Release to refresh…"

221225msgstr ""

222226

223−#: qml/Dash/ScopesOverview.qml:215

224−msgid "Manage Scopes"

227+#: qml/Dash/ScopesList.qml:63

228+msgid "Manage"

225229msgstr ""

226230

227−#: qml/Dash/ScopesOverview.qml:437

228−msgid "Done"

229−msgstr "Başa çatdı"

230−

231−#: qml/Dash/ScopesOverview.qml:463

232−msgid "Store"

231+#: qml/Dash/ScopesList.qml:107

232+msgid "Home"

233233msgstr ""

234234

235−#: qml/Dash/ScopesOverviewTab.qml:36

236−msgid "Favorites"

237−msgstr "Seçilmişlər"

238−

239−#: qml/Dash/ScopesOverviewTab.qml:54

240−msgid "All"

241−msgstr "Hamısı"

235+#: qml/Dash/ScopesList.qml:108

236+msgid "Also installed"

237+msgstr ""

242238

243239#: qml/Greeter/Greeter.qml:174

244240msgid "Unlock"

245241msgstr ""

246242

247−#: qml/Notifications/NotificationMenuItemFactory.qml:116

243+#: qml/Notifications/NotificationMenuItemFactory.qml:128

248244msgid "Show password"

249245msgstr "Şifrәni göstәr"

250246

@@ -292,49 +288,49 @@ msgstr "SIM kilidini aç"

292288msgid "Roaming"

293289msgstr "Rominq"

294290

295−#: qml/Shell.qml:391

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

296297msgid "Enter passphrase"

297298msgstr ""

298299

299−#: qml/Shell.qml:392

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

300310msgid "Sorry, incorrect passphrase"

301311msgstr "Bağışlayın, açar söz yanlışdır"

302312

303−#: qml/Shell.qml:393

313+#: qml/Shell.qml:372

304314msgid "Please re-enter"

305315msgstr ""

306316

307−#: qml/Shell.qml:395

308−msgid "Enter passcode"

309−msgstr ""

310−

311−#: qml/Shell.qml:396

317+#: qml/Shell.qml:373

312318msgid "Sorry, incorrect passcode"

313319msgstr ""

314320

315−#: qml/Shell.qml:399

316−#, qt-format

317−msgid "Enter %1"

318−msgstr ""

319−

320−#: qml/Shell.qml:400

321−#, qt-format

322−msgid "Sorry, incorrect %1"

323−msgstr "Bağışlayın, %1 yanlışdır"

324−

325−#: qml/Shell.qml:441

321+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

326322msgid "Sorry, incorrect passphrase."

327323msgstr "Bağışlayın, açar söz yanlışdır."

328324

329−#: qml/Shell.qml:442

325+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

330326msgid "Sorry, incorrect passcode."

331327msgstr "Təəssüf ki, açar kod yanlışdır."

332328

333−#: qml/Shell.qml:443

329+#: qml/Shell.qml:469

334330msgid "This will be your last attempt."

335331msgstr "Bu sizin son cəhdiniz olacaq."

336332

337−#: qml/Shell.qml:445

333+#: qml/Shell.qml:471

338334msgid ""

339335"If passphrase is entered incorrectly, your phone will conduct a factory "

340336"reset and all personal data will be deleted."

@@ -342,7 +338,7 @@ msgstr ""

342338"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "

343339"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."

344340

345−#: qml/Shell.qml:446

341+#: qml/Shell.qml:472

346342msgid ""

347343"If passcode is entered incorrectly, your phone will conduct a factory reset "

348344"and all personal data will be deleted."

@@ -350,6 +346,183 @@ msgstr ""

350346"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "

351347"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."

352348

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+

353526#~ msgid "Confirm"

354527#~ msgstr "Təsdiqlə"

355528

@@ -362,5 +535,14 @@ msgstr ""

362535#~ msgid "Speak Now..."

363536#~ msgstr "Danışın..."

364537

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ı"

546+

365547#~ msgid "Type or say a command"

366548#~ msgstr "Bir әmr söyləyin və ya yazın"

po/be.po+248−75

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-09-24 17:12+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Belarusian <be@li.org>\n"

@@ -16,19 +16,19 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

20−"X-Generator: Launchpad (build 17231)\n"

19+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

20+"X-Generator: Launchpad (build 17286)\n"

2121

2222#: plugins/LightDM/Greeter.cpp:130

2323msgid "Password: "

2424msgstr ""

2525

2626#: plugins/Unity/Launcher/launcheritem.cpp:45

27−#: plugins/Unity/Launcher/launcheritem.cpp:91

27+#: plugins/Unity/Launcher/launcheritem.cpp:100

2828msgid "Pin shortcut"

2929msgstr ""

3030

31−#: plugins/Unity/Launcher/launcheritem.cpp:91

31+#: plugins/Unity/Launcher/launcheritem.cpp:100

3232msgid "Unpin shortcut"

3333msgstr ""

3434

@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5151msgstr[0] ""

5252msgstr[1] ""

5353

54−#: qml/Components/Dialogs.qml:74

54+#: qml/Components/Dialogs.qml:70

5555msgid "Log out"

5656msgstr ""

5757

58−#: qml/Components/Dialogs.qml:75

58+#: qml/Components/Dialogs.qml:71

5959msgid "Are you sure you want to log out?"

6060msgstr ""

6161

62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

63−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63+#: qml/Components/Dialogs.qml:122

6464msgid "No"

6565msgstr ""

6666

67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

68−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68+#: qml/Components/Dialogs.qml:129

6969msgid "Yes"

7070msgstr ""

7171

72−#: qml/Components/Dialogs.qml:98

72+#: qml/Components/Dialogs.qml:94

7373msgid "Shut down"

7474msgstr ""

7575

76−#: qml/Components/Dialogs.qml:99

76+#: qml/Components/Dialogs.qml:95

7777msgid "Are you sure you want to shut down?"

7878msgstr ""

7979

80−#: qml/Components/Dialogs.qml:123

80+#: qml/Components/Dialogs.qml:119

8181msgid "Reboot"

8282msgstr ""

8383

84−#: qml/Components/Dialogs.qml:124

84+#: qml/Components/Dialogs.qml:120

8585msgid "Are you sure you want to reboot?"

8686msgstr ""

8787

88−#: qml/Components/Dialogs.qml:148

88+#: qml/Components/Dialogs.qml:144

8989msgid "Power"

9090msgstr ""

9191

92−#: qml/Components/Dialogs.qml:149

92+#: qml/Components/Dialogs.qml:145

9393msgid ""

9494"Are you sure you would like\n"

9595"to power off?"

9696msgstr ""

9797

98−#: qml/Components/Dialogs.qml:151

98+#: qml/Components/Dialogs.qml:147

9999msgid "Power off"

100100msgstr ""

101101

102−#: qml/Components/Dialogs.qml:161

102+#: qml/Components/Dialogs.qml:157

103103msgid "Restart"

104104msgstr ""

105105

106−#: qml/Components/Dialogs.qml:171

106+#: qml/Components/Dialogs.qml:167

107107msgid "Cancel"

108108msgstr ""

109109

@@ -111,82 +111,86 @@ msgstr ""

111111msgid "Skip intro"

112112msgstr ""

113113

114−#: qml/Components/EdgeDemo.qml:112

114+#: qml/Components/EdgeDemo.qml:125

115115msgid "Right edge"

116116msgstr ""

117117

118−#: qml/Components/EdgeDemo.qml:113

118+#: qml/Components/EdgeDemo.qml:126

119119msgid "Try swiping from the right edge to unlock the phone"

120120msgstr ""

121121

122−#: qml/Components/EdgeDemo.qml:144

122+#: qml/Components/EdgeDemo.qml:157

123123msgid "Top edge"

124124msgstr ""

125125

126−#: qml/Components/EdgeDemo.qml:145

126+#: qml/Components/EdgeDemo.qml:158

127127msgid "Try swiping from the top edge to access the indicators"

128128msgstr ""

129129

130−#: qml/Components/EdgeDemo.qml:170

130+#: qml/Components/EdgeDemo.qml:183

131131msgid "Close"

132132msgstr ""

133133

134−#: qml/Components/EdgeDemo.qml:171

134+#: qml/Components/EdgeDemo.qml:184

135135msgid "Swipe up again to close the settings screen"

136136msgstr ""

137137

138−#: qml/Components/EdgeDemo.qml:201

138+#: qml/Components/EdgeDemo.qml:214

139139msgid "Left edge"

140140msgstr ""

141141

142−#: qml/Components/EdgeDemo.qml:202

142+#: qml/Components/EdgeDemo.qml:215

143143msgid "Swipe from the left to reveal the launcher for quick access to apps"

144144msgstr ""

145145

146−#: qml/Components/EdgeDemo.qml:229

146+#: qml/Components/EdgeDemo.qml:242

147147msgid "Well done"

148148msgstr ""

149149

150−#: qml/Components/EdgeDemo.qml:230

150+#: qml/Components/EdgeDemo.qml:243

151151msgid ""

152152"You have now mastered the edge gestures and can start using the "

153153"phone<br><br>Tap on the screen to start"

154154msgstr ""

155155

156−#: qml/Components/Lockscreen.qml:223

156+#: qml/Components/Lockscreen.qml:238

157157msgid "Return to Call"

158158msgstr ""

159159

160−#: qml/Components/Lockscreen.qml:223

160+#: qml/Components/Lockscreen.qml:238

161161msgid "Emergency Call"

162162msgstr ""

163163

164−#: qml/Components/Lockscreen.qml:255

164+#: qml/Components/Lockscreen.qml:270

165165msgid "OK"

166166msgstr ""

167167

168−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

168+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

169169msgid "See less"

170170msgstr ""

171171

172−#: qml/Dash/GenericScopeView.qml:434

172+#: qml/Dash/GenericScopeView.qml:431

173173msgid "See all"

174174msgstr ""

175175

176−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

176+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

177177#: qml/Panel/SearchIndicator.qml:27

178178msgid "Search"

179179msgstr ""

180180

181−#: qml/Dash/PageHeader.qml:268

181+#: qml/Dash/PageHeader.qml:260

182+msgid "Store"

183+msgstr ""

184+

185+#: qml/Dash/PageHeader.qml:277

182186msgid "Settings"

183187msgstr ""

184188

185−#: qml/Dash/PageHeader.qml:275

189+#: qml/Dash/PageHeader.qml:284

186190msgid "Remove from Favorites"

187191msgstr ""

188192

189−#: qml/Dash/PageHeader.qml:275

193+#: qml/Dash/PageHeader.qml:284

190194msgid "Add to Favorites"

191195msgstr ""

192196

@@ -218,31 +222,23 @@ msgstr ""

218222msgid "Release to refresh…"

219223msgstr ""

220224

221−#: qml/Dash/ScopesOverview.qml:215

222−msgid "Manage Scopes"

223−msgstr ""

224−

225−#: qml/Dash/ScopesOverview.qml:437

226−msgid "Done"

227−msgstr ""

228−

229−#: qml/Dash/ScopesOverview.qml:463

230−msgid "Store"

225+#: qml/Dash/ScopesList.qml:63

226+msgid "Manage"

231227msgstr ""

232228

233−#: qml/Dash/ScopesOverviewTab.qml:36

234−msgid "Favorites"

229+#: qml/Dash/ScopesList.qml:107

230+msgid "Home"

235231msgstr ""

236232

237−#: qml/Dash/ScopesOverviewTab.qml:54

238−msgid "All"

233+#: qml/Dash/ScopesList.qml:108

234+msgid "Also installed"

239235msgstr ""

240236

241237#: qml/Greeter/Greeter.qml:174

242238msgid "Unlock"

243239msgstr ""

244240

245−#: qml/Notifications/NotificationMenuItemFactory.qml:116

241+#: qml/Notifications/NotificationMenuItemFactory.qml:128

246242msgid "Show password"

247243msgstr ""

248244

@@ -290,56 +286,233 @@ msgstr ""

290286msgid "Roaming"

291287msgstr ""

292288

293−#: qml/Shell.qml:391

294−msgid "Enter passphrase"

289+#: qml/Shell.qml:367

290+#, qt-format

291+msgid "Enter %1"

295292msgstr ""

296293

297−#: qml/Shell.qml:392

298−msgid "Sorry, incorrect passphrase"

294+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

295+msgid "Enter passphrase"

299296msgstr ""

300297

301−#: qml/Shell.qml:393

302−msgid "Please re-enter"

298+#: qml/Shell.qml:369

299+msgid "Enter passcode"

303300msgstr ""

304301

305−#: qml/Shell.qml:395

306−msgid "Enter passcode"

302+#: qml/Shell.qml:370

303+#, qt-format

304+msgid "Sorry, incorrect %1"

307305msgstr ""

308306

309−#: qml/Shell.qml:396

310−msgid "Sorry, incorrect passcode"

307+#: qml/Shell.qml:371

308+msgid "Sorry, incorrect passphrase"

311309msgstr ""

312310

313−#: qml/Shell.qml:399

314−#, qt-format

315−msgid "Enter %1"

311+#: qml/Shell.qml:372

312+msgid "Please re-enter"

316313msgstr ""

317314

318−#: qml/Shell.qml:400

319−#, qt-format

320−msgid "Sorry, incorrect %1"

315+#: qml/Shell.qml:373

316+msgid "Sorry, incorrect passcode"

321317msgstr ""

322318

323−#: qml/Shell.qml:441

319+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

324320msgid "Sorry, incorrect passphrase."

325321msgstr ""

326322

327−#: qml/Shell.qml:442

323+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

328324msgid "Sorry, incorrect passcode."

329325msgstr ""

330326

331−#: qml/Shell.qml:443

327+#: qml/Shell.qml:469

332328msgid "This will be your last attempt."

333329msgstr ""

334330

335−#: qml/Shell.qml:445

331+#: qml/Shell.qml:471

336332msgid ""

337333"If passphrase is entered incorrectly, your phone will conduct a factory "

338334"reset and all personal data will be deleted."

339335msgstr ""

340336

341−#: qml/Shell.qml:446

337+#: qml/Shell.qml:472

342338msgid ""

343339"If passcode is entered incorrectly, your phone will conduct a factory reset "

344340"and all personal data will be deleted."

345341msgstr ""

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+248−75

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-04-01 14:08+0000\n"

1212"Last-Translator: Atanas Kovachki <Unknown>\n"

1313"Language-Team: Bulgarian <bg@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr ""

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr ""

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr ""

3333

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] ""

5151msgstr[1] ""

5252

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

5454msgid "Log out"

5555msgstr ""

5656

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

5858msgid "Are you sure you want to log out?"

5959msgstr ""

6060

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62−#: qml/Components/Dialogs.qml:126

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:122

6363msgid "No"

6464msgstr ""

6565

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67−#: qml/Components/Dialogs.qml:133

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:129

6868msgid "Yes"

6969msgstr ""

7070

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

7272msgid "Shut down"

7373msgstr ""

7474

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

7676msgid "Are you sure you want to shut down?"

7777msgstr ""

7878

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

8080msgid "Reboot"

8181msgstr ""

8282

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

8484msgid "Are you sure you want to reboot?"

8585msgstr ""

8686

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

8888msgid "Power"

8989msgstr ""

9090

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

9292msgid ""

9393"Are you sure you would like\n"

9494"to power off?"

9595msgstr ""

9696

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

9898msgid "Power off"

9999msgstr ""

100100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102102msgid "Restart"

103103msgstr ""

104104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106106msgid "Cancel"

107107msgstr ""

108108

@@ -110,89 +110,93 @@ msgstr ""

110110msgid "Skip intro"

111111msgstr "Пропусни интрото"

112112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114114msgid "Right edge"

115115msgstr "Десен край"

116116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118118msgid "Try swiping from the right edge to unlock the phone"

119119msgstr ""

120120"Опитайте се да приплъзнете пръста си от десния край към левия, за да "

121121"отключите телефона"

122122

123−#: qml/Components/EdgeDemo.qml:144

123+#: qml/Components/EdgeDemo.qml:157

124124msgid "Top edge"

125125msgstr "Горен край"

126126

127−#: qml/Components/EdgeDemo.qml:145

127+#: qml/Components/EdgeDemo.qml:158

128128msgid "Try swiping from the top edge to access the indicators"

129129msgstr ""

130130"Опитайте се да приплъзнете пръста си от горния край към долния, за да "

131131"получите достъп до индикаторите"

132132

133−#: qml/Components/EdgeDemo.qml:170

133+#: qml/Components/EdgeDemo.qml:183

134134msgid "Close"

135135msgstr "Затвори"

136136

137−#: qml/Components/EdgeDemo.qml:171

137+#: qml/Components/EdgeDemo.qml:184

138138msgid "Swipe up again to close the settings screen"

139139msgstr ""

140140"Отново приплъзнете пръста си нагоре за да затворите екрана с настройките"

141141

142−#: qml/Components/EdgeDemo.qml:201

142+#: qml/Components/EdgeDemo.qml:214

143143msgid "Left edge"

144144msgstr "Ляв край"

145145

146−#: qml/Components/EdgeDemo.qml:202

146+#: qml/Components/EdgeDemo.qml:215

147147msgid "Swipe from the left to reveal the launcher for quick access to apps"

148148msgstr ""

149149"Приплъзнете пръста си от левия край към десния, за да отворите стартера за "

150150"бърз достъп до приложенията"

151151

152−#: qml/Components/EdgeDemo.qml:229

152+#: qml/Components/EdgeDemo.qml:242

153153msgid "Well done"

154154msgstr "Великолепно"

155155

156−#: qml/Components/EdgeDemo.qml:230

156+#: qml/Components/EdgeDemo.qml:243

157157msgid ""

158158"You have now mastered the edge gestures and can start using the "

159159"phone<br><br>Tap on the screen to start"

160160msgstr ""

161161

162−#: qml/Components/Lockscreen.qml:223

162+#: qml/Components/Lockscreen.qml:238

163163msgid "Return to Call"

164164msgstr ""

165165

166−#: qml/Components/Lockscreen.qml:223

166+#: qml/Components/Lockscreen.qml:238

167167msgid "Emergency Call"

168168msgstr "Спешно повикване"

169169

170−#: qml/Components/Lockscreen.qml:255

170+#: qml/Components/Lockscreen.qml:270

171171msgid "OK"

172172msgstr ""

173173

174−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

174+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

175175msgid "See less"

176176msgstr ""

177177

178−#: qml/Dash/GenericScopeView.qml:434

178+#: qml/Dash/GenericScopeView.qml:431

179179msgid "See all"

180180msgstr ""

181181

182−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

182+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

183183#: qml/Panel/SearchIndicator.qml:27

184184msgid "Search"

185185msgstr "Търсене"

186186

187−#: qml/Dash/PageHeader.qml:268

187+#: qml/Dash/PageHeader.qml:260

188+msgid "Store"

189+msgstr ""

190+

191+#: qml/Dash/PageHeader.qml:277

188192msgid "Settings"

189193msgstr ""

190194

191−#: qml/Dash/PageHeader.qml:275

195+#: qml/Dash/PageHeader.qml:284

192196msgid "Remove from Favorites"

193197msgstr ""

194198

195−#: qml/Dash/PageHeader.qml:275

199+#: qml/Dash/PageHeader.qml:284

196200msgid "Add to Favorites"

197201msgstr ""

198202

@@ -224,31 +228,23 @@ msgstr ""

224228msgid "Release to refresh…"

225229msgstr ""

226230

227−#: qml/Dash/ScopesOverview.qml:215

228−msgid "Manage Scopes"

229−msgstr ""

230−

231−#: qml/Dash/ScopesOverview.qml:437

232−msgid "Done"

233−msgstr ""

234−

235−#: qml/Dash/ScopesOverview.qml:463

236−msgid "Store"

231+#: qml/Dash/ScopesList.qml:63

232+msgid "Manage"

237233msgstr ""

238234

239−#: qml/Dash/ScopesOverviewTab.qml:36

240−msgid "Favorites"

235+#: qml/Dash/ScopesList.qml:107

236+msgid "Home"

241237msgstr ""

242238

243−#: qml/Dash/ScopesOverviewTab.qml:54

244−msgid "All"

239+#: qml/Dash/ScopesList.qml:108

240+msgid "Also installed"

245241msgstr ""

246242

247243#: qml/Greeter/Greeter.qml:174

248244msgid "Unlock"

249245msgstr ""

250246

251−#: qml/Notifications/NotificationMenuItemFactory.qml:116

247+#: qml/Notifications/NotificationMenuItemFactory.qml:128

252248msgid "Show password"

253249msgstr "Покажи паролата"

254250

@@ -296,60 +292,237 @@ msgstr ""

296292msgid "Roaming"

297293msgstr ""

298294

299−#: qml/Shell.qml:391

300−msgid "Enter passphrase"

295+#: qml/Shell.qml:367

296+#, qt-format

297+msgid "Enter %1"

301298msgstr ""

302299

303−#: qml/Shell.qml:392

304−msgid "Sorry, incorrect passphrase"

300+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

301+msgid "Enter passphrase"

305302msgstr ""

306303

307−#: qml/Shell.qml:393

308−msgid "Please re-enter"

304+#: qml/Shell.qml:369

305+msgid "Enter passcode"

309306msgstr ""

310307

311−#: qml/Shell.qml:395

312−msgid "Enter passcode"

308+#: qml/Shell.qml:370

309+#, qt-format

310+msgid "Sorry, incorrect %1"

313311msgstr ""

314312

315−#: qml/Shell.qml:396

316−msgid "Sorry, incorrect passcode"

313+#: qml/Shell.qml:371

314+msgid "Sorry, incorrect passphrase"

317315msgstr ""

318316

319−#: qml/Shell.qml:399

320−#, qt-format

321−msgid "Enter %1"

317+#: qml/Shell.qml:372

318+msgid "Please re-enter"

322319msgstr ""

323320

324−#: qml/Shell.qml:400

325−#, qt-format

326−msgid "Sorry, incorrect %1"

321+#: qml/Shell.qml:373

322+msgid "Sorry, incorrect passcode"

327323msgstr ""

328324

329−#: qml/Shell.qml:441

325+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

330326msgid "Sorry, incorrect passphrase."

331327msgstr ""

332328

333−#: qml/Shell.qml:442

329+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

334330msgid "Sorry, incorrect passcode."

335331msgstr ""

336332

337−#: qml/Shell.qml:443

333+#: qml/Shell.qml:469

338334msgid "This will be your last attempt."

339335msgstr ""

340336

341−#: qml/Shell.qml:445

337+#: qml/Shell.qml:471

342338msgid ""

343339"If passphrase is entered incorrectly, your phone will conduct a factory "

344340"reset and all personal data will be deleted."

345341msgstr ""

346342

347−#: qml/Shell.qml:446

343+#: qml/Shell.qml:472

348344msgid ""

349345"If passcode is entered incorrectly, your phone will conduct a factory reset "

350346"and all personal data will be deleted."

351347msgstr ""

352348

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+

353526#~ msgid "Confirm"

354527#~ msgstr "Потвърди"

355528

po/br.po+274−81

@@ -7,27 +7,27 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

11−"PO-Revision-Date: 2014-11-05 07:24+0000\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11+"PO-Revision-Date: 2014-12-16 07:27+0000\n"

1212"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"

1313"Language-Team: Breton <br@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-17 07:06+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Ger-tremen : "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Spilhennañ ar verradenn"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Dispilhennañ ar verradenn"

3333

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

5454msgstr[0] "Gortozit %1 vunutenn, mar plij, hag esaeit en-dro..."

5555msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."

5656

57−#: qml/Components/Dialogs.qml:74

57+#: qml/Components/Dialogs.qml:70

5858msgid "Log out"

5959msgstr "Digevreañ"

6060

61−#: qml/Components/Dialogs.qml:75

61+#: qml/Components/Dialogs.qml:71

6262msgid "Are you sure you want to log out?"

6363msgstr "Ha sur oc'h e fell deoc'h digevreañ ?"

6464

65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

66−#: qml/Components/Dialogs.qml:126

65+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66+#: qml/Components/Dialogs.qml:122

6767msgid "No"

6868msgstr "N'on ket"

6969

70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

71−#: qml/Components/Dialogs.qml:133

70+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71+#: qml/Components/Dialogs.qml:129

7272msgid "Yes"

7373msgstr "Ya"

7474

75−#: qml/Components/Dialogs.qml:98

75+#: qml/Components/Dialogs.qml:94

7676msgid "Shut down"

7777msgstr "Lazhañ ar benveg"

7878

79−#: qml/Components/Dialogs.qml:99

79+#: qml/Components/Dialogs.qml:95

8080msgid "Are you sure you want to shut down?"

8181msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"

8282

83−#: qml/Components/Dialogs.qml:123

83+#: qml/Components/Dialogs.qml:119

8484msgid "Reboot"

8585msgstr "Adloc'hañ"

8686

87−#: qml/Components/Dialogs.qml:124

87+#: qml/Components/Dialogs.qml:120

8888msgid "Are you sure you want to reboot?"

8989msgstr "Ha sur oc'h e fell deoc'h adloc'hañ ?"

9090

91−#: qml/Components/Dialogs.qml:148

91+#: qml/Components/Dialogs.qml:144

9292msgid "Power"

9393msgstr "Tredan"

9494

95−#: qml/Components/Dialogs.qml:149

95+#: qml/Components/Dialogs.qml:145

9696msgid ""

9797"Are you sure you would like\n"

9898"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100100"Ha sur oc'h e fell deoc'h\n"

101101"troc'hañ an tredan ?"

102102

103−#: qml/Components/Dialogs.qml:151

103+#: qml/Components/Dialogs.qml:147

104104msgid "Power off"

105105msgstr "Lazhañ"

106106

107−#: qml/Components/Dialogs.qml:161

107+#: qml/Components/Dialogs.qml:157

108108msgid "Restart"

109109msgstr "Adloc'hañ"

110110

111−#: qml/Components/Dialogs.qml:171

111+#: qml/Components/Dialogs.qml:167

112112msgid "Cancel"

113113msgstr "Nullañ"

114114

@@ -116,48 +116,48 @@ msgstr "Nullañ"

116116msgid "Skip intro"

117117msgstr "Tremen hep sellet ouzh an digoradur"

118118

119−#: qml/Components/EdgeDemo.qml:112

119+#: qml/Components/EdgeDemo.qml:125

120120msgid "Right edge"

121121msgstr "Bord dehoù"

122122

123−#: qml/Components/EdgeDemo.qml:113

123+#: qml/Components/EdgeDemo.qml:126

124124msgid "Try swiping from the right edge to unlock the phone"

125125msgstr ""

126126"Lakait ho piz da riklañ adalek ar bord dehoù da zibrennañ ar pellgomzer."

127127

128−#: qml/Components/EdgeDemo.qml:144

128+#: qml/Components/EdgeDemo.qml:157

129129msgid "Top edge"

130130msgstr "Bord uhelañ"

131131

132−#: qml/Components/EdgeDemo.qml:145

132+#: qml/Components/EdgeDemo.qml:158

133133msgid "Try swiping from the top edge to access the indicators"

134134msgstr ""

135135"Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war wel."

136136

137−#: qml/Components/EdgeDemo.qml:170

137+#: qml/Components/EdgeDemo.qml:183

138138msgid "Close"

139139msgstr "Serriñ"

140140

141−#: qml/Components/EdgeDemo.qml:171

141+#: qml/Components/EdgeDemo.qml:184

142142msgid "Swipe up again to close the settings screen"

143143msgstr ""

144144"Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an arventennoù"

145145

146−#: qml/Components/EdgeDemo.qml:201

146+#: qml/Components/EdgeDemo.qml:214

147147msgid "Left edge"

148148msgstr "Bord kleiz"

149149

150−#: qml/Components/EdgeDemo.qml:202

150+#: qml/Components/EdgeDemo.qml:215

151151msgid "Swipe from the left to reveal the launcher for quick access to apps"

152152msgstr ""

153153"Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser arloadoù "

154154"prim."

155155

156−#: qml/Components/EdgeDemo.qml:229

156+#: qml/Components/EdgeDemo.qml:242

157157msgid "Well done"

158158msgstr "Gourc'hemennoù !"

159159

160−#: qml/Components/EdgeDemo.qml:230

160+#: qml/Components/EdgeDemo.qml:243

161161msgid ""

162162"You have now mastered the edge gestures and can start using the "

163163"phone<br><br>Tap on the screen to start"

@@ -165,40 +165,44 @@ msgstr ""

165165"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "

166166"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"

167167

168−#: qml/Components/Lockscreen.qml:223

168+#: qml/Components/Lockscreen.qml:238

169169msgid "Return to Call"

170170msgstr "Distreiñ d'ar bellgomzadenn"

171171

172−#: qml/Components/Lockscreen.qml:223

172+#: qml/Components/Lockscreen.qml:238

173173msgid "Emergency Call"

174174msgstr "Pellgomzadenn vallus"

175175

176−#: qml/Components/Lockscreen.qml:255

176+#: qml/Components/Lockscreen.qml:270

177177msgid "OK"

178178msgstr "Mat eo"

179179

180−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

180+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

181181msgid "See less"

182182msgstr "Gwelet nebeutoc'h"

183183

184−#: qml/Dash/GenericScopeView.qml:434

184+#: qml/Dash/GenericScopeView.qml:431

185185msgid "See all"

186186msgstr "Gwelet pep tra"

187187

188−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

188+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

189189#: qml/Panel/SearchIndicator.qml:27

190190msgid "Search"

191191msgstr "Klask"

192192

193−#: qml/Dash/PageHeader.qml:268

193+#: qml/Dash/PageHeader.qml:260

194+msgid "Store"

195+msgstr "Enrollañ"

196+

197+#: qml/Dash/PageHeader.qml:277

194198msgid "Settings"

195199msgstr "Arventennoù"

196200

197−#: qml/Dash/PageHeader.qml:275

201+#: qml/Dash/PageHeader.qml:284

198202msgid "Remove from Favorites"

199203msgstr "Lemel eus ar sinedoù"

200204

201−#: qml/Dash/PageHeader.qml:275

205+#: qml/Dash/PageHeader.qml:284

202206msgid "Add to Favorites"

203207msgstr "Ouzhpennañ d'ar sinedoù"

204208

@@ -230,31 +234,23 @@ msgstr "Tennañ evit freskaat..."

230234msgid "Release to refresh…"

231235msgstr "Lezel da vont evit freskaat..."

232236

233−#: qml/Dash/ScopesOverview.qml:215

234−msgid "Manage Scopes"

235−msgstr "Merañ ar c'hefluskerioù enklask"

237+#: qml/Dash/ScopesList.qml:63

238+msgid "Manage"

239+msgstr "Merañ"

236240

237−#: qml/Dash/ScopesOverview.qml:437

238−msgid "Done"

239−msgstr "Graet eo"

240−

241−#: qml/Dash/ScopesOverview.qml:463

242−msgid "Store"

243−msgstr "Enrollañ"

241+#: qml/Dash/ScopesList.qml:107

242+msgid "Home"

243+msgstr "Er gêr"

244244

245−#: qml/Dash/ScopesOverviewTab.qml:36

246−msgid "Favorites"

247−msgstr "Gwellañ deuet"

248−

249−#: qml/Dash/ScopesOverviewTab.qml:54

250−msgid "All"

251−msgstr "An holl anezho"

245+#: qml/Dash/ScopesList.qml:108

246+msgid "Also installed"

247+msgstr "Staliet ivez"

252248

253249#: qml/Greeter/Greeter.qml:174

254250msgid "Unlock"

255251msgstr "Dibrennañ"

256252

257−#: qml/Notifications/NotificationMenuItemFactory.qml:116

253+#: qml/Notifications/NotificationMenuItemFactory.qml:128

258254msgid "Show password"

259255msgstr "Diskouez ar ger-tremen"

260256

@@ -302,49 +298,49 @@ msgstr "Dibrennañ ar gartenn SIM"

302298msgid "Roaming"

303299msgstr "O kantren"

304300

305−#: qml/Shell.qml:391

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

306307msgid "Enter passphrase"

307308msgstr "Merkañ ar frazenn-dremen"

308309

309−#: qml/Shell.qml:392

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

310320msgid "Sorry, incorrect passphrase"

311321msgstr "Siwazh, frazenn-dremen direizh"

312322

313−#: qml/Shell.qml:393

323+#: qml/Shell.qml:372

314324msgid "Please re-enter"

315325msgstr "Adverkañ, mar plij"

316326

317−#: qml/Shell.qml:395

318−msgid "Enter passcode"

319−msgstr "Merkañ ar c'hod-tremen"

320−

321−#: qml/Shell.qml:396

327+#: qml/Shell.qml:373

322328msgid "Sorry, incorrect passcode"

323329msgstr "Digarezit, kod-tremen direizh"

324330

325−#: qml/Shell.qml:399

326−#, qt-format

327−msgid "Enter %1"

328−msgstr "Merkañ %1"

329−

330−#: qml/Shell.qml:400

331−#, qt-format

332−msgid "Sorry, incorrect %1"

333−msgstr "Siwazh, %1 direizh"

334−

335−#: qml/Shell.qml:441

331+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

336332msgid "Sorry, incorrect passphrase."

337333msgstr "Siwazh, frazenn-dremen direizh"

338334

339−#: qml/Shell.qml:442

335+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

340336msgid "Sorry, incorrect passcode."

341337msgstr "Siwazh, kod-tremen direizh"

342338

343−#: qml/Shell.qml:443

339+#: qml/Shell.qml:469

344340msgid "This will be your last attempt."

345341msgstr "Ho taol-esae diwezhañ e vo."

346342

347−#: qml/Shell.qml:445

343+#: qml/Shell.qml:471

348344msgid ""

349345"If passphrase is entered incorrectly, your phone will conduct a factory "

350346"reset and all personal data will be deleted."

@@ -352,7 +348,7 @@ msgstr ""

352348"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "

353349"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"

354350

355−#: qml/Shell.qml:446

351+#: qml/Shell.qml:472

356352msgid ""

357353"If passcode is entered incorrectly, your phone will conduct a factory reset "

358354"and all personal data will be deleted."

@@ -360,6 +356,191 @@ msgstr ""

360356"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "

361357"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."

362358

359+#: qml/Wizard/Page.qml:89

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+

363544#~ msgid "Loading. Please Wait..."

364545#~ msgstr "O kargañ. Gortozit, mar plij..."

365546

@@ -374,3 +555,15 @@ msgstr ""

374555

375556#~ msgid "Type or say a command"

376557#~ 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"

567+

568+#~ msgid "Manage Scopes"

569+#~ msgstr "Merañ ar c'hefluskerioù enklask"

po/bs.po+248−75

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-01-16 22:33+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Bosnian <bs@li.org>\n"

@@ -16,19 +16,19 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

20−"X-Generator: Launchpad (build 17231)\n"

19+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

20+"X-Generator: Launchpad (build 17286)\n"

2121

2222#: plugins/LightDM/Greeter.cpp:130

2323msgid "Password: "

2424msgstr ""

2525

2626#: plugins/Unity/Launcher/launcheritem.cpp:45

27−#: plugins/Unity/Launcher/launcheritem.cpp:91

27+#: plugins/Unity/Launcher/launcheritem.cpp:100

2828msgid "Pin shortcut"

2929msgstr ""

3030

31−#: plugins/Unity/Launcher/launcheritem.cpp:91

31+#: plugins/Unity/Launcher/launcheritem.cpp:100

3232msgid "Unpin shortcut"

3333msgstr ""

3434

@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5151msgstr[0] ""

5252msgstr[1] ""

5353

54−#: qml/Components/Dialogs.qml:74

54+#: qml/Components/Dialogs.qml:70

5555msgid "Log out"

5656msgstr ""

5757

58−#: qml/Components/Dialogs.qml:75

58+#: qml/Components/Dialogs.qml:71

5959msgid "Are you sure you want to log out?"

6060msgstr ""

6161

62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

63−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63+#: qml/Components/Dialogs.qml:122

6464msgid "No"

6565msgstr ""

6666

67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

68−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68+#: qml/Components/Dialogs.qml:129

6969msgid "Yes"

7070msgstr ""

7171

72−#: qml/Components/Dialogs.qml:98

72+#: qml/Components/Dialogs.qml:94

7373msgid "Shut down"

7474msgstr ""

7575

76−#: qml/Components/Dialogs.qml:99

76+#: qml/Components/Dialogs.qml:95

7777msgid "Are you sure you want to shut down?"

7878msgstr ""

7979

80−#: qml/Components/Dialogs.qml:123

80+#: qml/Components/Dialogs.qml:119

8181msgid "Reboot"

8282msgstr ""

8383

84−#: qml/Components/Dialogs.qml:124

84+#: qml/Components/Dialogs.qml:120

8585msgid "Are you sure you want to reboot?"

8686msgstr ""

8787

88−#: qml/Components/Dialogs.qml:148

88+#: qml/Components/Dialogs.qml:144

8989msgid "Power"

9090msgstr ""

9191

92−#: qml/Components/Dialogs.qml:149

92+#: qml/Components/Dialogs.qml:145

9393msgid ""

9494"Are you sure you would like\n"

9595"to power off?"

9696msgstr ""

9797

98−#: qml/Components/Dialogs.qml:151

98+#: qml/Components/Dialogs.qml:147

9999msgid "Power off"

100100msgstr ""

101101

102−#: qml/Components/Dialogs.qml:161

102+#: qml/Components/Dialogs.qml:157

103103msgid "Restart"

104104msgstr ""

105105

106−#: qml/Components/Dialogs.qml:171

106+#: qml/Components/Dialogs.qml:167

107107msgid "Cancel"

108108msgstr ""

109109

@@ -111,82 +111,86 @@ msgstr ""

111111msgid "Skip intro"

112112msgstr "Preskoči uvod"

113113

114−#: qml/Components/EdgeDemo.qml:112

114+#: qml/Components/EdgeDemo.qml:125

115115msgid "Right edge"

116116msgstr "Desna ivica"

117117

118−#: qml/Components/EdgeDemo.qml:113

118+#: qml/Components/EdgeDemo.qml:126

119119msgid "Try swiping from the right edge to unlock the phone"

120120msgstr ""

121121

122−#: qml/Components/EdgeDemo.qml:144

122+#: qml/Components/EdgeDemo.qml:157

123123msgid "Top edge"

124124msgstr "Gornja ivica"

125125

126−#: qml/Components/EdgeDemo.qml:145

126+#: qml/Components/EdgeDemo.qml:158

127127msgid "Try swiping from the top edge to access the indicators"

128128msgstr ""

129129

130−#: qml/Components/EdgeDemo.qml:170

130+#: qml/Components/EdgeDemo.qml:183

131131msgid "Close"

132132msgstr "Zatvori"

133133

134−#: qml/Components/EdgeDemo.qml:171

134+#: qml/Components/EdgeDemo.qml:184

135135msgid "Swipe up again to close the settings screen"

136136msgstr ""

137137

138−#: qml/Components/EdgeDemo.qml:201

138+#: qml/Components/EdgeDemo.qml:214

139139msgid "Left edge"

140140msgstr ""

141141

142−#: qml/Components/EdgeDemo.qml:202

142+#: qml/Components/EdgeDemo.qml:215

143143msgid "Swipe from the left to reveal the launcher for quick access to apps"

144144msgstr ""

145145

146−#: qml/Components/EdgeDemo.qml:229

146+#: qml/Components/EdgeDemo.qml:242

147147msgid "Well done"

148148msgstr ""

149149

150−#: qml/Components/EdgeDemo.qml:230

150+#: qml/Components/EdgeDemo.qml:243

151151msgid ""

152152"You have now mastered the edge gestures and can start using the "

153153"phone<br><br>Tap on the screen to start"

154154msgstr ""

155155

156−#: qml/Components/Lockscreen.qml:223

156+#: qml/Components/Lockscreen.qml:238

157157msgid "Return to Call"

158158msgstr ""

159159

160−#: qml/Components/Lockscreen.qml:223

160+#: qml/Components/Lockscreen.qml:238

161161msgid "Emergency Call"

162162msgstr ""

163163

164−#: qml/Components/Lockscreen.qml:255

164+#: qml/Components/Lockscreen.qml:270

165165msgid "OK"

166166msgstr ""

167167

168−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

168+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

169169msgid "See less"

170170msgstr ""

171171

172−#: qml/Dash/GenericScopeView.qml:434

172+#: qml/Dash/GenericScopeView.qml:431

173173msgid "See all"

174174msgstr ""

175175

176−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

176+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

177177#: qml/Panel/SearchIndicator.qml:27

178178msgid "Search"

179179msgstr ""

180180

181−#: qml/Dash/PageHeader.qml:268

181+#: qml/Dash/PageHeader.qml:260

182+msgid "Store"

183+msgstr ""

184+

185+#: qml/Dash/PageHeader.qml:277

182186msgid "Settings"

183187msgstr ""

184188

185−#: qml/Dash/PageHeader.qml:275

189+#: qml/Dash/PageHeader.qml:284

186190msgid "Remove from Favorites"

187191msgstr ""

188192

189−#: qml/Dash/PageHeader.qml:275

193+#: qml/Dash/PageHeader.qml:284

190194msgid "Add to Favorites"

191195msgstr ""

192196

@@ -218,31 +222,23 @@ msgstr ""

218222msgid "Release to refresh…"

219223msgstr ""

220224

221−#: qml/Dash/ScopesOverview.qml:215

222−msgid "Manage Scopes"

223−msgstr ""

224−

225−#: qml/Dash/ScopesOverview.qml:437

226−msgid "Done"

227−msgstr ""

228−

229−#: qml/Dash/ScopesOverview.qml:463

230−msgid "Store"

225+#: qml/Dash/ScopesList.qml:63

226+msgid "Manage"

231227msgstr ""

232228

233−#: qml/Dash/ScopesOverviewTab.qml:36

234−msgid "Favorites"

229+#: qml/Dash/ScopesList.qml:107

230+msgid "Home"

235231msgstr ""

236232

237−#: qml/Dash/ScopesOverviewTab.qml:54

238−msgid "All"

233+#: qml/Dash/ScopesList.qml:108

234+msgid "Also installed"

239235msgstr ""

240236

241237#: qml/Greeter/Greeter.qml:174

242238msgid "Unlock"

243239msgstr ""

244240

245−#: qml/Notifications/NotificationMenuItemFactory.qml:116

241+#: qml/Notifications/NotificationMenuItemFactory.qml:128

246242msgid "Show password"

247243msgstr ""

248244

@@ -290,56 +286,233 @@ msgstr ""

290286msgid "Roaming"

291287msgstr ""

292288

293−#: qml/Shell.qml:391

294−msgid "Enter passphrase"

289+#: qml/Shell.qml:367

290+#, qt-format

291+msgid "Enter %1"

295292msgstr ""

296293

297−#: qml/Shell.qml:392

298−msgid "Sorry, incorrect passphrase"

294+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

295+msgid "Enter passphrase"

299296msgstr ""

300297

301−#: qml/Shell.qml:393

302−msgid "Please re-enter"

298+#: qml/Shell.qml:369

299+msgid "Enter passcode"

303300msgstr ""

304301

305−#: qml/Shell.qml:395

306−msgid "Enter passcode"

302+#: qml/Shell.qml:370

303+#, qt-format

304+msgid "Sorry, incorrect %1"

307305msgstr ""

308306

309−#: qml/Shell.qml:396

310−msgid "Sorry, incorrect passcode"

307+#: qml/Shell.qml:371

308+msgid "Sorry, incorrect passphrase"

311309msgstr ""

312310

313−#: qml/Shell.qml:399

314−#, qt-format

315−msgid "Enter %1"

311+#: qml/Shell.qml:372

312+msgid "Please re-enter"

316313msgstr ""

317314

318−#: qml/Shell.qml:400

319−#, qt-format

320−msgid "Sorry, incorrect %1"

315+#: qml/Shell.qml:373

316+msgid "Sorry, incorrect passcode"

321317msgstr ""

322318

323−#: qml/Shell.qml:441

319+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

324320msgid "Sorry, incorrect passphrase."

325321msgstr ""

326322

327−#: qml/Shell.qml:442

323+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

328324msgid "Sorry, incorrect passcode."

329325msgstr ""

330326

331−#: qml/Shell.qml:443

327+#: qml/Shell.qml:469

332328msgid "This will be your last attempt."

333329msgstr ""

334330

335−#: qml/Shell.qml:445

331+#: qml/Shell.qml:471

336332msgid ""

337333"If passphrase is entered incorrectly, your phone will conduct a factory "

338334"reset and all personal data will be deleted."

339335msgstr ""

340336

341−#: qml/Shell.qml:446

337+#: qml/Shell.qml:472

342338msgid ""

343339"If passcode is entered incorrectly, your phone will conduct a factory reset "

344340"and all personal data will be deleted."

345341msgstr ""

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+265−80

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-11-10 09:22+0000\n"

1212"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

1313"Language-Team: Catalan <ca@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-11 07:11+0000\n"

19−"X-Generator: Launchpad (build 17241)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Contrasenya: "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Enganxa la drecera"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Desenganxa la drecera"

3333

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

5454msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."

5555msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."

5656

57−#: qml/Components/Dialogs.qml:74

57+#: qml/Components/Dialogs.qml:70

5858msgid "Log out"

5959msgstr "Surt"

6060

61−#: qml/Components/Dialogs.qml:75

61+#: qml/Components/Dialogs.qml:71

6262msgid "Are you sure you want to log out?"

6363msgstr "Segur que voleu sortir?"

6464

65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

66−#: qml/Components/Dialogs.qml:126

65+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66+#: qml/Components/Dialogs.qml:122

6767msgid "No"

6868msgstr "No"

6969

70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

71−#: qml/Components/Dialogs.qml:133

70+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71+#: qml/Components/Dialogs.qml:129

7272msgid "Yes"

7373msgstr "Sí"

7474

75−#: qml/Components/Dialogs.qml:98

75+#: qml/Components/Dialogs.qml:94

7676msgid "Shut down"

7777msgstr "Apaga"

7878

79−#: qml/Components/Dialogs.qml:99

79+#: qml/Components/Dialogs.qml:95

8080msgid "Are you sure you want to shut down?"

8181msgstr "Segur que voleu apagar?"

8282

83−#: qml/Components/Dialogs.qml:123

83+#: qml/Components/Dialogs.qml:119

8484msgid "Reboot"

8585msgstr "Reinicia"

8686

87−#: qml/Components/Dialogs.qml:124

87+#: qml/Components/Dialogs.qml:120

8888msgid "Are you sure you want to reboot?"

8989msgstr "Segur que voleu reiniciar?"

9090

91−#: qml/Components/Dialogs.qml:148

91+#: qml/Components/Dialogs.qml:144

9292msgid "Power"

9393msgstr "Energia"

9494

95−#: qml/Components/Dialogs.qml:149

95+#: qml/Components/Dialogs.qml:145

9696msgid ""

9797"Are you sure you would like\n"

9898"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100100"Segur que voleu\n"

101101"apagar?"

102102

103−#: qml/Components/Dialogs.qml:151

103+#: qml/Components/Dialogs.qml:147

104104msgid "Power off"

105105msgstr "Apaga"

106106

107−#: qml/Components/Dialogs.qml:161

107+#: qml/Components/Dialogs.qml:157

108108msgid "Restart"

109109msgstr "Reinicia"

110110

111−#: qml/Components/Dialogs.qml:171

111+#: qml/Components/Dialogs.qml:167

112112msgid "Cancel"

113113msgstr "Cancel·la"

114114

@@ -116,49 +116,49 @@ msgstr "Cancel·la"

116116msgid "Skip intro"

117117msgstr "Omet la introducció"

118118

119−#: qml/Components/EdgeDemo.qml:112

119+#: qml/Components/EdgeDemo.qml:125

120120msgid "Right edge"

121121msgstr "Vora dreta"

122122

123−#: qml/Components/EdgeDemo.qml:113

123+#: qml/Components/EdgeDemo.qml:126

124124msgid "Try swiping from the right edge to unlock the phone"

125125msgstr ""

126126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"

127127

128−#: qml/Components/EdgeDemo.qml:144

128+#: qml/Components/EdgeDemo.qml:157

129129msgid "Top edge"

130130msgstr "Vora superior"

131131

132−#: qml/Components/EdgeDemo.qml:145

132+#: qml/Components/EdgeDemo.qml:158

133133msgid "Try swiping from the top edge to access the indicators"

134134msgstr ""

135135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"

136136

137−#: qml/Components/EdgeDemo.qml:170

137+#: qml/Components/EdgeDemo.qml:183

138138msgid "Close"

139139msgstr "Tanca"

140140

141−#: qml/Components/EdgeDemo.qml:171

141+#: qml/Components/EdgeDemo.qml:184

142142msgid "Swipe up again to close the settings screen"

143143msgstr ""

144144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "

145145"configuració"

146146

147−#: qml/Components/EdgeDemo.qml:201

147+#: qml/Components/EdgeDemo.qml:214

148148msgid "Left edge"

149149msgstr "Vora esquerra"

150150

151−#: qml/Components/EdgeDemo.qml:202

151+#: qml/Components/EdgeDemo.qml:215

152152msgid "Swipe from the left to reveal the launcher for quick access to apps"

153153msgstr ""

154154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

155155"ràpidament a les aplicacions"

156156

157−#: qml/Components/EdgeDemo.qml:229

157+#: qml/Components/EdgeDemo.qml:242

158158msgid "Well done"

159159msgstr "Enhorabona!"

160160

161−#: qml/Components/EdgeDemo.qml:230

161+#: qml/Components/EdgeDemo.qml:243

162162msgid ""

163163"You have now mastered the edge gestures and can start using the "

164164"phone<br><br>Tap on the screen to start"

@@ -166,40 +166,44 @@ msgstr ""

166166"Ja heu après com utilitzar els gestos de les vores per fer servir el "

167167"telèfon<br><br>Feu un toc a la pantalla per començar"

168168

169−#: qml/Components/Lockscreen.qml:223

169+#: qml/Components/Lockscreen.qml:238

170170msgid "Return to Call"

171171msgstr "Torna a la trucada"

172172

173−#: qml/Components/Lockscreen.qml:223

173+#: qml/Components/Lockscreen.qml:238

174174msgid "Emergency Call"

175175msgstr "Trucada d'emergència"

176176

177−#: qml/Components/Lockscreen.qml:255

177+#: qml/Components/Lockscreen.qml:270

178178msgid "OK"

179179msgstr "D'acord"

180180

181−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

181+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

182182msgid "See less"

183183msgstr "Mostra'n menys"

184184

185−#: qml/Dash/GenericScopeView.qml:434

185+#: qml/Dash/GenericScopeView.qml:431

186186msgid "See all"

187187msgstr "Mostra-ho tot"

188188

189−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

189+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

190190#: qml/Panel/SearchIndicator.qml:27

191191msgid "Search"

192192msgstr "Cerca"

193193

194−#: qml/Dash/PageHeader.qml:268

194+#: qml/Dash/PageHeader.qml:260

195+msgid "Store"

196+msgstr "Botiga"

197+

198+#: qml/Dash/PageHeader.qml:277

195199msgid "Settings"

196200msgstr "Paràmetres"

197201

198−#: qml/Dash/PageHeader.qml:275

202+#: qml/Dash/PageHeader.qml:284

199203msgid "Remove from Favorites"

200204msgstr "Suprimeix dels preferits"

201205

202−#: qml/Dash/PageHeader.qml:275

206+#: qml/Dash/PageHeader.qml:284

203207msgid "Add to Favorites"

204208msgstr "Afegeix als preferits"

205209

@@ -231,31 +235,23 @@ msgstr "Estireu per actualitzar..."

231235msgid "Release to refresh…"

232236msgstr "Deixeu anar per actualitzar..."

233237

234−#: qml/Dash/ScopesOverview.qml:215

235−msgid "Manage Scopes"

236−msgstr "Gestioneu les lents"

237−

238−#: qml/Dash/ScopesOverview.qml:437

239−msgid "Done"

240−msgstr "Fet"

241−

242−#: qml/Dash/ScopesOverview.qml:463

243−msgid "Store"

244−msgstr "Botiga"

238+#: qml/Dash/ScopesList.qml:63

239+msgid "Manage"

240+msgstr ""

245241

246−#: qml/Dash/ScopesOverviewTab.qml:36

247−msgid "Favorites"

248−msgstr "Preferides"

242+#: qml/Dash/ScopesList.qml:107

243+msgid "Home"

244+msgstr ""

249245

250−#: qml/Dash/ScopesOverviewTab.qml:54

251−msgid "All"

252−msgstr "Totes"

246+#: qml/Dash/ScopesList.qml:108

247+msgid "Also installed"

248+msgstr ""

253249

254250#: qml/Greeter/Greeter.qml:174

255251msgid "Unlock"

256252msgstr "Desbloca"

257253

258−#: qml/Notifications/NotificationMenuItemFactory.qml:116

254+#: qml/Notifications/NotificationMenuItemFactory.qml:128

259255msgid "Show password"

260256msgstr "Mostra la contrasenya"

261257

@@ -303,49 +299,49 @@ msgstr "Desbloca la SIM"

303299msgid "Roaming"

304300msgstr "Itinerància"

305301

306−#: qml/Shell.qml:391

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

307308msgid "Enter passphrase"

308309msgstr "Introduïu la contrasenya"

309310

310−#: qml/Shell.qml:392

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

311321msgid "Sorry, incorrect passphrase"

312322msgstr "La contrasenya no és correcta"

313323

314−#: qml/Shell.qml:393

324+#: qml/Shell.qml:372

315325msgid "Please re-enter"

316326msgstr "Torneu-ho a introduir"

317327

318−#: qml/Shell.qml:395

319−msgid "Enter passcode"

320−msgstr "Introduïu el codi d'accés"

321−

322−#: qml/Shell.qml:396

328+#: qml/Shell.qml:373

323329msgid "Sorry, incorrect passcode"

324330msgstr "El codi d'accés no és correcte"

325331

326−#: qml/Shell.qml:399

327−#, qt-format

328−msgid "Enter %1"

329−msgstr "Introduïu: %1"

330−

331−#: qml/Shell.qml:400

332−#, qt-format

333−msgid "Sorry, incorrect %1"

334−msgstr "Incorrecte (%1)"

335−

336−#: qml/Shell.qml:441

332+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

337333msgid "Sorry, incorrect passphrase."

338334msgstr "La contrasenya és incorrecta"

339335

340−#: qml/Shell.qml:442

336+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

341337msgid "Sorry, incorrect passcode."

342338msgstr "El codi d'accés no és correcte"

343339

344−#: qml/Shell.qml:443

340+#: qml/Shell.qml:469

345341msgid "This will be your last attempt."

346342msgstr "Aquest serà el darrer intent."

347343

348−#: qml/Shell.qml:445

344+#: qml/Shell.qml:471

349345msgid ""

350346"If passphrase is entered incorrectly, your phone will conduct a factory "

351347"reset and all personal data will be deleted."

@@ -354,7 +350,7 @@ msgstr ""

354350"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

355351"personals."

356352

357−#: qml/Shell.qml:446

353+#: qml/Shell.qml:472

358354msgid ""

359355"If passcode is entered incorrectly, your phone will conduct a factory reset "

360356"and all personal data will be deleted."

@@ -363,6 +359,183 @@ msgstr ""

363359"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

364360"personals."

365361

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+

366539#~ msgid "Confirm"

367540#~ msgstr "Confirma"

368541

@@ -377,3 +550,15 @@ msgstr ""

377550

378551#~ msgid "Speaking..."

379552#~ 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"

562+

563+#~ msgid "Manage Scopes"

564+#~ msgstr "Gestioneu les lents"

po/ca@valencia.po+272−87

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-11-23 07:17+0000\n"

1212"Last-Translator: Pau Iranzo <Unknown>\n"

1313"Language-Team: Catalan <ca@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-24 06:20+0000\n"

19−"X-Generator: Launchpad (build 17252)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Contrasenya: "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Apega la drecera"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Desenganxa la drecera"

3333

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

5454msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."

5555msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."

5656

57−#: qml/Components/Dialogs.qml:74

57+#: qml/Components/Dialogs.qml:70

5858msgid "Log out"

5959msgstr "Ix"

6060

61−#: qml/Components/Dialogs.qml:75

61+#: qml/Components/Dialogs.qml:71

6262msgid "Are you sure you want to log out?"

6363msgstr "Segur que voleu eixir?"

6464

65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

66−#: qml/Components/Dialogs.qml:126

65+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66+#: qml/Components/Dialogs.qml:122

6767msgid "No"

6868msgstr "No"

6969

70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

71−#: qml/Components/Dialogs.qml:133

70+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71+#: qml/Components/Dialogs.qml:129

7272msgid "Yes"

7373msgstr "Sí"

7474

75−#: qml/Components/Dialogs.qml:98

75+#: qml/Components/Dialogs.qml:94

7676msgid "Shut down"

7777msgstr "Apaga"

7878

79−#: qml/Components/Dialogs.qml:99

79+#: qml/Components/Dialogs.qml:95

8080msgid "Are you sure you want to shut down?"

8181msgstr "Segur que voleu apagar?"

8282

83−#: qml/Components/Dialogs.qml:123

83+#: qml/Components/Dialogs.qml:119

8484msgid "Reboot"

8585msgstr "Reinicia"

8686

87−#: qml/Components/Dialogs.qml:124

87+#: qml/Components/Dialogs.qml:120

8888msgid "Are you sure you want to reboot?"

8989msgstr "Segur que voleu reiniciar?"

9090

91−#: qml/Components/Dialogs.qml:148

91+#: qml/Components/Dialogs.qml:144

9292msgid "Power"

9393msgstr "Energia"

9494

95−#: qml/Components/Dialogs.qml:149

95+#: qml/Components/Dialogs.qml:145

9696msgid ""

9797"Are you sure you would like\n"

9898"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100100"Segur que voleu\n"

101101"apagar?"

102102

103−#: qml/Components/Dialogs.qml:151

103+#: qml/Components/Dialogs.qml:147

104104msgid "Power off"

105105msgstr "Apaga"

106106

107−#: qml/Components/Dialogs.qml:161

107+#: qml/Components/Dialogs.qml:157

108108msgid "Restart"

109109msgstr "Reinicia"

110110

111−#: qml/Components/Dialogs.qml:171

111+#: qml/Components/Dialogs.qml:167

112112msgid "Cancel"

113113msgstr "Cancel·la"

114114

@@ -116,49 +116,49 @@ msgstr "Cancel·la"

116116msgid "Skip intro"

117117msgstr "Omet la introducció"

118118

119−#: qml/Components/EdgeDemo.qml:112

119+#: qml/Components/EdgeDemo.qml:125

120120msgid "Right edge"

121121msgstr "Vora dreta"

122122

123−#: qml/Components/EdgeDemo.qml:113

123+#: qml/Components/EdgeDemo.qml:126

124124msgid "Try swiping from the right edge to unlock the phone"

125125msgstr ""

126126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"

127127

128−#: qml/Components/EdgeDemo.qml:144

128+#: qml/Components/EdgeDemo.qml:157

129129msgid "Top edge"

130130msgstr "Vora superior"

131131

132−#: qml/Components/EdgeDemo.qml:145

132+#: qml/Components/EdgeDemo.qml:158

133133msgid "Try swiping from the top edge to access the indicators"

134134msgstr ""

135135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"

136136

137−#: qml/Components/EdgeDemo.qml:170

137+#: qml/Components/EdgeDemo.qml:183

138138msgid "Close"

139139msgstr "Tanca"

140140

141−#: qml/Components/EdgeDemo.qml:171

141+#: qml/Components/EdgeDemo.qml:184

142142msgid "Swipe up again to close the settings screen"

143143msgstr ""

144144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "

145145"configuració"

146146

147−#: qml/Components/EdgeDemo.qml:201

147+#: qml/Components/EdgeDemo.qml:214

148148msgid "Left edge"

149149msgstr "Vora esquerra"

150150

151−#: qml/Components/EdgeDemo.qml:202

151+#: qml/Components/EdgeDemo.qml:215

152152msgid "Swipe from the left to reveal the launcher for quick access to apps"

153153msgstr ""

154154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

155155"ràpidament a les aplicacions"

156156

157−#: qml/Components/EdgeDemo.qml:229

157+#: qml/Components/EdgeDemo.qml:242

158158msgid "Well done"

159159msgstr "Enhorabona!"

160160

161−#: qml/Components/EdgeDemo.qml:230

161+#: qml/Components/EdgeDemo.qml:243

162162msgid ""

163163"You have now mastered the edge gestures and can start using the "

164164"phone<br><br>Tap on the screen to start"

@@ -166,40 +166,44 @@ msgstr ""

166166"Ja heu aprés com utilitzar els gestos de les vores per fer servir el "

167167"telèfon<br><br>Feu un toc a la pantalla per començar"

168168

169−#: qml/Components/Lockscreen.qml:223

169+#: qml/Components/Lockscreen.qml:238

170170msgid "Return to Call"

171171msgstr "Torna a la trucada"

172172

173−#: qml/Components/Lockscreen.qml:223

173+#: qml/Components/Lockscreen.qml:238

174174msgid "Emergency Call"

175175msgstr "Cridada d'emergència"

176176

177−#: qml/Components/Lockscreen.qml:255

177+#: qml/Components/Lockscreen.qml:270

178178msgid "OK"

179179msgstr "D'acord"

180180

181−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

181+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

182182msgid "See less"

183183msgstr "Mostra'n menys"

184184

185−#: qml/Dash/GenericScopeView.qml:434

185+#: qml/Dash/GenericScopeView.qml:431

186186msgid "See all"

187187msgstr "Mostra-ho tot"

188188

189−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

189+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

190190#: qml/Panel/SearchIndicator.qml:27

191191msgid "Search"

192192msgstr "Cerca"

193193

194−#: qml/Dash/PageHeader.qml:268

194+#: qml/Dash/PageHeader.qml:260

195+msgid "Store"

196+msgstr "Botiga"

197+

198+#: qml/Dash/PageHeader.qml:277

195199msgid "Settings"

196200msgstr "Paràmetres"

197201

198−#: qml/Dash/PageHeader.qml:275

202+#: qml/Dash/PageHeader.qml:284

199203msgid "Remove from Favorites"

200204msgstr "Suprimeix dels preferits"

201205

202−#: qml/Dash/PageHeader.qml:275

206+#: qml/Dash/PageHeader.qml:284

203207msgid "Add to Favorites"

204208msgstr "Afig als preferits"

205209

@@ -231,31 +235,23 @@ msgstr "Estireu per actualitzar..."

231235msgid "Release to refresh…"

232236msgstr "Deixeu anar per actualitzar..."

233237

234−#: qml/Dash/ScopesOverview.qml:215

235−msgid "Manage Scopes"

236−msgstr "Gestioneu les lents"

237−

238−#: qml/Dash/ScopesOverview.qml:437

239−msgid "Done"

240−msgstr "Fet"

241−

242−#: qml/Dash/ScopesOverview.qml:463

243−msgid "Store"

244−msgstr "Botiga"

238+#: qml/Dash/ScopesList.qml:63

239+msgid "Manage"

240+msgstr ""

245241

246−#: qml/Dash/ScopesOverviewTab.qml:36

247−msgid "Favorites"

248−msgstr "Preferides"

242+#: qml/Dash/ScopesList.qml:107

243+msgid "Home"

244+msgstr ""

249245

250−#: qml/Dash/ScopesOverviewTab.qml:54

251−msgid "All"

252−msgstr "Totes"

246+#: qml/Dash/ScopesList.qml:108

247+msgid "Also installed"

248+msgstr ""

253249

254250#: qml/Greeter/Greeter.qml:174

255251msgid "Unlock"

256252msgstr "Desbloca"

257253

258−#: qml/Notifications/NotificationMenuItemFactory.qml:116

254+#: qml/Notifications/NotificationMenuItemFactory.qml:128

259255msgid "Show password"

260256msgstr "Mostra la contrasenya"

261257

@@ -267,31 +263,31 @@ msgstr "Feu un toc per tornar a la cridada..."

267263msgid "Conference"

268264msgstr "Conferència"

269265

270−#: qml/Panel/Indicators/MenuItemFactory.qml:615

266+#: qml/Panel/Indicators/MenuItemFactory.qml:643

271267msgid "Nothing is playing"

272268msgstr "No s'està reproduint res"

273269

274−#: qml/Panel/Indicators/MenuItemFactory.qml:763

270+#: qml/Panel/Indicators/MenuItemFactory.qml:791

275271msgid "In queue…"

276272msgstr "A la cua..."

277273

278−#: qml/Panel/Indicators/MenuItemFactory.qml:767

274+#: qml/Panel/Indicators/MenuItemFactory.qml:795

279275msgid "Downloading"

280276msgstr "S'està baixant"

281277

282−#: qml/Panel/Indicators/MenuItemFactory.qml:769

278+#: qml/Panel/Indicators/MenuItemFactory.qml:797

283279msgid "Paused, tap to resume"

284280msgstr "En pausa, feu un toc per continuar"

285281

286−#: qml/Panel/Indicators/MenuItemFactory.qml:771

282+#: qml/Panel/Indicators/MenuItemFactory.qml:799

287283msgid "Canceled"

288284msgstr "S'ha cancel·lat"

289285

290−#: qml/Panel/Indicators/MenuItemFactory.qml:773

286+#: qml/Panel/Indicators/MenuItemFactory.qml:801

291287msgid "Finished"

292288msgstr "S'ha finalitzat"

293289

294−#: qml/Panel/Indicators/MenuItemFactory.qml:775

290+#: qml/Panel/Indicators/MenuItemFactory.qml:803

295291msgid "Failed, tap to retry"

296292msgstr "Ha fallat, feu un toc per tornar-ho a intentar"

297293

@@ -303,49 +299,49 @@ msgstr "Desbloca la SIM"

303299msgid "Roaming"

304300msgstr "Itinerància"

305301

306−#: qml/Shell.qml:381

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

307308msgid "Enter passphrase"

308309msgstr "Introduïu la contrasenya"

309310

310−#: qml/Shell.qml:382

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

311321msgid "Sorry, incorrect passphrase"

312322msgstr "La contrasenya no és correcta"

313323

314−#: qml/Shell.qml:383

324+#: qml/Shell.qml:372

315325msgid "Please re-enter"

316326msgstr "Torneu-ho a introduir"

317327

318−#: qml/Shell.qml:385

319−msgid "Enter passcode"

320−msgstr "Introduïu el codi d'accés"

321−

322−#: qml/Shell.qml:386

328+#: qml/Shell.qml:373

323329msgid "Sorry, incorrect passcode"

324330msgstr "El codi d'accés no és correcte"

325331

326−#: qml/Shell.qml:389

327−#, qt-format

328−msgid "Enter %1"

329−msgstr "Introduïu: %1"

330−

331−#: qml/Shell.qml:390

332−#, qt-format

333−msgid "Sorry, incorrect %1"

334−msgstr "Incorrecte (%1)"

335−

336−#: qml/Shell.qml:431

332+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

337333msgid "Sorry, incorrect passphrase."

338334msgstr "La contrasenya és incorrecta"

339335

340−#: qml/Shell.qml:432

336+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

341337msgid "Sorry, incorrect passcode."

342338msgstr "El codi d'accés no és correcte"

343339

344−#: qml/Shell.qml:433

340+#: qml/Shell.qml:469

345341msgid "This will be your last attempt."

346342msgstr "Este serà el darrer intent."

347343

348−#: qml/Shell.qml:435

344+#: qml/Shell.qml:471

349345msgid ""

350346"If passphrase is entered incorrectly, your phone will conduct a factory "

351347"reset and all personal data will be deleted."

@@ -354,7 +350,7 @@ msgstr ""

354350"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

355351"personals."

356352

357−#: qml/Shell.qml:436

353+#: qml/Shell.qml:472

358354msgid ""

359355"If passcode is entered incorrectly, your phone will conduct a factory reset "

360356"and all personal data will be deleted."

@@ -363,6 +359,195 @@ msgstr ""

363359"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

364360"personals."

365361

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+

366551#~ msgid "Confirm"

367552#~ msgstr "Confirma"

368553

po/ckb.po+248−75

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-01-21 11:05+0000\n"

1212"Last-Translator: Aras <aras.noori@gmail.com>\n"

1313"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr ""

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr ""

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr ""

3333

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] ""

5151msgstr[1] ""

5252

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

5454msgid "Log out"

5555msgstr ""

5656

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

5858msgid "Are you sure you want to log out?"

5959msgstr ""

6060

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62−#: qml/Components/Dialogs.qml:126

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:122

6363msgid "No"

6464msgstr ""

6565

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67−#: qml/Components/Dialogs.qml:133

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:129

6868msgid "Yes"

6969msgstr ""

7070

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

7272msgid "Shut down"

7373msgstr ""

7474

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

7676msgid "Are you sure you want to shut down?"

7777msgstr ""

7878

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

8080msgid "Reboot"

8181msgstr ""

8282

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

8484msgid "Are you sure you want to reboot?"

8585msgstr ""

8686

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

8888msgid "Power"

8989msgstr ""

9090

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

9292msgid ""

9393"Are you sure you would like\n"

9494"to power off?"

9595msgstr ""

9696

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

9898msgid "Power off"

9999msgstr ""

100100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102102msgid "Restart"

103103msgstr ""

104104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106106msgid "Cancel"

107107msgstr ""

108108

@@ -110,82 +110,86 @@ msgstr ""

110110msgid "Skip intro"

111111msgstr "پێشەکیی بپەڕێنە"

112112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114114msgid "Right edge"

115115msgstr "لێواری ڕاست"

116116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118118msgid "Try swiping from the right edge to unlock the phone"

119119msgstr "لێواری ڕاست ڕابکێشە بۆ کردنەوەی مۆبایلەکە"

120120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122122msgid "Top edge"

123123msgstr "لێواری سەرەوە"

124124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126126msgid "Try swiping from the top edge to access the indicators"

127127msgstr "لێواری سەرەوە ڕابکێشە بۆ گەیشتن بە نیشاندەرەکان"

128128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130130msgid "Close"

131131msgstr "داخستن"

132132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134134msgid "Swipe up again to close the settings screen"

135135msgstr "ڕایکێشەوە سەرەوە جارێکی تر بۆ داخستنی پەردەی ڕێکخستنەکان"

136136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138138msgid "Left edge"

139139msgstr "لێواری چەپ"

140140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143143msgstr "لە چەپەوە بچۆرەوە سەر دەستپێک بۆئەوەی بتوانی هەموو ئەپەکان ببینی"

144144

145−#: qml/Components/EdgeDemo.qml:229

145+#: qml/Components/EdgeDemo.qml:242

146146msgid "Well done"

147147msgstr "دەستخۆش"

148148

149−#: qml/Components/EdgeDemo.qml:230

149+#: qml/Components/EdgeDemo.qml:243

150150msgid ""

151151"You have now mastered the edge gestures and can start using the "

152152"phone<br><br>Tap on the screen to start"

153153msgstr ""

154154

155−#: qml/Components/Lockscreen.qml:223

155+#: qml/Components/Lockscreen.qml:238

156156msgid "Return to Call"

157157msgstr ""

158158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160160msgid "Emergency Call"

161161msgstr "هێڵی فریاگوزاری"

162162

163−#: qml/Components/Lockscreen.qml:255

163+#: qml/Components/Lockscreen.qml:270

164164msgid "OK"

165165msgstr ""

166166

167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

168168msgid "See less"

169169msgstr ""

170170

171−#: qml/Dash/GenericScopeView.qml:434

171+#: qml/Dash/GenericScopeView.qml:431

172172msgid "See all"

173173msgstr ""

174174

175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176176#: qml/Panel/SearchIndicator.qml:27

177177msgid "Search"

178178msgstr "گەڕان"

179179

180−#: qml/Dash/PageHeader.qml:268

180+#: qml/Dash/PageHeader.qml:260

181+msgid "Store"

182+msgstr ""

183+

184+#: qml/Dash/PageHeader.qml:277

181185msgid "Settings"

182186msgstr ""

183187

184−#: qml/Dash/PageHeader.qml:275

188+#: qml/Dash/PageHeader.qml:284

185189msgid "Remove from Favorites"

186190msgstr ""

187191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189193msgid "Add to Favorites"

190194msgstr ""

191195

@@ -217,31 +221,23 @@ msgstr ""

217221msgid "Release to refresh…"

218222msgstr ""

219223

220−#: qml/Dash/ScopesOverview.qml:215

221−msgid "Manage Scopes"

222−msgstr ""

223−

224−#: qml/Dash/ScopesOverview.qml:437

225−msgid "Done"

226−msgstr ""

227−

228−#: qml/Dash/ScopesOverview.qml:463

229−msgid "Store"

224+#: qml/Dash/ScopesList.qml:63

225+msgid "Manage"

230226msgstr ""

231227

232−#: qml/Dash/ScopesOverviewTab.qml:36

233−msgid "Favorites"

228+#: qml/Dash/ScopesList.qml:107

229+msgid "Home"

234230msgstr ""

235231

236−#: qml/Dash/ScopesOverviewTab.qml:54

237−msgid "All"

232+#: qml/Dash/ScopesList.qml:108

233+msgid "Also installed"

238234msgstr ""

239235

240236#: qml/Greeter/Greeter.qml:174

241237msgid "Unlock"

242238msgstr ""

243239

244−#: qml/Notifications/NotificationMenuItemFactory.qml:116

240+#: qml/Notifications/NotificationMenuItemFactory.qml:128

245241msgid "Show password"

246242msgstr "تێپەڕەوشە پیشان بدە"

247243

@@ -289,60 +285,237 @@ msgstr ""

289285msgid "Roaming"

290286msgstr ""

291287

292−#: qml/Shell.qml:391

293−msgid "Enter passphrase"

288+#: qml/Shell.qml:367

289+#, qt-format

290+msgid "Enter %1"

294291msgstr ""

295292

296−#: qml/Shell.qml:392

297−msgid "Sorry, incorrect passphrase"

293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

294+msgid "Enter passphrase"

298295msgstr ""

299296

300−#: qml/Shell.qml:393

301−msgid "Please re-enter"

297+#: qml/Shell.qml:369

298+msgid "Enter passcode"

302299msgstr ""

303300

304−#: qml/Shell.qml:395

305−msgid "Enter passcode"

301+#: qml/Shell.qml:370

302+#, qt-format

303+msgid "Sorry, incorrect %1"

306304msgstr ""

307305

308−#: qml/Shell.qml:396

309−msgid "Sorry, incorrect passcode"

306+#: qml/Shell.qml:371

307+msgid "Sorry, incorrect passphrase"

310308msgstr ""

311309

312−#: qml/Shell.qml:399

313−#, qt-format

314−msgid "Enter %1"

310+#: qml/Shell.qml:372

311+msgid "Please re-enter"

315312msgstr ""

316313

317−#: qml/Shell.qml:400

318−#, qt-format

319−msgid "Sorry, incorrect %1"

314+#: qml/Shell.qml:373

315+msgid "Sorry, incorrect passcode"

320316msgstr ""

321317

322−#: qml/Shell.qml:441

318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

323319msgid "Sorry, incorrect passphrase."

324320msgstr ""

325321

326−#: qml/Shell.qml:442

322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

327323msgid "Sorry, incorrect passcode."

328324msgstr ""

329325

330−#: qml/Shell.qml:443

326+#: qml/Shell.qml:469

331327msgid "This will be your last attempt."

332328msgstr ""

333329

334−#: qml/Shell.qml:445

330+#: qml/Shell.qml:471

335331msgid ""

336332"If passphrase is entered incorrectly, your phone will conduct a factory "

337333"reset and all personal data will be deleted."

338334msgstr ""

339335

340−#: qml/Shell.qml:446

336+#: qml/Shell.qml:472

341337msgid ""

342338"If passcode is entered incorrectly, your phone will conduct a factory reset "

343339"and all personal data will be deleted."

344340msgstr ""

345341

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+

346519#~ msgid "Speaking..."

347520#~ msgstr "قسە دەکات..."

348521

po/cs.po+248−75

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-01-08 10:11+0000\n"

1212"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"

1313"Language-Team: Czech <cs@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr ""

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr ""

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr ""

3333

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] ""

5151msgstr[1] ""

5252

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

5454msgid "Log out"

5555msgstr ""

5656

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

5858msgid "Are you sure you want to log out?"

5959msgstr ""

6060

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62−#: qml/Components/Dialogs.qml:126

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:122

6363msgid "No"

6464msgstr ""

6565

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67−#: qml/Components/Dialogs.qml:133

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:129

6868msgid "Yes"

6969msgstr ""

7070

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

7272msgid "Shut down"

7373msgstr ""

7474

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

7676msgid "Are you sure you want to shut down?"

7777msgstr ""

7878

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

8080msgid "Reboot"

8181msgstr ""

8282

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

8484msgid "Are you sure you want to reboot?"

8585msgstr ""

8686

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

8888msgid "Power"

8989msgstr ""

9090

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

9292msgid ""

9393"Are you sure you would like\n"

9494"to power off?"

9595msgstr ""

9696

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

9898msgid "Power off"

9999msgstr ""

100100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102102msgid "Restart"

103103msgstr ""

104104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106106msgid "Cancel"

107107msgstr ""

108108

@@ -110,82 +110,86 @@ msgstr ""

110110msgid "Skip intro"

111111msgstr "Přeskočit intro"

112112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114114msgid "Right edge"

115115msgstr "Pravý okraj"

116116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118118msgid "Try swiping from the right edge to unlock the phone"

119119msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."

120120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122122msgid "Top edge"

123123msgstr "Horní okraj"

124124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126126msgid "Try swiping from the top edge to access the indicators"

127127msgstr "Pokuste se zpřístupnit indikátory potažením prstu z horního okraje"

128128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130130msgid "Close"

131131msgstr "Uzavřít"

132132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134134msgid "Swipe up again to close the settings screen"

135135msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"

136136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138138msgid "Left edge"

139139msgstr "Levý okraj"

140140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143143msgstr "Pro rychlý přístup k aplikacím potáhněte prst z levého okraje."

144144

145−#: qml/Components/EdgeDemo.qml:229

145+#: qml/Components/EdgeDemo.qml:242

146146msgid "Well done"

147147msgstr "Výborně"

148148

149−#: qml/Components/EdgeDemo.qml:230

149+#: qml/Components/EdgeDemo.qml:243

150150msgid ""

151151"You have now mastered the edge gestures and can start using the "

152152"phone<br><br>Tap on the screen to start"

153153msgstr ""

154154

155−#: qml/Components/Lockscreen.qml:223

155+#: qml/Components/Lockscreen.qml:238

156156msgid "Return to Call"

157157msgstr ""

158158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160160msgid "Emergency Call"

161161msgstr "Tísňové volání"

162162

163−#: qml/Components/Lockscreen.qml:255

163+#: qml/Components/Lockscreen.qml:270

164164msgid "OK"

165165msgstr ""

166166

167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

168168msgid "See less"

169169msgstr ""

170170

171−#: qml/Dash/GenericScopeView.qml:434

171+#: qml/Dash/GenericScopeView.qml:431

172172msgid "See all"

173173msgstr ""

174174

175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176176#: qml/Panel/SearchIndicator.qml:27

177177msgid "Search"

178178msgstr "Hledat"

179179

180−#: qml/Dash/PageHeader.qml:268

180+#: qml/Dash/PageHeader.qml:260

181+msgid "Store"

182+msgstr ""

183+

184+#: qml/Dash/PageHeader.qml:277

181185msgid "Settings"

182186msgstr ""

183187

184−#: qml/Dash/PageHeader.qml:275

188+#: qml/Dash/PageHeader.qml:284

185189msgid "Remove from Favorites"

186190msgstr ""

187191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189193msgid "Add to Favorites"

190194msgstr ""

191195

@@ -217,31 +221,23 @@ msgstr ""

217221msgid "Release to refresh…"

218222msgstr ""

219223

220−#: qml/Dash/ScopesOverview.qml:215

221−msgid "Manage Scopes"

222−msgstr ""

223−

224−#: qml/Dash/ScopesOverview.qml:437

225−msgid "Done"

226−msgstr ""

227−

228−#: qml/Dash/ScopesOverview.qml:463

229−msgid "Store"

224+#: qml/Dash/ScopesList.qml:63

225+msgid "Manage"

230226msgstr ""

231227

232−#: qml/Dash/ScopesOverviewTab.qml:36

233−msgid "Favorites"

228+#: qml/Dash/ScopesList.qml:107

229+msgid "Home"

234230msgstr ""

235231

236−#: qml/Dash/ScopesOverviewTab.qml:54

237−msgid "All"

232+#: qml/Dash/ScopesList.qml:108

233+msgid "Also installed"

238234msgstr ""

239235

240236#: qml/Greeter/Greeter.qml:174

241237msgid "Unlock"

242238msgstr ""

243239

244−#: qml/Notifications/NotificationMenuItemFactory.qml:116

240+#: qml/Notifications/NotificationMenuItemFactory.qml:128

245241msgid "Show password"

246242msgstr "Zobrazit heslo"

247243

@@ -289,60 +285,237 @@ msgstr ""

289285msgid "Roaming"

290286msgstr ""

291287

292−#: qml/Shell.qml:391

293−msgid "Enter passphrase"

288+#: qml/Shell.qml:367

289+#, qt-format

290+msgid "Enter %1"

294291msgstr ""

295292

296−#: qml/Shell.qml:392

297−msgid "Sorry, incorrect passphrase"

293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

294+msgid "Enter passphrase"

298295msgstr ""

299296

300−#: qml/Shell.qml:393

301−msgid "Please re-enter"

297+#: qml/Shell.qml:369

298+msgid "Enter passcode"

302299msgstr ""

303300

304−#: qml/Shell.qml:395

305−msgid "Enter passcode"

301+#: qml/Shell.qml:370

302+#, qt-format

303+msgid "Sorry, incorrect %1"

306304msgstr ""

307305

308−#: qml/Shell.qml:396

309−msgid "Sorry, incorrect passcode"

306+#: qml/Shell.qml:371

307+msgid "Sorry, incorrect passphrase"

310308msgstr ""

311309

312−#: qml/Shell.qml:399

313−#, qt-format

314−msgid "Enter %1"

310+#: qml/Shell.qml:372

311+msgid "Please re-enter"

315312msgstr ""

316313

317−#: qml/Shell.qml:400

318−#, qt-format

319−msgid "Sorry, incorrect %1"

314+#: qml/Shell.qml:373

315+msgid "Sorry, incorrect passcode"

320316msgstr ""

321317

322−#: qml/Shell.qml:441

318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

323319msgid "Sorry, incorrect passphrase."

324320msgstr ""

325321

326−#: qml/Shell.qml:442

322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

327323msgid "Sorry, incorrect passcode."

328324msgstr ""

329325

330−#: qml/Shell.qml:443

326+#: qml/Shell.qml:469

331327msgid "This will be your last attempt."

332328msgstr ""

333329

334−#: qml/Shell.qml:445

330+#: qml/Shell.qml:471

335331msgid ""

336332"If passphrase is entered incorrectly, your phone will conduct a factory "

337333"reset and all personal data will be deleted."

338334msgstr ""

339335

340−#: qml/Shell.qml:446

336+#: qml/Shell.qml:472

341337msgid ""

342338"If passcode is entered incorrectly, your phone will conduct a factory reset "

343339"and all personal data will be deleted."

344340msgstr ""

345341

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+

346519#~ msgid "Loading. Please Wait..."

347520#~ msgstr "Načítám. Čekejte prosím..."

348521

po/da.po+248−75

@@ -8,7 +8,7 @@ msgid ""

88msgstr ""

99"Project-Id-Version: unity8\n"

1010"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

11−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

11+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1212"PO-Revision-Date: 2014-07-30 12:37+0000\n"

1313"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"

1414"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"

@@ -16,19 +16,19 @@ msgstr ""

1616"Content-Type: text/plain; charset=UTF-8\n"

1717"Content-Transfer-Encoding: 8bit\n"

1818"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

20−"X-Generator: Launchpad (build 17231)\n"

19+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

20+"X-Generator: Launchpad (build 17286)\n"

2121

2222#: plugins/LightDM/Greeter.cpp:130

2323msgid "Password: "

2424msgstr ""

2525

2626#: plugins/Unity/Launcher/launcheritem.cpp:45

27−#: plugins/Unity/Launcher/launcheritem.cpp:91

27+#: plugins/Unity/Launcher/launcheritem.cpp:100

2828msgid "Pin shortcut"

2929msgstr "Fastgør genvej"

3030

31−#: plugins/Unity/Launcher/launcheritem.cpp:91

31+#: plugins/Unity/Launcher/launcheritem.cpp:100

3232msgid "Unpin shortcut"

3333msgstr "Gør genvej flytbar"

3434

@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5151msgstr[0] ""

5252msgstr[1] ""

5353

54−#: qml/Components/Dialogs.qml:74

54+#: qml/Components/Dialogs.qml:70

5555msgid "Log out"

5656msgstr ""

5757

58−#: qml/Components/Dialogs.qml:75

58+#: qml/Components/Dialogs.qml:71

5959msgid "Are you sure you want to log out?"

6060msgstr ""

6161

62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

63−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63+#: qml/Components/Dialogs.qml:122

6464msgid "No"

6565msgstr ""

6666

67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

68−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68+#: qml/Components/Dialogs.qml:129

6969msgid "Yes"

7070msgstr ""

7171

72−#: qml/Components/Dialogs.qml:98

72+#: qml/Components/Dialogs.qml:94

7373msgid "Shut down"

7474msgstr ""

7575

76−#: qml/Components/Dialogs.qml:99

76+#: qml/Components/Dialogs.qml:95

7777msgid "Are you sure you want to shut down?"

7878msgstr ""

7979

80−#: qml/Components/Dialogs.qml:123

80+#: qml/Components/Dialogs.qml:119

8181msgid "Reboot"

8282msgstr ""

8383

84−#: qml/Components/Dialogs.qml:124

84+#: qml/Components/Dialogs.qml:120

8585msgid "Are you sure you want to reboot?"

8686msgstr ""

8787

88−#: qml/Components/Dialogs.qml:148

88+#: qml/Components/Dialogs.qml:144

8989msgid "Power"

9090msgstr ""

9191

92−#: qml/Components/Dialogs.qml:149

92+#: qml/Components/Dialogs.qml:145

9393msgid ""

9494"Are you sure you would like\n"

9595"to power off?"

9696msgstr ""

9797

98−#: qml/Components/Dialogs.qml:151

98+#: qml/Components/Dialogs.qml:147

9999msgid "Power off"

100100msgstr ""

101101

102−#: qml/Components/Dialogs.qml:161

102+#: qml/Components/Dialogs.qml:157

103103msgid "Restart"

104104msgstr ""

105105

106−#: qml/Components/Dialogs.qml:171

106+#: qml/Components/Dialogs.qml:167

107107msgid "Cancel"

108108msgstr ""

109109

@@ -111,43 +111,43 @@ msgstr ""

111111msgid "Skip intro"

112112msgstr "Spring intro over"

113113

114−#: qml/Components/EdgeDemo.qml:112

114+#: qml/Components/EdgeDemo.qml:125

115115msgid "Right edge"

116116msgstr "Højre kant"

117117

118−#: qml/Components/EdgeDemo.qml:113

118+#: qml/Components/EdgeDemo.qml:126

119119msgid "Try swiping from the right edge to unlock the phone"

120120msgstr "Prøv at stryge fra højre kant for at låse telefonen op"

121121

122−#: qml/Components/EdgeDemo.qml:144

122+#: qml/Components/EdgeDemo.qml:157

123123msgid "Top edge"

124124msgstr "Øvre kant"

125125

126−#: qml/Components/EdgeDemo.qml:145

126+#: qml/Components/EdgeDemo.qml:158

127127msgid "Try swiping from the top edge to access the indicators"

128128msgstr "Prøv at stryge fra den øvre kant for at tilgå indikatorerne"

129129

130−#: qml/Components/EdgeDemo.qml:170

130+#: qml/Components/EdgeDemo.qml:183

131131msgid "Close"

132132msgstr "Luk"

133133

134−#: qml/Components/EdgeDemo.qml:171

134+#: qml/Components/EdgeDemo.qml:184

135135msgid "Swipe up again to close the settings screen"

136136msgstr "Stryg op igen for at låse indstillingsskærmen"

137137

138−#: qml/Components/EdgeDemo.qml:201

138+#: qml/Components/EdgeDemo.qml:214

139139msgid "Left edge"

140140msgstr "Venstre kant"

141141

142−#: qml/Components/EdgeDemo.qml:202

142+#: qml/Components/EdgeDemo.qml:215

143143msgid "Swipe from the left to reveal the launcher for quick access to apps"

144144msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"

145145

146−#: qml/Components/EdgeDemo.qml:229

146+#: qml/Components/EdgeDemo.qml:242

147147msgid "Well done"

148148msgstr "Godt gjort"

149149

150−#: qml/Components/EdgeDemo.qml:230

150+#: qml/Components/EdgeDemo.qml:243

151151msgid ""

152152"You have now mastered the edge gestures and can start using the "

153153"phone<br><br>Tap on the screen to start"

@@ -155,40 +155,44 @@ msgstr ""

155155"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "

156156"på skærmen for at starte"

157157

158−#: qml/Components/Lockscreen.qml:223

158+#: qml/Components/Lockscreen.qml:238

159159msgid "Return to Call"

160160msgstr ""

161161

162−#: qml/Components/Lockscreen.qml:223

162+#: qml/Components/Lockscreen.qml:238

163163msgid "Emergency Call"

164164msgstr "Nødopkald"

165165

166−#: qml/Components/Lockscreen.qml:255

166+#: qml/Components/Lockscreen.qml:270

167167msgid "OK"

168168msgstr "O.k."

169169

170−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

170+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

171171msgid "See less"

172172msgstr "Vis mindre"

173173

174−#: qml/Dash/GenericScopeView.qml:434

174+#: qml/Dash/GenericScopeView.qml:431

175175msgid "See all"

176176msgstr "Se alle"

177177

178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

178+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

179179#: qml/Panel/SearchIndicator.qml:27

180180msgid "Search"

181181msgstr "Søg"

182182

183−#: qml/Dash/PageHeader.qml:268

183+#: qml/Dash/PageHeader.qml:260

184+msgid "Store"

185+msgstr ""

186+

187+#: qml/Dash/PageHeader.qml:277

184188msgid "Settings"

185189msgstr ""

186190

187−#: qml/Dash/PageHeader.qml:275

191+#: qml/Dash/PageHeader.qml:284

188192msgid "Remove from Favorites"

189193msgstr ""

190194

191−#: qml/Dash/PageHeader.qml:275

195+#: qml/Dash/PageHeader.qml:284

192196msgid "Add to Favorites"

193197msgstr ""

194198

@@ -220,31 +224,23 @@ msgstr ""

220224msgid "Release to refresh…"

221225msgstr ""

222226

223−#: qml/Dash/ScopesOverview.qml:215

224−msgid "Manage Scopes"

225−msgstr ""

226−

227−#: qml/Dash/ScopesOverview.qml:437

228−msgid "Done"

229−msgstr ""

230−

231−#: qml/Dash/ScopesOverview.qml:463

232−msgid "Store"

227+#: qml/Dash/ScopesList.qml:63

228+msgid "Manage"

233229msgstr ""

234230

235−#: qml/Dash/ScopesOverviewTab.qml:36

236−msgid "Favorites"

231+#: qml/Dash/ScopesList.qml:107

232+msgid "Home"

237233msgstr ""

238234

239−#: qml/Dash/ScopesOverviewTab.qml:54

240−msgid "All"

235+#: qml/Dash/ScopesList.qml:108

236+msgid "Also installed"

241237msgstr ""

242238

243239#: qml/Greeter/Greeter.qml:174

244240msgid "Unlock"

245241msgstr ""

246242

247−#: qml/Notifications/NotificationMenuItemFactory.qml:116

243+#: qml/Notifications/NotificationMenuItemFactory.qml:128

248244msgid "Show password"

249245msgstr "Vis adgangskode"

250246

@@ -292,60 +288,237 @@ msgstr ""

292288msgid "Roaming"

293289msgstr ""

294290

295−#: qml/Shell.qml:391

296−msgid "Enter passphrase"

291+#: qml/Shell.qml:367

292+#, qt-format

293+msgid "Enter %1"

297294msgstr ""

298295

299−#: qml/Shell.qml:392

300−msgid "Sorry, incorrect passphrase"

296+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

297+msgid "Enter passphrase"

301298msgstr ""

302299

303−#: qml/Shell.qml:393

304−msgid "Please re-enter"

300+#: qml/Shell.qml:369

301+msgid "Enter passcode"

305302msgstr ""

306303

307−#: qml/Shell.qml:395

308−msgid "Enter passcode"

304+#: qml/Shell.qml:370

305+#, qt-format

306+msgid "Sorry, incorrect %1"

309307msgstr ""

310308

311−#: qml/Shell.qml:396

312−msgid "Sorry, incorrect passcode"

309+#: qml/Shell.qml:371

310+msgid "Sorry, incorrect passphrase"

313311msgstr ""

314312

315−#: qml/Shell.qml:399

316−#, qt-format

317−msgid "Enter %1"

313+#: qml/Shell.qml:372

314+msgid "Please re-enter"

318315msgstr ""

319316

320−#: qml/Shell.qml:400

321−#, qt-format

322−msgid "Sorry, incorrect %1"

317+#: qml/Shell.qml:373

318+msgid "Sorry, incorrect passcode"

323319msgstr ""

324320

325−#: qml/Shell.qml:441

321+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

326322msgid "Sorry, incorrect passphrase."

327323msgstr ""

328324

329−#: qml/Shell.qml:442

325+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

330326msgid "Sorry, incorrect passcode."

331327msgstr ""

332328

333−#: qml/Shell.qml:443

329+#: qml/Shell.qml:469

334330msgid "This will be your last attempt."

335331msgstr ""

336332

337−#: qml/Shell.qml:445

333+#: qml/Shell.qml:471

338334msgid ""

339335"If passphrase is entered incorrectly, your phone will conduct a factory "

340336"reset and all personal data will be deleted."

341337msgstr ""

342338

343−#: qml/Shell.qml:446

339+#: qml/Shell.qml:472

344340msgid ""

345341"If passcode is entered incorrectly, your phone will conduct a factory reset "

346342"and all personal data will be deleted."

347343msgstr ""

348344

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+

349522#~ msgid "Speaking..."

350523#~ msgstr "Taler..."

351524

po/de.po+268−83

@@ -7,27 +7,27 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

11−"PO-Revision-Date: 2014-10-21 11:26+0000\n"

12−"Last-Translator: Alexander Dobetsberger <Unknown>\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11+"PO-Revision-Date: 2014-12-12 01:42+0000\n"

12+"Last-Translator: Niklas Wenzel <nikwen.developer@gmail.com>\n"

1313"Language-Team: German <de@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Passwort: "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Verknüpfung anheften"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Verknüpfung entfernen"

3333

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

5454msgstr[0] "Bitte warten Sie %1 Minute und versuchen Sie es dann erneut..."

5555msgstr[1] "Bitte warten Sie %1 Minuten und versuchen Sie es dann erneut..."

5656

57−#: qml/Components/Dialogs.qml:74

57+#: qml/Components/Dialogs.qml:70

5858msgid "Log out"

5959msgstr "Abmelden"

6060

61−#: qml/Components/Dialogs.qml:75

61+#: qml/Components/Dialogs.qml:71

6262msgid "Are you sure you want to log out?"

6363msgstr "Sind Sie sicher, dass Sie sich abmelden wollen?"

6464

65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

66−#: qml/Components/Dialogs.qml:126

65+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66+#: qml/Components/Dialogs.qml:122

6767msgid "No"

6868msgstr "Nein"

6969

70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

71−#: qml/Components/Dialogs.qml:133

70+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71+#: qml/Components/Dialogs.qml:129

7272msgid "Yes"

7373msgstr "Ja"

7474

75−#: qml/Components/Dialogs.qml:98

75+#: qml/Components/Dialogs.qml:94

7676msgid "Shut down"

7777msgstr "Herunterfahren"

7878

79−#: qml/Components/Dialogs.qml:99

79+#: qml/Components/Dialogs.qml:95

8080msgid "Are you sure you want to shut down?"

8181msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"

8282

83−#: qml/Components/Dialogs.qml:123

83+#: qml/Components/Dialogs.qml:119

8484msgid "Reboot"

8585msgstr "Neustart"

8686

87−#: qml/Components/Dialogs.qml:124

87+#: qml/Components/Dialogs.qml:120

8888msgid "Are you sure you want to reboot?"

8989msgstr "Sind Sie sicher, dass Sie neu starten wollen?"

9090

91−#: qml/Components/Dialogs.qml:148

91+#: qml/Components/Dialogs.qml:144

9292msgid "Power"

9393msgstr "Energie"

9494

95−#: qml/Components/Dialogs.qml:149

95+#: qml/Components/Dialogs.qml:145

9696msgid ""

9797"Are you sure you would like\n"

9898"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100100"Sind Sie sicher, dass Sie das\n"

101101"Gerät ausschalten wollen?"

102102

103−#: qml/Components/Dialogs.qml:151

103+#: qml/Components/Dialogs.qml:147

104104msgid "Power off"

105105msgstr "Ausschalten"

106106

107−#: qml/Components/Dialogs.qml:161

107+#: qml/Components/Dialogs.qml:157

108108msgid "Restart"

109109msgstr "Neustarten"

110110

111−#: qml/Components/Dialogs.qml:171

111+#: qml/Components/Dialogs.qml:167

112112msgid "Cancel"

113113msgstr "Abbrechen"

114114

@@ -116,46 +116,46 @@ msgstr "Abbrechen"

116116msgid "Skip intro"

117117msgstr "Einführung überspringen"

118118

119−#: qml/Components/EdgeDemo.qml:112

119+#: qml/Components/EdgeDemo.qml:125

120120msgid "Right edge"

121121msgstr "Rechter Bildschirmrand"

122122

123−#: qml/Components/EdgeDemo.qml:113

123+#: qml/Components/EdgeDemo.qml:126

124124msgid "Try swiping from the right edge to unlock the phone"

125125msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"

126126

127−#: qml/Components/EdgeDemo.qml:144

127+#: qml/Components/EdgeDemo.qml:157

128128msgid "Top edge"

129129msgstr "Oberer Bildschirmrand"

130130

131−#: qml/Components/EdgeDemo.qml:145

131+#: qml/Components/EdgeDemo.qml:158

132132msgid "Try swiping from the top edge to access the indicators"

133133msgstr ""

134134"Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"

135135

136−#: qml/Components/EdgeDemo.qml:170

136+#: qml/Components/EdgeDemo.qml:183

137137msgid "Close"

138138msgstr "Schließen"

139139

140−#: qml/Components/EdgeDemo.qml:171

140+#: qml/Components/EdgeDemo.qml:184

141141msgid "Swipe up again to close the settings screen"

142142msgstr "Wischen Sie erneut nach oben, um das Einstellungsmenü zu schließen"

143143

144−#: qml/Components/EdgeDemo.qml:201

144+#: qml/Components/EdgeDemo.qml:214

145145msgid "Left edge"

146146msgstr "Linker Rand"

147147

148−#: qml/Components/EdgeDemo.qml:202

148+#: qml/Components/EdgeDemo.qml:215

149149msgid "Swipe from the left to reveal the launcher for quick access to apps"

150150msgstr ""

151151"Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"

152152"Schnellzugriff aufzurufen"

153153

154−#: qml/Components/EdgeDemo.qml:229

154+#: qml/Components/EdgeDemo.qml:242

155155msgid "Well done"

156156msgstr "Gut gemacht"

157157

158−#: qml/Components/EdgeDemo.qml:230

158+#: qml/Components/EdgeDemo.qml:243

159159msgid ""

160160"You have now mastered the edge gestures and can start using the "

161161"phone<br><br>Tap on the screen to start"

@@ -163,40 +163,44 @@ msgstr ""

163163"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "

164164"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"

165165

166−#: qml/Components/Lockscreen.qml:223

166+#: qml/Components/Lockscreen.qml:238

167167msgid "Return to Call"

168−msgstr ""

168+msgstr "Zu Anruf zurückkehren"

169169

170−#: qml/Components/Lockscreen.qml:223

170+#: qml/Components/Lockscreen.qml:238

171171msgid "Emergency Call"

172172msgstr "Notruf"

173173

174−#: qml/Components/Lockscreen.qml:255

174+#: qml/Components/Lockscreen.qml:270

175175msgid "OK"

176176msgstr "OK"

177177

178−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

178+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

179179msgid "See less"

180180msgstr "Weniger ansehen"

181181

182−#: qml/Dash/GenericScopeView.qml:434

182+#: qml/Dash/GenericScopeView.qml:431

183183msgid "See all"

184184msgstr "Alle anzeigen"

185185

186−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

186+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

187187#: qml/Panel/SearchIndicator.qml:27

188188msgid "Search"

189189msgstr "Suchen"

190190

191−#: qml/Dash/PageHeader.qml:268

191+#: qml/Dash/PageHeader.qml:260

192+msgid "Store"

193+msgstr "Store"

194+

195+#: qml/Dash/PageHeader.qml:277

192196msgid "Settings"

193197msgstr "Einstellungen"

194198

195−#: qml/Dash/PageHeader.qml:275

199+#: qml/Dash/PageHeader.qml:284

196200msgid "Remove from Favorites"

197201msgstr "Aus den Favoriten entfernen"

198202

199−#: qml/Dash/PageHeader.qml:275

203+#: qml/Dash/PageHeader.qml:284

200204msgid "Add to Favorites"

201205msgstr "Zu Favoriten hinzufügen"

202206

@@ -228,31 +232,23 @@ msgstr "Zum Aktualisieren ziehen …"

228232msgid "Release to refresh…"

229233msgstr "Zum Aktualisieren loslassen …"

230234

231−#: qml/Dash/ScopesOverview.qml:215

232−msgid "Manage Scopes"

233−msgstr "Filter verwalten"

234−

235−#: qml/Dash/ScopesOverview.qml:437

236−msgid "Done"

237−msgstr "Erledigt"

238−

239−#: qml/Dash/ScopesOverview.qml:463

240−msgid "Store"

241−msgstr "Store"

235+#: qml/Dash/ScopesList.qml:63

236+msgid "Manage"

237+msgstr "Verwalten"

242238

243−#: qml/Dash/ScopesOverviewTab.qml:36

244−msgid "Favorites"

245−msgstr "Favoriten"

239+#: qml/Dash/ScopesList.qml:107

240+msgid "Home"

241+msgstr ""

246242

247−#: qml/Dash/ScopesOverviewTab.qml:54

248−msgid "All"

249−msgstr "Alle"

243+#: qml/Dash/ScopesList.qml:108

244+msgid "Also installed"

245+msgstr ""

250246

251247#: qml/Greeter/Greeter.qml:174

252248msgid "Unlock"

253249msgstr "Entsperren"

254250

255−#: qml/Notifications/NotificationMenuItemFactory.qml:116

251+#: qml/Notifications/NotificationMenuItemFactory.qml:128

256252msgid "Show password"

257253msgstr "Passwort anzeigen"

258254

@@ -300,49 +296,49 @@ msgstr "SIM-Karte entsperren"

300296msgid "Roaming"

301297msgstr "Roaming"

302298

303−#: qml/Shell.qml:391

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

304305msgid "Enter passphrase"

305306msgstr "Passwort eingeben"

306307

307−#: qml/Shell.qml:392

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

308318msgid "Sorry, incorrect passphrase"

309319msgstr "Das Passwort ist nicht korrekt"

310320

311−#: qml/Shell.qml:393

321+#: qml/Shell.qml:372

312322msgid "Please re-enter"

313323msgstr "Bitte erneut eingeben"

314324

315−#: qml/Shell.qml:395

316−msgid "Enter passcode"

317−msgstr "PIN eingeben"

318−

319−#: qml/Shell.qml:396

325+#: qml/Shell.qml:373

320326msgid "Sorry, incorrect passcode"

321327msgstr "Falsches Passwort"

322328

323−#: qml/Shell.qml:399

324−#, qt-format

325−msgid "Enter %1"

326−msgstr "%1 eingeben"

327−

328−#: qml/Shell.qml:400

329−#, qt-format

330−msgid "Sorry, incorrect %1"

331−msgstr "%1 falsch"

332−

333−#: qml/Shell.qml:441

329+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

334330msgid "Sorry, incorrect passphrase."

335331msgstr "Entschuldigung, falsches Passwort."

336332

337−#: qml/Shell.qml:442

333+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

338334msgid "Sorry, incorrect passcode."

339335msgstr "Falsche PIN"

340336

341−#: qml/Shell.qml:443

337+#: qml/Shell.qml:469

342338msgid "This will be your last attempt."

343339msgstr "Dies ist Ihr letzter Versuch."

344340

345−#: qml/Shell.qml:445

341+#: qml/Shell.qml:471

346342msgid ""

347343"If passphrase is entered incorrectly, your phone will conduct a factory "

348344"reset and all personal data will be deleted."

@@ -350,7 +346,7 @@ msgstr ""

350346"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "

351347"zurückgesetzt und alle Daten werden gelöscht."

352348

353−#: qml/Shell.qml:446

349+#: qml/Shell.qml:472

354350msgid ""

355351"If passcode is entered incorrectly, your phone will conduct a factory reset "

356352"and all personal data will be deleted."

@@ -358,6 +354,183 @@ msgstr ""

358354"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "

359355"zurückgesetzt und alle Daten werden gelöscht."

360356

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+

361534#~ msgid "Confirm"

362535#~ msgstr "Bestätigen"

363536

@@ -372,3 +545,15 @@ msgstr ""

372545

373546#~ msgid "Speaking..."

374547#~ 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+262−80

@@ -7,27 +7,27 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-11-08 18:38+0000\n"

12−"Last-Translator: Stathis Iosifidis <Unknown>\n"

12+"Last-Translator: Efstathios Iosifidis <Unknown>\n"

1313"Language-Team: Greek <el@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Κωδικός πρόσβασης: "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Καρφίτσωμα συντόμευσης"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Ξεκαρφίτσωμα συντόμευσης"

3333

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

5454msgstr[0] "Παρακαλώ περιμένετε %1 λεπτό και δοκιμάστε ξανά..."

5555msgstr[1] "Παρακαλώ περιμένετε %1 λεπτά και δοκιμάστε ξανά..."

5656

57−#: qml/Components/Dialogs.qml:74

57+#: qml/Components/Dialogs.qml:70

5858msgid "Log out"

5959msgstr "Αποσύνδεση"

6060

61−#: qml/Components/Dialogs.qml:75

61+#: qml/Components/Dialogs.qml:71

6262msgid "Are you sure you want to log out?"

6363msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε;"

6464

65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

66−#: qml/Components/Dialogs.qml:126

65+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66+#: qml/Components/Dialogs.qml:122

6767msgid "No"

6868msgstr "Όχι"

6969

70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

71−#: qml/Components/Dialogs.qml:133

70+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71+#: qml/Components/Dialogs.qml:129

7272msgid "Yes"

7373msgstr "Ναι"

7474

75−#: qml/Components/Dialogs.qml:98

75+#: qml/Components/Dialogs.qml:94

7676msgid "Shut down"

7777msgstr "Τερματισμός λειτουργίας"

7878

79−#: qml/Components/Dialogs.qml:99

79+#: qml/Components/Dialogs.qml:95

8080msgid "Are you sure you want to shut down?"

8181msgstr "Επιθυμείτε σίγουρα τερματισμό;"

8282

83−#: qml/Components/Dialogs.qml:123

83+#: qml/Components/Dialogs.qml:119

8484msgid "Reboot"

8585msgstr "Επανεκκίνηση"

8686

87−#: qml/Components/Dialogs.qml:124

87+#: qml/Components/Dialogs.qml:120

8888msgid "Are you sure you want to reboot?"

8989msgstr "Επιθυμείτε σίγουρα επανεκκίνηση;"

9090

91−#: qml/Components/Dialogs.qml:148

91+#: qml/Components/Dialogs.qml:144

9292msgid "Power"

9393msgstr ""

9494

95−#: qml/Components/Dialogs.qml:149

95+#: qml/Components/Dialogs.qml:145

9696msgid ""

9797"Are you sure you would like\n"

9898"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100100"Επιθυμείτε σίγουρα τον\n"

101101"τερματισμό λειτουργίας;"

102102

103−#: qml/Components/Dialogs.qml:151

103+#: qml/Components/Dialogs.qml:147

104104msgid "Power off"

105105msgstr "Τερματισμός"

106106

107−#: qml/Components/Dialogs.qml:161

107+#: qml/Components/Dialogs.qml:157

108108msgid "Restart"

109109msgstr "Επανεκκίνηση"

110110

111−#: qml/Components/Dialogs.qml:171

111+#: qml/Components/Dialogs.qml:167

112112msgid "Cancel"

113113msgstr "Ακύρωση"

114114

@@ -116,45 +116,45 @@ msgstr "Ακύρωση"

116116msgid "Skip intro"

117117msgstr "Παράλειψη εισαγωγής"

118118

119−#: qml/Components/EdgeDemo.qml:112

119+#: qml/Components/EdgeDemo.qml:125

120120msgid "Right edge"

121121msgstr "Δεξί άκρο"

122122

123−#: qml/Components/EdgeDemo.qml:113

123+#: qml/Components/EdgeDemo.qml:126

124124msgid "Try swiping from the right edge to unlock the phone"

125125msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"

126126

127−#: qml/Components/EdgeDemo.qml:144

127+#: qml/Components/EdgeDemo.qml:157

128128msgid "Top edge"

129129msgstr "Πάνω άκρο"

130130

131−#: qml/Components/EdgeDemo.qml:145

131+#: qml/Components/EdgeDemo.qml:158

132132msgid "Try swiping from the top edge to access the indicators"

133133msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"

134134

135−#: qml/Components/EdgeDemo.qml:170

135+#: qml/Components/EdgeDemo.qml:183

136136msgid "Close"

137137msgstr "Κλείσιμο"

138138

139−#: qml/Components/EdgeDemo.qml:171

139+#: qml/Components/EdgeDemo.qml:184

140140msgid "Swipe up again to close the settings screen"

141141msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"

142142

143−#: qml/Components/EdgeDemo.qml:201

143+#: qml/Components/EdgeDemo.qml:214

144144msgid "Left edge"

145145msgstr "Αριστερό άκρο"

146146

147−#: qml/Components/EdgeDemo.qml:202

147+#: qml/Components/EdgeDemo.qml:215

148148msgid "Swipe from the left to reveal the launcher for quick access to apps"

149149msgstr ""

150150"Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "

151151"στις εφαρμογές"

152152

153−#: qml/Components/EdgeDemo.qml:229

153+#: qml/Components/EdgeDemo.qml:242

154154msgid "Well done"

155155msgstr "Συγχαρητήρια"

156156

157−#: qml/Components/EdgeDemo.qml:230

157+#: qml/Components/EdgeDemo.qml:243

158158msgid ""

159159"You have now mastered the edge gestures and can start using the "

160160"phone<br><br>Tap on the screen to start"

@@ -162,40 +162,44 @@ msgstr ""

162162"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "

163163"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"

164164

165−#: qml/Components/Lockscreen.qml:223

165+#: qml/Components/Lockscreen.qml:238

166166msgid "Return to Call"

167167msgstr "Επιστροφή στην κλήση"

168168

169−#: qml/Components/Lockscreen.qml:223

169+#: qml/Components/Lockscreen.qml:238

170170msgid "Emergency Call"

171171msgstr "Κλήση έκτακτης ανάγκης"

172172

173−#: qml/Components/Lockscreen.qml:255

173+#: qml/Components/Lockscreen.qml:270

174174msgid "OK"

175175msgstr "OK"

176176

177−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

177+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

178178msgid "See less"

179179msgstr "Λιγότερα"

180180

181−#: qml/Dash/GenericScopeView.qml:434

181+#: qml/Dash/GenericScopeView.qml:431

182182msgid "See all"

183183msgstr "Εμφάνιση όλων"

184184

185−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

185+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

186186#: qml/Panel/SearchIndicator.qml:27

187187msgid "Search"

188188msgstr "Αναζήτηση"

189189

190−#: qml/Dash/PageHeader.qml:268

190+#: qml/Dash/PageHeader.qml:260

191+msgid "Store"

192+msgstr "Κατάστημα"

193+

194+#: qml/Dash/PageHeader.qml:277

191195msgid "Settings"

192196msgstr "Ρυθμίσεις"

193197

194−#: qml/Dash/PageHeader.qml:275

198+#: qml/Dash/PageHeader.qml:284

195199msgid "Remove from Favorites"

196200msgstr "Αφαίρεση από τα αγαπημένα"

197201

198−#: qml/Dash/PageHeader.qml:275

202+#: qml/Dash/PageHeader.qml:284

199203msgid "Add to Favorites"

200204msgstr "Προσθήκη στα αγαπημένα"

201205

@@ -227,31 +231,23 @@ msgstr ""

227231msgid "Release to refresh…"

228232msgstr ""

229233

230−#: qml/Dash/ScopesOverview.qml:215

231−msgid "Manage Scopes"

234+#: qml/Dash/ScopesList.qml:63

235+msgid "Manage"

232236msgstr ""

233237

234−#: qml/Dash/ScopesOverview.qml:437

235−msgid "Done"

236−msgstr "Ολοκληρώθηκε"

237−

238−#: qml/Dash/ScopesOverview.qml:463

239−msgid "Store"

240−msgstr "Κατάστημα"

241−

242−#: qml/Dash/ScopesOverviewTab.qml:36

243−msgid "Favorites"

244−msgstr "Αγαπημένα"

238+#: qml/Dash/ScopesList.qml:107

239+msgid "Home"

240+msgstr ""

245241

246−#: qml/Dash/ScopesOverviewTab.qml:54

247−msgid "All"

248−msgstr "Όλα"

242+#: qml/Dash/ScopesList.qml:108

243+msgid "Also installed"

244+msgstr ""

249245

250246#: qml/Greeter/Greeter.qml:174

251247msgid "Unlock"

252248msgstr "Ξεκλείδωμα"

253249

254−#: qml/Notifications/NotificationMenuItemFactory.qml:116

250+#: qml/Notifications/NotificationMenuItemFactory.qml:128

255251msgid "Show password"

256252msgstr "Εμφάνιση κωδικού"

257253

@@ -299,60 +295,237 @@ msgstr "Ξεκλείδωμα SIM"

299295msgid "Roaming"

300296msgstr "Περιαγωγή"

301297

302−#: qml/Shell.qml:391

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

303304msgid "Enter passphrase"

304305msgstr "Εισαγωγή συνθηματικού"

305306

306−#: qml/Shell.qml:392

307+#: qml/Shell.qml:369

308+msgid "Enter passcode"

309+msgstr "Εισαγωγή κωδικού"

310+

311+#: qml/Shell.qml:370

312+#, qt-format

313+msgid "Sorry, incorrect %1"

314+msgstr "Συγνώμη, μη έγκυρο %1"

315+

316+#: qml/Shell.qml:371

307317msgid "Sorry, incorrect passphrase"

308318msgstr "Συγνώμη, μη έγκυρο συνθηματικό"

309319

310−#: qml/Shell.qml:393

320+#: qml/Shell.qml:372

311321msgid "Please re-enter"

312322msgstr "Παρακαλώ πληκτρολογήστε ξανά"

313323

314−#: qml/Shell.qml:395

315−msgid "Enter passcode"

316−msgstr "Εισαγωγή κωδικού"

317−

318−#: qml/Shell.qml:396

324+#: qml/Shell.qml:373

319325msgid "Sorry, incorrect passcode"

320326msgstr ""

321327

322−#: qml/Shell.qml:399

323−#, qt-format

324−msgid "Enter %1"

325−msgstr "Εισάγετε %1"

326−

327−#: qml/Shell.qml:400

328−#, qt-format

329−msgid "Sorry, incorrect %1"

330−msgstr "Συγνώμη, μη έγκυρο %1"

331−

332−#: qml/Shell.qml:441

328+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

333329msgid "Sorry, incorrect passphrase."

334330msgstr ""

335331

336−#: qml/Shell.qml:442

332+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

337333msgid "Sorry, incorrect passcode."

338334msgstr ""

339335

340−#: qml/Shell.qml:443

336+#: qml/Shell.qml:469

341337msgid "This will be your last attempt."

342338msgstr ""

343339

344−#: qml/Shell.qml:445

340+#: qml/Shell.qml:471

345341msgid ""

346342"If passphrase is entered incorrectly, your phone will conduct a factory "

347343"reset and all personal data will be deleted."

348344msgstr ""

349345

350−#: qml/Shell.qml:446

346+#: qml/Shell.qml:472

351347msgid ""

352348"If passcode is entered incorrectly, your phone will conduct a factory reset "

353349"and all personal data will be deleted."

354350msgstr ""

355351

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+

356529#~ msgid "Confirm"

357530#~ msgstr "Επιβεβαίωση"

358531

@@ -367,3 +540,12 @@ msgstr ""

367540

368541#~ msgid "Loading. Please Wait..."

369542#~ msgstr "Γίνεται φόρτωση. Παρακαλώ περιμένετε..."

543+

544+#~ msgid "All"

545+#~ msgstr "Όλα"

546+

547+#~ msgid "Favorites"

548+#~ msgstr "Αγαπημένα"

549+

550+#~ msgid "Done"

551+#~ msgstr "Ολοκληρώθηκε"

po/en_AU.po+265−80

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-10-12 09:41+0000\n"

1212"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"

1313"Language-Team: English (Australia) <en_AU@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Password: "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Pin shortcut"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Unpin shortcut"

3333

@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] "Please wait %1 minute and then try again…"

5151msgstr[1] "Please wait %1 minutes and then try again…"

5252

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

5454msgid "Log out"

5555msgstr "Log out"

5656

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

5858msgid "Are you sure you want to log out?"

5959msgstr "Are you sure you want to log out?"

6060

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62−#: qml/Components/Dialogs.qml:126

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:122

6363msgid "No"

6464msgstr "No"

6565

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67−#: qml/Components/Dialogs.qml:133

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:129

6868msgid "Yes"

6969msgstr "Yes"

7070

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

7272msgid "Shut down"

7373msgstr "Shut down"

7474

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

7676msgid "Are you sure you want to shut down?"

7777msgstr "Are you sure you want to shut down?"

7878

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

8080msgid "Reboot"

8181msgstr "Reboot"

8282

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

8484msgid "Are you sure you want to reboot?"

8585msgstr "Are you sure you want to reboot?"

8686

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

8888msgid "Power"

8989msgstr "Power"

9090

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

9292msgid ""

9393"Are you sure you would like\n"

9494"to power off?"

@@ -96,15 +96,15 @@ msgstr ""

9696"Are you sure you would like\n"

9797"to power off?"

9898

99−#: qml/Components/Dialogs.qml:151

99+#: qml/Components/Dialogs.qml:147

100100msgid "Power off"

101101msgstr "Power off"

102102

103−#: qml/Components/Dialogs.qml:161

103+#: qml/Components/Dialogs.qml:157

104104msgid "Restart"

105105msgstr "Restart"

106106

107−#: qml/Components/Dialogs.qml:171

107+#: qml/Components/Dialogs.qml:167

108108msgid "Cancel"

109109msgstr "Cancel"

110110

@@ -112,43 +112,43 @@ msgstr "Cancel"

112112msgid "Skip intro"

113113msgstr "Skip intro"

114114

115−#: qml/Components/EdgeDemo.qml:112

115+#: qml/Components/EdgeDemo.qml:125

116116msgid "Right edge"

117117msgstr "Right edge"

118118

119−#: qml/Components/EdgeDemo.qml:113

119+#: qml/Components/EdgeDemo.qml:126

120120msgid "Try swiping from the right edge to unlock the phone"

121121msgstr "Try swiping from the right edge to unlock the phone"

122122

123−#: qml/Components/EdgeDemo.qml:144

123+#: qml/Components/EdgeDemo.qml:157

124124msgid "Top edge"

125125msgstr "Top edge"

126126

127−#: qml/Components/EdgeDemo.qml:145

127+#: qml/Components/EdgeDemo.qml:158

128128msgid "Try swiping from the top edge to access the indicators"

129129msgstr "Try swiping from the top edge to access the indicators"

130130

131−#: qml/Components/EdgeDemo.qml:170

131+#: qml/Components/EdgeDemo.qml:183

132132msgid "Close"

133133msgstr "Close"

134134

135−#: qml/Components/EdgeDemo.qml:171

135+#: qml/Components/EdgeDemo.qml:184

136136msgid "Swipe up again to close the settings screen"

137137msgstr "Swipe up again to close the settings screen"

138138

139−#: qml/Components/EdgeDemo.qml:201

139+#: qml/Components/EdgeDemo.qml:214

140140msgid "Left edge"

141141msgstr "Left edge"

142142

143−#: qml/Components/EdgeDemo.qml:202

143+#: qml/Components/EdgeDemo.qml:215

144144msgid "Swipe from the left to reveal the launcher for quick access to apps"

145145msgstr "Swipe from the left to reveal the launcher for quick access to apps"

146146

147−#: qml/Components/EdgeDemo.qml:229

147+#: qml/Components/EdgeDemo.qml:242

148148msgid "Well done"

149149msgstr "Well done"

150150

151−#: qml/Components/EdgeDemo.qml:230

151+#: qml/Components/EdgeDemo.qml:243

152152msgid ""

153153"You have now mastered the edge gestures and can start using the "

154154"phone<br><br>Tap on the screen to start"

@@ -156,40 +156,44 @@ msgstr ""

156156"You have now mastered the edge gestures and can start using the "

157157"phone<br><br>Tap on the screen to start"

158158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160160msgid "Return to Call"

161161msgstr ""

162162

163−#: qml/Components/Lockscreen.qml:223

163+#: qml/Components/Lockscreen.qml:238

164164msgid "Emergency Call"

165165msgstr "Emergency Call"

166166

167−#: qml/Components/Lockscreen.qml:255

167+#: qml/Components/Lockscreen.qml:270

168168msgid "OK"

169169msgstr "OK"

170170

171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

172172msgid "See less"

173173msgstr "See less"

174174

175−#: qml/Dash/GenericScopeView.qml:434

175+#: qml/Dash/GenericScopeView.qml:431

176176msgid "See all"

177177msgstr "See all"

178178

179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

180180#: qml/Panel/SearchIndicator.qml:27

181181msgid "Search"

182182msgstr "Search"

183183

184−#: qml/Dash/PageHeader.qml:268

184+#: qml/Dash/PageHeader.qml:260

185+msgid "Store"

186+msgstr "Store"

187+

188+#: qml/Dash/PageHeader.qml:277

185189msgid "Settings"

186190msgstr "Settings"

187191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189193msgid "Remove from Favorites"

190194msgstr "Remove from Favourites"

191195

192−#: qml/Dash/PageHeader.qml:275

196+#: qml/Dash/PageHeader.qml:284

193197msgid "Add to Favorites"

194198msgstr "Add to Favourites"

195199

@@ -221,31 +225,23 @@ msgstr "Pull to refresh…"

221225msgid "Release to refresh…"

222226msgstr "Release to refresh…"

223227

224−#: qml/Dash/ScopesOverview.qml:215

225−msgid "Manage Scopes"

226−msgstr "Manage Scopes"

227−

228−#: qml/Dash/ScopesOverview.qml:437

229−msgid "Done"

230−msgstr "Done"

231−

232−#: qml/Dash/ScopesOverview.qml:463

233−msgid "Store"

234−msgstr "Store"

228+#: qml/Dash/ScopesList.qml:63

229+msgid "Manage"

230+msgstr ""

235231

236−#: qml/Dash/ScopesOverviewTab.qml:36

237−msgid "Favorites"

238−msgstr "Favourites"

232+#: qml/Dash/ScopesList.qml:107

233+msgid "Home"

234+msgstr ""

239235

240−#: qml/Dash/ScopesOverviewTab.qml:54

241−msgid "All"

242−msgstr "All"

236+#: qml/Dash/ScopesList.qml:108

237+msgid "Also installed"

238+msgstr ""

243239

244240#: qml/Greeter/Greeter.qml:174

245241msgid "Unlock"

246242msgstr "Unlock"

247243

248−#: qml/Notifications/NotificationMenuItemFactory.qml:116

244+#: qml/Notifications/NotificationMenuItemFactory.qml:128

249245msgid "Show password"

250246msgstr "Show password"

251247

@@ -293,49 +289,49 @@ msgstr "Unlock SIM"

293289msgid "Roaming"

294290msgstr "Roaming"

295291

296−#: qml/Shell.qml:391

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

297298msgid "Enter passphrase"

298299msgstr "Enter passphrase"

299300

300−#: qml/Shell.qml:392

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

301311msgid "Sorry, incorrect passphrase"

302312msgstr "Sorry, incorrect passphrase"

303313

304−#: qml/Shell.qml:393

314+#: qml/Shell.qml:372

305315msgid "Please re-enter"

306316msgstr "Please re-enter"

307317

308−#: qml/Shell.qml:395

309−msgid "Enter passcode"

310−msgstr "Enter passcode"

311−

312−#: qml/Shell.qml:396

318+#: qml/Shell.qml:373

313319msgid "Sorry, incorrect passcode"

314320msgstr "Sorry, incorrect passcode"

315321

316−#: qml/Shell.qml:399

317−#, qt-format

318−msgid "Enter %1"

319−msgstr "Enter %1"

320−

321−#: qml/Shell.qml:400

322−#, qt-format

323−msgid "Sorry, incorrect %1"

324−msgstr "Sorry, incorrect %1"

325−

326−#: qml/Shell.qml:441

322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

327323msgid "Sorry, incorrect passphrase."

328324msgstr "Sorry, incorrect passphrase."

329325

330−#: qml/Shell.qml:442

326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

331327msgid "Sorry, incorrect passcode."

332328msgstr "Sorry, incorrect passcode."

333329

334−#: qml/Shell.qml:443

330+#: qml/Shell.qml:469

335331msgid "This will be your last attempt."

336332msgstr "This will be your last attempt."

337333

338−#: qml/Shell.qml:445

334+#: qml/Shell.qml:471

339335msgid ""

340336"If passphrase is entered incorrectly, your phone will conduct a factory "

341337"reset and all personal data will be deleted."

@@ -343,7 +339,7 @@ msgstr ""

343339"If passphrase is entered incorrectly, your phone will conduct a factory "

344340"reset and all personal data will be deleted."

345341

346−#: qml/Shell.qml:446

342+#: qml/Shell.qml:472

347343msgid ""

348344"If passcode is entered incorrectly, your phone will conduct a factory reset "

349345"and all personal data will be deleted."

@@ -351,6 +347,183 @@ msgstr ""

351347"If passcode is entered incorrectly, your phone will conduct a factory reset "

352348"and all personal data will be deleted."

353349

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+

354527#~ msgid "Confirm"

355528#~ msgstr "Confirm"

356529

@@ -365,3 +538,15 @@ msgstr ""

365538

366539#~ msgid "Speaking..."

367540#~ 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+265−80

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-11-05 18:59+0000\n"

1212"Last-Translator: Andi Chandler <Unknown>\n"

1313"Language-Team: English (United Kingdom) <en_GB@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Password: "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Pin shortcut"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Unpin shortcut"

3333

@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] "Please wait %1 minute and then try again…"

5151msgstr[1] "Please wait %1 minutes and then try again…"

5252

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

5454msgid "Log out"

5555msgstr "Log out"

5656

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

5858msgid "Are you sure you want to log out?"

5959msgstr "Are you sure you want to log out?"

6060

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62−#: qml/Components/Dialogs.qml:126

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:122

6363msgid "No"

6464msgstr "No"

6565

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67−#: qml/Components/Dialogs.qml:133

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:129

6868msgid "Yes"

6969msgstr "Yes"

7070

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

7272msgid "Shut down"

7373msgstr "Shut down"

7474

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

7676msgid "Are you sure you want to shut down?"

7777msgstr "Are you sure you want to shut down?"

7878

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

8080msgid "Reboot"

8181msgstr "Reboot"

8282

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

8484msgid "Are you sure you want to reboot?"

8585msgstr "Are you sure you want to reboot?"

8686

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

8888msgid "Power"

8989msgstr "Power"

9090

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

9292msgid ""

9393"Are you sure you would like\n"

9494"to power off?"

@@ -96,15 +96,15 @@ msgstr ""

9696"Are you sure you would like\n"

9797"to power off?"

9898

99−#: qml/Components/Dialogs.qml:151

99+#: qml/Components/Dialogs.qml:147

100100msgid "Power off"

101101msgstr "Power off"

102102

103−#: qml/Components/Dialogs.qml:161

103+#: qml/Components/Dialogs.qml:157

104104msgid "Restart"

105105msgstr "Restart"

106106

107−#: qml/Components/Dialogs.qml:171

107+#: qml/Components/Dialogs.qml:167

108108msgid "Cancel"

109109msgstr "Cancel"

110110

@@ -112,43 +112,43 @@ msgstr "Cancel"

112112msgid "Skip intro"

113113msgstr "Skip intro"

114114

115−#: qml/Components/EdgeDemo.qml:112

115+#: qml/Components/EdgeDemo.qml:125

116116msgid "Right edge"

117117msgstr "Right edge"

118118

119−#: qml/Components/EdgeDemo.qml:113

119+#: qml/Components/EdgeDemo.qml:126

120120msgid "Try swiping from the right edge to unlock the phone"

121121msgstr "Try swiping from the right edge to unlock the phone"

122122

123−#: qml/Components/EdgeDemo.qml:144

123+#: qml/Components/EdgeDemo.qml:157

124124msgid "Top edge"

125125msgstr "Top edge"

126126

127−#: qml/Components/EdgeDemo.qml:145

127+#: qml/Components/EdgeDemo.qml:158

128128msgid "Try swiping from the top edge to access the indicators"

129129msgstr "Try swiping from the top edge to access the indicators"

130130

131−#: qml/Components/EdgeDemo.qml:170

131+#: qml/Components/EdgeDemo.qml:183

132132msgid "Close"

133133msgstr "Close"

134134

135−#: qml/Components/EdgeDemo.qml:171

135+#: qml/Components/EdgeDemo.qml:184

136136msgid "Swipe up again to close the settings screen"

137137msgstr "Swipe up again to close the settings screen"

138138

139−#: qml/Components/EdgeDemo.qml:201

139+#: qml/Components/EdgeDemo.qml:214

140140msgid "Left edge"

141141msgstr "Left edge"

142142

143−#: qml/Components/EdgeDemo.qml:202

143+#: qml/Components/EdgeDemo.qml:215

144144msgid "Swipe from the left to reveal the launcher for quick access to apps"

145145msgstr "Swipe from the left to reveal the launcher for quick access to apps"

146146

147−#: qml/Components/EdgeDemo.qml:229

147+#: qml/Components/EdgeDemo.qml:242

148148msgid "Well done"

149149msgstr "Well done"

150150

151−#: qml/Components/EdgeDemo.qml:230

151+#: qml/Components/EdgeDemo.qml:243

152152msgid ""

153153"You have now mastered the edge gestures and can start using the "

154154"phone<br><br>Tap on the screen to start"

@@ -156,40 +156,44 @@ msgstr ""

156156"You have now mastered the edge gestures and can start using the "

157157"phone<br><br>Tap on the screen to start"

158158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160160msgid "Return to Call"

161161msgstr "Return to Call"

162162

163−#: qml/Components/Lockscreen.qml:223

163+#: qml/Components/Lockscreen.qml:238

164164msgid "Emergency Call"

165165msgstr "Emergency Call"

166166

167−#: qml/Components/Lockscreen.qml:255

167+#: qml/Components/Lockscreen.qml:270

168168msgid "OK"

169169msgstr "OK"

170170

171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

172172msgid "See less"

173173msgstr "See less"

174174

175−#: qml/Dash/GenericScopeView.qml:434

175+#: qml/Dash/GenericScopeView.qml:431

176176msgid "See all"

177177msgstr "See all"

178178

179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

180180#: qml/Panel/SearchIndicator.qml:27

181181msgid "Search"

182182msgstr "Search"

183183

184−#: qml/Dash/PageHeader.qml:268

184+#: qml/Dash/PageHeader.qml:260

185+msgid "Store"

186+msgstr "Store"

187+

188+#: qml/Dash/PageHeader.qml:277

185189msgid "Settings"

186190msgstr "Settings"

187191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189193msgid "Remove from Favorites"

190194msgstr "Remove from Favourites"

191195

192−#: qml/Dash/PageHeader.qml:275

196+#: qml/Dash/PageHeader.qml:284

193197msgid "Add to Favorites"

194198msgstr "Add to Favourites"

195199

@@ -221,31 +225,23 @@ msgstr "Pull to refresh…"

221225msgid "Release to refresh…"

222226msgstr "Release to refresh…"

223227

224−#: qml/Dash/ScopesOverview.qml:215

225−msgid "Manage Scopes"

226−msgstr "Manage Scopes"

227−

228−#: qml/Dash/ScopesOverview.qml:437

229−msgid "Done"

230−msgstr "Done"

228+#: qml/Dash/ScopesList.qml:63

229+msgid "Manage"

230+msgstr "Manage"

231231

232−#: qml/Dash/ScopesOverview.qml:463

233−msgid "Store"

234−msgstr "Store"

232+#: qml/Dash/ScopesList.qml:107

233+msgid "Home"

234+msgstr "Home"

235235

236−#: qml/Dash/ScopesOverviewTab.qml:36

237−msgid "Favorites"

238−msgstr "Favourites"

239−

240−#: qml/Dash/ScopesOverviewTab.qml:54

241−msgid "All"

242−msgstr "All"

236+#: qml/Dash/ScopesList.qml:108

237+msgid "Also installed"

238+msgstr "Also installed"

243239

244240#: qml/Greeter/Greeter.qml:174

245241msgid "Unlock"

246242msgstr "Unlock"

247243

248−#: qml/Notifications/NotificationMenuItemFactory.qml:116

244+#: qml/Notifications/NotificationMenuItemFactory.qml:128

249245msgid "Show password"

250246msgstr "Show password"

251247

@@ -293,49 +289,49 @@ msgstr "Unlock SIM"

293289msgid "Roaming"

294290msgstr "Roaming"

295291

296−#: qml/Shell.qml:391

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

297298msgid "Enter passphrase"

298299msgstr "Enter passphrase"

299300

300−#: qml/Shell.qml:392

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

301311msgid "Sorry, incorrect passphrase"

302312msgstr "Sorry, incorrect passphrase"

303313

304−#: qml/Shell.qml:393

314+#: qml/Shell.qml:372

305315msgid "Please re-enter"

306316msgstr "Please re-enter"

307317

308−#: qml/Shell.qml:395

309−msgid "Enter passcode"

310−msgstr "Enter passcode"

311−

312−#: qml/Shell.qml:396

318+#: qml/Shell.qml:373

313319msgid "Sorry, incorrect passcode"

314320msgstr "Sorry, incorrect passcode"

315321

316−#: qml/Shell.qml:399

317−#, qt-format

318−msgid "Enter %1"

319−msgstr "Enter %1"

320−

321−#: qml/Shell.qml:400

322−#, qt-format

323−msgid "Sorry, incorrect %1"

324−msgstr "Sorry, incorrect %1"

325−

326−#: qml/Shell.qml:441

322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

327323msgid "Sorry, incorrect passphrase."

328324msgstr "Sorry, incorrect passphrase."

329325

330−#: qml/Shell.qml:442

326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

331327msgid "Sorry, incorrect passcode."

332328msgstr "Sorry, incorrect passcode."

333329

334−#: qml/Shell.qml:443

330+#: qml/Shell.qml:469

335331msgid "This will be your last attempt."

336332msgstr "This will be your last attempt."

337333

338−#: qml/Shell.qml:445

334+#: qml/Shell.qml:471

339335msgid ""

340336"If passphrase is entered incorrectly, your phone will conduct a factory "

341337"reset and all personal data will be deleted."

@@ -343,7 +339,7 @@ msgstr ""

343339"If passphrase is entered incorrectly, your phone will conduct a factory "

344340"reset and all personal data will be deleted."

345341

346−#: qml/Shell.qml:446

342+#: qml/Shell.qml:472

347343msgid ""

348344"If passcode is entered incorrectly, your phone will conduct a factory reset "

349345"and all personal data will be deleted."

@@ -351,6 +347,183 @@ msgstr ""

351347"If passcode is entered incorrectly, your phone will conduct a factory reset "

352348"and all personal data will be deleted."

353349

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+

354527#~ msgid "Confirm"

355528#~ msgstr "Confirm"

356529

@@ -365,3 +538,15 @@ msgstr ""

365538

366539#~ msgid "Speaking..."

367540#~ 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/eo.po+248−75

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2013-06-26 22:35+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Esperanto <eo@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr ""

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr ""

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr ""

3333

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] ""

5151msgstr[1] ""

5252

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

5454msgid "Log out"

5555msgstr ""

5656

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

5858msgid "Are you sure you want to log out?"

5959msgstr ""

6060

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62−#: qml/Components/Dialogs.qml:126

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:122

6363msgid "No"

6464msgstr ""

6565

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67−#: qml/Components/Dialogs.qml:133

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:129

6868msgid "Yes"

6969msgstr ""

7070

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

7272msgid "Shut down"

7373msgstr ""

7474

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

7676msgid "Are you sure you want to shut down?"

7777msgstr ""

7878

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

8080msgid "Reboot"

8181msgstr ""

8282

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

8484msgid "Are you sure you want to reboot?"

8585msgstr ""

8686

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

8888msgid "Power"

8989msgstr ""

9090

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

9292msgid ""

9393"Are you sure you would like\n"

9494"to power off?"

9595msgstr ""

9696

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

9898msgid "Power off"

9999msgstr ""

100100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102102msgid "Restart"

103103msgstr ""

104104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106106msgid "Cancel"

107107msgstr ""

108108

@@ -110,82 +110,86 @@ msgstr ""

110110msgid "Skip intro"

111111msgstr ""

112112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114114msgid "Right edge"

115115msgstr ""

116116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118118msgid "Try swiping from the right edge to unlock the phone"

119119msgstr ""

120120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122122msgid "Top edge"

123123msgstr ""

124124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126126msgid "Try swiping from the top edge to access the indicators"

127127msgstr ""

128128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130130msgid "Close"

131131msgstr ""

132132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134134msgid "Swipe up again to close the settings screen"

135135msgstr ""

136136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138138msgid "Left edge"

139139msgstr ""

140140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143143msgstr ""

144144

145−#: qml/Components/EdgeDemo.qml:229

145+#: qml/Components/EdgeDemo.qml:242

146146msgid "Well done"

147147msgstr ""

148148

149−#: qml/Components/EdgeDemo.qml:230

149+#: qml/Components/EdgeDemo.qml:243

150150msgid ""

151151"You have now mastered the edge gestures and can start using the "

152152"phone<br><br>Tap on the screen to start"

153153msgstr ""

154154

155−#: qml/Components/Lockscreen.qml:223

155+#: qml/Components/Lockscreen.qml:238

156156msgid "Return to Call"

157157msgstr ""

158158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160160msgid "Emergency Call"

161161msgstr ""

162162

163−#: qml/Components/Lockscreen.qml:255

163+#: qml/Components/Lockscreen.qml:270

164164msgid "OK"

165165msgstr ""

166166

167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

168168msgid "See less"

169169msgstr ""

170170

171−#: qml/Dash/GenericScopeView.qml:434

171+#: qml/Dash/GenericScopeView.qml:431

172172msgid "See all"

173173msgstr ""

174174

175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176176#: qml/Panel/SearchIndicator.qml:27

177177msgid "Search"

178178msgstr ""

179179

180−#: qml/Dash/PageHeader.qml:268

180+#: qml/Dash/PageHeader.qml:260

181+msgid "Store"

182+msgstr ""

183+

184+#: qml/Dash/PageHeader.qml:277

181185msgid "Settings"

182186msgstr ""

183187

184−#: qml/Dash/PageHeader.qml:275

188+#: qml/Dash/PageHeader.qml:284

185189msgid "Remove from Favorites"

186190msgstr ""

187191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189193msgid "Add to Favorites"

190194msgstr ""

191195

@@ -217,31 +221,23 @@ msgstr ""

217221msgid "Release to refresh…"

218222msgstr ""

219223

220−#: qml/Dash/ScopesOverview.qml:215

221−msgid "Manage Scopes"

222−msgstr ""

223−

224−#: qml/Dash/ScopesOverview.qml:437

225−msgid "Done"

226−msgstr ""

227−

228−#: qml/Dash/ScopesOverview.qml:463

229−msgid "Store"

224+#: qml/Dash/ScopesList.qml:63

225+msgid "Manage"

230226msgstr ""

231227

232−#: qml/Dash/ScopesOverviewTab.qml:36

233−msgid "Favorites"

228+#: qml/Dash/ScopesList.qml:107

229+msgid "Home"

234230msgstr ""

235231

236−#: qml/Dash/ScopesOverviewTab.qml:54

237−msgid "All"

232+#: qml/Dash/ScopesList.qml:108

233+msgid "Also installed"

238234msgstr ""

239235

240236#: qml/Greeter/Greeter.qml:174

241237msgid "Unlock"

242238msgstr ""

243239

244−#: qml/Notifications/NotificationMenuItemFactory.qml:116

240+#: qml/Notifications/NotificationMenuItemFactory.qml:128

245241msgid "Show password"

246242msgstr ""

247243

@@ -289,56 +285,233 @@ msgstr ""

289285msgid "Roaming"

290286msgstr ""

291287

292−#: qml/Shell.qml:391

293−msgid "Enter passphrase"

288+#: qml/Shell.qml:367

289+#, qt-format

290+msgid "Enter %1"

294291msgstr ""

295292

296−#: qml/Shell.qml:392

297−msgid "Sorry, incorrect passphrase"

293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

294+msgid "Enter passphrase"

298295msgstr ""

299296

300−#: qml/Shell.qml:393

301−msgid "Please re-enter"

297+#: qml/Shell.qml:369

298+msgid "Enter passcode"

302299msgstr ""

303300

304−#: qml/Shell.qml:395

305−msgid "Enter passcode"

301+#: qml/Shell.qml:370

302+#, qt-format

303+msgid "Sorry, incorrect %1"

306304msgstr ""

307305

308−#: qml/Shell.qml:396

309−msgid "Sorry, incorrect passcode"

306+#: qml/Shell.qml:371

307+msgid "Sorry, incorrect passphrase"

310308msgstr ""

311309

312−#: qml/Shell.qml:399

313−#, qt-format

314−msgid "Enter %1"

310+#: qml/Shell.qml:372

311+msgid "Please re-enter"

315312msgstr ""

316313

317−#: qml/Shell.qml:400

318−#, qt-format

319−msgid "Sorry, incorrect %1"

314+#: qml/Shell.qml:373

315+msgid "Sorry, incorrect passcode"

320316msgstr ""

321317

322−#: qml/Shell.qml:441

318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

323319msgid "Sorry, incorrect passphrase."

324320msgstr ""

325321

326−#: qml/Shell.qml:442

322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

327323msgid "Sorry, incorrect passcode."

328324msgstr ""

329325

330−#: qml/Shell.qml:443

326+#: qml/Shell.qml:469

331327msgid "This will be your last attempt."

332328msgstr ""

333329

334−#: qml/Shell.qml:445

330+#: qml/Shell.qml:471

335331msgid ""

336332"If passphrase is entered incorrectly, your phone will conduct a factory "

337333"reset and all personal data will be deleted."

338334msgstr ""

339335

340−#: qml/Shell.qml:446

336+#: qml/Shell.qml:472

341337msgid ""

342338"If passcode is entered incorrectly, your phone will conduct a factory reset "

343339"and all personal data will be deleted."

344340msgstr ""

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+265−80

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-11-08 08:01+0000\n"

1212"Last-Translator: Paco Molinero <paco@byasl.com>\n"

1313"Language-Team: Spanish <es@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Contraseña: "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Anclar"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Desanclar"

3333

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

5454msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."

5555msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."

5656

57−#: qml/Components/Dialogs.qml:74

57+#: qml/Components/Dialogs.qml:70

5858msgid "Log out"

5959msgstr "Cerrar la sesión"

6060

61−#: qml/Components/Dialogs.qml:75

61+#: qml/Components/Dialogs.qml:71

6262msgid "Are you sure you want to log out?"

6363msgstr "̉¿Está seguro de que quiere cerrar la sesión?"

6464

65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

66−#: qml/Components/Dialogs.qml:126

65+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66+#: qml/Components/Dialogs.qml:122

6767msgid "No"

6868msgstr "No"

6969

70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

71−#: qml/Components/Dialogs.qml:133

70+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71+#: qml/Components/Dialogs.qml:129

7272msgid "Yes"

7373msgstr "Sí"

7474

75−#: qml/Components/Dialogs.qml:98

75+#: qml/Components/Dialogs.qml:94

7676msgid "Shut down"

7777msgstr "Apagar"

7878

79−#: qml/Components/Dialogs.qml:99

79+#: qml/Components/Dialogs.qml:95

8080msgid "Are you sure you want to shut down?"

8181msgstr "¿Está seguro de que quiere apagar?"

8282

83−#: qml/Components/Dialogs.qml:123

83+#: qml/Components/Dialogs.qml:119

8484msgid "Reboot"

8585msgstr "Reiniciar"

8686

87−#: qml/Components/Dialogs.qml:124

87+#: qml/Components/Dialogs.qml:120

8888msgid "Are you sure you want to reboot?"

8989msgstr "¿Esta seguro de que quiere reiniciar?"

9090

91−#: qml/Components/Dialogs.qml:148

91+#: qml/Components/Dialogs.qml:144

9292msgid "Power"

9393msgstr "Apagar"

9494

95−#: qml/Components/Dialogs.qml:149

95+#: qml/Components/Dialogs.qml:145

9696msgid ""

9797"Are you sure you would like\n"

9898"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100100"¿Está seguro de que quiere\n"

101101"apagar?"

102102

103−#: qml/Components/Dialogs.qml:151

103+#: qml/Components/Dialogs.qml:147

104104msgid "Power off"

105105msgstr "Apagar"

106106

107−#: qml/Components/Dialogs.qml:161

107+#: qml/Components/Dialogs.qml:157

108108msgid "Restart"

109109msgstr "Reiniciar"

110110

111−#: qml/Components/Dialogs.qml:171

111+#: qml/Components/Dialogs.qml:167

112112msgid "Cancel"

113113msgstr "Cancelar"

114114

@@ -116,46 +116,46 @@ msgstr "Cancelar"

116116msgid "Skip intro"

117117msgstr "Omitir la introducción"

118118

119−#: qml/Components/EdgeDemo.qml:112

119+#: qml/Components/EdgeDemo.qml:125

120120msgid "Right edge"

121121msgstr "Borde derecho"

122122

123−#: qml/Components/EdgeDemo.qml:113

123+#: qml/Components/EdgeDemo.qml:126

124124msgid "Try swiping from the right edge to unlock the phone"

125125msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"

126126

127−#: qml/Components/EdgeDemo.qml:144

127+#: qml/Components/EdgeDemo.qml:157

128128msgid "Top edge"

129129msgstr "Borde superior"

130130

131−#: qml/Components/EdgeDemo.qml:145

131+#: qml/Components/EdgeDemo.qml:158

132132msgid "Try swiping from the top edge to access the indicators"

133133msgstr ""

134134"Deslice el dedo desde el borde superior para acceder a los indicadores"

135135

136−#: qml/Components/EdgeDemo.qml:170

136+#: qml/Components/EdgeDemo.qml:183

137137msgid "Close"

138138msgstr "Cerrar"

139139

140−#: qml/Components/EdgeDemo.qml:171

140+#: qml/Components/EdgeDemo.qml:184

141141msgid "Swipe up again to close the settings screen"

142142msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"

143143

144−#: qml/Components/EdgeDemo.qml:201

144+#: qml/Components/EdgeDemo.qml:214

145145msgid "Left edge"

146146msgstr "Borde izquierdo"

147147

148−#: qml/Components/EdgeDemo.qml:202

148+#: qml/Components/EdgeDemo.qml:215

149149msgid "Swipe from the left to reveal the launcher for quick access to apps"

150150msgstr ""

151151"Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "

152152"rápidamente a las aplicaciones"

153153

154−#: qml/Components/EdgeDemo.qml:229

154+#: qml/Components/EdgeDemo.qml:242

155155msgid "Well done"

156156msgstr "Bien hecho"

157157

158−#: qml/Components/EdgeDemo.qml:230

158+#: qml/Components/EdgeDemo.qml:243

159159msgid ""

160160"You have now mastered the edge gestures and can start using the "

161161"phone<br><br>Tap on the screen to start"

@@ -163,40 +163,44 @@ msgstr ""

163163"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "

164164"la pantalla para comenzar"

165165

166−#: qml/Components/Lockscreen.qml:223

166+#: qml/Components/Lockscreen.qml:238

167167msgid "Return to Call"

168168msgstr "Volver a la llamada"

169169

170−#: qml/Components/Lockscreen.qml:223

170+#: qml/Components/Lockscreen.qml:238

171171msgid "Emergency Call"

172172msgstr "Llamada de emergencia"

173173

174−#: qml/Components/Lockscreen.qml:255

174+#: qml/Components/Lockscreen.qml:270

175175msgid "OK"

176176msgstr "Aceptar"

177177

178−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

178+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

179179msgid "See less"

180180msgstr "Ver menos"

181181

182−#: qml/Dash/GenericScopeView.qml:434

182+#: qml/Dash/GenericScopeView.qml:431

183183msgid "See all"

184184msgstr "Ver todo"

185185

186−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

186+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

187187#: qml/Panel/SearchIndicator.qml:27

188188msgid "Search"

189189msgstr "Buscar"

190190

191−#: qml/Dash/PageHeader.qml:268

191+#: qml/Dash/PageHeader.qml:260

192+msgid "Store"

193+msgstr "Tienda"

194+

195+#: qml/Dash/PageHeader.qml:277

192196msgid "Settings"

193197msgstr "Configuración"

194198

195−#: qml/Dash/PageHeader.qml:275

199+#: qml/Dash/PageHeader.qml:284

196200msgid "Remove from Favorites"

197201msgstr "Quitar de favoritos"

198202

199−#: qml/Dash/PageHeader.qml:275

203+#: qml/Dash/PageHeader.qml:284

200204msgid "Add to Favorites"

201205msgstr "Añadir a favoritos"

202206

@@ -228,31 +232,23 @@ msgstr "Deslice para actualizar…"

228232msgid "Release to refresh…"

229233msgstr "Suelte para actualizar…"

230234

231−#: qml/Dash/ScopesOverview.qml:215

232−msgid "Manage Scopes"

233−msgstr "Administrar Scopes"

234−

235−#: qml/Dash/ScopesOverview.qml:437

236−msgid "Done"

237−msgstr "Hecho"

238−

239−#: qml/Dash/ScopesOverview.qml:463

240−msgid "Store"

241−msgstr "Tienda"

235+#: qml/Dash/ScopesList.qml:63

236+msgid "Manage"

237+msgstr ""

242238

243−#: qml/Dash/ScopesOverviewTab.qml:36

244−msgid "Favorites"

245−msgstr "Favoritos"

239+#: qml/Dash/ScopesList.qml:107

240+msgid "Home"

241+msgstr ""

246242

247−#: qml/Dash/ScopesOverviewTab.qml:54

248−msgid "All"

249−msgstr "Todo"

243+#: qml/Dash/ScopesList.qml:108

244+msgid "Also installed"

245+msgstr ""

250246

251247#: qml/Greeter/Greeter.qml:174

252248msgid "Unlock"

253249msgstr "Desbloquear"

254250

255−#: qml/Notifications/NotificationMenuItemFactory.qml:116

251+#: qml/Notifications/NotificationMenuItemFactory.qml:128

256252msgid "Show password"

257253msgstr "Mostrar contraseña"

258254

@@ -300,49 +296,49 @@ msgstr "Desbloquear SIM"

300296msgid "Roaming"

301297msgstr "Itinerancia"

302298

303−#: qml/Shell.qml:391

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

304305msgid "Enter passphrase"

305306msgstr "Introduzca la contraseña"

306307

307−#: qml/Shell.qml:392

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

308318msgid "Sorry, incorrect passphrase"

309319msgstr "La contraseña es incorrecta"

310320

311−#: qml/Shell.qml:393

321+#: qml/Shell.qml:372

312322msgid "Please re-enter"

313323msgstr "Reintroduzca"

314324

315−#: qml/Shell.qml:395

316−msgid "Enter passcode"

317−msgstr "Introduzca el código"

318−

319−#: qml/Shell.qml:396

325+#: qml/Shell.qml:373

320326msgid "Sorry, incorrect passcode"

321327msgstr "El código es incorrecto"

322328

323−#: qml/Shell.qml:399

324−#, qt-format

325−msgid "Enter %1"

326−msgstr "Introduzca %1"

327−

328−#: qml/Shell.qml:400

329−#, qt-format

330−msgid "Sorry, incorrect %1"

331−msgstr "Incorrecto (%1)"

332−

333−#: qml/Shell.qml:441

329+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

334330msgid "Sorry, incorrect passphrase."

335331msgstr "La contraseña es incorrecta."

336332

337−#: qml/Shell.qml:442

333+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

338334msgid "Sorry, incorrect passcode."

339335msgstr "Código de acceso incorrecto."

340336

341−#: qml/Shell.qml:443

337+#: qml/Shell.qml:469

342338msgid "This will be your last attempt."

343339msgstr "Este será su último intento."

344340

345−#: qml/Shell.qml:445

341+#: qml/Shell.qml:471

346342msgid ""

347343"If passphrase is entered incorrectly, your phone will conduct a factory "

348344"reset and all personal data will be deleted."

@@ -350,7 +346,7 @@ msgstr ""

350346"Si se introduce la frase incorrectamente, el teléfono volverá a la "

351347"configuración de fábrica y se perderán todos los datos personales."

352348

353−#: qml/Shell.qml:446

349+#: qml/Shell.qml:472

354350msgid ""

355351"If passcode is entered incorrectly, your phone will conduct a factory reset "

356352"and all personal data will be deleted."

@@ -358,6 +354,183 @@ msgstr ""

358354"Si se introduce el código incorrectamente, el teléfono volverá a la "

359355"configuración de fábrica y se perderán todos los datos personales."

360356

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+

361534#~ msgid "Confirm"

362535#~ msgstr "Confirmar"

363536

@@ -372,3 +545,15 @@ msgstr ""

372545

373546#~ msgid "Speaking..."

374547#~ msgstr "Hablando…"

548+

549+#~ msgid "All"

550+#~ msgstr "Todo"

551+

552+#~ msgid "Favorites"

553+#~ msgstr "Favoritos"

554+

555+#~ msgid "Done"

556+#~ msgstr "Hecho"

557+

558+#~ msgid "Manage Scopes"

559+#~ msgstr "Administrar Scopes"

po/eu.po+265−80

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-11-08 14:44+0000\n"

1212"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

1313"Language-Team: Basque <eu@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Pasahitza: "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Ainguratu lasterbidea"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Askatu lasterbidea"

3333

@@ -53,59 +53,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5353msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"

5454msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"

5555

56−#: qml/Components/Dialogs.qml:74

56+#: qml/Components/Dialogs.qml:70

5757msgid "Log out"

5858msgstr "Amaitu saioa"

5959

60−#: qml/Components/Dialogs.qml:75

60+#: qml/Components/Dialogs.qml:71

6161msgid "Are you sure you want to log out?"

6262msgstr "Ziur saioa amaitu nahi duzula?"

6363

64−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

65−#: qml/Components/Dialogs.qml:126

64+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

65+#: qml/Components/Dialogs.qml:122

6666msgid "No"

6767msgstr "Ez"

6868

69−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

70−#: qml/Components/Dialogs.qml:133

69+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

70+#: qml/Components/Dialogs.qml:129

7171msgid "Yes"

7272msgstr "Bai"

7373

74−#: qml/Components/Dialogs.qml:98

74+#: qml/Components/Dialogs.qml:94

7575msgid "Shut down"

7676msgstr "Itzali"

7777

78−#: qml/Components/Dialogs.qml:99

78+#: qml/Components/Dialogs.qml:95

7979msgid "Are you sure you want to shut down?"

8080msgstr "Ziur itzali nahi duzula?"

8181

82−#: qml/Components/Dialogs.qml:123

82+#: qml/Components/Dialogs.qml:119

8383msgid "Reboot"

8484msgstr "Berrabiarazi"

8585

86−#: qml/Components/Dialogs.qml:124

86+#: qml/Components/Dialogs.qml:120

8787msgid "Are you sure you want to reboot?"

8888msgstr "Ziur berrabiarazi nahi duzula?"

8989

90−#: qml/Components/Dialogs.qml:148

90+#: qml/Components/Dialogs.qml:144

9191msgid "Power"

9292msgstr "Piztu/itzali"

9393

94−#: qml/Components/Dialogs.qml:149

94+#: qml/Components/Dialogs.qml:145

9595msgid ""

9696"Are you sure you would like\n"

9797"to power off?"

9898msgstr "Ziur itzali nahi duzula?"

9999

100−#: qml/Components/Dialogs.qml:151

100+#: qml/Components/Dialogs.qml:147

101101msgid "Power off"

102102msgstr "Itzali"

103103

104−#: qml/Components/Dialogs.qml:161

104+#: qml/Components/Dialogs.qml:157

105105msgid "Restart"

106106msgstr "Berrabiarazi"

107107

108−#: qml/Components/Dialogs.qml:171

108+#: qml/Components/Dialogs.qml:167

109109msgid "Cancel"

110110msgstr "Utzi"

111111

@@ -113,46 +113,46 @@ msgstr "Utzi"

113113msgid "Skip intro"

114114msgstr "Saltatu aurkezpena"

115115

116−#: qml/Components/EdgeDemo.qml:112

116+#: qml/Components/EdgeDemo.qml:125

117117msgid "Right edge"

118118msgstr "Eskuineko ertza"

119119

120−#: qml/Components/EdgeDemo.qml:113

120+#: qml/Components/EdgeDemo.qml:126

121121msgid "Try swiping from the right edge to unlock the phone"

122122msgstr ""

123123"Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"

124124

125−#: qml/Components/EdgeDemo.qml:144

125+#: qml/Components/EdgeDemo.qml:157

126126msgid "Top edge"

127127msgstr "Goiko ertza"

128128

129−#: qml/Components/EdgeDemo.qml:145

129+#: qml/Components/EdgeDemo.qml:158

130130msgid "Try swiping from the top edge to access the indicators"

131131msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"

132132

133−#: qml/Components/EdgeDemo.qml:170

133+#: qml/Components/EdgeDemo.qml:183

134134msgid "Close"

135135msgstr "Itxi"

136136

137−#: qml/Components/EdgeDemo.qml:171

137+#: qml/Components/EdgeDemo.qml:184

138138msgid "Swipe up again to close the settings screen"

139139msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"

140140

141−#: qml/Components/EdgeDemo.qml:201

141+#: qml/Components/EdgeDemo.qml:214

142142msgid "Left edge"

143143msgstr "Ezkerreko ertza"

144144

145−#: qml/Components/EdgeDemo.qml:202

145+#: qml/Components/EdgeDemo.qml:215

146146msgid "Swipe from the left to reveal the launcher for quick access to apps"

147147msgstr ""

148148"Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak berehala eskura "

149149"izateko"

150150

151−#: qml/Components/EdgeDemo.qml:229

151+#: qml/Components/EdgeDemo.qml:242

152152msgid "Well done"

153153msgstr "Bikain"

154154

155−#: qml/Components/EdgeDemo.qml:230

155+#: qml/Components/EdgeDemo.qml:243

156156msgid ""

157157"You have now mastered the edge gestures and can start using the "

158158"phone<br><br>Tap on the screen to start"

@@ -160,40 +160,44 @@ msgstr ""

160160"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "

161161"zaitezke<br><br>Sakatu pantailan hasteko"

162162

163−#: qml/Components/Lockscreen.qml:223

163+#: qml/Components/Lockscreen.qml:238

164164msgid "Return to Call"

165165msgstr "Itzuli deira"

166166

167−#: qml/Components/Lockscreen.qml:223

167+#: qml/Components/Lockscreen.qml:238

168168msgid "Emergency Call"

169169msgstr "Larrialdi-deia"

170170

171−#: qml/Components/Lockscreen.qml:255

171+#: qml/Components/Lockscreen.qml:270

172172msgid "OK"

173173msgstr "Ados"

174174

175−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

175+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

176176msgid "See less"

177177msgstr "Ikusi gutxiago"

178178

179−#: qml/Dash/GenericScopeView.qml:434

179+#: qml/Dash/GenericScopeView.qml:431

180180msgid "See all"

181181msgstr "Ikusi guztiak"

182182

183−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

183+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

184184#: qml/Panel/SearchIndicator.qml:27

185185msgid "Search"

186186msgstr "Bilatu"

187187

188−#: qml/Dash/PageHeader.qml:268

188+#: qml/Dash/PageHeader.qml:260

189+msgid "Store"

190+msgstr "Denda"

191+

192+#: qml/Dash/PageHeader.qml:277

189193msgid "Settings"

190194msgstr "Ezarpenak"

191195

192−#: qml/Dash/PageHeader.qml:275

196+#: qml/Dash/PageHeader.qml:284

193197msgid "Remove from Favorites"

194198msgstr "Kendu gogokoetatik"

195199

196−#: qml/Dash/PageHeader.qml:275

200+#: qml/Dash/PageHeader.qml:284

197201msgid "Add to Favorites"

198202msgstr "Gehitu gogokoetara"

199203

@@ -225,31 +229,23 @@ msgstr "Tiratu freskatzeko…"

225229msgid "Release to refresh…"

226230msgstr "Askatu freskatzeko…"

227231

228−#: qml/Dash/ScopesOverview.qml:215

229−msgid "Manage Scopes"

230−msgstr "Kudeatu eremuak"

231−

232−#: qml/Dash/ScopesOverview.qml:437

233−msgid "Done"

234−msgstr "Eginda"

235−

236−#: qml/Dash/ScopesOverview.qml:463

237−msgid "Store"

238−msgstr "Denda"

232+#: qml/Dash/ScopesList.qml:63

233+msgid "Manage"

234+msgstr ""

239235

240−#: qml/Dash/ScopesOverviewTab.qml:36

241−msgid "Favorites"

242−msgstr "Gogokoak"

236+#: qml/Dash/ScopesList.qml:107

237+msgid "Home"

238+msgstr ""

243239

244−#: qml/Dash/ScopesOverviewTab.qml:54

245−msgid "All"

246−msgstr "Guztiak"

240+#: qml/Dash/ScopesList.qml:108

241+msgid "Also installed"

242+msgstr ""

247243

248244#: qml/Greeter/Greeter.qml:174

249245msgid "Unlock"

250246msgstr "Desblokeatu"

251247

252−#: qml/Notifications/NotificationMenuItemFactory.qml:116

248+#: qml/Notifications/NotificationMenuItemFactory.qml:128

253249msgid "Show password"

254250msgstr "Erakutsi pasahitza"

255251

@@ -297,49 +293,49 @@ msgstr "Desblokeatu SIMa"

297293msgid "Roaming"

298294msgstr "Ibiltaritza"

299295

300−#: qml/Shell.qml:391

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

301302msgid "Enter passphrase"

302303msgstr "Sartu pasaesaldia"

303304

304−#: qml/Shell.qml:392

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

305315msgid "Sorry, incorrect passphrase"

306316msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"

307317

308−#: qml/Shell.qml:393

318+#: qml/Shell.qml:372

309319msgid "Please re-enter"

310320msgstr "Errepikatu"

311321

312−#: qml/Shell.qml:395

313−msgid "Enter passcode"

314−msgstr "Sartu pasakodea"

315−

316−#: qml/Shell.qml:396

322+#: qml/Shell.qml:373

317323msgid "Sorry, incorrect passcode"

318324msgstr "Sentitzen dugu, pasakodea okerra da"

319325

320−#: qml/Shell.qml:399

321−#, qt-format

322−msgid "Enter %1"

323−msgstr "Sartu %1"

324−

325−#: qml/Shell.qml:400

326−#, qt-format

327−msgid "Sorry, incorrect %1"

328−msgstr "Sentitzen dugu, %1 okerra da"

329−

330−#: qml/Shell.qml:441

326+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

331327msgid "Sorry, incorrect passphrase."

332328msgstr "Sentitzen dugu, pasaesaldia okerra da."

333329

334−#: qml/Shell.qml:442

330+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

335331msgid "Sorry, incorrect passcode."

336332msgstr "Sentitzen dugu, pasakodea okerra da."

337333

338−#: qml/Shell.qml:443

334+#: qml/Shell.qml:469

339335msgid "This will be your last attempt."

340336msgstr "Hau duzu azken saiakera."

341337

342−#: qml/Shell.qml:445

338+#: qml/Shell.qml:471

343339msgid ""

344340"If passphrase is entered incorrectly, your phone will conduct a factory "

345341"reset and all personal data will be deleted."

@@ -347,7 +343,7 @@ msgstr ""

347343"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "

348344"berrezarri eta datu pertsonal guztiak ezabatuko dira."

349345

350−#: qml/Shell.qml:446

346+#: qml/Shell.qml:472

351347msgid ""

352348"If passcode is entered incorrectly, your phone will conduct a factory reset "

353349"and all personal data will be deleted."

@@ -355,6 +351,183 @@ msgstr ""

355351"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "

356352"berrezarri eta datu pertsonal guztiak ezabatuko dira."

357353

354+#: qml/Wizard/Page.qml:89

355+msgid "Back"

356+msgstr ""

357+

358+#: qml/Wizard/Pages/10-welcome.qml:27

359+msgid "Hi!"

360+msgstr ""

361+

362+#: qml/Wizard/Pages/10-welcome.qml:44

363+msgid "Welcome to your Ubuntu phone."

364+msgstr ""

365+

366+#: qml/Wizard/Pages/10-welcome.qml:52

367+msgid "Let’s get started."

368+msgstr ""

369+

370+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

371+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

372+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

373+#: qml/Wizard/Pages/passwd-set.qml:90

374+msgid "Continue"

375+msgstr ""

376+

377+#: qml/Wizard/Pages/20-sim.qml:25

378+msgid "Add a SIM card and restart your device"

379+msgstr ""

380+

381+#: qml/Wizard/Pages/20-sim.qml:55

382+msgid "Without it, you won’t be able to make calls or use text messaging."

383+msgstr ""

384+

385+#: 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+

358531#~ msgid "Type or say a command"

359532#~ msgstr "Idatzi edo esan agindu bat"

360533

@@ -367,5 +540,17 @@ msgstr ""

367540#~ msgid "Speaking..."

368541#~ msgstr "Hitz egiten..."

369542

543+#~ msgid "Done"

544+#~ msgstr "Eginda"

545+

546+#~ msgid "All"

547+#~ msgstr "Guztiak"

548+

549+#~ msgid "Favorites"

550+#~ msgstr "Gogokoak"

551+

370552#~ msgid "Confirm"

371553#~ msgstr "Berretsi"

554+

555+#~ msgid "Manage Scopes"

556+#~ msgstr "Kudeatu eremuak"

po/fa.po+242−49

@@ -7,16 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

11−"PO-Revision-Date: 2014-11-07 12:53+0000\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11+"PO-Revision-Date: 2015-01-09 15:59+0000\n"

1212"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"

1313"Language-Team: Persian <fa@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2015-01-10 07:18+0000\n"

19+"X-Generator: Launchpad (build 17298)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

@@ -176,20 +176,24 @@ msgstr "کم‌تر ببینید"

176176msgid "See all"

177177msgstr "دیدن همه"

178178

179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268

180180#: qml/Panel/SearchIndicator.qml:27

181181msgid "Search"

182182msgstr "جست‌وجو"

183183

184−#: qml/Dash/PageHeader.qml:268

184+#: qml/Dash/PageHeader.qml:261

185+msgid "Store"

186+msgstr "فروشگاه"

187+

188+#: qml/Dash/PageHeader.qml:278

185189msgid "Settings"

186190msgstr "تنظیمات"

187191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:285

189193msgid "Remove from Favorites"

190194msgstr "برداشتن از برگزیده‌ها"

191195

192−#: qml/Dash/PageHeader.qml:275

196+#: qml/Dash/PageHeader.qml:285

193197msgid "Add to Favorites"

194198msgstr "افزودن به برگزیده‌ها"

195199

@@ -221,31 +225,23 @@ msgstr "برای تازه‌سازی بکشید…"

221225msgid "Release to refresh…"

222226msgstr "برای تازه‌سازی رها کنید…"

223227

224−#: qml/Dash/ScopesOverview.qml:215

225−msgid "Manage Scopes"

226−msgstr "مدیریت حوزه‌ها"

227−

228−#: qml/Dash/ScopesOverview.qml:437

229−msgid "Done"

230−msgstr "انجام شد"

231−

232−#: qml/Dash/ScopesOverview.qml:463

233−msgid "Store"

234−msgstr "فروشگاه"

228+#: qml/Dash/ScopesList.qml:63

229+msgid "Manage"

230+msgstr "مدیریت"

235231

236−#: qml/Dash/ScopesOverviewTab.qml:36

237−msgid "Favorites"

238−msgstr "برگزیده‌ها"

232+#: qml/Dash/ScopesList.qml:107

233+msgid "Home"

234+msgstr "خانه"

239235

240−#: qml/Dash/ScopesOverviewTab.qml:54

241−msgid "All"

242−msgstr "همه"

236+#: qml/Dash/ScopesList.qml:108

237+msgid "Also installed"

238+msgstr "هم‌چنین نصب شده"

243239

244240#: qml/Greeter/Greeter.qml:174

245241msgid "Unlock"

246242msgstr "بازکردن قفل"

247243

248−#: qml/Notifications/NotificationMenuItemFactory.qml:116

244+#: qml/Notifications/NotificationMenuItemFactory.qml:128

249245msgid "Show password"

250246msgstr "نمایش گذرواژه"

251247

@@ -293,49 +289,49 @@ msgstr "باز کردن قفل سیم‌کارت"

293289msgid "Roaming"

294290msgstr "رومینگ"

295291

296−#: qml/Shell.qml:391

292+#: qml/Shell.qml:402

293+#, qt-format

294+msgid "Enter %1"

295+msgstr "%1 را وارد کنید"

296+

297+#: qml/Shell.qml:394

297298msgid "Enter passphrase"

298299msgstr "عبارت‌عبور را وارد کنید"

299300

300−#: qml/Shell.qml:392

301+#: qml/Shell.qml:398

302+msgid "Enter passcode"

303+msgstr "رمزعبور را وارد کنید"

304+

305+#: qml/Shell.qml:403

306+#, qt-format

307+msgid "Sorry, incorrect %1"

308+msgstr "متأسّفیم، %1 نادرست بود"

309+

310+#: qml/Shell.qml:395

301311msgid "Sorry, incorrect passphrase"

302312msgstr "متأسّفیم، عبارت‌عبور نادرست بود"

303313

304−#: qml/Shell.qml:393

314+#: qml/Shell.qml:396

305315msgid "Please re-enter"

306316msgstr "لطفاً دوباره وارد کنید"

307317

308−#: qml/Shell.qml:395

309−msgid "Enter passcode"

310−msgstr "رمزعبور را وارد کنید"

311−

312−#: qml/Shell.qml:396

318+#: qml/Shell.qml:399

313319msgid "Sorry, incorrect passcode"

314320msgstr "متأسّفیم، رمزعبور نادرست بود"

315321

316−#: qml/Shell.qml:399

317−#, qt-format

318−msgid "Enter %1"

319−msgstr "%1 را وارد کنید"

320−

321−#: qml/Shell.qml:400

322−#, qt-format

323−msgid "Sorry, incorrect %1"

324−msgstr "متأسّفیم، %1 نادرست بود"

325−

326−#: qml/Shell.qml:441

322+#: qml/Shell.qml:444

327323msgid "Sorry, incorrect passphrase."

328324msgstr "متأسّفیم، عبارت‌عبور نادرست است."

329325

330−#: qml/Shell.qml:442

326+#: qml/Shell.qml:445

331327msgid "Sorry, incorrect passcode."

332328msgstr "متأسّفیم، رمزعبور نادرست است."

333329

334−#: qml/Shell.qml:443

330+#: qml/Shell.qml:446

335331msgid "This will be your last attempt."

336332msgstr "این آخرین تلاش شما خواهد بود."

337333

338−#: qml/Shell.qml:445

334+#: qml/Shell.qml:448

339335msgid ""

340336"If passphrase is entered incorrectly, your phone will conduct a factory "

341337"reset and all personal data will be deleted."

@@ -343,7 +339,7 @@ msgstr ""

343339"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

344340"اطّلاعات شخصی حذف خواهند شد."

345341

346−#: qml/Shell.qml:446

342+#: qml/Shell.qml:449

347343msgid ""

348344"If passcode is entered incorrectly, your phone will conduct a factory reset "

349345"and all personal data will be deleted."

@@ -351,6 +347,191 @@ msgstr ""

351347"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

352348"اطّلاعات شخصی حذف خواهند شد."

353349

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+

382+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

383+msgid "Skip"

384+msgstr "پرش"

385+

386+#: qml/Wizard/Pages/30-passwd-type.qml:39

387+msgid "Lock security"

388+msgstr "امنیت قفل"

389+

390+#: qml/Wizard/Pages/30-passwd-type.qml:74

391+msgid "Please select how you’d like to unlock your phone."

392+msgstr "لطفاً برگزینید که می‌خواهید چگونه قفل تلفنتان را باز کنید."

393+

394+#: qml/Wizard/Pages/30-passwd-type.qml:97

395+msgid "Swipe"

396+msgstr "لغزش"

397+

398+#: qml/Wizard/Pages/30-passwd-type.qml:98

399+msgid "No security"

400+msgstr "بدون امنیت"

401+

402+#: qml/Wizard/Pages/30-passwd-type.qml:100

403+msgid "Passcode"

404+msgstr "رمزعبور"

405+

406+#: qml/Wizard/Pages/30-passwd-type.qml:101

407+msgid "4 digits only"

408+msgstr "فقط ۴ رقم"

409+

410+#: qml/Wizard/Pages/30-passwd-type.qml:103

411+msgid "Passphrase"

412+msgstr "عبارت‌عبور"

413+

414+#: qml/Wizard/Pages/30-passwd-type.qml:104

415+msgid "Numbers and letters"

416+msgstr "اعداد و حروف"

417+

418+#: qml/Wizard/Pages/40-wifi.qml:28

419+msgid "Connect to Wi‑Fi"

420+msgstr "اتّصال به بی‌سیم"

421+

422+#: qml/Wizard/Pages/40-wifi.qml:147

423+msgid "Available networks…"

424+msgstr "شبکه‌های موجود…"

425+

426+#: qml/Wizard/Pages/40-wifi.qml:148

427+msgid "No available networks."

428+msgstr "هیچ شبکه‌ای موجود نیست."

429+

430+#: qml/Wizard/Pages/50-location.qml:27

431+msgid "Location"

432+msgstr "موقعیت"

433+

434+#: qml/Wizard/Pages/50-location.qml:62

435+msgid "Let the phone detect your location:"

436+msgstr "اجازه به تلفن برای تشخیص موقعیّتتان:"

437+

438+#: qml/Wizard/Pages/50-location.qml:69

439+msgid "Using GPS only (less accurate)"

440+msgstr "فقط با استفاده از جی‌پی‌اس (دقّت کم‌تر)"

441+

442+#: qml/Wizard/Pages/50-location.qml:86

443+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

444+msgstr ""

445+"با استفاده از جی‌پی‌اس، بی‌سیم ناشناس و اطّلاعات شبکه‌ی سلّولی (پیشنهاد شده)"

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+"با انتخاب این گزینه، با <a href='#'>شرایط و ضوابط</a> HERE نوکیا موافقت "

454+"می‌کنید."

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 "می‌توانید بعدها نظرتان را در <b>تنظیمات سامانه</b> تغییر دهید."

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+"شرکت کنونیکال و شرکایش گزارش دهد."

475+

476+#: qml/Wizard/Pages/60-reporting.qml:43

477+msgid ""

478+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

479+"Privacy</b>"

480+msgstr ""

481+"این می‌تواند در <b>تنظیمات سامانه</b> ذیل <b>امنیت و محرمانگی</b> غیرفعَال "

482+"شود"

483+

484+#: qml/Wizard/Pages/80-finished.qml:24

485+msgid "All done"

486+msgstr "همه‌چیز انجام شد"

487+

488+#: qml/Wizard/Pages/80-finished.qml:39

489+msgid "Nice work!"

490+msgstr "عالی بود!"

491+

492+#: qml/Wizard/Pages/80-finished.qml:46

493+msgid "Your phone is now ready to use."

494+msgstr "هم‌اکنون تلفن شما آماده‌ی استفاده است."

495+

496+#: qml/Wizard/Pages/80-finished.qml:53

497+msgid "Finish"

498+msgstr "پایان"

499+

500+#: qml/Wizard/Pages/here-terms.qml:27

501+msgid "Terms & Conditions"

502+msgstr "شرایط و ضوابط"

503+

504+#: qml/Wizard/Pages/passwd-confirm.qml:49

505+msgid "Confirm passphrase"

506+msgstr "تأیید عبارت‌عبور"

507+

508+#: qml/Wizard/Pages/passwd-confirm.qml:50

509+msgid "Confirm passcode"

510+msgstr "تأیید رمزعبور"

511+

512+#: qml/Wizard/Pages/passwd-confirm.qml:53

513+#: qml/Wizard/Pages/passwd-confirm.qml:54

514+msgid "Please try again."

515+msgstr "لطفاً دوباره سعی کنید."

516+

517+#: qml/Wizard/Pages/passwd-set.qml:61

518+msgid "Choose your passcode"

519+msgstr "رمزعبور خود را انتخاب کنید"

520+

521+#: qml/Wizard/Pages/passwd-set.qml:68

522+msgid "Passphrase must be 4 characters long"

523+msgstr "عبارت‌عبور باید ۴ نویسه طول داشته باشد"

524+

525+#: qml/Wizard/StackButton.qml:39

526+#, qt-format

527+msgid "〈 %1"

528+msgstr "〈 %1"

529+

530+#: qml/Wizard/StackButton.qml:42

531+#, qt-format

532+msgid "%1 〉"

533+msgstr "%1 〉"

534+

354535#~ msgid "Type or say a command"

355536#~ msgstr "دستوری را بنویسید یا بگویید"

356537

@@ -365,3 +546,15 @@ msgstr ""

365546

366547#~ msgid "Speak Now..."

367548#~ msgstr "اکنون صحبت کنید…"

549+

550+#~ msgid "All"

551+#~ msgstr "همه"

552+

553+#~ msgid "Favorites"

554+#~ msgstr "برگزیده‌ها"

555+

556+#~ msgid "Done"

557+#~ msgstr "انجام شد"

558+

559+#~ msgid "Manage Scopes"

560+#~ msgstr "مدیریت حوزه‌ها"

po/fi.po+273−81

@@ -7,27 +7,27 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

11−"PO-Revision-Date: 2014-11-05 11:49+0000\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11+"PO-Revision-Date: 2014-12-14 15:37+0000\n"

1212"Last-Translator: Jiri Grönroos <Unknown>\n"

1313"Language-Team: Finnish <fi@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-15 06:34+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Salasana: "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Kiinnitä pikakuvake"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Poista pikakuvakkeen kiinnitys"

3333

@@ -52,45 +52,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

5252msgstr[0] "Odota %1 minuutti ja yritä sitten uudelleen…"

5353msgstr[1] "Odota %1 minuuttia ja yritä sitten uudelleen…"

5454

55−#: qml/Components/Dialogs.qml:74

55+#: qml/Components/Dialogs.qml:70

5656msgid "Log out"

5757msgstr "Kirjaudu ulos"

5858

59−#: qml/Components/Dialogs.qml:75

59+#: qml/Components/Dialogs.qml:71

6060msgid "Are you sure you want to log out?"

6161msgstr "Haluatko varmasti kirjautua ulos?"

6262

63−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

64−#: qml/Components/Dialogs.qml:126

63+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

64+#: qml/Components/Dialogs.qml:122

6565msgid "No"

6666msgstr "Ei"

6767

68−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

69−#: qml/Components/Dialogs.qml:133

68+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

69+#: qml/Components/Dialogs.qml:129

7070msgid "Yes"

7171msgstr "Kyllä"

7272

73−#: qml/Components/Dialogs.qml:98

73+#: qml/Components/Dialogs.qml:94

7474msgid "Shut down"

7575msgstr "Sammuta"

7676

77−#: qml/Components/Dialogs.qml:99

77+#: qml/Components/Dialogs.qml:95

7878msgid "Are you sure you want to shut down?"

7979msgstr "Haluatko varmasti sammuttaa laitteen?"

8080

81−#: qml/Components/Dialogs.qml:123

81+#: qml/Components/Dialogs.qml:119

8282msgid "Reboot"

8383msgstr "Käynnistä uudelleen"

8484

85−#: qml/Components/Dialogs.qml:124

85+#: qml/Components/Dialogs.qml:120

8686msgid "Are you sure you want to reboot?"

8787msgstr "Haluatko varmasti käynnistää laitteen uudelleen?"

8888

89−#: qml/Components/Dialogs.qml:148

89+#: qml/Components/Dialogs.qml:144

9090msgid "Power"

9191msgstr "Virran katkaisu"

9292

93−#: qml/Components/Dialogs.qml:149

93+#: qml/Components/Dialogs.qml:145

9494msgid ""

9595"Are you sure you would like\n"

9696"to power off?"

@@ -98,15 +98,15 @@ msgstr ""

9898"Haluatko varmasti\n"

9999"sammuttaa laitteen?"

100100

101−#: qml/Components/Dialogs.qml:151

101+#: qml/Components/Dialogs.qml:147

102102msgid "Power off"

103103msgstr "Sammuta"

104104

105−#: qml/Components/Dialogs.qml:161

105+#: qml/Components/Dialogs.qml:157

106106msgid "Restart"

107107msgstr "Käynnistä uudelleen"

108108

109−#: qml/Components/Dialogs.qml:171

109+#: qml/Components/Dialogs.qml:167

110110msgid "Cancel"

111111msgstr "Peru"

112112

@@ -114,43 +114,43 @@ msgstr "Peru"

114114msgid "Skip intro"

115115msgstr "Ohita esittely"

116116

117−#: qml/Components/EdgeDemo.qml:112

117+#: qml/Components/EdgeDemo.qml:125

118118msgid "Right edge"

119119msgstr "Oikea reuna"

120120

121−#: qml/Components/EdgeDemo.qml:113

121+#: qml/Components/EdgeDemo.qml:126

122122msgid "Try swiping from the right edge to unlock the phone"

123123msgstr "Vedä oikealta avataksesi puhelimen lukituksen"

124124

125−#: qml/Components/EdgeDemo.qml:144

125+#: qml/Components/EdgeDemo.qml:157

126126msgid "Top edge"

127127msgstr "Yläreuna"

128128

129−#: qml/Components/EdgeDemo.qml:145

129+#: qml/Components/EdgeDemo.qml:158

130130msgid "Try swiping from the top edge to access the indicators"

131131msgstr "Vedä yläreunasta käyttääksesi ilmaisimia"

132132

133−#: qml/Components/EdgeDemo.qml:170

133+#: qml/Components/EdgeDemo.qml:183

134134msgid "Close"

135135msgstr "Sulje"

136136

137−#: qml/Components/EdgeDemo.qml:171

137+#: qml/Components/EdgeDemo.qml:184

138138msgid "Swipe up again to close the settings screen"

139139msgstr "Vedä uudestaan sulkeaksesi asetusnäkymän"

140140

141−#: qml/Components/EdgeDemo.qml:201

141+#: qml/Components/EdgeDemo.qml:214

142142msgid "Left edge"

143143msgstr "Vasen reuna"

144144

145−#: qml/Components/EdgeDemo.qml:202

145+#: qml/Components/EdgeDemo.qml:215

146146msgid "Swipe from the left to reveal the launcher for quick access to apps"

147147msgstr "Vedä vasemmalta saattaaksesi sovellusten käynnistimen esiin"

148148

149−#: qml/Components/EdgeDemo.qml:229

149+#: qml/Components/EdgeDemo.qml:242

150150msgid "Well done"

151151msgstr "Hyvin tehty"

152152

153−#: qml/Components/EdgeDemo.qml:230

153+#: qml/Components/EdgeDemo.qml:243

154154msgid ""

155155"You have now mastered the edge gestures and can start using the "

156156"phone<br><br>Tap on the screen to start"

@@ -158,40 +158,44 @@ msgstr ""

158158"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "

159159"käytön<br><br>Napauta näyttöä aloittaaksesi"

160160

161−#: qml/Components/Lockscreen.qml:223

161+#: qml/Components/Lockscreen.qml:238

162162msgid "Return to Call"

163163msgstr "Palaa puheluun"

164164

165−#: qml/Components/Lockscreen.qml:223

165+#: qml/Components/Lockscreen.qml:238

166166msgid "Emergency Call"

167167msgstr "Hätäpuhelu"

168168

169−#: qml/Components/Lockscreen.qml:255

169+#: qml/Components/Lockscreen.qml:270

170170msgid "OK"

171171msgstr "OK"

172172

173−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

173+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

174174msgid "See less"

175175msgstr "Näytä vähemmän"

176176

177−#: qml/Dash/GenericScopeView.qml:434

177+#: qml/Dash/GenericScopeView.qml:431

178178msgid "See all"

179179msgstr "Näytä kaikki"

180180

181−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

181+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

182182#: qml/Panel/SearchIndicator.qml:27

183183msgid "Search"

184184msgstr "Hae"

185185

186−#: qml/Dash/PageHeader.qml:268

186+#: qml/Dash/PageHeader.qml:260

187+msgid "Store"

188+msgstr "Kauppa"

189+

190+#: qml/Dash/PageHeader.qml:277

187191msgid "Settings"

188192msgstr "Asetukset"

189193

190−#: qml/Dash/PageHeader.qml:275

194+#: qml/Dash/PageHeader.qml:284

191195msgid "Remove from Favorites"

192196msgstr "Poista suosikeista"

193197

194−#: qml/Dash/PageHeader.qml:275

198+#: qml/Dash/PageHeader.qml:284

195199msgid "Add to Favorites"

196200msgstr "Lisää suosikkeihin"

197201

@@ -223,31 +227,23 @@ msgstr "Vedä päivittääksesi…"

223227msgid "Release to refresh…"

224228msgstr "Vapauta päivittääksesi…"

225229

226−#: qml/Dash/ScopesOverview.qml:215

227−msgid "Manage Scopes"

228−msgstr "Näkymien hallinta"

230+#: qml/Dash/ScopesList.qml:63

231+msgid "Manage"

232+msgstr "Hallitse"

229233

230−#: qml/Dash/ScopesOverview.qml:437

231−msgid "Done"

232−msgstr "Valmis"

234+#: qml/Dash/ScopesList.qml:107

235+msgid "Home"

236+msgstr "Koti"

233237

234−#: qml/Dash/ScopesOverview.qml:463

235−msgid "Store"

236−msgstr "Kauppa"

237−

238−#: qml/Dash/ScopesOverviewTab.qml:36

239−msgid "Favorites"

240−msgstr "Suosikit"

241−

242−#: qml/Dash/ScopesOverviewTab.qml:54

243−msgid "All"

244−msgstr "Kaikki"

238+#: qml/Dash/ScopesList.qml:108

239+msgid "Also installed"

240+msgstr "Myös asennettu"

245241

246242#: qml/Greeter/Greeter.qml:174

247243msgid "Unlock"

248244msgstr "Avaa lukitus"

249245

250−#: qml/Notifications/NotificationMenuItemFactory.qml:116

246+#: qml/Notifications/NotificationMenuItemFactory.qml:128

251247msgid "Show password"

252248msgstr "Näytä salasana"

253249

@@ -295,49 +291,49 @@ msgstr "Avaa SIM-kortin lukitus"

295291msgid "Roaming"

296292msgstr "Verkkovierailu"

297293

298−#: qml/Shell.qml:391

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

299300msgid "Enter passphrase"

300301msgstr "Anna tunnuslause"

301302

302−#: qml/Shell.qml:392

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

303313msgid "Sorry, incorrect passphrase"

304314msgstr "Virheellinen tunnuslause"

305315

306−#: qml/Shell.qml:393

316+#: qml/Shell.qml:372

307317msgid "Please re-enter"

308318msgstr "Anna uudelleen"

309319

310−#: qml/Shell.qml:395

311−msgid "Enter passcode"

312−msgstr "Anna suojakoodi"

313−

314−#: qml/Shell.qml:396

320+#: qml/Shell.qml:373

315321msgid "Sorry, incorrect passcode"

316322msgstr "Väärä suojakoodi"

317323

318−#: qml/Shell.qml:399

319−#, qt-format

320−msgid "Enter %1"

321−msgstr "Anna %1"

322−

323−#: qml/Shell.qml:400

324−#, qt-format

325−msgid "Sorry, incorrect %1"

326−msgstr "Väärä %1"

327−

328−#: qml/Shell.qml:441

324+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

329325msgid "Sorry, incorrect passphrase."

330326msgstr "Virheellinen tunnuslause."

331327

332−#: qml/Shell.qml:442

328+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

333329msgid "Sorry, incorrect passcode."

334330msgstr "Virheellinen suojakoodi."

335331

336−#: qml/Shell.qml:443

332+#: qml/Shell.qml:469

337333msgid "This will be your last attempt."

338334msgstr "Tämä on viimeinen yritys."

339335

340−#: qml/Shell.qml:445

336+#: qml/Shell.qml:471

341337msgid ""

342338"If passphrase is entered incorrectly, your phone will conduct a factory "

343339"reset and all personal data will be deleted."

@@ -345,7 +341,7 @@ msgstr ""

345341"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "

346342"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

347343

348−#: qml/Shell.qml:446

344+#: qml/Shell.qml:472

349345msgid ""

350346"If passcode is entered incorrectly, your phone will conduct a factory reset "

351347"and all personal data will be deleted."

@@ -353,6 +349,190 @@ msgstr ""

353349"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "

354350"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

355351

352+#: qml/Wizard/Page.qml:89

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+

356536#~ msgid "Confirm"

357537#~ msgstr "Hyväksy"

358538

@@ -367,3 +547,15 @@ msgstr ""

367547

368548#~ msgid "Loading. Please Wait..."

369549#~ 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"

559+

560+#~ msgid "Manage Scopes"

561+#~ msgstr "Näkymien hallinta"

po/fo.po+248−75

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-01-14 20:08+0000\n"

1212"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"

1313"Language-Team: Faroese <fo@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr ""

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr ""

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr ""

3333

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] ""

5151msgstr[1] ""

5252

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

5454msgid "Log out"

5555msgstr ""

5656

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

5858msgid "Are you sure you want to log out?"

5959msgstr ""

6060

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62−#: qml/Components/Dialogs.qml:126

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:122

6363msgid "No"

6464msgstr ""

6565

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67−#: qml/Components/Dialogs.qml:133

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:129

6868msgid "Yes"

6969msgstr ""

7070

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

7272msgid "Shut down"

7373msgstr ""

7474

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

7676msgid "Are you sure you want to shut down?"

7777msgstr ""

7878

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

8080msgid "Reboot"

8181msgstr ""

8282

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

8484msgid "Are you sure you want to reboot?"

8585msgstr ""

8686

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

8888msgid "Power"

8989msgstr ""

9090

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

9292msgid ""

9393"Are you sure you would like\n"

9494"to power off?"

9595msgstr ""

9696

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

9898msgid "Power off"

9999msgstr ""

100100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102102msgid "Restart"

103103msgstr ""

104104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106106msgid "Cancel"

107107msgstr ""

108108

@@ -110,82 +110,86 @@ msgstr ""

110110msgid "Skip intro"

111111msgstr ""

112112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114114msgid "Right edge"

115115msgstr "Høgra kant"

116116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118118msgid "Try swiping from the right edge to unlock the phone"

119119msgstr ""

120120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122122msgid "Top edge"

123123msgstr "Topp kantur"

124124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126126msgid "Try swiping from the top edge to access the indicators"

127127msgstr ""

128128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130130msgid "Close"

131131msgstr ""

132132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134134msgid "Swipe up again to close the settings screen"

135135msgstr ""

136136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138138msgid "Left edge"

139139msgstr ""

140140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143143msgstr ""

144144

145−#: qml/Components/EdgeDemo.qml:229

145+#: qml/Components/EdgeDemo.qml:242

146146msgid "Well done"

147147msgstr ""

148148

149−#: qml/Components/EdgeDemo.qml:230

149+#: qml/Components/EdgeDemo.qml:243

150150msgid ""

151151"You have now mastered the edge gestures and can start using the "

152152"phone<br><br>Tap on the screen to start"

153153msgstr ""

154154

155−#: qml/Components/Lockscreen.qml:223

155+#: qml/Components/Lockscreen.qml:238

156156msgid "Return to Call"

157157msgstr ""

158158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160160msgid "Emergency Call"

161161msgstr ""

162162

163−#: qml/Components/Lockscreen.qml:255

163+#: qml/Components/Lockscreen.qml:270

164164msgid "OK"

165165msgstr ""

166166

167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

168168msgid "See less"

169169msgstr ""

170170

171−#: qml/Dash/GenericScopeView.qml:434

171+#: qml/Dash/GenericScopeView.qml:431

172172msgid "See all"

173173msgstr ""

174174

175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176176#: qml/Panel/SearchIndicator.qml:27

177177msgid "Search"

178178msgstr "Leita"

179179

180−#: qml/Dash/PageHeader.qml:268

180+#: qml/Dash/PageHeader.qml:260

181+msgid "Store"

182+msgstr ""

183+

184+#: qml/Dash/PageHeader.qml:277

181185msgid "Settings"

182186msgstr ""

183187

184−#: qml/Dash/PageHeader.qml:275

188+#: qml/Dash/PageHeader.qml:284

185189msgid "Remove from Favorites"

186190msgstr ""

187191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189193msgid "Add to Favorites"

190194msgstr ""

191195

@@ -217,31 +221,23 @@ msgstr ""

217221msgid "Release to refresh…"

218222msgstr ""

219223

220−#: qml/Dash/ScopesOverview.qml:215

221−msgid "Manage Scopes"

222−msgstr ""

223−

224−#: qml/Dash/ScopesOverview.qml:437

225−msgid "Done"

226−msgstr ""

227−

228−#: qml/Dash/ScopesOverview.qml:463

229−msgid "Store"

224+#: qml/Dash/ScopesList.qml:63

225+msgid "Manage"

230226msgstr ""

231227

232−#: qml/Dash/ScopesOverviewTab.qml:36

233−msgid "Favorites"

228+#: qml/Dash/ScopesList.qml:107

229+msgid "Home"

234230msgstr ""

235231

236−#: qml/Dash/ScopesOverviewTab.qml:54

237−msgid "All"

232+#: qml/Dash/ScopesList.qml:108

233+msgid "Also installed"

238234msgstr ""

239235

240236#: qml/Greeter/Greeter.qml:174

241237msgid "Unlock"

242238msgstr ""

243239

244−#: qml/Notifications/NotificationMenuItemFactory.qml:116

240+#: qml/Notifications/NotificationMenuItemFactory.qml:128

245241msgid "Show password"

246242msgstr ""

247243

@@ -289,60 +285,237 @@ msgstr ""

289285msgid "Roaming"

290286msgstr ""

291287

292−#: qml/Shell.qml:391

293−msgid "Enter passphrase"

288+#: qml/Shell.qml:367

289+#, qt-format

290+msgid "Enter %1"

294291msgstr ""

295292

296−#: qml/Shell.qml:392

297−msgid "Sorry, incorrect passphrase"

293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

294+msgid "Enter passphrase"

298295msgstr ""

299296

300−#: qml/Shell.qml:393

301−msgid "Please re-enter"

297+#: qml/Shell.qml:369

298+msgid "Enter passcode"

302299msgstr ""

303300

304−#: qml/Shell.qml:395

305−msgid "Enter passcode"

301+#: qml/Shell.qml:370

302+#, qt-format

303+msgid "Sorry, incorrect %1"

306304msgstr ""

307305

308−#: qml/Shell.qml:396

309−msgid "Sorry, incorrect passcode"

306+#: qml/Shell.qml:371

307+msgid "Sorry, incorrect passphrase"

310308msgstr ""

311309

312−#: qml/Shell.qml:399

313−#, qt-format

314−msgid "Enter %1"

310+#: qml/Shell.qml:372

311+msgid "Please re-enter"

315312msgstr ""

316313

317−#: qml/Shell.qml:400

318−#, qt-format

319−msgid "Sorry, incorrect %1"

314+#: qml/Shell.qml:373

315+msgid "Sorry, incorrect passcode"

320316msgstr ""

321317

322−#: qml/Shell.qml:441

318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

323319msgid "Sorry, incorrect passphrase."

324320msgstr ""

325321

326−#: qml/Shell.qml:442

322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

327323msgid "Sorry, incorrect passcode."

328324msgstr ""

329325

330−#: qml/Shell.qml:443

326+#: qml/Shell.qml:469

331327msgid "This will be your last attempt."

332328msgstr ""

333329

334−#: qml/Shell.qml:445

330+#: qml/Shell.qml:471

335331msgid ""

336332"If passphrase is entered incorrectly, your phone will conduct a factory "

337333"reset and all personal data will be deleted."

338334msgstr ""

339335

340−#: qml/Shell.qml:446

336+#: qml/Shell.qml:472

341337msgid ""

342338"If passcode is entered incorrectly, your phone will conduct a factory reset "

343339"and all personal data will be deleted."

344340msgstr ""

345341

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+

346519#~ msgid "Confirm"

347520#~ msgstr "Vátta"

348521

po/fr.po+267−82

@@ -7,27 +7,27 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

11−"PO-Revision-Date: 2014-11-05 17:30+0000\n"

12−"Last-Translator: Sébastien Maes <nautilussebastien@gmail.com>\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11+"PO-Revision-Date: 2014-12-10 22:01+0000\n"

12+"Last-Translator: Jean Marc <Unknown>\n"

1313"Language-Team: French <fr@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Mot de passe : "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Épingler le raccourci"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Détacher le raccourci"

3333

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

5454msgstr[0] "Veuillez patienter %1 minute et réessayer..."

5555msgstr[1] "Veuillez patienter %1 minutes et réessayer..."

5656

57−#: qml/Components/Dialogs.qml:74

57+#: qml/Components/Dialogs.qml:70

5858msgid "Log out"

5959msgstr "Se déconnecter"

6060

61−#: qml/Components/Dialogs.qml:75

61+#: qml/Components/Dialogs.qml:71

6262msgid "Are you sure you want to log out?"

6363msgstr "Êtes-vous sûr de vouloir vous déconnecter ?"

6464

65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

66−#: qml/Components/Dialogs.qml:126

65+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66+#: qml/Components/Dialogs.qml:122

6767msgid "No"

6868msgstr "Non"

6969

70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

71−#: qml/Components/Dialogs.qml:133

70+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71+#: qml/Components/Dialogs.qml:129

7272msgid "Yes"

7373msgstr "Oui"

7474

75−#: qml/Components/Dialogs.qml:98

75+#: qml/Components/Dialogs.qml:94

7676msgid "Shut down"

7777msgstr "Éteindre"

7878

79−#: qml/Components/Dialogs.qml:99

79+#: qml/Components/Dialogs.qml:95

8080msgid "Are you sure you want to shut down?"

8181msgstr "Êtes-vous sûr de vouloir éteindre ?"

8282

83−#: qml/Components/Dialogs.qml:123

83+#: qml/Components/Dialogs.qml:119

8484msgid "Reboot"

8585msgstr "Redémarrer"

8686

87−#: qml/Components/Dialogs.qml:124

87+#: qml/Components/Dialogs.qml:120

8888msgid "Are you sure you want to reboot?"

8989msgstr "Êtes-vous sûr de vouloir redémarrer ?"

9090

91−#: qml/Components/Dialogs.qml:148

91+#: qml/Components/Dialogs.qml:144

9292msgid "Power"

9393msgstr "Alimentation"

9494

95−#: qml/Components/Dialogs.qml:149

95+#: qml/Components/Dialogs.qml:145

9696msgid ""

9797"Are you sure you would like\n"

9898"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100100"Êtes-vous sûr de vouloir\n"

101101"couper l'alimentation ?"

102102

103−#: qml/Components/Dialogs.qml:151

103+#: qml/Components/Dialogs.qml:147

104104msgid "Power off"

105105msgstr "Éteindre"

106106

107−#: qml/Components/Dialogs.qml:161

107+#: qml/Components/Dialogs.qml:157

108108msgid "Restart"

109109msgstr "Redémarrer"

110110

111−#: qml/Components/Dialogs.qml:171

111+#: qml/Components/Dialogs.qml:167

112112msgid "Cancel"

113113msgstr "Annuler"

114114

@@ -116,50 +116,50 @@ msgstr "Annuler"

116116msgid "Skip intro"

117117msgstr "Passer l'intro"

118118

119−#: qml/Components/EdgeDemo.qml:112

119+#: qml/Components/EdgeDemo.qml:125

120120msgid "Right edge"

121121msgstr "Bord droit"

122122

123−#: qml/Components/EdgeDemo.qml:113

123+#: qml/Components/EdgeDemo.qml:126

124124msgid "Try swiping from the right edge to unlock the phone"

125125msgstr ""

126126"Faites glisser votre doigt à partir du bord droit pour déverrouiller."

127127

128−#: qml/Components/EdgeDemo.qml:144

128+#: qml/Components/EdgeDemo.qml:157

129129msgid "Top edge"

130130msgstr "Bord supérieur"

131131

132−#: qml/Components/EdgeDemo.qml:145

132+#: qml/Components/EdgeDemo.qml:158

133133msgid "Try swiping from the top edge to access the indicators"

134134msgstr ""

135135"Faites glisser votre doigt à partir du bord supérieur pour accéder aux "

136136"indicateurs."

137137

138−#: qml/Components/EdgeDemo.qml:170

138+#: qml/Components/EdgeDemo.qml:183

139139msgid "Close"

140140msgstr "Fermer"

141141

142−#: qml/Components/EdgeDemo.qml:171

142+#: qml/Components/EdgeDemo.qml:184

143143msgid "Swipe up again to close the settings screen"

144144msgstr ""

145145"Faites glisser à nouveau votre doigt vers le bord supérieur pour fermer "

146146"l'écran des paramètres"

147147

148−#: qml/Components/EdgeDemo.qml:201

148+#: qml/Components/EdgeDemo.qml:214

149149msgid "Left edge"

150150msgstr "Bord gauche"

151151

152−#: qml/Components/EdgeDemo.qml:202

152+#: qml/Components/EdgeDemo.qml:215

153153msgid "Swipe from the left to reveal the launcher for quick access to apps"

154154msgstr ""

155155"Faites glisser votre doigt à partir du bord gauche pour afficher le lanceur "

156156"d'applications."

157157

158−#: qml/Components/EdgeDemo.qml:229

158+#: qml/Components/EdgeDemo.qml:242

159159msgid "Well done"

160160msgstr "Félicitations"

161161

162−#: qml/Components/EdgeDemo.qml:230

162+#: qml/Components/EdgeDemo.qml:243

163163msgid ""

164164"You have now mastered the edge gestures and can start using the "

165165"phone<br><br>Tap on the screen to start"

@@ -167,40 +167,44 @@ msgstr ""

167167"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "

168168"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"

169169

170−#: qml/Components/Lockscreen.qml:223

170+#: qml/Components/Lockscreen.qml:238

171171msgid "Return to Call"

172172msgstr "Retourner à l'appel"

173173

174−#: qml/Components/Lockscreen.qml:223

174+#: qml/Components/Lockscreen.qml:238

175175msgid "Emergency Call"

176176msgstr "Appel d'urgence"

177177

178−#: qml/Components/Lockscreen.qml:255

178+#: qml/Components/Lockscreen.qml:270

179179msgid "OK"

180180msgstr "OK"

181181

182−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

182+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

183183msgid "See less"

184184msgstr "Voir moins"

185185

186−#: qml/Dash/GenericScopeView.qml:434

186+#: qml/Dash/GenericScopeView.qml:431

187187msgid "See all"

188188msgstr "Tout voir"

189189

190−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

190+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

191191#: qml/Panel/SearchIndicator.qml:27

192192msgid "Search"

193193msgstr "Rechercher"

194194

195−#: 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

196200msgid "Settings"

197201msgstr "Paramètres"

198202

199−#: qml/Dash/PageHeader.qml:275

203+#: qml/Dash/PageHeader.qml:284

200204msgid "Remove from Favorites"

201205msgstr "Retirer des favoris"

202206

203−#: qml/Dash/PageHeader.qml:275

207+#: qml/Dash/PageHeader.qml:284

204208msgid "Add to Favorites"

205209msgstr "Ajouter aux favoris"

206210

@@ -232,31 +236,23 @@ msgstr "Tirer pour actualiser..."

232236msgid "Release to refresh…"

233237msgstr "Relâcher pour actualiser..."

234238

235−#: qml/Dash/ScopesOverview.qml:215

236−msgid "Manage Scopes"

237−msgstr "Gérer les moteurs de recherche"

238−

239−#: qml/Dash/ScopesOverview.qml:437

240−msgid "Done"

241−msgstr "Terminé"

242−

243−#: qml/Dash/ScopesOverview.qml:463

244−msgid "Store"

245−msgstr "Logithèque"

239+#: qml/Dash/ScopesList.qml:63

240+msgid "Manage"

241+msgstr ""

246242

247−#: qml/Dash/ScopesOverviewTab.qml:36

248−msgid "Favorites"

249−msgstr "Favorites"

243+#: qml/Dash/ScopesList.qml:107

244+msgid "Home"

245+msgstr ""

250246

251−#: qml/Dash/ScopesOverviewTab.qml:54

252−msgid "All"

253−msgstr "Toutes"

247+#: qml/Dash/ScopesList.qml:108

248+msgid "Also installed"

249+msgstr "Également installées"

254250

255251#: qml/Greeter/Greeter.qml:174

256252msgid "Unlock"

257253msgstr "Déverrouiller"

258254

259−#: qml/Notifications/NotificationMenuItemFactory.qml:116

255+#: qml/Notifications/NotificationMenuItemFactory.qml:128

260256msgid "Show password"

261257msgstr "Afficher le mot de passe"

262258

@@ -304,49 +300,49 @@ msgstr "Déverrouiller la carte SIM"

304300msgid "Roaming"

305301msgstr "Roaming"

306302

307−#: qml/Shell.qml:391

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

308309msgid "Enter passphrase"

309310msgstr "Saisissez la phrase de passe"

310311

311−#: qml/Shell.qml:392

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

312322msgid "Sorry, incorrect passphrase"

313323msgstr "Désolé, phrase secrète incorrecte"

314324

315−#: qml/Shell.qml:393

325+#: qml/Shell.qml:372

316326msgid "Please re-enter"

317327msgstr "Veuillez ressaisir"

318328

319−#: qml/Shell.qml:395

320−msgid "Enter passcode"

321−msgstr "Saisissez le mot de passe"

322−

323−#: qml/Shell.qml:396

329+#: qml/Shell.qml:373

324330msgid "Sorry, incorrect passcode"

325331msgstr "Désolé, code incorrect"

326332

327−#: qml/Shell.qml:399

328−#, qt-format

329−msgid "Enter %1"

330−msgstr "Saisissez %1"

331−

332−#: qml/Shell.qml:400

333−#, qt-format

334−msgid "Sorry, incorrect %1"

335−msgstr "Désolé, %1 incorrect"

336−

337−#: qml/Shell.qml:441

333+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

338334msgid "Sorry, incorrect passphrase."

339335msgstr "Désolé, phrase secrète incorrecte."

340336

341−#: qml/Shell.qml:442

337+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

342338msgid "Sorry, incorrect passcode."

343339msgstr "Désolé, code incorrect."

344340

345−#: qml/Shell.qml:443

341+#: qml/Shell.qml:469

346342msgid "This will be your last attempt."

347343msgstr "Ceci sera votre dernière tentative."

348344

349−#: qml/Shell.qml:445

345+#: qml/Shell.qml:471

350346msgid ""

351347"If passphrase is entered incorrectly, your phone will conduct a factory "

352348"reset and all personal data will be deleted."

@@ -355,7 +351,7 @@ msgstr ""

355351"effectuera une réinitialisation aux paramètres d'usine et toutes les données "

356352"personnelles seront supprimées."

357353

358−#: qml/Shell.qml:446

354+#: qml/Shell.qml:472

359355msgid ""

360356"If passcode is entered incorrectly, your phone will conduct a factory reset "

361357"and all personal data will be deleted."

@@ -364,6 +360,183 @@ msgstr ""

364360"réinitialisation aux paramètres d'usine et toutes les données personnelles "

365361"seront supprimées."

366362

363+#: qml/Wizard/Page.qml:89

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+

367540#~ msgid "Speaking..."

368541#~ msgstr "En cours d'écoute..."

369542

@@ -378,3 +551,15 @@ msgstr ""

378551

379552#~ msgid "Speak Now..."

380553#~ msgstr "Parlez maintenant…"

554+

555+#~ msgid "All"

556+#~ msgstr "Toutes"

557+

558+#~ msgid "Done"

559+#~ msgstr "Terminé"

560+

561+#~ msgid "Favorites"

562+#~ msgstr "Favorites"

563+

564+#~ msgid "Manage Scopes"

565+#~ msgstr "Gérer les moteurs de recherche"

po/gd.po+265−80

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-11-09 08:18+0000\n"

1212"Last-Translator: GunChleoc <Unknown>\n"

1313"Language-Team: Fòram na Gàidhlig\n"

@@ -16,8 +16,8 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "

1818"(n > 2 && n < 20) ? 2 : 3;\n"

19−"X-Launchpad-Export-Date: 2014-11-10 06:09+0000\n"

20−"X-Generator: Launchpad (build 17231)\n"

19+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

20+"X-Generator: Launchpad (build 17286)\n"

2121"Language: gd\n"

2222

2323#: plugins/LightDM/Greeter.cpp:130

@@ -25,11 +25,11 @@ msgid "Password: "

2525msgstr "Facal-faire: "

2626

2727#: plugins/Unity/Launcher/launcheritem.cpp:45

28−#: plugins/Unity/Launcher/launcheritem.cpp:91

28+#: plugins/Unity/Launcher/launcheritem.cpp:100

2929msgid "Pin shortcut"

3030msgstr "Prìnich ath-ghoirid"

3131

32−#: plugins/Unity/Launcher/launcheritem.cpp:91

32+#: plugins/Unity/Launcher/launcheritem.cpp:100

3333msgid "Unpin shortcut"

3434msgstr "Neo-phrìnich an ath-ghoirid"

3535

@@ -58,45 +58,45 @@ msgstr[1] "Fuirich ort %1 dhiog 's feuch ris a-rithist an uairsin…"

5858msgstr[2] "Fuirich ort %1 diogan 's feuch ris a-rithist an uairsin…"

5959msgstr[3] "Fuirich ort %1 diog 's feuch ris a-rithist an uairsin…"

6060

61−#: qml/Components/Dialogs.qml:74

61+#: qml/Components/Dialogs.qml:70

6262msgid "Log out"

6363msgstr "Clàraich a-mach"

6464

65−#: qml/Components/Dialogs.qml:75

65+#: qml/Components/Dialogs.qml:71

6666msgid "Are you sure you want to log out?"

6767msgstr "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?"

6868

69−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

70−#: qml/Components/Dialogs.qml:126

69+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

70+#: qml/Components/Dialogs.qml:122

7171msgid "No"

7272msgstr "Chan eil"

7373

74−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

75−#: qml/Components/Dialogs.qml:133

74+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

75+#: qml/Components/Dialogs.qml:129

7676msgid "Yes"

7777msgstr "Tha"

7878

79−#: qml/Components/Dialogs.qml:98

79+#: qml/Components/Dialogs.qml:94

8080msgid "Shut down"

8181msgstr "Dùin sìos"

8282

83−#: qml/Components/Dialogs.qml:99

83+#: qml/Components/Dialogs.qml:95

8484msgid "Are you sure you want to shut down?"

8585msgstr "A bheil thu cinnteach gu bheil thu airson a dhùnadh sìos?"

8686

87−#: qml/Components/Dialogs.qml:123

87+#: qml/Components/Dialogs.qml:119

8888msgid "Reboot"

8989msgstr "Ath-thòisich an siostam"

9090

91−#: qml/Components/Dialogs.qml:124

91+#: qml/Components/Dialogs.qml:120

9292msgid "Are you sure you want to reboot?"

9393msgstr "A bheil thu cinnteach gu bheil thu airson tòiseachadh às ùr?"

9494

95−#: qml/Components/Dialogs.qml:148

95+#: qml/Components/Dialogs.qml:144

9696msgid "Power"

9797msgstr "Cumhachd"

9898

99−#: qml/Components/Dialogs.qml:149

99+#: qml/Components/Dialogs.qml:145

100100msgid ""

101101"Are you sure you would like\n"

102102"to power off?"

@@ -104,15 +104,15 @@ msgstr ""

104104"A bheil thu cinnteach gu bheil thu\n"

105105"airson a' chumhachd a chur dheth?"

106106

107−#: qml/Components/Dialogs.qml:151

107+#: qml/Components/Dialogs.qml:147

108108msgid "Power off"

109109msgstr "Cuir a' chumhachd dheth"

110110

111−#: qml/Components/Dialogs.qml:161

111+#: qml/Components/Dialogs.qml:157

112112msgid "Restart"

113113msgstr "Ath-thòisich"

114114

115−#: qml/Components/Dialogs.qml:171

115+#: qml/Components/Dialogs.qml:167

116116msgid "Cancel"

117117msgstr "Sguir dheth"

118118

@@ -120,49 +120,49 @@ msgstr "Sguir dheth"

120120msgid "Skip intro"

121121msgstr "Gearr leum thairis air an ro-ràdh"

122122

123−#: qml/Components/EdgeDemo.qml:112

123+#: qml/Components/EdgeDemo.qml:125

124124msgid "Right edge"

125125msgstr "An oir dheas"

126126

127−#: qml/Components/EdgeDemo.qml:113

127+#: qml/Components/EdgeDemo.qml:126

128128msgid "Try swiping from the right edge to unlock the phone"

129129msgstr ""

130130"Feuch is dèan grad-shlaighdeadh a-steach on oir dheas gus a' ghlas a thoirt "

131131"far an fhòn"

132132

133−#: qml/Components/EdgeDemo.qml:144

133+#: qml/Components/EdgeDemo.qml:157

134134msgid "Top edge"

135135msgstr "An oir aig a' bharr"

136136

137−#: qml/Components/EdgeDemo.qml:145

137+#: qml/Components/EdgeDemo.qml:158

138138msgid "Try swiping from the top edge to access the indicators"

139139msgstr ""

140140"Feuch is dèan grad-shlaighdeadh a-steach on oir aig a' bharr gus greim "

141141"fhaighinn air na taisbeanairean"

142142

143−#: qml/Components/EdgeDemo.qml:170

143+#: qml/Components/EdgeDemo.qml:183

144144msgid "Close"

145145msgstr "Dùin"

146146

147−#: qml/Components/EdgeDemo.qml:171

147+#: qml/Components/EdgeDemo.qml:184

148148msgid "Swipe up again to close the settings screen"

149149msgstr "Dèan grad-shlaighdeadh a-nìos gus sgrìn nan roghainnean a dhùnadh"

150150

151−#: qml/Components/EdgeDemo.qml:201

151+#: qml/Components/EdgeDemo.qml:214

152152msgid "Left edge"

153153msgstr "An oir chlì"

154154

155−#: qml/Components/EdgeDemo.qml:202

155+#: qml/Components/EdgeDemo.qml:215

156156msgid "Swipe from the left to reveal the launcher for quick access to apps"

157157msgstr ""

158158"Dèan grad-shlaighdeadh on oir chlì air an lòinseir a bheir dhut cothrom "

159159"luath air na h-aplacaidean"

160160

161−#: qml/Components/EdgeDemo.qml:229

161+#: qml/Components/EdgeDemo.qml:242

162162msgid "Well done"

163163msgstr "Gasta!"

164164

165−#: qml/Components/EdgeDemo.qml:230

165+#: qml/Components/EdgeDemo.qml:243

166166msgid ""

167167"You have now mastered the edge gestures and can start using the "

168168"phone<br><br>Tap on the screen to start"

@@ -170,40 +170,44 @@ msgstr ""

170170"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "

171171"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"

172172

173−#: qml/Components/Lockscreen.qml:223

173+#: qml/Components/Lockscreen.qml:238

174174msgid "Return to Call"

175175msgstr "Till dhan ghairm"

176176

177−#: qml/Components/Lockscreen.qml:223

177+#: qml/Components/Lockscreen.qml:238

178178msgid "Emergency Call"

179179msgstr "Gairm èiginn"

180180

181−#: qml/Components/Lockscreen.qml:255

181+#: qml/Components/Lockscreen.qml:270

182182msgid "OK"

183183msgstr "Ceart ma-thà"

184184

185−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

185+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

186186msgid "See less"

187187msgstr "Seall nas lugha"

188188

189−#: qml/Dash/GenericScopeView.qml:434

189+#: qml/Dash/GenericScopeView.qml:431

190190msgid "See all"

191191msgstr "Seall na h-uile"

192192

193−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

193+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

194194#: qml/Panel/SearchIndicator.qml:27

195195msgid "Search"

196196msgstr "Lorg"

197197

198−#: 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

199203msgid "Settings"

200204msgstr "Roghainnean"

201205

202−#: qml/Dash/PageHeader.qml:275

206+#: qml/Dash/PageHeader.qml:284

203207msgid "Remove from Favorites"

204208msgstr "Thoir air falbh o na h-annsachdan"

205209

206−#: qml/Dash/PageHeader.qml:275

210+#: qml/Dash/PageHeader.qml:284

207211msgid "Add to Favorites"

208212msgstr "Cuir ris na h-annsachdan"

209213

@@ -235,31 +239,23 @@ msgstr "Tarraing airson ath-nuadhachadh…"

235239msgid "Release to refresh…"

236240msgstr "Leig às airson ath-nuadhachadh…"

237241

238−#: qml/Dash/ScopesOverview.qml:215

239−msgid "Manage Scopes"

240−msgstr "Stiùirich na sgòpaichean"

241−

242−#: qml/Dash/ScopesOverview.qml:437

243−msgid "Done"

244−msgstr "Deiseil"

245−

246−#: qml/Dash/ScopesOverview.qml:463

247−msgid "Store"

248−msgstr "Am bùth"

242+#: qml/Dash/ScopesList.qml:63

243+msgid "Manage"

244+msgstr ""

249245

250−#: qml/Dash/ScopesOverviewTab.qml:36

251−msgid "Favorites"

252−msgstr "Annsachdan"

246+#: qml/Dash/ScopesList.qml:107

247+msgid "Home"

248+msgstr ""

253249

254−#: qml/Dash/ScopesOverviewTab.qml:54

255−msgid "All"

256−msgstr "Na h-uile"

250+#: qml/Dash/ScopesList.qml:108

251+msgid "Also installed"

252+msgstr ""

257253

258254#: qml/Greeter/Greeter.qml:174

259255msgid "Unlock"

260256msgstr "Thoir a' ghlas dheth"

261257

262−#: qml/Notifications/NotificationMenuItemFactory.qml:116

258+#: qml/Notifications/NotificationMenuItemFactory.qml:128

263259msgid "Show password"

264260msgstr "Seall am facal-faire"

265261

@@ -307,49 +303,49 @@ msgstr "Thoir a' ghlas far an SIM"

307303msgid "Roaming"

308304msgstr "Air fàrsan"

309305

310−#: qml/Shell.qml:391

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

311312msgid "Enter passphrase"

312313msgstr "Cuir abairt-fhaire a-steach"

313314

314−#: qml/Shell.qml:392

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

315325msgid "Sorry, incorrect passphrase"

316326msgstr "Duilich ach tha an abairt-fhaire cearr"

317327

318−#: qml/Shell.qml:393

328+#: qml/Shell.qml:372

319329msgid "Please re-enter"

320330msgstr "Cuir a-steach e a-rithist"

321331

322−#: qml/Shell.qml:395

323−msgid "Enter passcode"

324−msgstr "Cuir còd-faire a-steach"

325−

326−#: qml/Shell.qml:396

332+#: qml/Shell.qml:373

327333msgid "Sorry, incorrect passcode"

328334msgstr "Duilich ach tha an còd-faire cearr"

329335

330−#: qml/Shell.qml:399

331−#, qt-format

332−msgid "Enter %1"

333−msgstr "Cuir a-steach %1"

334−

335−#: qml/Shell.qml:400

336−#, qt-format

337−msgid "Sorry, incorrect %1"

338−msgstr "Duilich ach tha a' %1 cearr"

339−

340−#: qml/Shell.qml:441

336+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

341337msgid "Sorry, incorrect passphrase."

342338msgstr "Duilich ach tha an abairt-fhaire cearr."

343339

344−#: qml/Shell.qml:442

340+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

345341msgid "Sorry, incorrect passcode."

346342msgstr "Duilich ach tha an còd-faire cearr."

347343

348−#: qml/Shell.qml:443

344+#: qml/Shell.qml:469

349345msgid "This will be your last attempt."

350346msgstr "Seo an oidhirp mu dheireadh agad."

351347

352−#: qml/Shell.qml:445

348+#: qml/Shell.qml:471

353349msgid ""

354350"If passphrase is entered incorrectly, your phone will conduct a factory "

355351"reset and all personal data will be deleted."

@@ -358,7 +354,7 @@ msgstr ""

358354"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "

359355"pearsanta a sguabadh às."

360356

361−#: qml/Shell.qml:446

357+#: qml/Shell.qml:472

362358msgid ""

363359"If passcode is entered incorrectly, your phone will conduct a factory reset "

364360"and all personal data will be deleted."

@@ -367,6 +363,183 @@ msgstr ""

367363"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "

368364"a sguabadh às."

369365

366+#: qml/Wizard/Page.qml:89

367+msgid "Back"

368+msgstr ""

369+

370+#: qml/Wizard/Pages/10-welcome.qml:27

371+msgid "Hi!"

372+msgstr ""

373+

374+#: qml/Wizard/Pages/10-welcome.qml:44

375+msgid "Welcome to your Ubuntu phone."

376+msgstr ""

377+

378+#: qml/Wizard/Pages/10-welcome.qml:52

379+msgid "Let’s get started."

380+msgstr ""

381+

382+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

383+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

384+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

385+#: qml/Wizard/Pages/passwd-set.qml:90

386+msgid "Continue"

387+msgstr ""

388+

389+#: qml/Wizard/Pages/20-sim.qml:25

390+msgid "Add a SIM card and restart your device"

391+msgstr ""

392+

393+#: qml/Wizard/Pages/20-sim.qml:55

394+msgid "Without it, you won’t be able to make calls or use text messaging."

395+msgstr ""

396+

397+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

398+msgid "Skip"

399+msgstr ""

400+

401+#: qml/Wizard/Pages/30-passwd-type.qml:39

402+msgid "Lock security"

403+msgstr ""

404+

405+#: qml/Wizard/Pages/30-passwd-type.qml:74

406+msgid "Please select how you’d like to unlock your phone."

407+msgstr ""

408+

409+#: qml/Wizard/Pages/30-passwd-type.qml:97

410+msgid "Swipe"

411+msgstr ""

412+

413+#: qml/Wizard/Pages/30-passwd-type.qml:98

414+msgid "No security"

415+msgstr ""

416+

417+#: qml/Wizard/Pages/30-passwd-type.qml:100

418+msgid "Passcode"

419+msgstr ""

420+

421+#: qml/Wizard/Pages/30-passwd-type.qml:101

422+msgid "4 digits only"

423+msgstr ""

424+

425+#: qml/Wizard/Pages/30-passwd-type.qml:103

426+msgid "Passphrase"

427+msgstr ""

428+

429+#: qml/Wizard/Pages/30-passwd-type.qml:104

430+msgid "Numbers and letters"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/40-wifi.qml:28

434+msgid "Connect to Wi‑Fi"

435+msgstr ""

436+

437+#: qml/Wizard/Pages/40-wifi.qml:147

438+msgid "Available networks…"

439+msgstr ""

440+

441+#: qml/Wizard/Pages/40-wifi.qml:148

442+msgid "No available networks."

443+msgstr ""

444+

445+#: qml/Wizard/Pages/50-location.qml:27

446+msgid "Location"

447+msgstr ""

448+

449+#: qml/Wizard/Pages/50-location.qml:62

450+msgid "Let the phone detect your location:"

451+msgstr ""

452+

453+#: qml/Wizard/Pages/50-location.qml:69

454+msgid "Using GPS only (less accurate)"

455+msgstr ""

456+

457+#: qml/Wizard/Pages/50-location.qml:86

458+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

459+msgstr ""

460+

461+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

462+#: qml/Wizard/Pages/50-location.qml:103

463+msgid ""

464+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

465+"conditions</a>."

466+msgstr ""

467+

468+#: qml/Wizard/Pages/50-location.qml:112

469+msgid "Not at all"

470+msgstr ""

471+

472+#: qml/Wizard/Pages/50-location.qml:124

473+msgid "You can change your mind later in <b>System Settings</b>."

474+msgstr ""

475+

476+#: qml/Wizard/Pages/60-reporting.qml:24

477+msgid "Improving your experience"

478+msgstr ""

479+

480+#: qml/Wizard/Pages/60-reporting.qml:36

481+msgid ""

482+"Your phone is set up to automatically report errors to Canonical and its "

483+"partners, the makers of the operating system."

484+msgstr ""

485+

486+#: qml/Wizard/Pages/60-reporting.qml:43

487+msgid ""

488+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

489+"Privacy</b>"

490+msgstr ""

491+

492+#: qml/Wizard/Pages/80-finished.qml:24

493+msgid "All done"

494+msgstr ""

495+

496+#: qml/Wizard/Pages/80-finished.qml:39

497+msgid "Nice work!"

498+msgstr ""

499+

500+#: qml/Wizard/Pages/80-finished.qml:46

501+msgid "Your phone is now ready to use."

502+msgstr ""

503+

504+#: qml/Wizard/Pages/80-finished.qml:53

505+msgid "Finish"

506+msgstr ""

507+

508+#: qml/Wizard/Pages/here-terms.qml:27

509+msgid "Terms & Conditions"

510+msgstr ""

511+

512+#: qml/Wizard/Pages/passwd-confirm.qml:49

513+msgid "Confirm passphrase"

514+msgstr ""

515+

516+#: qml/Wizard/Pages/passwd-confirm.qml:50

517+msgid "Confirm passcode"

518+msgstr ""

519+

520+#: qml/Wizard/Pages/passwd-confirm.qml:53

521+#: qml/Wizard/Pages/passwd-confirm.qml:54

522+msgid "Please try again."

523+msgstr ""

524+

525+#: qml/Wizard/Pages/passwd-set.qml:61

526+msgid "Choose your passcode"

527+msgstr ""

528+

529+#: qml/Wizard/Pages/passwd-set.qml:68

530+msgid "Passphrase must be 4 characters long"

531+msgstr ""

532+

533+#: qml/Wizard/StackButton.qml:39

534+#, qt-format

535+msgid "〈 %1"

536+msgstr ""

537+

538+#: qml/Wizard/StackButton.qml:42

539+#, qt-format

540+msgid "%1 〉"

541+msgstr ""

542+

370543#~ msgid "Confirm"

371544#~ msgstr "Dearbhaich"

372545

@@ -381,3 +554,15 @@ msgstr ""

381554

382555#~ msgid "Speak Now..."

383556#~ 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"

566+

567+#~ msgid "Manage Scopes"

568+#~ msgstr "Stiùirich na sgòpaichean"

po/gl.po+273−81

@@ -7,27 +7,27 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

11−"PO-Revision-Date: 2014-11-06 13:30+0000\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11+"PO-Revision-Date: 2014-12-13 10:46+0000\n"

1212"Last-Translator: Marcos Lans <Unknown>\n"

1313"Language-Team: Galician <gl@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-14 06:14+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Contrasinal : "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Fixar o atallo"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Eliminar o atallo"

3333

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] "Agarde %1 minuto e ténteo de novo…"

5151msgstr[1] "Agarde %1 minutos e ténteo de novo…"

5252

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

5454msgid "Log out"

5555msgstr "Saír da sesión"

5656

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

5858msgid "Are you sure you want to log out?"

5959msgstr "Está seguro de querer pechar a sesión?"

6060

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62−#: qml/Components/Dialogs.qml:126

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:122

6363msgid "No"

6464msgstr "Non"

6565

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67−#: qml/Components/Dialogs.qml:133

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:129

6868msgid "Yes"

6969msgstr "Si"

7070

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

7272msgid "Shut down"

7373msgstr "Apagar"

7474

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

7676msgid "Are you sure you want to shut down?"

7777msgstr "Está seguro de querer apagar?"

7878

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

8080msgid "Reboot"

8181msgstr "Reiniciar"

8282

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

8484msgid "Are you sure you want to reboot?"

8585msgstr "Está seguro de querer reiniciar?"

8686

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

8888msgid "Power"

8989msgstr "Enerxía"

9090

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

9292msgid ""

9393"Are you sure you would like\n"

9494"to power off?"

9595msgstr "Está seguro de querer apagar?"

9696

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

9898msgid "Power off"

9999msgstr "Apagar"

100100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102102msgid "Restart"

103103msgstr "Reiniciar"

104104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106106msgid "Cancel"

107107msgstr "Cancelar"

108108

@@ -110,45 +110,45 @@ msgstr "Cancelar"

110110msgid "Skip intro"

111111msgstr "Saltar introdución"

112112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114114msgid "Right edge"

115115msgstr "Bordo dereito"

116116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118118msgid "Try swiping from the right edge to unlock the phone"

119119msgstr "Esvare o dedo desde o bordo dereito para desbloquear o teléfono"

120120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122122msgid "Top edge"

123123msgstr "Bordo superior"

124124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126126msgid "Try swiping from the top edge to access the indicators"

127127msgstr "Esvare o dedo desde o bordo superior para acceder aos indicadores."

128128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130130msgid "Close"

131131msgstr "Pechar"

132132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134134msgid "Swipe up again to close the settings screen"

135135msgstr "Esvare o dedo de novo cara a arriba para pechar os axustes"

136136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138138msgid "Left edge"

139139msgstr "Bordo esquerdo"

140140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143143msgstr ""

144144"Esvare o dedo desde a esquerda para mostrar o iniciador rápido dos "

145145"aplicativos"

146146

147−#: qml/Components/EdgeDemo.qml:229

147+#: qml/Components/EdgeDemo.qml:242

148148msgid "Well done"

149149msgstr "Ben feito!"

150150

151−#: qml/Components/EdgeDemo.qml:230

151+#: qml/Components/EdgeDemo.qml:243

152152msgid ""

153153"You have now mastered the edge gestures and can start using the "

154154"phone<br><br>Tap on the screen to start"

@@ -156,40 +156,44 @@ msgstr ""

156156"Agora xa domina os xestos dos bordos e pode comezar a usar o "

157157"teléfono<br><br>Toque na pantalla para comezar"

158158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160160msgid "Return to Call"

161161msgstr "Volver á chamada"

162162

163−#: qml/Components/Lockscreen.qml:223

163+#: qml/Components/Lockscreen.qml:238

164164msgid "Emergency Call"

165165msgstr "Chamada de emerxencia"

166166

167−#: qml/Components/Lockscreen.qml:255

167+#: qml/Components/Lockscreen.qml:270

168168msgid "OK"

169169msgstr "Aceptar"

170170

171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

172172msgid "See less"

173173msgstr "Ver menos"

174174

175−#: qml/Dash/GenericScopeView.qml:434

175+#: qml/Dash/GenericScopeView.qml:431

176176msgid "See all"

177177msgstr "Ver todo"

178178

179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

180180#: qml/Panel/SearchIndicator.qml:27

181181msgid "Search"

182182msgstr "Buscar"

183183

184−#: qml/Dash/PageHeader.qml:268

184+#: qml/Dash/PageHeader.qml:260

185+msgid "Store"

186+msgstr "Tenda"

187+

188+#: qml/Dash/PageHeader.qml:277

185189msgid "Settings"

186190msgstr "Axustes"

187191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189193msgid "Remove from Favorites"

190194msgstr "Eliminar dos favoritos"

191195

192−#: qml/Dash/PageHeader.qml:275

196+#: qml/Dash/PageHeader.qml:284

193197msgid "Add to Favorites"

194198msgstr "Engadir aos favoritos"

195199

@@ -221,31 +225,23 @@ msgstr "Tirar para actualizar..."

221225msgid "Release to refresh…"

222226msgstr "Soltar para actualizar"

223227

224−#: qml/Dash/ScopesOverview.qml:215

225−msgid "Manage Scopes"

226−msgstr "Xestionar os Ámbitos"

228+#: qml/Dash/ScopesList.qml:63

229+msgid "Manage"

230+msgstr "Xestionar"

227231

228−#: qml/Dash/ScopesOverview.qml:437

229−msgid "Done"

230−msgstr "Feito"

231−

232−#: qml/Dash/ScopesOverview.qml:463

233−msgid "Store"

234−msgstr "Tenda"

232+#: qml/Dash/ScopesList.qml:107

233+msgid "Home"

234+msgstr "Inicio"

235235

236−#: qml/Dash/ScopesOverviewTab.qml:36

237−msgid "Favorites"

238−msgstr "Favoritos"

239−

240−#: qml/Dash/ScopesOverviewTab.qml:54

241−msgid "All"

242−msgstr "Todos"

236+#: qml/Dash/ScopesList.qml:108

237+msgid "Also installed"

238+msgstr "Tamén instalado"

243239

244240#: qml/Greeter/Greeter.qml:174

245241msgid "Unlock"

246242msgstr "Desbloquear"

247243

248−#: qml/Notifications/NotificationMenuItemFactory.qml:116

244+#: qml/Notifications/NotificationMenuItemFactory.qml:128

249245msgid "Show password"

250246msgstr "Mostrar contrasinal"

251247

@@ -293,49 +289,49 @@ msgstr "Desbloquear a SIM"

293289msgid "Roaming"

294290msgstr "Itinerancia"

295291

296−#: qml/Shell.qml:391

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

297298msgid "Enter passphrase"

298299msgstr "Introduza a frase secreta"

299300

300−#: qml/Shell.qml:392

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

301311msgid "Sorry, incorrect passphrase"

302312msgstr "Sentímolo a frase é incorrecta"

303313

304−#: qml/Shell.qml:393

314+#: qml/Shell.qml:372

305315msgid "Please re-enter"

306316msgstr "Introducir de novo"

307317

308−#: qml/Shell.qml:395

309−msgid "Enter passcode"

310−msgstr "Introduza a clave"

311−

312−#: qml/Shell.qml:396

318+#: qml/Shell.qml:373

313319msgid "Sorry, incorrect passcode"

314320msgstr "Sentímolo, a clave é incorrecta"

315321

316−#: qml/Shell.qml:399

317−#, qt-format

318−msgid "Enter %1"

319−msgstr "Introducir %1"

320−

321−#: qml/Shell.qml:400

322−#, qt-format

323−msgid "Sorry, incorrect %1"

324−msgstr "Sentímolo, %1 non coincide"

325−

326−#: qml/Shell.qml:441

322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

327323msgid "Sorry, incorrect passphrase."

328324msgstr "Sentímolo a frase é incorrecta."

329325

330−#: qml/Shell.qml:442

326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

331327msgid "Sorry, incorrect passcode."

332328msgstr "Sentímolo, a clave é incorrecta."

333329

334−#: qml/Shell.qml:443

330+#: qml/Shell.qml:469

335331msgid "This will be your last attempt."

336332msgstr "Este será o seu último intento."

337333

338−#: qml/Shell.qml:445

334+#: qml/Shell.qml:471

339335msgid ""

340336"If passphrase is entered incorrectly, your phone will conduct a factory "

341337"reset and all personal data will be deleted."

@@ -343,7 +339,7 @@ msgstr ""

343339"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "

344340"valores de fábrica e perderá todos os datos persoais."

345341

346−#: qml/Shell.qml:446

342+#: qml/Shell.qml:472

347343msgid ""

348344"If passcode is entered incorrectly, your phone will conduct a factory reset "

349345"and all personal data will be deleted."

@@ -351,6 +347,190 @@ msgstr ""

351347"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "

352348"fábrica e perderá todos os datos persoais."

353349

350+#: qml/Wizard/Page.qml:89

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+

354534#~ msgid "Confirm"

355535#~ msgstr "Confirmar"

356536

@@ -365,3 +545,15 @@ msgstr ""

365545

366546#~ msgid "Loading. Please Wait..."

367547#~ msgstr "Cargando, agarde…"

548+

549+#~ msgid "All"

550+#~ msgstr "Todos"

551+

552+#~ msgid "Favorites"

553+#~ msgstr "Favoritos"

554+

555+#~ msgid "Done"

556+#~ msgstr "Feito"

557+

558+#~ msgid "Manage Scopes"

559+#~ msgstr "Xestionar os Ámbitos"

po/he.po+260−78

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-08-23 14:19+0000\n"

1212"Last-Translator: Yaron <sh.yaron@gmail.com>\n"

1313"Language-Team: Hebrew <he@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "ססמה: "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "הצמדת קיצור דרך"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "הפרדת קיצור הדרך"

3333

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] ""

5151msgstr[1] ""

5252

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

5454msgid "Log out"

5555msgstr ""

5656

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

5858msgid "Are you sure you want to log out?"

5959msgstr ""

6060

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62−#: qml/Components/Dialogs.qml:126

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:122

6363msgid "No"

6464msgstr ""

6565

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67−#: qml/Components/Dialogs.qml:133

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:129

6868msgid "Yes"

6969msgstr ""

7070

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

7272msgid "Shut down"

7373msgstr ""

7474

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

7676msgid "Are you sure you want to shut down?"

7777msgstr ""

7878

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

8080msgid "Reboot"

8181msgstr ""

8282

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

8484msgid "Are you sure you want to reboot?"

8585msgstr ""

8686

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

8888msgid "Power"

8989msgstr ""

9090

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

9292msgid ""

9393"Are you sure you would like\n"

9494"to power off?"

9595msgstr ""

9696

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

9898msgid "Power off"

9999msgstr "כיבוי"

100100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102102msgid "Restart"

103103msgstr ""

104104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106106msgid "Cancel"

107107msgstr "ביטול"

108108

@@ -110,43 +110,43 @@ msgstr "ביטול"

110110msgid "Skip intro"

111111msgstr "לדלג על הפתיחה"

112112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114114msgid "Right edge"

115115msgstr "שול ימני"

116116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118118msgid "Try swiping from the right edge to unlock the phone"

119119msgstr "נא לנסות למשוך מהשול הימני כדי לשחרר את נעילת הטלפון"

120120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122122msgid "Top edge"

123123msgstr "השול העליון"

124124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126126msgid "Try swiping from the top edge to access the indicators"

127127msgstr "נא לנסות למשוך מהשול העליון כדי לגשת למחוונים"

128128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130130msgid "Close"

131131msgstr "סגירה"

132132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134134msgid "Swipe up again to close the settings screen"

135135msgstr "ניתן למשוך שוב כדי לסגור את מסך ההגדרות"

136136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138138msgid "Left edge"

139139msgstr "שול שמאלי"

140140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143143msgstr "יש למשוך משמאל כדי לחשוף את המשגר לצורך גישה מהירה ליישומים"

144144

145−#: qml/Components/EdgeDemo.qml:229

145+#: qml/Components/EdgeDemo.qml:242

146146msgid "Well done"

147147msgstr "כל הכבוד"

148148

149−#: qml/Components/EdgeDemo.qml:230

149+#: qml/Components/EdgeDemo.qml:243

150150msgid ""

151151"You have now mastered the edge gestures and can start using the "

152152"phone<br><br>Tap on the screen to start"

@@ -154,40 +154,44 @@ msgstr ""

154154"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "

155155"לגעת במסך כדי להתחיל"

156156

157−#: qml/Components/Lockscreen.qml:223

157+#: qml/Components/Lockscreen.qml:238

158158msgid "Return to Call"

159159msgstr ""

160160

161−#: qml/Components/Lockscreen.qml:223

161+#: qml/Components/Lockscreen.qml:238

162162msgid "Emergency Call"

163163msgstr "שיחת חירום"

164164

165−#: qml/Components/Lockscreen.qml:255

165+#: qml/Components/Lockscreen.qml:270

166166msgid "OK"

167167msgstr "אישור"

168168

169−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

169+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

170170msgid "See less"

171171msgstr "לראות פחות"

172172

173−#: qml/Dash/GenericScopeView.qml:434

173+#: qml/Dash/GenericScopeView.qml:431

174174msgid "See all"

175175msgstr "להציג הכול"

176176

177−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

177+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

178178#: qml/Panel/SearchIndicator.qml:27

179179msgid "Search"

180180msgstr "חיפוש"

181181

182−#: qml/Dash/PageHeader.qml:268

182+#: qml/Dash/PageHeader.qml:260

183+msgid "Store"

184+msgstr "אחסון"

185+

186+#: qml/Dash/PageHeader.qml:277

183187msgid "Settings"

184188msgstr ""

185189

186−#: qml/Dash/PageHeader.qml:275

190+#: qml/Dash/PageHeader.qml:284

187191msgid "Remove from Favorites"

188192msgstr ""

189193

190−#: qml/Dash/PageHeader.qml:275

194+#: qml/Dash/PageHeader.qml:284

191195msgid "Add to Favorites"

192196msgstr ""

193197

@@ -219,31 +223,23 @@ msgstr ""

219223msgid "Release to refresh…"

220224msgstr ""

221225

222−#: qml/Dash/ScopesOverview.qml:215

223−msgid "Manage Scopes"

226+#: qml/Dash/ScopesList.qml:63

227+msgid "Manage"

224228msgstr ""

225229

226−#: qml/Dash/ScopesOverview.qml:437

227−msgid "Done"

228−msgstr "סיימתי"

229−

230−#: qml/Dash/ScopesOverview.qml:463

231−msgid "Store"

232−msgstr "אחסון"

233−

234−#: qml/Dash/ScopesOverviewTab.qml:36

235−msgid "Favorites"

236−msgstr "מועדפים"

230+#: qml/Dash/ScopesList.qml:107

231+msgid "Home"

232+msgstr ""

237233

238−#: qml/Dash/ScopesOverviewTab.qml:54

239−msgid "All"

240−msgstr "הכול"

234+#: qml/Dash/ScopesList.qml:108

235+msgid "Also installed"

236+msgstr ""

241237

242238#: qml/Greeter/Greeter.qml:174

243239msgid "Unlock"

244240msgstr ""

245241

246−#: qml/Notifications/NotificationMenuItemFactory.qml:116

242+#: qml/Notifications/NotificationMenuItemFactory.qml:128

247243msgid "Show password"

248244msgstr "הצגת הססמה"

249245

@@ -291,60 +287,237 @@ msgstr ""

291287msgid "Roaming"

292288msgstr "נדידה"

293289

294−#: qml/Shell.qml:391

295−msgid "Enter passphrase"

290+#: qml/Shell.qml:367

291+#, qt-format

292+msgid "Enter %1"

296293msgstr ""

297294

298−#: qml/Shell.qml:392

299−msgid "Sorry, incorrect passphrase"

300−msgstr "מילת הצופן שגויה, עמך הסליחה."

301−

302−#: qml/Shell.qml:393

303−msgid "Please re-enter"

295+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

296+msgid "Enter passphrase"

304297msgstr ""

305298

306−#: qml/Shell.qml:395

299+#: qml/Shell.qml:369

307300msgid "Enter passcode"

308301msgstr ""

309302

310−#: qml/Shell.qml:396

311−msgid "Sorry, incorrect passcode"

303+#: qml/Shell.qml:370

304+#, qt-format

305+msgid "Sorry, incorrect %1"

312306msgstr ""

313307

314−#: qml/Shell.qml:399

315−#, qt-format

316−msgid "Enter %1"

308+#: qml/Shell.qml:371

309+msgid "Sorry, incorrect passphrase"

310+msgstr "מילת הצופן שגויה, עמך הסליחה."

311+

312+#: qml/Shell.qml:372

313+msgid "Please re-enter"

317314msgstr ""

318315

319−#: qml/Shell.qml:400

320−#, qt-format

321−msgid "Sorry, incorrect %1"

316+#: qml/Shell.qml:373

317+msgid "Sorry, incorrect passcode"

322318msgstr ""

323319

324−#: qml/Shell.qml:441

320+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

325321msgid "Sorry, incorrect passphrase."

326322msgstr "מילת הצופן שגויה, עמך הסליחה."

327323

328−#: qml/Shell.qml:442

324+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

329325msgid "Sorry, incorrect passcode."

330326msgstr "הצופן שגוי, עם הסליחה."

331327

332−#: qml/Shell.qml:443

328+#: qml/Shell.qml:469

333329msgid "This will be your last attempt."

334330msgstr "זה יהיה הניסיון האחרון שלך."

335331

336−#: qml/Shell.qml:445

332+#: qml/Shell.qml:471

337333msgid ""

338334"If passphrase is entered incorrectly, your phone will conduct a factory "

339335"reset and all personal data will be deleted."

340336msgstr ""

341337

342−#: qml/Shell.qml:446

338+#: qml/Shell.qml:472

343339msgid ""

344340"If passcode is entered incorrectly, your phone will conduct a factory reset "

345341"and all personal data will be deleted."

346342msgstr ""

347343

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+

348521#~ msgid "Confirm"

349522#~ msgstr "אישור"

350523

@@ -359,3 +532,12 @@ msgstr ""

359532

360533#~ msgid "Speaking..."

361534#~ msgstr "הדיבור מושמע…"

535+

536+#~ msgid "Done"

537+#~ msgstr "סיימתי"

538+

539+#~ msgid "All"

540+#~ msgstr "הכול"

541+

542+#~ msgid "Favorites"

543+#~ msgstr "מועדפים"

po/hi.po+248−75

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-01-15 01:49+0000\n"

1212"Last-Translator: Siddhanathan S. <Unknown>\n"

1313"Language-Team: Hindi <hi@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr ""

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr ""

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr ""

3333

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5050msgstr[0] ""

5151msgstr[1] ""

5252

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

5454msgid "Log out"

5555msgstr ""

5656

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

5858msgid "Are you sure you want to log out?"

5959msgstr ""

6060

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62−#: qml/Components/Dialogs.qml:126

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62+#: qml/Components/Dialogs.qml:122

6363msgid "No"

6464msgstr ""

6565

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67−#: qml/Components/Dialogs.qml:133

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67+#: qml/Components/Dialogs.qml:129

6868msgid "Yes"

6969msgstr ""

7070

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

7272msgid "Shut down"

7373msgstr ""

7474

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

7676msgid "Are you sure you want to shut down?"

7777msgstr ""

7878

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

8080msgid "Reboot"

8181msgstr ""

8282

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

8484msgid "Are you sure you want to reboot?"

8585msgstr ""

8686

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

8888msgid "Power"

8989msgstr ""

9090

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

9292msgid ""

9393"Are you sure you would like\n"

9494"to power off?"

9595msgstr ""

9696

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

9898msgid "Power off"

9999msgstr ""

100100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102102msgid "Restart"

103103msgstr ""

104104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106106msgid "Cancel"

107107msgstr ""

108108

@@ -110,82 +110,86 @@ msgstr ""

110110msgid "Skip intro"

111111msgstr "परिचय छोड़"

112112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114114msgid "Right edge"

115115msgstr "दायाँ किनारा"

116116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118118msgid "Try swiping from the right edge to unlock the phone"

119119msgstr ""

120120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122122msgid "Top edge"

123123msgstr "ऊपर किनारे"

124124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126126msgid "Try swiping from the top edge to access the indicators"

127127msgstr ""

128128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130130msgid "Close"

131131msgstr "बंद करें"

132132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134134msgid "Swipe up again to close the settings screen"

135135msgstr ""

136136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138138msgid "Left edge"

139139msgstr "बायाँ किनारा"

140140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143143msgstr ""

144144

145−#: qml/Components/EdgeDemo.qml:229

145+#: qml/Components/EdgeDemo.qml:242

146146msgid "Well done"

147147msgstr "शाबाश"

148148

149−#: qml/Components/EdgeDemo.qml:230

149+#: qml/Components/EdgeDemo.qml:243

150150msgid ""

151151"You have now mastered the edge gestures and can start using the "

152152"phone<br><br>Tap on the screen to start"

153153msgstr ""

154154

155−#: qml/Components/Lockscreen.qml:223

155+#: qml/Components/Lockscreen.qml:238

156156msgid "Return to Call"

157157msgstr ""

158158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160160msgid "Emergency Call"

161161msgstr "आपातकालीन कॉल"

162162

163−#: qml/Components/Lockscreen.qml:255

163+#: qml/Components/Lockscreen.qml:270

164164msgid "OK"

165165msgstr ""

166166

167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

168168msgid "See less"

169169msgstr ""

170170

171−#: qml/Dash/GenericScopeView.qml:434

171+#: qml/Dash/GenericScopeView.qml:431

172172msgid "See all"

173173msgstr ""

174174

175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176176#: qml/Panel/SearchIndicator.qml:27

177177msgid "Search"

178178msgstr "खोजें"

179179

180−#: qml/Dash/PageHeader.qml:268

180+#: qml/Dash/PageHeader.qml:260

181+msgid "Store"

182+msgstr ""

183+

184+#: qml/Dash/PageHeader.qml:277

181185msgid "Settings"

182186msgstr ""

183187

184−#: qml/Dash/PageHeader.qml:275

188+#: qml/Dash/PageHeader.qml:284

185189msgid "Remove from Favorites"

186190msgstr ""

187191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189193msgid "Add to Favorites"

190194msgstr ""

191195

@@ -217,31 +221,23 @@ msgstr ""

217221msgid "Release to refresh…"

218222msgstr ""

219223

220−#: qml/Dash/ScopesOverview.qml:215

221−msgid "Manage Scopes"

222−msgstr ""

223−

224−#: qml/Dash/ScopesOverview.qml:437

225−msgid "Done"

226−msgstr ""

227−

228−#: qml/Dash/ScopesOverview.qml:463

229−msgid "Store"

224+#: qml/Dash/ScopesList.qml:63

225+msgid "Manage"

230226msgstr ""

231227

232−#: qml/Dash/ScopesOverviewTab.qml:36

233−msgid "Favorites"

228+#: qml/Dash/ScopesList.qml:107

229+msgid "Home"

234230msgstr ""

235231

236−#: qml/Dash/ScopesOverviewTab.qml:54

237−msgid "All"

232+#: qml/Dash/ScopesList.qml:108

233+msgid "Also installed"

238234msgstr ""

239235

240236#: qml/Greeter/Greeter.qml:174

241237msgid "Unlock"

242238msgstr ""

243239

244−#: qml/Notifications/NotificationMenuItemFactory.qml:116

240+#: qml/Notifications/NotificationMenuItemFactory.qml:128

245241msgid "Show password"

246242msgstr ""

247243

@@ -289,60 +285,237 @@ msgstr ""

289285msgid "Roaming"

290286msgstr ""

291287

292−#: qml/Shell.qml:391

293−msgid "Enter passphrase"

288+#: qml/Shell.qml:367

289+#, qt-format

290+msgid "Enter %1"

294291msgstr ""

295292

296−#: qml/Shell.qml:392

297−msgid "Sorry, incorrect passphrase"

293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

294+msgid "Enter passphrase"

298295msgstr ""

299296

300−#: qml/Shell.qml:393

301−msgid "Please re-enter"

297+#: qml/Shell.qml:369

298+msgid "Enter passcode"

302299msgstr ""

303300

304−#: qml/Shell.qml:395

305−msgid "Enter passcode"

301+#: qml/Shell.qml:370

302+#, qt-format

303+msgid "Sorry, incorrect %1"

306304msgstr ""

307305

308−#: qml/Shell.qml:396

309−msgid "Sorry, incorrect passcode"

306+#: qml/Shell.qml:371

307+msgid "Sorry, incorrect passphrase"

310308msgstr ""

311309

312−#: qml/Shell.qml:399

313−#, qt-format

314−msgid "Enter %1"

310+#: qml/Shell.qml:372

311+msgid "Please re-enter"

315312msgstr ""

316313

317−#: qml/Shell.qml:400

318−#, qt-format

319−msgid "Sorry, incorrect %1"

314+#: qml/Shell.qml:373

315+msgid "Sorry, incorrect passcode"

320316msgstr ""

321317

322−#: qml/Shell.qml:441

318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

323319msgid "Sorry, incorrect passphrase."

324320msgstr ""

325321

326−#: qml/Shell.qml:442

322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

327323msgid "Sorry, incorrect passcode."

328324msgstr ""

329325

330−#: qml/Shell.qml:443

326+#: qml/Shell.qml:469

331327msgid "This will be your last attempt."

332328msgstr ""

333329

334−#: qml/Shell.qml:445

330+#: qml/Shell.qml:471

335331msgid ""

336332"If passphrase is entered incorrectly, your phone will conduct a factory "

337333"reset and all personal data will be deleted."

338334msgstr ""

339335

340−#: qml/Shell.qml:446

336+#: qml/Shell.qml:472

341337msgid ""

342338"If passcode is entered incorrectly, your phone will conduct a factory reset "

343339"and all personal data will be deleted."

344340msgstr ""

345341

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+

346519#~ msgid "Speaking..."

347520#~ msgstr "अब बोल रहे हैं"

348521

po/hr.po+248−75

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2013-06-27 04:14+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Croatian <hr@li.org>\n"

@@ -16,19 +16,19 @@ msgstr ""

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

20−"X-Generator: Launchpad (build 17231)\n"

19+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

20+"X-Generator: Launchpad (build 17286)\n"

2121

2222#: plugins/LightDM/Greeter.cpp:130

2323msgid "Password: "

2424msgstr ""

2525

2626#: plugins/Unity/Launcher/launcheritem.cpp:45

27−#: plugins/Unity/Launcher/launcheritem.cpp:91

27+#: plugins/Unity/Launcher/launcheritem.cpp:100

2828msgid "Pin shortcut"

2929msgstr ""

3030

31−#: plugins/Unity/Launcher/launcheritem.cpp:91

31+#: plugins/Unity/Launcher/launcheritem.cpp:100

3232msgid "Unpin shortcut"

3333msgstr ""

3434

@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

5151msgstr[0] ""

5252msgstr[1] ""

5353

54−#: qml/Components/Dialogs.qml:74

54+#: qml/Components/Dialogs.qml:70

5555msgid "Log out"

5656msgstr ""

5757

58−#: qml/Components/Dialogs.qml:75

58+#: qml/Components/Dialogs.qml:71

5959msgid "Are you sure you want to log out?"

6060msgstr ""

6161

62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

63−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63+#: qml/Components/Dialogs.qml:122

6464msgid "No"

6565msgstr ""

6666

67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

68−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68+#: qml/Components/Dialogs.qml:129

6969msgid "Yes"

7070msgstr ""

7171

72−#: qml/Components/Dialogs.qml:98

72+#: qml/Components/Dialogs.qml:94

7373msgid "Shut down"

7474msgstr ""

7575

76−#: qml/Components/Dialogs.qml:99

76+#: qml/Components/Dialogs.qml:95

7777msgid "Are you sure you want to shut down?"

7878msgstr ""

7979

80−#: qml/Components/Dialogs.qml:123

80+#: qml/Components/Dialogs.qml:119

8181msgid "Reboot"

8282msgstr ""

8383

84−#: qml/Components/Dialogs.qml:124

84+#: qml/Components/Dialogs.qml:120

8585msgid "Are you sure you want to reboot?"

8686msgstr ""

8787

88−#: qml/Components/Dialogs.qml:148

88+#: qml/Components/Dialogs.qml:144

8989msgid "Power"

9090msgstr ""

9191

92−#: qml/Components/Dialogs.qml:149

92+#: qml/Components/Dialogs.qml:145

9393msgid ""

9494"Are you sure you would like\n"

9595"to power off?"

9696msgstr ""

9797

98−#: qml/Components/Dialogs.qml:151

98+#: qml/Components/Dialogs.qml:147

9999msgid "Power off"

100100msgstr ""

101101

102−#: qml/Components/Dialogs.qml:161

102+#: qml/Components/Dialogs.qml:157

103103msgid "Restart"

104104msgstr ""

105105

106−#: qml/Components/Dialogs.qml:171

106+#: qml/Components/Dialogs.qml:167

107107msgid "Cancel"

108108msgstr ""

109109

@@ -111,82 +111,86 @@ msgstr ""

111111msgid "Skip intro"

112112msgstr ""

113113

114−#: qml/Components/EdgeDemo.qml:112

114+#: qml/Components/EdgeDemo.qml:125

115115msgid "Right edge"

116116msgstr ""

117117

118−#: qml/Components/EdgeDemo.qml:113

118+#: qml/Components/EdgeDemo.qml:126

119119msgid "Try swiping from the right edge to unlock the phone"

120120msgstr ""

121121

122−#: qml/Components/EdgeDemo.qml:144

122+#: qml/Components/EdgeDemo.qml:157

123123msgid "Top edge"

124124msgstr ""

125125

126−#: qml/Components/EdgeDemo.qml:145

126+#: qml/Components/EdgeDemo.qml:158

127127msgid "Try swiping from the top edge to access the indicators"

128128msgstr ""

129129

130−#: qml/Components/EdgeDemo.qml:170

130+#: qml/Components/EdgeDemo.qml:183

131131msgid "Close"

132132msgstr ""

133133

134−#: qml/Components/EdgeDemo.qml:171

134+#: qml/Components/EdgeDemo.qml:184

135135msgid "Swipe up again to close the settings screen"

136136msgstr ""

137137

138−#: qml/Components/EdgeDemo.qml:201

138+#: qml/Components/EdgeDemo.qml:214

139139msgid "Left edge"

140140msgstr ""

141141

142−#: qml/Components/EdgeDemo.qml:202

142+#: qml/Components/EdgeDemo.qml:215

143143msgid "Swipe from the left to reveal the launcher for quick access to apps"

144144msgstr ""

145145

146−#: qml/Components/EdgeDemo.qml:229

146+#: qml/Components/EdgeDemo.qml:242

147147msgid "Well done"

148148msgstr ""

149149

150−#: qml/Components/EdgeDemo.qml:230

150+#: qml/Components/EdgeDemo.qml:243

151151msgid ""

152152"You have now mastered the edge gestures and can start using the "

153153"phone<br><br>Tap on the screen to start"

154154msgstr ""

155155

156−#: qml/Components/Lockscreen.qml:223

156+#: qml/Components/Lockscreen.qml:238

157157msgid "Return to Call"

158158msgstr ""

159159

160−#: qml/Components/Lockscreen.qml:223

160+#: qml/Components/Lockscreen.qml:238

161161msgid "Emergency Call"

162162msgstr ""

163163

164−#: qml/Components/Lockscreen.qml:255

164+#: qml/Components/Lockscreen.qml:270

165165msgid "OK"

166166msgstr ""

167167

168−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

168+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

169169msgid "See less"

170170msgstr ""

171171

172−#: qml/Dash/GenericScopeView.qml:434

172+#: qml/Dash/GenericScopeView.qml:431

173173msgid "See all"

174174msgstr ""

175175

176−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

176+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

177177#: qml/Panel/SearchIndicator.qml:27

178178msgid "Search"

179179msgstr "Pretraživanje"

180180

181−#: qml/Dash/PageHeader.qml:268

181+#: qml/Dash/PageHeader.qml:260

182+msgid "Store"

183+msgstr ""

184+

185+#: qml/Dash/PageHeader.qml:277

182186msgid "Settings"

183187msgstr ""

184188

185−#: qml/Dash/PageHeader.qml:275

189+#: qml/Dash/PageHeader.qml:284

186190msgid "Remove from Favorites"

187191msgstr ""

188192

189−#: qml/Dash/PageHeader.qml:275

193+#: qml/Dash/PageHeader.qml:284

190194msgid "Add to Favorites"

191195msgstr ""

192196

@@ -218,31 +222,23 @@ msgstr ""

218222msgid "Release to refresh…"

219223msgstr ""

220224

221−#: qml/Dash/ScopesOverview.qml:215

222−msgid "Manage Scopes"

223−msgstr ""

224−

225−#: qml/Dash/ScopesOverview.qml:437

226−msgid "Done"

227−msgstr ""

228−

229−#: qml/Dash/ScopesOverview.qml:463

230−msgid "Store"

225+#: qml/Dash/ScopesList.qml:63

226+msgid "Manage"

231227msgstr ""

232228

233−#: qml/Dash/ScopesOverviewTab.qml:36

234−msgid "Favorites"

229+#: qml/Dash/ScopesList.qml:107

230+msgid "Home"

235231msgstr ""

236232

237−#: qml/Dash/ScopesOverviewTab.qml:54

238−msgid "All"

233+#: qml/Dash/ScopesList.qml:108

234+msgid "Also installed"

239235msgstr ""

240236

241237#: qml/Greeter/Greeter.qml:174

242238msgid "Unlock"

243239msgstr ""

244240

245−#: qml/Notifications/NotificationMenuItemFactory.qml:116

241+#: qml/Notifications/NotificationMenuItemFactory.qml:128

246242msgid "Show password"

247243msgstr ""

248244

@@ -290,60 +286,237 @@ msgstr ""

290286msgid "Roaming"

291287msgstr ""

292288

293−#: qml/Shell.qml:391

294−msgid "Enter passphrase"

289+#: qml/Shell.qml:367

290+#, qt-format

291+msgid "Enter %1"

295292msgstr ""

296293

297−#: qml/Shell.qml:392

298−msgid "Sorry, incorrect passphrase"

294+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

295+msgid "Enter passphrase"

299296msgstr ""

300297

301−#: qml/Shell.qml:393

302−msgid "Please re-enter"

298+#: qml/Shell.qml:369

299+msgid "Enter passcode"

303300msgstr ""

304301

305−#: qml/Shell.qml:395

306−msgid "Enter passcode"

302+#: qml/Shell.qml:370

303+#, qt-format

304+msgid "Sorry, incorrect %1"

307305msgstr ""

308306

309−#: qml/Shell.qml:396

310−msgid "Sorry, incorrect passcode"

307+#: qml/Shell.qml:371

308+msgid "Sorry, incorrect passphrase"

311309msgstr ""

312310

313−#: qml/Shell.qml:399

314−#, qt-format

315−msgid "Enter %1"

311+#: qml/Shell.qml:372

312+msgid "Please re-enter"

316313msgstr ""

317314

318−#: qml/Shell.qml:400

319−#, qt-format

320−msgid "Sorry, incorrect %1"

315+#: qml/Shell.qml:373

316+msgid "Sorry, incorrect passcode"

321317msgstr ""

322318

323−#: qml/Shell.qml:441

319+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

324320msgid "Sorry, incorrect passphrase."

325321msgstr ""

326322

327−#: qml/Shell.qml:442

323+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

328324msgid "Sorry, incorrect passcode."

329325msgstr ""

330326

331−#: qml/Shell.qml:443

327+#: qml/Shell.qml:469

332328msgid "This will be your last attempt."

333329msgstr ""

334330

335−#: qml/Shell.qml:445

331+#: qml/Shell.qml:471

336332msgid ""

337333"If passphrase is entered incorrectly, your phone will conduct a factory "

338334"reset and all personal data will be deleted."

339335msgstr ""

340336

341−#: qml/Shell.qml:446

337+#: qml/Shell.qml:472

342338msgid ""

343339"If passcode is entered incorrectly, your phone will conduct a factory reset "

344340"and all personal data will be deleted."

345341msgstr ""

346342

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+

347520#~ msgid "Confirm"

348521#~ msgstr "Potvrdi"

349522

po/hu.po+247−54

@@ -7,16 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

11−"PO-Revision-Date: 2014-11-05 15:45+0000\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11+"PO-Revision-Date: 2014-12-21 15:13+0000\n"

1212"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

1313"Language-Team: Hungarian <hu@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-22 07:05+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

@@ -47,8 +47,8 @@ msgstr "A túl sok hibás jelkód próbálkozás miatt le lett zárva az eszköz

4747#, qt-format

4848msgid "Please wait %1 minute and then try again…"

4949msgid_plural "Please wait %1 minutes and then try again…"

50−msgstr[0] "Kérjük várjon %1 percet és próbálja újra…"

51−msgstr[1] "Kérjük várjon %1 percet és próbálja újra…"

50+msgstr[0] "Várjon %1 percet és próbálja újra…"

51+msgstr[1] "Várjon %1 percet és próbálja újra…"

5252

5353#: qml/Components/Dialogs.qml:74

5454msgid "Log out"

@@ -178,20 +178,24 @@ msgstr "Kevesebb"

178178msgid "See all"

179179msgstr "Összes megtekintése"

180180

181−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

181+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268

182182#: qml/Panel/SearchIndicator.qml:27

183183msgid "Search"

184184msgstr "Keresés"

185185

186−#: qml/Dash/PageHeader.qml:268

186+#: qml/Dash/PageHeader.qml:261

187+msgid "Store"

188+msgstr "Áruház"

189+

190+#: qml/Dash/PageHeader.qml:278

187191msgid "Settings"

188192msgstr "Beállítások"

189193

190−#: qml/Dash/PageHeader.qml:275

194+#: qml/Dash/PageHeader.qml:285

191195msgid "Remove from Favorites"

192196msgstr "Eltávolítás a kedvencek közül"

193197

194−#: qml/Dash/PageHeader.qml:275

198+#: qml/Dash/PageHeader.qml:285

195199msgid "Add to Favorites"

196200msgstr "Hozzáadás a kedvencekhez"

197201

@@ -223,31 +227,23 @@ msgstr "Húzza a frissítéshez…"

223227msgid "Release to refresh…"

224228msgstr "Engedje el a frissítéshez…"

225229

226−#: qml/Dash/ScopesOverview.qml:215

227−msgid "Manage Scopes"

228−msgstr "Lencsék kezelése"

230+#: qml/Dash/ScopesList.qml:63

231+msgid "Manage"

232+msgstr "Kezelés"

229233

230−#: qml/Dash/ScopesOverview.qml:437

231−msgid "Done"

232−msgstr "Kész"

233−

234−#: qml/Dash/ScopesOverview.qml:463

235−msgid "Store"

236−msgstr "Áruház"

234+#: qml/Dash/ScopesList.qml:107

235+msgid "Home"

236+msgstr "Kezdőlapon"

237237

238−#: qml/Dash/ScopesOverviewTab.qml:36

239−msgid "Favorites"

240−msgstr "Kedvencek"

241−

242−#: qml/Dash/ScopesOverviewTab.qml:54

243−msgid "All"

244−msgstr "Összes"

238+#: qml/Dash/ScopesList.qml:108

239+msgid "Also installed"

240+msgstr "Szintén telepítve"

245241

246242#: qml/Greeter/Greeter.qml:174

247243msgid "Unlock"

248244msgstr "Feloldás"

249245

250−#: qml/Notifications/NotificationMenuItemFactory.qml:116

246+#: qml/Notifications/NotificationMenuItemFactory.qml:128

251247msgid "Show password"

252248msgstr "Jelszó megjelenítése"

253249

@@ -295,49 +291,49 @@ msgstr "SIM feloldása"

295291msgid "Roaming"

296292msgstr "Barangolás"

297293

298−#: qml/Shell.qml:391

294+#: qml/Shell.qml:402

295+#, qt-format

296+msgid "Enter %1"

297+msgstr "Adja meg: %1"

298+

299+#: qml/Shell.qml:394

299300msgid "Enter passphrase"

300301msgstr "Jelmondat megadása"

301302

302−#: qml/Shell.qml:392

303−msgid "Sorry, incorrect passphrase"

304−msgstr "Sajnáljuk, helytelen jelmondat"

303+#: qml/Shell.qml:398

304+msgid "Enter passcode"

305+msgstr "Jelkód megadása"

305306

306−#: qml/Shell.qml:393

307−msgid "Please re-enter"

308−msgstr "Kérjük próbálja újra"

307+#: qml/Shell.qml:403

308+#, qt-format

309+msgid "Sorry, incorrect %1"

310+msgstr "Sajnálom, helytelen %1"

309311

310312#: qml/Shell.qml:395

311−msgid "Enter passcode"

312−msgstr "Jelkód megadása"

313+msgid "Sorry, incorrect passphrase"

314+msgstr "Sajnálom, helytelen jelmondat"

313315

314316#: qml/Shell.qml:396

315−msgid "Sorry, incorrect passcode"

316−msgstr "Sajnáljuk, helytelen jelkód"

317+msgid "Please re-enter"

318+msgstr "Próbálja újra"

317319

318320#: qml/Shell.qml:399

319−#, qt-format

320−msgid "Enter %1"

321−msgstr "Adja meg: %1"

322−

323−#: qml/Shell.qml:400

324−#, qt-format

325−msgid "Sorry, incorrect %1"

326−msgstr "Sajnáljuk, helytelen %1"

321+msgid "Sorry, incorrect passcode"

322+msgstr "Sajnálom, helytelen jelkód"

327323

328−#: qml/Shell.qml:441

324+#: qml/Shell.qml:444

329325msgid "Sorry, incorrect passphrase."

330−msgstr "Sajnáljuk, helytelen jelmondat."

326+msgstr "Sajnálom, helytelen jelmondat."

331327

332−#: qml/Shell.qml:442

328+#: qml/Shell.qml:445

333329msgid "Sorry, incorrect passcode."

334−msgstr "Sajnáljuk, helytelen jelkód."

330+msgstr "Sajnálom, helytelen jelkód."

335331

336−#: qml/Shell.qml:443

332+#: qml/Shell.qml:446

337333msgid "This will be your last attempt."

338334msgstr "Ez az utolsó próbálkozási lehetősége."

339335

340−#: qml/Shell.qml:445

336+#: qml/Shell.qml:448

341337msgid ""

342338"If passphrase is entered incorrectly, your phone will conduct a factory "

343339"reset and all personal data will be deleted."

@@ -345,7 +341,7 @@ msgstr ""

345341"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "

346342"beállításokat és törli minden személyes adatát."

347343

348−#: qml/Shell.qml:446

344+#: qml/Shell.qml:449

349345msgid ""

350346"If passcode is entered incorrectly, your phone will conduct a factory reset "

351347"and all personal data will be deleted."

@@ -353,6 +349,191 @@ msgstr ""

353349"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "

354350"beállításokat és törli minden személyes adatát."

355351

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+

356537#~ msgid "Confirm"

357538#~ msgstr "Megerősítés"

358539

@@ -367,3 +548,15 @@ msgstr ""

367548

368549#~ msgid "Speak Now..."

369550#~ 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+261−79

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2014-10-28 06:34+0000\n"

1212"Last-Translator: Vahan Harutyunyan <Unknown>\n"

1313"Language-Team: Armenian <hy@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

2323msgstr "Գաղտնաբառ: "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

2828msgstr "Փակցնել պիտակը"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

3232msgstr "Հեռացնել պիտակը"

3333

@@ -53,60 +53,60 @@ msgstr[0] ""

5353"Խնդրում ենք սպասել %1 րոպե և փորձել կրկին...\r\n"

5454"Խնդրում ենք սպասել %1 րոպե և փորձել կրկին..."

5555

56−#: qml/Components/Dialogs.qml:74

56+#: qml/Components/Dialogs.qml:70

5757msgid "Log out"

5858msgstr "Ելք"

5959

60−#: qml/Components/Dialogs.qml:75

60+#: qml/Components/Dialogs.qml:71

6161msgid "Are you sure you want to log out?"

6262msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք դուրս գալ համակարգից"

6363

64−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

65−#: qml/Components/Dialogs.qml:126

64+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

65+#: qml/Components/Dialogs.qml:122

6666msgid "No"

6767msgstr "Ոչ"

6868

69−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

70−#: qml/Components/Dialogs.qml:133

69+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

70+#: qml/Components/Dialogs.qml:129

7171msgid "Yes"

7272msgstr "Այո"

7373

74−#: qml/Components/Dialogs.qml:98

74+#: qml/Components/Dialogs.qml:94

7575msgid "Shut down"

7676msgstr "Անջատել"

7777

78−#: qml/Components/Dialogs.qml:99

78+#: qml/Components/Dialogs.qml:95

7979msgid "Are you sure you want to shut down?"

8080msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք անջատել համակարգիչը"

8181

82−#: qml/Components/Dialogs.qml:123

82+#: qml/Components/Dialogs.qml:119

8383msgid "Reboot"

8484msgstr "Վերաբեռնել"

8585

86−#: qml/Components/Dialogs.qml:124

86+#: qml/Components/Dialogs.qml:120

8787msgid "Are you sure you want to reboot?"

8888msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք վերաբեռնել համակարգիչը"

8989

90−#: qml/Components/Dialogs.qml:148

90+#: qml/Components/Dialogs.qml:144

9191msgid "Power"

9292msgstr "Էլեկտրասնուցում"

9393

94−#: qml/Components/Dialogs.qml:149

94+#: qml/Components/Dialogs.qml:145

9595msgid ""

9696"Are you sure you would like\n"

9797"to power off?"

9898msgstr ""

9999"Դուք համոզվա՞ծ եք, որ ցանկանում եք անջատել համակարգիչը սնուցման աղբյուրից"

100100

101−#: qml/Components/Dialogs.qml:151

101+#: qml/Components/Dialogs.qml:147

102102msgid "Power off"

103103msgstr "Անջատել սնուցման աղբյուրից"

104104

105−#: qml/Components/Dialogs.qml:161

105+#: qml/Components/Dialogs.qml:157

106106msgid "Restart"

107107msgstr "Վերագործարկել"

108108

109−#: qml/Components/Dialogs.qml:171

109+#: qml/Components/Dialogs.qml:167

110110msgid "Cancel"

111111msgstr "Չեղյալ համարել"

112112

@@ -114,82 +114,86 @@ msgstr "Չեղյալ համարել"

114114msgid "Skip intro"

115115msgstr "Բաց թողնել ներածությունը"

116116

117−#: qml/Components/EdgeDemo.qml:112

117+#: qml/Components/EdgeDemo.qml:125

118118msgid "Right edge"

119119msgstr "Աջ եզրը"

120120

121−#: qml/Components/EdgeDemo.qml:113

121+#: qml/Components/EdgeDemo.qml:126

122122msgid "Try swiping from the right edge to unlock the phone"

123123msgstr ""

124124

125−#: qml/Components/EdgeDemo.qml:144

125+#: qml/Components/EdgeDemo.qml:157

126126msgid "Top edge"

127127msgstr "Վերին եզրը"

128128

129−#: qml/Components/EdgeDemo.qml:145

129+#: qml/Components/EdgeDemo.qml:158

130130msgid "Try swiping from the top edge to access the indicators"

131131msgstr ""

132132

133−#: qml/Components/EdgeDemo.qml:170

133+#: qml/Components/EdgeDemo.qml:183

134134msgid "Close"

135135msgstr "Փակել"

136136

137−#: qml/Components/EdgeDemo.qml:171

137+#: qml/Components/EdgeDemo.qml:184

138138msgid "Swipe up again to close the settings screen"

139139msgstr ""

140140

141−#: qml/Components/EdgeDemo.qml:201

141+#: qml/Components/EdgeDemo.qml:214

142142msgid "Left edge"

143143msgstr "Ձախ եզրը"

144144

145−#: qml/Components/EdgeDemo.qml:202

145+#: qml/Components/EdgeDemo.qml:215

146146msgid "Swipe from the left to reveal the launcher for quick access to apps"

147147msgstr ""

148148

149−#: qml/Components/EdgeDemo.qml:229

149+#: qml/Components/EdgeDemo.qml:242

150150msgid "Well done"

151151msgstr "Լավ է"

152152

153−#: qml/Components/EdgeDemo.qml:230

153+#: qml/Components/EdgeDemo.qml:243

154154msgid ""

155155"You have now mastered the edge gestures and can start using the "

156156"phone<br><br>Tap on the screen to start"

157157msgstr ""

158158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160160msgid "Return to Call"

161161msgstr ""

162162

163−#: qml/Components/Lockscreen.qml:223

163+#: qml/Components/Lockscreen.qml:238

164164msgid "Emergency Call"

165165msgstr ""

166166

167−#: qml/Components/Lockscreen.qml:255

167+#: qml/Components/Lockscreen.qml:270

168168msgid "OK"

169169msgstr ""

170170

171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

172172msgid "See less"

173173msgstr ""

174174

175−#: qml/Dash/GenericScopeView.qml:434

175+#: qml/Dash/GenericScopeView.qml:431

176176msgid "See all"

177177msgstr "Տեսնել բոլորը"

178178

179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

180180#: qml/Panel/SearchIndicator.qml:27

181181msgid "Search"

182182msgstr "Որոնում"

183183

184−#: qml/Dash/PageHeader.qml:268

184+#: qml/Dash/PageHeader.qml:260

185+msgid "Store"

186+msgstr "Խանութ"

187+

188+#: qml/Dash/PageHeader.qml:277

185189msgid "Settings"

186190msgstr "Կարգավորումներ"

187191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189193msgid "Remove from Favorites"

190194msgstr "Հեռացնել ընտրյալների ցուցակից"

191195

192−#: qml/Dash/PageHeader.qml:275

196+#: qml/Dash/PageHeader.qml:284

193197msgid "Add to Favorites"

194198msgstr "Ավելացնել ընտրյալների ցուցակում"

195199

@@ -221,31 +225,23 @@ msgstr ""

221225msgid "Release to refresh…"

222226msgstr ""

223227

224−#: qml/Dash/ScopesOverview.qml:215

225−msgid "Manage Scopes"

228+#: qml/Dash/ScopesList.qml:63

229+msgid "Manage"

226230msgstr ""

227231

228−#: qml/Dash/ScopesOverview.qml:437

229−msgid "Done"

230−msgstr "Կատարված է"

231−

232−#: qml/Dash/ScopesOverview.qml:463

233−msgid "Store"

234−msgstr "Խանութ"

235−

236−#: qml/Dash/ScopesOverviewTab.qml:36

237−msgid "Favorites"

238−msgstr "Նախընտրելի"

232+#: qml/Dash/ScopesList.qml:107

233+msgid "Home"

234+msgstr ""

239235

240−#: qml/Dash/ScopesOverviewTab.qml:54

241−msgid "All"

242−msgstr "Բոլորը"

236+#: qml/Dash/ScopesList.qml:108

237+msgid "Also installed"

238+msgstr ""

243239

244240#: qml/Greeter/Greeter.qml:174

245241msgid "Unlock"

246242msgstr "Ապաբլոկավորել"

247243

248−#: qml/Notifications/NotificationMenuItemFactory.qml:116

244+#: qml/Notifications/NotificationMenuItemFactory.qml:128

249245msgid "Show password"

250246msgstr "Ցույց տալ գաղտնաբառը"

251247

@@ -293,60 +289,237 @@ msgstr "Ապաբլոկավորել SIM-ը"

293289msgid "Roaming"

294290msgstr "Ռոումինգ"

295291

296−#: qml/Shell.qml:391

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

297298msgid "Enter passphrase"

298299msgstr "Մուտքագրե՛ք անցաբառը"

299300

300−#: qml/Shell.qml:392

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

301311msgid "Sorry, incorrect passphrase"

302312msgstr "Ներեցեք, սխալ անցաբառ է"

303313

304−#: qml/Shell.qml:393

314+#: qml/Shell.qml:372

305315msgid "Please re-enter"

306316msgstr "Խնդրում ենք նորից մուտքագրել"

307317

308−#: qml/Shell.qml:395

309−msgid "Enter passcode"

310−msgstr "Մոտքագրեք ծածկագիրը"

311−

312−#: qml/Shell.qml:396

318+#: qml/Shell.qml:373

313319msgid "Sorry, incorrect passcode"

314320msgstr "Ներեցեք, սխալ ծածկագիր է"

315321

316−#: qml/Shell.qml:399

317−#, qt-format

318−msgid "Enter %1"

319−msgstr "Մուտքագրեք %1"

320−

321−#: qml/Shell.qml:400

322−#, qt-format

323−msgid "Sorry, incorrect %1"

324−msgstr "Ներեցեք, սխալ %1"

325−

326−#: qml/Shell.qml:441

322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

327323msgid "Sorry, incorrect passphrase."

328324msgstr "Ներեցեք, սխալ անցաբառ է"

329325

330−#: qml/Shell.qml:442

326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

331327msgid "Sorry, incorrect passcode."

332328msgstr "Ներեցեք, սխալ ծածկագիր է:"

333329

334−#: qml/Shell.qml:443

330+#: qml/Shell.qml:469

335331msgid "This will be your last attempt."

336332msgstr "Սա կլինի ձեր վերջին փորձը"

337333

338−#: qml/Shell.qml:445

334+#: qml/Shell.qml:471

339335msgid ""

340336"If passphrase is entered incorrectly, your phone will conduct a factory "

341337"reset and all personal data will be deleted."

342338msgstr ""

343339

344−#: qml/Shell.qml:446

340+#: qml/Shell.qml:472

345341msgid ""

346342"If passcode is entered incorrectly, your phone will conduct a factory reset "

347343"and all personal data will be deleted."

348344msgstr ""

349345

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+

350523#~ msgid "Confirm"

351524#~ msgstr "Հաստատել"

352525

@@ -356,8 +529,17 @@ msgstr ""

356529#~ msgid "Speaking..."

357530#~ msgstr "Խոսում եմ..."

358531

532+#~ msgid "Favorites"

533+#~ msgstr "Նախընտրելի"

534+

535+#~ msgid "Done"

536+#~ msgstr "Կատարված է"

537+

359538#~ msgid "Loading. Please Wait..."

360539#~ msgstr "Բեռնվում է: Խնդրում ենք սպասել..."

361540

362541#~ msgid "Speak Now..."

363542#~ msgstr "Հիմա խոսեք..."

543+

544+#~ msgid "All"

545+#~ msgstr "Բոլորը"

po/id.po+347−138

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

1111"PO-Revision-Date: 2013-06-26 22:35+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Indonesian <id@li.org>\n"

@@ -15,330 +15,539 @@ msgstr ""

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Generator: Launchpad (build 17286)\n"

2020

2121#: plugins/LightDM/Greeter.cpp:130

2222msgid "Password: "

23−msgstr ""

23+msgstr "Sandi: "

2424

2525#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

2727msgid "Pin shortcut"

28−msgstr ""

28+msgstr "Paku pintasan"

2929

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

3131msgid "Unpin shortcut"

32−msgstr ""

32+msgstr "Lepas pintasan"

3333

3434#: qml/Components/DelayedLockscreen.qml:47

3535msgid "Device Locked"

36−msgstr ""

36+msgstr "Perangkat Terkunci"

3737

3838#: qml/Components/DelayedLockscreen.qml:62

3939msgid "You have been locked out due to too many failed passphrase attempts."

4040msgstr ""

41+"Anda telah terkunci karena terlalu banyak percobaan frasa sandi yang gagal."

4142

4243#: qml/Components/DelayedLockscreen.qml:63

4344msgid "You have been locked out due to too many failed passcode attempts."

4445msgstr ""

46+"Anda telah terkunci karena terlalu banyak percobaan kode sandi yang gagal."

4547

4648#: qml/Components/DelayedLockscreen.qml:72

4749#, qt-format

4850msgid "Please wait %1 minute and then try again…"

4951msgid_plural "Please wait %1 minutes and then try again…"

50−msgstr[0] ""

51−msgstr[1] ""

52+msgstr[0] "Harap tunggu %1 menit lalu coba lagi..."

5253

53−#: qml/Components/Dialogs.qml:74

54+#: qml/Components/Dialogs.qml:70

5455msgid "Log out"

55−msgstr ""

56+msgstr "Log keluar"

5657

57−#: qml/Components/Dialogs.qml:75

58+#: qml/Components/Dialogs.qml:71

5859msgid "Are you sure you want to log out?"

59−msgstr ""

60+msgstr "Anda yakin ingin log keluar?"

6061

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63+#: qml/Components/Dialogs.qml:122

6364msgid "No"

64−msgstr ""

65+msgstr "Tidak"

6566

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68+#: qml/Components/Dialogs.qml:129

6869msgid "Yes"

69−msgstr ""

70+msgstr "Ya"

7071

71−#: qml/Components/Dialogs.qml:98

72+#: qml/Components/Dialogs.qml:94

7273msgid "Shut down"

73−msgstr ""

74+msgstr "Matikan"

7475

75−#: qml/Components/Dialogs.qml:99

76+#: qml/Components/Dialogs.qml:95

7677msgid "Are you sure you want to shut down?"

77−msgstr ""

78+msgstr "Anda yakin ingin mematikan?"

7879

79−#: qml/Components/Dialogs.qml:123

80+#: qml/Components/Dialogs.qml:119

8081msgid "Reboot"

81−msgstr ""

82+msgstr "Boot ulang"

8283

83−#: qml/Components/Dialogs.qml:124

84+#: qml/Components/Dialogs.qml:120

8485msgid "Are you sure you want to reboot?"

85−msgstr ""

86+msgstr "Anda yakin ingin boot ulang?"

8687

87−#: qml/Components/Dialogs.qml:148

88+#: qml/Components/Dialogs.qml:144

8889msgid "Power"

89−msgstr ""

90+msgstr "Daya"

9091

91−#: qml/Components/Dialogs.qml:149

92+#: qml/Components/Dialogs.qml:145

9293msgid ""

9394"Are you sure you would like\n"

9495"to power off?"

9596msgstr ""

97+"Anda yakin ingin\n"

98+"mematikan daya?"

9699

97−#: qml/Components/Dialogs.qml:151

100+#: qml/Components/Dialogs.qml:147

98101msgid "Power off"

99−msgstr ""

102+msgstr "Matikan"

100103

101−#: qml/Components/Dialogs.qml:161

104+#: qml/Components/Dialogs.qml:157

102105msgid "Restart"

103−msgstr ""

106+msgstr "Nyalakan ulang"

104107

105−#: qml/Components/Dialogs.qml:171

108+#: qml/Components/Dialogs.qml:167

106109msgid "Cancel"

107−msgstr ""

110+msgstr "Batal"

108111

109112#: qml/Components/EdgeDemoOverlay.qml:151

110113msgid "Skip intro"

111−msgstr ""

114+msgstr "Lewati pengenalan"

112115

113−#: qml/Components/EdgeDemo.qml:112

116+#: qml/Components/EdgeDemo.qml:125

114117msgid "Right edge"

115−msgstr ""

118+msgstr "Tepi kanan"

116119

117−#: qml/Components/EdgeDemo.qml:113

120+#: qml/Components/EdgeDemo.qml:126

118121msgid "Try swiping from the right edge to unlock the phone"

119−msgstr ""

122+msgstr "Coba usap dari tepi kanan untuk membuka kunci telepon"

120123

121−#: qml/Components/EdgeDemo.qml:144

124+#: qml/Components/EdgeDemo.qml:157

122125msgid "Top edge"

123−msgstr ""

126+msgstr "Tepi atas"

124127

125−#: qml/Components/EdgeDemo.qml:145

128+#: qml/Components/EdgeDemo.qml:158

126129msgid "Try swiping from the top edge to access the indicators"

127−msgstr ""

130+msgstr "Coba usap dari tepi atas untuk mengakses indikator"

128131

129−#: qml/Components/EdgeDemo.qml:170

132+#: qml/Components/EdgeDemo.qml:183

130133msgid "Close"

131−msgstr ""

134+msgstr "Tutup"

132135

133−#: qml/Components/EdgeDemo.qml:171

136+#: qml/Components/EdgeDemo.qml:184

134137msgid "Swipe up again to close the settings screen"

135−msgstr ""

138+msgstr "Usap ke atas lagi untuk menutup layar pengaturan"

136139

137−#: qml/Components/EdgeDemo.qml:201

140+#: qml/Components/EdgeDemo.qml:214

138141msgid "Left edge"

139−msgstr ""

142+msgstr "Tepi kiri"

140143

141−#: qml/Components/EdgeDemo.qml:202

144+#: qml/Components/EdgeDemo.qml:215

142145msgid "Swipe from the left to reveal the launcher for quick access to apps"

143−msgstr ""

146+msgstr "Usap dari tepi kiri menampilkan peluncur untuk akses cepat aplikasi"

144147

145−#: qml/Components/EdgeDemo.qml:229

148+#: qml/Components/EdgeDemo.qml:242

146149msgid "Well done"

147−msgstr ""

150+msgstr "Bagus sekali"

148151

149−#: qml/Components/EdgeDemo.qml:230

152+#: qml/Components/EdgeDemo.qml:243

150153msgid ""

151154"You have now mastered the edge gestures and can start using the "

152155"phone<br><br>Tap on the screen to start"

153156msgstr ""

157+"Anda kini telah menguasai gestur tepi dan dapat mulai memakai "

158+"telepon<br><br>Ketuk pada layar untuk mulai"

154159

155−#: qml/Components/Lockscreen.qml:223

160+#: qml/Components/Lockscreen.qml:238

156161msgid "Return to Call"

157−msgstr ""

162+msgstr "Kembali ke Panggilan"

158163

159−#: qml/Components/Lockscreen.qml:223

164+#: qml/Components/Lockscreen.qml:238

160165msgid "Emergency Call"

161−msgstr ""

166+msgstr "Panggilan Darurat"

162167

163−#: qml/Components/Lockscreen.qml:255

168+#: qml/Components/Lockscreen.qml:270

164169msgid "OK"

165−msgstr ""

170+msgstr "OK"

166171

167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

172+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

168173msgid "See less"

169−msgstr ""

174+msgstr "Lihat lebih sedikit"

170175

171−#: qml/Dash/GenericScopeView.qml:434

176+#: qml/Dash/GenericScopeView.qml:431

172177msgid "See all"

173−msgstr ""

178+msgstr "Lihat semua"

174179

175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

180+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176181#: qml/Panel/SearchIndicator.qml:27

177182msgid "Search"

178−msgstr ""

183+msgstr "Cari"

184+

185+#: qml/Dash/PageHeader.qml:260

186+msgid "Store"

187+msgstr "Simpan"

179188

180−#: qml/Dash/PageHeader.qml:268

189+#: qml/Dash/PageHeader.qml:277

181190msgid "Settings"

182−msgstr ""

191+msgstr "Pengaturan"

183192

184−#: qml/Dash/PageHeader.qml:275

193+#: qml/Dash/PageHeader.qml:284

185194msgid "Remove from Favorites"

186−msgstr ""

195+msgstr "Hapus dari Favorit"

187196

188−#: qml/Dash/PageHeader.qml:275

197+#: qml/Dash/PageHeader.qml:284

189198msgid "Add to Favorites"

190−msgstr ""

199+msgstr "Tambah ke Favorit"

191200

192201#: qml/Dash/Previews/PreviewActionCombo.qml:35

193202msgid "More..."

194−msgstr ""

203+msgstr "Lebih..."

195204

196205#: qml/Dash/Previews/PreviewActionCombo.qml:35

197206msgid "Less..."

198−msgstr ""

207+msgstr "Kurang..."

199208

200209#: qml/Dash/Previews/PreviewRatingInput.qml:81

201210msgid "Rate this"

202−msgstr ""

211+msgstr "Beri peringkat"

203212

204213#: qml/Dash/Previews/PreviewRatingInput.qml:126

205214msgid "Add a review"

206−msgstr ""

215+msgstr "Berikan ulasan"

207216

208217#: qml/Dash/Previews/PreviewRatingInput.qml:166

209218msgid "Send"

210−msgstr ""

219+msgstr "Kirim"

211220

212221#: qml/Dash/PullToRefreshScopeStyle.qml:55

213222msgid "Pull to refresh…"

214−msgstr ""

223+msgstr "Tarik untuk menyegarkan..."

215224

216225#: qml/Dash/PullToRefreshScopeStyle.qml:60

217226msgid "Release to refresh…"

218−msgstr ""

227+msgstr "Lepas untuk menyegarkan..."

219228

220−#: qml/Dash/ScopesOverview.qml:215

221−msgid "Manage Scopes"

229+#: qml/Dash/ScopesList.qml:63

230+msgid "Manage"

222231msgstr ""

223232

224−#: qml/Dash/ScopesOverview.qml:437

225−msgid "Done"

233+#: qml/Dash/ScopesList.qml:107

234+msgid "Home"

226235msgstr ""

227236

228−#: qml/Dash/ScopesOverview.qml:463

229−msgid "Store"

230−msgstr ""

231−

232−#: qml/Dash/ScopesOverviewTab.qml:36

233−msgid "Favorites"

234−msgstr ""

235−

236−#: qml/Dash/ScopesOverviewTab.qml:54

237−msgid "All"

237+#: qml/Dash/ScopesList.qml:108

238+msgid "Also installed"

238239msgstr ""

239240

240241#: qml/Greeter/Greeter.qml:174

241242msgid "Unlock"

242−msgstr ""

243+msgstr "Buka kunci"

243244

244−#: qml/Notifications/NotificationMenuItemFactory.qml:116

245+#: qml/Notifications/NotificationMenuItemFactory.qml:128

245246msgid "Show password"

246−msgstr ""

247+msgstr "Tampilkan sandi"

247248

248249#: qml/Panel/ActiveCallHint.qml:79

249250msgid "Tap to return to call..."

250−msgstr ""

251+msgstr "Ketuk untuk kembali ke panggilan..."

251252

252253#: qml/Panel/ActiveCallHint.qml:92

253254msgid "Conference"

254−msgstr ""

255+msgstr "Konferensi"

255256

256257#: qml/Panel/Indicators/MenuItemFactory.qml:643

257258msgid "Nothing is playing"

258−msgstr ""

259+msgstr "Tak ada yang sedang diputar"

259260

260261#: qml/Panel/Indicators/MenuItemFactory.qml:791

261262msgid "In queue…"

262−msgstr ""

263+msgstr "Dalam antrian..."

263264

264265#: qml/Panel/Indicators/MenuItemFactory.qml:795

265266msgid "Downloading"

266−msgstr ""

267+msgstr "Sedang mengunduh"

267268

268269#: qml/Panel/Indicators/MenuItemFactory.qml:797

269270msgid "Paused, tap to resume"

270−msgstr ""

271+msgstr "Jeda, ketuk untuk melanjutkan"

271272

272273#: qml/Panel/Indicators/MenuItemFactory.qml:799

273274msgid "Canceled"

274−msgstr ""

275+msgstr "Dibatalkan"

275276

276277#: qml/Panel/Indicators/MenuItemFactory.qml:801

277278msgid "Finished"

278−msgstr ""

279+msgstr "Selesai"

279280

280281#: qml/Panel/Indicators/MenuItemFactory.qml:803

281282msgid "Failed, tap to retry"

282−msgstr ""

283+msgstr "Gagal, ketuk untuk mencoba ulang"

283284

284285#: qml/Panel/Indicators/ModemInfoItem.qml:105

285286msgid "Unlock SIM"

286−msgstr ""

287+msgstr "Buka Kunci SIM"

287288

288289#: qml/Panel/Indicators/RoamingIndication.qml:27

289290msgid "Roaming"

290−msgstr ""

291+msgstr "Roaming"

291292

292−#: qml/Shell.qml:391

293+#: qml/Shell.qml:367

294+#, qt-format

295+msgid "Enter %1"

296+msgstr "Masukkan %1"

297+

298+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

293299msgid "Enter passphrase"

294−msgstr ""

300+msgstr "Masukkan frasa sandi"

301+

302+#: qml/Shell.qml:369

303+msgid "Enter passcode"

304+msgstr "Masukkan kode sandi"

305+

306+#: qml/Shell.qml:370

307+#, qt-format

308+msgid "Sorry, incorrect %1"

309+msgstr "Maaf, %1 salah"

295310

296−#: qml/Shell.qml:392

311+#: qml/Shell.qml:371

297312msgid "Sorry, incorrect passphrase"

298−msgstr ""

313+msgstr "Maaf, frasa sandi salah"

299314

300−#: qml/Shell.qml:393

315+#: qml/Shell.qml:372

301316msgid "Please re-enter"

317+msgstr "Harap masukkan lagi"

318+

319+#: qml/Shell.qml:373

320+msgid "Sorry, incorrect passcode"

321+msgstr "Maaf, kode sandi salah"

322+

323+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

324+msgid "Sorry, incorrect passphrase."

325+msgstr "Maaf, frasa sandi salah."

326+

327+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

328+msgid "Sorry, incorrect passcode."

329+msgstr "Maaf, kode sandi salah."

330+

331+#: qml/Shell.qml:469

332+msgid "This will be your last attempt."

333+msgstr "Ini akan menjadi upaya terakhir Anda."

334+

335+#: qml/Shell.qml:471

336+msgid ""

337+"If passphrase is entered incorrectly, your phone will conduct a factory "

338+"reset and all personal data will be deleted."

302339msgstr ""

340+"Bila frasa sandi salah dimasukkan, telepon Anda akan melakukan reset pabrik "

341+"dan semua data pribadi akan dihapus."

303342

304−#: qml/Shell.qml:395

305−msgid "Enter passcode"

343+#: qml/Shell.qml:472

344+msgid ""

345+"If passcode is entered incorrectly, your phone will conduct a factory reset "

346+"and all personal data will be deleted."

306347msgstr ""

348+"Bila kode sandi salah dimasukkan, telepon Anda akan melakukan reset pabrik "

349+"dan semua data pribadi akan dihapus."

307350

308−#: qml/Shell.qml:396

309−msgid "Sorry, incorrect passcode"

351+#: qml/Wizard/Page.qml:89

352+msgid "Back"

310353msgstr ""

311354

312−#: qml/Shell.qml:399

313−#, qt-format

314−msgid "Enter %1"

355+#: qml/Wizard/Pages/10-welcome.qml:27

356+msgid "Hi!"

315357msgstr ""

316358

317−#: qml/Shell.qml:400

318−#, qt-format

319−msgid "Sorry, incorrect %1"

359+#: qml/Wizard/Pages/10-welcome.qml:44

360+msgid "Welcome to your Ubuntu phone."

320361msgstr ""

321362

322−#: qml/Shell.qml:441

323−msgid "Sorry, incorrect passphrase."

363+#: qml/Wizard/Pages/10-welcome.qml:52

364+msgid "Let’s get started."

324365msgstr ""

325366

326−#: qml/Shell.qml:442

327−msgid "Sorry, incorrect passcode."

367+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

368+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

369+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

370+#: qml/Wizard/Pages/passwd-set.qml:90

371+msgid "Continue"

328372msgstr ""

329373

330−#: qml/Shell.qml:443

331−msgid "This will be your last attempt."

374+#: qml/Wizard/Pages/20-sim.qml:25

375+msgid "Add a SIM card and restart your device"

376+msgstr ""

377+

378+#: qml/Wizard/Pages/20-sim.qml:55

379+msgid "Without it, you won’t be able to make calls or use text messaging."

380+msgstr ""

381+

382+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

383+msgid "Skip"

384+msgstr ""

385+

386+#: qml/Wizard/Pages/30-passwd-type.qml:39

387+msgid "Lock security"

388+msgstr ""

389+

390+#: qml/Wizard/Pages/30-passwd-type.qml:74

391+msgid "Please select how you’d like to unlock your phone."

392+msgstr ""

393+

394+#: qml/Wizard/Pages/30-passwd-type.qml:97

395+msgid "Swipe"

396+msgstr ""

397+

398+#: qml/Wizard/Pages/30-passwd-type.qml:98

399+msgid "No security"

400+msgstr ""

401+

402+#: qml/Wizard/Pages/30-passwd-type.qml:100

403+msgid "Passcode"

404+msgstr ""

405+

406+#: qml/Wizard/Pages/30-passwd-type.qml:101

407+msgid "4 digits only"

332408msgstr ""

333409

334−#: qml/Shell.qml:445

410+#: qml/Wizard/Pages/30-passwd-type.qml:103

411+msgid "Passphrase"

412+msgstr ""

413+

414+#: qml/Wizard/Pages/30-passwd-type.qml:104

415+msgid "Numbers and letters"

416+msgstr ""

417+

418+#: qml/Wizard/Pages/40-wifi.qml:28

419+msgid "Connect to Wi‑Fi"

420+msgstr ""

421+

422+#: qml/Wizard/Pages/40-wifi.qml:147

423+msgid "Available networks…"

424+msgstr ""

425+

426+#: qml/Wizard/Pages/40-wifi.qml:148

427+msgid "No available networks."

428+msgstr ""

429+

430+#: qml/Wizard/Pages/50-location.qml:27

431+msgid "Location"

432+msgstr ""

433+

434+#: qml/Wizard/Pages/50-location.qml:62

435+msgid "Let the phone detect your location:"

436+msgstr ""

437+

438+#: qml/Wizard/Pages/50-location.qml:69

439+msgid "Using GPS only (less accurate)"

440+msgstr ""

441+

442+#: qml/Wizard/Pages/50-location.qml:86

443+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

444+msgstr ""

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

335448msgid ""

336−"If passphrase is entered incorrectly, your phone will conduct a factory "

337−"reset and all personal data will be deleted."

449+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

450+"conditions</a>."

451+msgstr ""

452+

453+#: qml/Wizard/Pages/50-location.qml:112

454+msgid "Not at all"

338455msgstr ""

339456

340−#: qml/Shell.qml:446

457+#: qml/Wizard/Pages/50-location.qml:124

458+msgid "You can change your mind later in <b>System Settings</b>."

459+msgstr ""

460+

461+#: qml/Wizard/Pages/60-reporting.qml:24

462+msgid "Improving your experience"

463+msgstr ""

464+

465+#: qml/Wizard/Pages/60-reporting.qml:36

341466msgid ""

342−"If passcode is entered incorrectly, your phone will conduct a factory reset "

343−"and all personal data will be deleted."

467+"Your phone is set up to automatically report errors to Canonical and its "

468+"partners, the makers of the operating system."

469+msgstr ""

470+

471+#: qml/Wizard/Pages/60-reporting.qml:43

472+msgid ""

473+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

474+"Privacy</b>"

475+msgstr ""

476+

477+#: qml/Wizard/Pages/80-finished.qml:24

478+msgid "All done"

479+msgstr ""

480+

481+#: qml/Wizard/Pages/80-finished.qml:39

482+msgid "Nice work!"

483+msgstr ""

484+

485+#: qml/Wizard/Pages/80-finished.qml:46

486+msgid "Your phone is now ready to use."

487+msgstr ""

488+

489+#: qml/Wizard/Pages/80-finished.qml:53

490+msgid "Finish"

491+msgstr ""

492+

493+#: qml/Wizard/Pages/here-terms.qml:27

494+msgid "Terms & Conditions"

495+msgstr ""

496+

497+#: qml/Wizard/Pages/passwd-confirm.qml:49

498+msgid "Confirm passphrase"

499+msgstr ""

500+

501+#: qml/Wizard/Pages/passwd-confirm.qml:50

502+msgid "Confirm passcode"

503+msgstr ""

504+

505+#: qml/Wizard/Pages/passwd-confirm.qml:53

506+#: qml/Wizard/Pages/passwd-confirm.qml:54

507+msgid "Please try again."

508+msgstr ""

509+

510+#: qml/Wizard/Pages/passwd-set.qml:61

511+msgid "Choose your passcode"

512+msgstr ""

513+

514+#: qml/Wizard/Pages/passwd-set.qml:68

515+msgid "Passphrase must be 4 characters long"

516+msgstr ""

517+

518+#: qml/Wizard/StackButton.qml:39

519+#, qt-format

520+msgid "〈 %1"

521+msgstr ""

522+

523+#: qml/Wizard/StackButton.qml:42

524+#, qt-format

525+msgid "%1 〉"

344526msgstr ""

527+

528+#~ msgid "Loading. Please Wait..."

529+#~ msgstr "Memuat. Mohon Tunggu..."

530+

531+#~ msgid "Speaking..."

532+#~ msgstr "Berbicara..."

533+

534+#~ msgid "Confirm"

535+#~ msgstr "Konfirmasi"

536+

537+#~ msgid "Done"

538+#~ msgstr "Selesai"

539+

540+#~ msgid "Type or say a command"

541+#~ msgstr "Ketik atau ucapkan sebuah perintah"

542+

543+#~ msgid "Speak Now..."

544+#~ msgstr "Bicaralah Sekarang..."

545+

546+#~ msgid "All"

547+#~ msgstr "Semua"

548+

549+#~ msgid "Favorites"

550+#~ msgstr "Favorit"

551+

552+#~ msgid "Manage Scopes"

553+#~ msgstr "Kelola Skup"

po/is.po+272−87

This diff is too big to show here.

po/it.po+265−80

This diff is too big to show here.

po/ja.po+272−87

This diff is too big to show here.

po/km.po+261−79

This diff is too big to show here.

po/kn.po+248−75

This diff is too big to show here.

po/ko.po+265−80

This diff is too big to show here.

po/ku.po+261−79

This diff is too big to show here.

po/ky.po+248−75

This diff is too big to show here.

po/lo.po+248−75

This diff is too big to show here.

po/lt.po+248−75

This diff is too big to show here.

po/lv.po+259−77

This diff is too big to show here.

po/ml.po+248−75

This diff is too big to show here.

po/mr.po+248−75

This diff is too big to show here.

po/ms.po+265−80

This diff is too big to show here.

po/my.po+248−75

This diff is too big to show here.

po/nb.po+272−87

This diff is too big to show here.

po/nl.po+265−80

This diff is too big to show here.

po/pa.po+248−75

This diff is too big to show here.

po/pl.po+248−75

This diff is too big to show here.

po/pt.po+265−80

This diff is too big to show here.

po/pt_BR.po+265−80

This diff is too big to show here.

po/ro.po+252−56

This diff is too big to show here.

po/ru.po+265−80

This diff is too big to show here.

po/shn.po+248−75

This diff is too big to show here.

po/si.po+248−75

This diff is too big to show here.

po/sl.po+261−79

This diff is too big to show here.

po/sq.po+248−75

This diff is too big to show here.

po/sr.po+261−79

This diff is too big to show here.

po/sv.po+265−80

This diff is too big to show here.

po/sw.po+248−75

This diff is too big to show here.

po/ta.po+248−75

This diff is too big to show here.

po/te.po+248−75

This diff is too big to show here.

po/th.po+248−75

This diff is too big to show here.

po/tr.po+253−77

This diff is too big to show here.

po/ug.po+266−81

This diff is too big to show here.

po/uk.po+269−80

This diff is too big to show here.

po/unity8.pot+246−73

This diff is too big to show here.

po/vi.po+248−75

This diff is too big to show here.

po/xh.po+248−75

This diff is too big to show here.

po/zh_CN.po+262−80

This diff is too big to show here.

po/zh_HK.po+248−75

This diff is too big to show here.

po/zh_TW.po+268−86

This diff is too big to show here.

qml/CMakeLists.txt+1

This diff is too big to show here.

qml/Components/Dialogs.qml+77−87

This diff is too big to show here.

qml/Components/DragHandle.qml+10−2

This diff is too big to show here.

qml/Components/EdgeDemo.qml+19−6

This diff is too big to show here.

qml/Components/EdgeDragEvaluator.qml+11−5

This diff is too big to show here.

qml/Components/PanelState/PanelState.qmlnew file+29

This diff is too big to show here.

qml/Components/PanelState/qmldirnew file+1

This diff is too big to show here.

qml/Components/ResponsiveVerticalJournal.qml+1

This diff is too big to show here.

qml/Components/ShellDialog.qmlnew file+37

This diff is too big to show here.

qml/Components/Showable.qml+13

This diff is too big to show here.

qml/Components/WindowControlButtons.qmlnew file+60

This diff is too big to show here.

qml/Dash/CardCarousel.qml+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/CardVerticalJournal.qml+1−1

This diff is too big to show here.

qml/Dash/Dash.qml+105−141

This diff is too big to show here.

qml/Dash/DashContent.qml+15−3

This diff is too big to show here.

qml/Dash/DashNavigation.qml+4

This diff is too big to show here.

qml/Dash/DashNavigationButton.qml+30−23

This diff is too big to show here.

qml/Dash/DashRenderer.qml+2−4

This diff is too big to show here.

qml/Dash/GenericScopeView.qml+50−27

This diff is too big to show here.

qml/Dash/PageHeader.qml+18−1

This diff is too big to show here.

qml/Dash/Previews/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+132

This diff is too big to show here.

qml/Dash/ScopesListCategory.qmlnew file+176

This diff is too big to show here.

qml/Dash/ScopesListCategoryItem.qmlnew file+107

This diff is too big to show here.

qml/Dash/ScopesOverview.qmldeleted−575

This diff is too big to show here.

qml/Dash/ScopesOverviewAll.qmldeleted−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+11−1

This diff is too big to show here.

qml/Greeter/Greeter.qml+91−82

This diff is too big to show here.

qml/Greeter/GreeterContent.qml+5

This diff is too big to show here.

qml/Greeter/Infographics.qml+9−10

This diff is too big to show here.

qml/Launcher/Launcher.qml+13−4

This diff is too big to show here.

qml/Launcher/LauncherPanel.qml+2−1

This diff is too big to show here.

qml/Notifications/Notifications.qml+1−1

This diff is too big to show here.

qml/Panel/IndicatorItem.qml−8

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

qml/Panel/Indicators/VisibleIndicators.qml+2−2

This diff is too big to show here.

qml/Panel/IndicatorsBar.qml+29−20

This diff is too big to show here.

qml/Panel/IndicatorsMenu.qml+5

This diff is too big to show here.

qml/Panel/Panel.qml+17−2

This diff is too big to show here.

qml/Shell.qml+79−25

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+17−33

This diff is too big to show here.

qml/Stages/SpreadDelegate.qml+8−1

This diff is too big to show here.

qml/Stages/TabletStage.qml+5−14

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.

src/main.cpp−6

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/create_interactive_notification.py−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/edges_demo.pynew file+140

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.h+20

This diff is too big to show here.

tests/mocks/CMakeLists.txt+3

This diff is too big to show here.

tests/mocks/LightDM/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/LightDM/Greeter.cpp+6

This diff is too big to show here.

tests/mocks/LightDM/Greeter.h+3

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Lights/qmldirnew file+3

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/QMenuModel/CMakeLists.txt+2

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/QMenuModel/plugin.cpp+13

This diff is too big to show here.

tests/mocks/Ubuntu/CMakeLists.txt+1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/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/Ubuntu/SystemSettings/SecurityPrivacy/plugin.hnew file+31

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

The content is the same.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Wizard/qmldirnew file+3

This diff is too big to show here.

tests/plugins/CMakeLists.txt+1

This diff is too big to show here.

tests/plugins/Dash/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/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/LightDM/CMakeLists.txt+4−8

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/CMakeLists.txt+3

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle.cpp+4

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Dash/tst_Card.qml+2−24

This diff is too big to show here.

tests/qmltests/Dash/tst_Dash.qml+261−149

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Greeter/tst_MultiGreeter.qml+15−15

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Panel/tst_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+10−3

This diff is too big to show here.

tests/qmltests/Stages/tst_SpreadDelegate.qml+10−7

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/tst_Shell.qml+11−14

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml+32

This diff is too big to show here.

tests/qmltests/tst_TabletShell.qml+17−13

This diff is too big to show here.

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

This diff is too big to show here.