git.iko.soy/unity8

on xenial help sign in

CMakeLists.txt+5

compare with xenial

unifiedsplit

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

61set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)

61set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)

62set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)

62set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)

63

63

64+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugin_private_module_dir SystemSettings OUTPUT_VARIABLE USS_PRIVATE_PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)

65+if(USS_PRIVATE_PLUGINDIR STREQUAL "")

66+ message(FATAL_ERROR "Could not determine USS private plugin installation dir.")

67+endif()

68+

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

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

65if(SHELL_INSTALL_QML STREQUAL "")

70if(SHELL_INSTALL_QML STREQUAL "")

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

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

build.sh+1

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

54 qtdeclarative5-unity-notifications-plugin \

54 qtdeclarative5-unity-notifications-plugin \

55 qml-module-ubuntu-connectivity \

55 qml-module-ubuntu-connectivity \

56 ubuntu-mobile-icons \

56 ubuntu-mobile-icons \

57+ ubuntu-system-settings \

57 unity-plugin-scopes \

58 unity-plugin-scopes \

58 xvfb \

59 xvfb \

59 || exit 5

60 || exit 5

cmake/modules/QmlTest.cmake+3

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

153

153

154macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)

154macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)

155 set(testCommand

155 set(testCommand

156+ ${ENVVAR}

156 LD_LIBRARY_PATH=${LD_PATH}

157 LD_LIBRARY_PATH=${LD_PATH}

158+ dbus-launch

157 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

159 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

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

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

159 -o -,txt)

161 -o -,txt)

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

171 ${ENVVAR}

173 ${ENVVAR}

172 LD_LIBRARY_PATH=${LD_PATH}

174 LD_LIBRARY_PATH=${LD_PATH}

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

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

176+ dbus-launch

174 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

177 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

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

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

176 -o -,txt)

179 -o -,txt)

com.canonical.Unity8.gschema.xmlnew file+14

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

1+<schemalist>

2+ <enum id="usage-mode-enum">

3+ <value nick="Staged" value="0" />

4+ <value nick="Windowed" value="1" />

5+ </enum>

6+

7+ <schema path="/com/canonical/unity8/" id="com.canonical.Unity8" gettext-domain="unity8">

8+ <key enum="usage-mode-enum" name="usage-mode">

9+ <default>"Staged"</default>

10+ <summary>The usage mode.</summary>

11+ <description>The usage mode chosen will affect the Window Management behaviour.</description>

12+ </key>

13+ </schema>

14+</schemalist>

debian/changelog+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+

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

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

2

187

3 [ Michael Zanetti ]

188 [ Michael Zanetti ]

debian/control+17−7

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

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

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

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

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

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

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

13−# version.

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

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

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

14− g++-4.9,

16+ g++-4.9:native,

17+ libconnectivity-qt1-dev,

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

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

16 libgl1-mesa-dri,

19 libgl1-mesa-dri,

17 libgles2-mesa-dev[armhf],

20 libgles2-mesa-dev[armhf],

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

21 libpam0g-dev,

24 libpam0g-dev,

22 libpay2-dev,

25 libpay2-dev,

23 libpulse-dev,

26 libpulse-dev,

24− libqmenumodel-dev (>= 0.2.8),

27+ libqmenumodel-dev (>= 0.2.9),

25 libqt5xmlpatterns5-dev,

28 libqt5xmlpatterns5-dev,

29+ libsystemsettings-dev,

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

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

27 libusermetricsoutput1-dev,

31 libusermetricsoutput1-dev,

28 libxcb1-dev,

32 libxcb1-dev,

29 pkg-config,

33 pkg-config,

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

31 python3-all:any,

35 python3-all:any,

32 python3-setuptools,

36 python3-setuptools,

33 python:any (>= 2.7),

37 python:any (>= 2.7),

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

34 qml-module-qtquick-layouts,

39 qml-module-qtquick-layouts,

35 qml-module-qtquick-xmllistmodel,

40 qml-module-qtquick-xmllistmodel,

36 qml-module-qtquick2,

41 qml-module-qtquick2,

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

45 qtdeclarative5-qtmultimedia-plugin,

50 qtdeclarative5-qtmultimedia-plugin,

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

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

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

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

53+ qtdeclarative5-ubuntu-web-plugin,

48 ttf-ubuntu-font-family,

54 ttf-ubuntu-font-family,

49Standards-Version: 3.9.4

55Standards-Version: 3.9.4

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

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

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

57

63

58Package: indicators-client

64Package: indicators-client

59Architecture: amd64 armhf i386

65Architecture: amd64 armhf i386

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

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

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

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

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

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

63 ${misc:Depends},

69 ${misc:Depends},

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

81Depends: gsettings-desktop-schemas,

87Depends: gsettings-desktop-schemas,

82 libcap2-bin,

88 libcap2-bin,

83 libglib2.0-bin,

89 libglib2.0-bin,

84− qmenumodel-qml (>= 0.2.8),

90+ qmenumodel-qml (>= 0.2.9),

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

85 qml-module-qtquick-xmllistmodel,

92 qml-module-qtquick-xmllistmodel,

86 qtdeclarative5-gsettings1.0,

93 qtdeclarative5-gsettings1.0,

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

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

88 qtdeclarative5-ubuntu-telephony0.1,

95 qtdeclarative5-ubuntu-telephony0.1,

96+ qtdeclarative5-ubuntu-web-plugin,

97+ ubuntu-system-settings,

89 unity-launcher-impl-4,

98 unity-launcher-impl-4,

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

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

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

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

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

100 unity8-greeter (<< 7.89),

109 unity8-greeter (<< 7.89),

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

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

102 unity8-greeter (<< 7.89),

111 unity8-greeter (<< 7.89),

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

103Description: Unity 8 shell

113Description: Unity 8 shell

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

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

105

115

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

128Package: unity8-autopilot

138Package: unity8-autopilot

129Architecture: all

139Architecture: all

130Depends: gir1.2-glib-2.0,

140Depends: gir1.2-glib-2.0,

141+ gir1.2-notify-0.7,

131 libautopilot-qt (>= 1.4),

142 libautopilot-qt (>= 1.4),

132 libqt5test5,

143 libqt5test5,

133 libqt5widgets5,

144 libqt5widgets5,

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

173 libhardware2,

184 libhardware2,

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

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

175 pay-service,

186 pay-service,

176− qml-module-ubuntu-connectivity,

177 ${misc:Depends},

187 ${misc:Depends},

178 ${shlibs:Depends},

188 ${shlibs:Depends},

179Provides: unity-launcher-impl,

189Provides: unity-launcher-impl,

debian/unity8-common.install+2

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

3usr/share/unity8/Dash

3usr/share/unity8/Dash

4usr/share/unity8/Notifications

4usr/share/unity8/Notifications

5usr/share/unity8/graphics

5usr/share/unity8/graphics

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

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

debian/unity8-private.install+1

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

9usr/lib/*/unity8/qml/Ubuntu

9usr/lib/*/unity8/qml/Ubuntu

10usr/lib/*/unity8/qml/Unity

10usr/lib/*/unity8/qml/Unity

11usr/lib/*/unity8/qml/Utils

11usr/lib/*/unity8/qml/Utils

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

12usr/lib/*/unity8/libUbuntuGestures*

13usr/lib/*/unity8/libUbuntuGestures*

13usr/share/accountsservice/interfaces

14usr/share/accountsservice/interfaces

14usr/share/dbus-1/interfaces

15usr/share/dbus-1/interfaces

debian/unity8.install+1

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

10usr/share/unity8/Panel

10usr/share/unity8/Panel

11usr/share/unity8/Shell.qml

11usr/share/unity8/Shell.qml

12usr/share/unity8/Stages

12usr/share/unity8/Stages

13+usr/share/unity8/Wizard

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

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

include/paths.h.in+2

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

71 QStringList paths;

71 QStringList paths;

72 if (isRunningInstalled()) {

72 if (isRunningInstalled()) {

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

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

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

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

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

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

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

76 } else {

77 } else {

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

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

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

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

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

79 }

81 }

plugins/AccountsService/AccountsService.cpp+61−2

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

19#include "AccountsService.h"

19#include "AccountsService.h"

20#include "AccountsServiceDBusAdaptor.h"

20#include "AccountsServiceDBusAdaptor.h"

21

21

22+#include <QFile>

22#include <QStringList>

23#include <QStringList>

23

24

24AccountsService::AccountsService(QObject* parent)

25AccountsService::AccountsService(QObject* parent)

25 : QObject(parent),

26 : QObject(parent),

26 m_service(new AccountsServiceDBusAdaptor(this)),

27 m_service(new AccountsServiceDBusAdaptor(this)),

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

28+ m_user(""),

28 m_demoEdges(false),

29 m_demoEdges(false),

29 m_enableLauncherWhileLocked(false),

30 m_enableLauncherWhileLocked(false),

30 m_enableIndicatorsWhileLocked(false),

31 m_enableIndicatorsWhileLocked(false),

31 m_statsWelcomeScreen(false),

32 m_statsWelcomeScreen(false),

32 m_passwordDisplayHint(Keyboard),

33 m_passwordDisplayHint(Keyboard),

33− m_failedLogins(0)

34+ m_failedLogins(0),

35+ m_hereEnabled(false),

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

34{

37{

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

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

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

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

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

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

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

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

42+

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

39}

44}

40

45

41QString AccountsService::user() const

46QString AccountsService::user() const

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

45

50

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

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

47{

52{

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

54+ return;

55+

48 m_user = user;

56 m_user = user;

49 Q_EMIT userChanged();

57 Q_EMIT userChanged();

50

58

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

55 updateStatsWelcomeScreen();

63 updateStatsWelcomeScreen();

56 updatePasswordDisplayHint();

64 updatePasswordDisplayHint();

57 updateFailedLogins();

65 updateFailedLogins();

66+ updateHereEnabled();

67+ updateHereLicensePath();

58}

68}

59

69

60bool AccountsService::demoEdges() const

70bool AccountsService::demoEdges() const

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

93 return m_passwordDisplayHint;

103 return m_passwordDisplayHint;

94}

104}

95

105

106+bool AccountsService::hereEnabled() const

107+{

108+ return m_hereEnabled;

109+}

110+

111+void AccountsService::setHereEnabled(bool enabled)

112+{

113+ m_service->setUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted", enabled);

114+}

115+

116+QString AccountsService::hereLicensePath() const

117+{

118+ return m_hereLicensePath;

119+}

120+

121+bool AccountsService::hereLicensePathValid() const

122+{

123+ return !m_hereLicensePath.isNull();

124+}

125+

96void AccountsService::updateDemoEdges()

126void AccountsService::updateDemoEdges()

97{

127{

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

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

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

156 }

186 }

157}

187}

158

188

189+void AccountsService::updateHereEnabled()

190+{

191+ bool hereEnabled = m_service->getUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted").toBool();

192+ if (m_hereEnabled != hereEnabled) {

193+ m_hereEnabled = hereEnabled;

194+ Q_EMIT hereEnabledChanged();

195+ }

196+}

197+

198+void AccountsService::updateHereLicensePath()

199+{

200+ QString hereLicensePath = m_service->getUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseBasePath").toString();

201+

202+ if (hereLicensePath.isEmpty() || !QFile::exists(hereLicensePath))

203+ hereLicensePath = "";

204+

205+ if (m_hereLicensePath.isNull() || m_hereLicensePath != hereLicensePath) {

206+ m_hereLicensePath = hereLicensePath;

207+ Q_EMIT hereLicensePathChanged();

208+ }

209+}

210+

159uint AccountsService::failedLogins() const

211uint AccountsService::failedLogins() const

160{

212{

161 return m_failedLogins;

213 return m_failedLogins;

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

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

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

196 updateEnableIndicatorsWhileLocked();

248 updateEnableIndicatorsWhileLocked();

197 }

249 }

250+ } else if (interface == "com.ubuntu.location.providers.here.AccountsService") {

251+ if (changed.contains("LicenseAccepted")) {

252+ updateHereEnabled();

253+ }

254+ if (changed.contains("LicenseBasePath")) {

255+ updateHereLicensePath();

256+ }

198 }

257 }

199}

258}

200

259

plugins/AccountsService/AccountsService.h+20

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

55 READ failedLogins

55 READ failedLogins

56 WRITE setFailedLogins

56 WRITE setFailedLogins

57 NOTIFY failedLoginsChanged)

57 NOTIFY failedLoginsChanged)

58+ Q_PROPERTY(bool hereEnabled

59+ READ hereEnabled

60+ WRITE setHereEnabled

61+ NOTIFY hereEnabledChanged)

62+ Q_PROPERTY(QString hereLicensePath

63+ READ hereLicensePath

64+ NOTIFY hereLicensePathChanged)

65+ Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that

66+ READ hereLicensePathValid

67+ NOTIFY hereLicensePathChanged)

58

68

59public:

69public:

60 enum PasswordDisplayHint {

70 enum PasswordDisplayHint {

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

75 PasswordDisplayHint passwordDisplayHint() const;

85 PasswordDisplayHint passwordDisplayHint() const;

76 uint failedLogins() const;

86 uint failedLogins() const;

77 void setFailedLogins(uint failedLogins);

87 void setFailedLogins(uint failedLogins);

88+ bool hereEnabled() const;

89+ void setHereEnabled(bool enabled);

90+ QString hereLicensePath() const;

91+ bool hereLicensePathValid() const;

78

92

79Q_SIGNALS:

93Q_SIGNALS:

80 void userChanged();

94 void userChanged();

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

85 void statsWelcomeScreenChanged();

99 void statsWelcomeScreenChanged();

86 void passwordDisplayHintChanged();

100 void passwordDisplayHintChanged();

87 void failedLoginsChanged();

101 void failedLoginsChanged();

102+ void hereEnabledChanged();

103+ void hereLicensePathChanged();

88

104

89private Q_SLOTS:

105private Q_SLOTS:

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

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

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

98 void updateStatsWelcomeScreen();

114 void updateStatsWelcomeScreen();

99 void updatePasswordDisplayHint();

115 void updatePasswordDisplayHint();

100 void updateFailedLogins();

116 void updateFailedLogins();

117+ void updateHereEnabled();

118+ void updateHereLicensePath();

101

119

102 AccountsServiceDBusAdaptor *m_service;

120 AccountsServiceDBusAdaptor *m_service;

103 QString m_user;

121 QString m_user;

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

108 bool m_statsWelcomeScreen;

126 bool m_statsWelcomeScreen;

109 PasswordDisplayHint m_passwordDisplayHint;

127 PasswordDisplayHint m_passwordDisplayHint;

110 uint m_failedLogins;

128 uint m_failedLogins;

129+ bool m_hereEnabled;

130+ QString m_hereLicensePath;

111};

131};

112

132

113#endif

133#endif

plugins/CMakeLists.txt+1

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

21add_subdirectory(Ubuntu)

21add_subdirectory(Ubuntu)

22add_subdirectory(Unity)

22add_subdirectory(Unity)

23add_subdirectory(Utils)

23add_subdirectory(Utils)

24+add_subdirectory(Wizard)

plugins/Dash/CMakeLists.txt+3−2

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

11 ${CMAKE_CURRENT_SOURCE_DIR}

11 ${CMAKE_CURRENT_SOURCE_DIR}

12 ${CMAKE_CURRENT_BINARY_DIR}

12 ${CMAKE_CURRENT_BINARY_DIR}

13 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

13 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

14− ${Qt5Quick_INCLUDE_DIRS}

15 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

14 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

16 ${Qt5V8_PRIVATE_INCLUDE_DIR}

15 ${Qt5V8_PRIVATE_INCLUDE_DIR}

17)

16)

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

25 verticaljournal.cpp

24 verticaljournal.cpp

26 horizontaljournal.cpp

25 horizontaljournal.cpp

27 organicgrid.cpp

26 organicgrid.cpp

27+ croppedimagesizer.cpp

28+ croppedimagesizerasyncworker.cpp

28 )

29 )

29

30

30add_library(Dash-qml MODULE

31add_library(Dash-qml MODULE

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

36 ${Qt5Quick_LIBRARIES}

37 ${Qt5Quick_LIBRARIES}

37 )

38 )

38

39

39−qt5_use_modules(Dash-qml Qml Quick)

40+qt5_use_modules(Dash-qml Qml Quick Concurrent)

40

41

41add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)

42add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)

plugins/Dash/CardCreator.js+8−10

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

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

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

83 } \n\

83 } \n\

84 } \n\

84 } \n\

85− image: CroppedImageMinimumSourceSize { \n\

85+ CroppedImageMinimumSourceSize { \n\

86+ id: artImage; \n\

86 objectName: "artImage"; \n\

87 objectName: "artImage"; \n\

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

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

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

89− cache: true; \n\

90 asynchronous: root.asynchronous; \n\

89 asynchronous: root.asynchronous; \n\

91 visible: false; \n\

90 visible: false; \n\

92 width: %2; \n\

91 width: %2; \n\

93 height: %3; \n\

92 height: %3; \n\

94 } \n\

93 } \n\

94+ image: artImage.image; \n\

95 } \n\

95 } \n\

96 } \n\

96 } \n\

97 }\n';

97 }\n';

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

181 id: mascotShapeLoader; \n\

181 id: mascotShapeLoader; \n\

182 objectName: "mascotShapeLoader"; \n\

182 objectName: "mascotShapeLoader"; \n\

183 asynchronous: root.asynchronous; \n\

183 asynchronous: root.asynchronous; \n\

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

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

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

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

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

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

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

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

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

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

189 anchors { %1 } \n\

189 anchors { %1 } \n\

190 }\n';

190 }\n';

191

191

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

195 id: mascotImage; \n\

195 id: mascotImage; \n\

196 objectName: "mascotImage"; \n\

196 objectName: "mascotImage"; \n\

197 anchors { %1 } \n\

197 anchors { %1 } \n\

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

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

198+ source: cardData && cardData["mascot"] || ""; \n\

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

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

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

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

202 horizontalAlignment: Image.AlignHCenter; \n\

201 horizontalAlignment: Image.AlignHCenter; \n\

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

435 mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);

434 mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);

436 }

435 }

437

436

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

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

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

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

440 }

439 }

441

440

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

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

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

656 import Ubuntu.Components 1.1; \n\

655 import Ubuntu.Components 1.1; \n\

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

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

658− import Ubuntu.Connectivity 1.0; \n\

659 import Dash 0.1;\n\

657 import Dash 0.1;\n\

660 import Utils 0.1;\n';

658 import Utils 0.1;\n';

661 var card = cardString(template, components);

659 var card = cardString(template, components);

plugins/Dash/CroppedImageMinimumSourceSize.qml+24−18

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

15 */

15 */

16

16

17import QtQuick 2.3

17import QtQuick 2.3

18+import Dash 0.1

18

19

19−Image {

20+Item {

20− property bool resized: false

21+ id: root

21− property bool resizing: false

22+

23+ property string source

24+ property alias image: innerImage

25+ property alias asynchronous: innerImage.asynchronous

26+ property alias verticalAlignment: innerImage.verticalAlignment

27+ property alias horizontalAlignment: innerImage.horizontalAlignment

28+ property alias fillMode: innerImage.fillMode

29+

30+ CroppedImageSizer {

31+ id: sizer

32+ source: root.source

33+ width: root.width

34+ height: root.height

35+ }

36+

37+ Image {

38+ id: innerImage

39+ anchors.fill: parent

22− fillMode: Image.PreserveAspectCrop

40+ fillMode: Image.PreserveAspectCrop

23− visible: resized

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

24− onSourceSizeChanged: {

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

26− resizing = true;

27− var ar = width / height;

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

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

29− if (ar > ssar) {

30− sourceSize = Qt.size(width, 0);

31− } else {

32− sourceSize = Qt.size(0, height);

33− }

34− resizing = false;

35− resized = true;

36− }

37 }

43 }

38}

44}

plugins/Dash/ScopeStyle.qml+1−1

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

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

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

71

71

72 /// Color of the primary preview button

72 /// Color of the primary preview button

73− readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : Theme.palette.selected.foreground

73+ readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : UbuntuColors.orange

74

74

75 //! @cond

75 //! @cond

76 property var d: QtObject {

76 property var d: QtObject {

plugins/Dash/abstractdashview.cpp+24−5

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

16

16

17#include "abstractdashview.h"

17#include "abstractdashview.h"

18

18

19−static const qreal bufferRatio = 0.5;

20−

21AbstractDashView::AbstractDashView()

19AbstractDashView::AbstractDashView()

22 : m_delegateModel(nullptr)

20 : m_delegateModel(nullptr)

23 , m_asyncRequestedIndex(-1)

21 , m_asyncRequestedIndex(-1)

24 , m_columnSpacing(0)

22 , m_columnSpacing(0)

25 , m_rowSpacing(0)

23 , m_rowSpacing(0)

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

26 , m_displayMarginBeginning(0)

25 , m_displayMarginBeginning(0)

27 , m_displayMarginEnd(0)

26 , m_displayMarginEnd(0)

28 , m_needsRelayout(false)

27 , m_needsRelayout(false)

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

112 }

111 }

113}

112}

114

113

114+int AbstractDashView::cacheBuffer() const

115+{

116+ return m_buffer;

117+}

118+

119+void AbstractDashView::setCacheBuffer(int buffer)

120+{

121+ if (buffer < 0) {

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

123+ return;

124+ }

125+

126+ if (m_buffer != buffer) {

127+ m_buffer = buffer;

128+ if (isComponentComplete()) {

129+ polish();

130+ }

131+ emit cacheBufferChanged();

132+ }

133+}

134+

115qreal AbstractDashView::displayMarginBeginning() const

135qreal AbstractDashView::displayMarginBeginning() const

116{

136{

117 return m_displayMarginBeginning;

137 return m_displayMarginBeginning;

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

160

180

161 const qreal from = -m_displayMarginBeginning;

181 const qreal from = -m_displayMarginBeginning;

162 const qreal to = height() + m_displayMarginEnd;

182 const qreal to = height() + m_displayMarginEnd;

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

164− const qreal bufferFrom = from - buffer;

183+ const qreal bufferFrom = from - m_buffer;

165− const qreal bufferTo = to + buffer;

184+ const qreal bufferTo = to + m_buffer;

166

185

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

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

168 bool removed = removeNonVisibleItems(bufferFrom, bufferTo);

187 bool removed = removeNonVisibleItems(bufferFrom, bufferTo);

plugins/Dash/abstractdashview.h+10

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

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

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

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

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

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

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

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

38 Q_PROPERTY(qreal displayMarginBeginning READ displayMarginBeginning

39 Q_PROPERTY(qreal displayMarginBeginning READ displayMarginBeginning

39 WRITE setDisplayMarginBeginning

40 WRITE setDisplayMarginBeginning

40 NOTIFY displayMarginBeginningChanged)

41 NOTIFY displayMarginBeginningChanged)

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

61 qreal rowSpacing() const;

62 qreal rowSpacing() const;

62 void setRowSpacing(qreal rowSpacing);

63 void setRowSpacing(qreal rowSpacing);

63

64

65+ int cacheBuffer() const;

66+ void setCacheBuffer(int);

67+

64 qreal displayMarginBeginning() const;

68 qreal displayMarginBeginning() const;

65 void setDisplayMarginBeginning(qreal);

69 void setDisplayMarginBeginning(qreal);

66

70

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

72 void delegateChanged();

76 void delegateChanged();

73 void columnSpacingChanged();

77 void columnSpacingChanged();

74 void rowSpacingChanged();

78 void rowSpacingChanged();

79+ void cacheBufferChanged();

75 void displayMarginBeginningChanged();

80 void displayMarginBeginningChanged();

76 void displayMarginEndChanged();

81 void displayMarginEndChanged();

77

82

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

104 virtual void doRelayout() = 0;

109 virtual void doRelayout() = 0;

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

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

106 virtual void calculateImplicitHeight() = 0;

111 virtual void calculateImplicitHeight() = 0;

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

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

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

114+#else

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

116+#endif

108

117

109 QQmlDelegateModel *m_delegateModel;

118 QQmlDelegateModel *m_delegateModel;

110

119

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

113

122

114 int m_columnSpacing;

123 int m_columnSpacing;

115 int m_rowSpacing;

124 int m_rowSpacing;

125+ int m_buffer;

116 qreal m_displayMarginBeginning;

126 qreal m_displayMarginBeginning;

117 qreal m_displayMarginEnd;

127 qreal m_displayMarginEnd;

118 bool m_needsRelayout;

128 bool m_needsRelayout;

plugins/Dash/croppedimagesizer.cppnew file+136

@@ -0,0 +1,136 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include "croppedimagesizer.h"

18+

19+#include "croppedimagesizerasyncworker.h"

20+

21+#include <QNetworkAccessManager>

22+#include <QNetworkRequest>

23+#include <QQmlEngine>

24+#include <QQuickItem>

25+

26+CroppedImageSizer::CroppedImageSizer()

27+ : m_width(0),

28+ m_height(0),

29+ m_sourceSize(QSize(-1, -1)),

30+ m_worker(nullptr)

31+{

32+ connect(this, &CroppedImageSizer::inputParamsChanged, this, &CroppedImageSizer::calculateSourceSize);

33+ connect(this, &CroppedImageSizer::sourceChanged, this, &CroppedImageSizer::requestImage);

34+}

35+

36+CroppedImageSizer::~CroppedImageSizer()

37+{

38+ if (m_worker) {

39+ m_worker->abort();

40+ }

41+}

42+

43+QUrl CroppedImageSizer::source() const

44+{

45+ return m_source;

46+}

47+

48+void CroppedImageSizer::setSource(const QUrl &source)

49+{

50+ if (source != m_source) {

51+ m_source = source;

52+ Q_EMIT sourceChanged();

53+ }

54+}

55+

56+qreal CroppedImageSizer::width() const

57+{

58+ return m_width;

59+}

60+

61+void CroppedImageSizer::setWidth(qreal width)

62+{

63+ if (width != m_width) {

64+ m_width = width;

65+ Q_EMIT inputParamsChanged();

66+ }

67+}

68+

69+qreal CroppedImageSizer::height() const

70+{

71+ return m_height;

72+}

73+

74+void CroppedImageSizer::setHeight(qreal height)

75+{

76+ if (height != m_height) {

77+ m_height = height;

78+ Q_EMIT inputParamsChanged();

79+ }

80+}

81+

82+QSize CroppedImageSizer::sourceSize() const

83+{

84+ return m_sourceSize;

85+}

86+

87+void CroppedImageSizer::setSourceSize(const QSize &sourceSize)

88+{

89+ if (sourceSize != m_sourceSize) {

90+ m_sourceSize = sourceSize;

91+ Q_EMIT sourceSizeChanged();

92+ }

93+}

94+

95+void CroppedImageSizer::setImageSize(const QSize &imageSize)

96+{

97+ m_imageSize = imageSize;

98+ m_worker = nullptr;

99+ calculateSourceSize();

100+}

101+

102+void CroppedImageSizer::requestImage()

103+{

104+ if (m_worker) {

105+ m_worker->abort();

106+ m_worker = nullptr;

107+ }

108+

109+ if (m_source.isValid() && qmlEngine(this) && qmlEngine(this)->networkAccessManager()) {

110+ QNetworkRequest request(m_source);

111+ QNetworkReply *reply = qmlEngine(this)->networkAccessManager()->get(request);

112+ m_worker = new CroppedImageSizerAsyncWorker(this, reply);

113+ } else {

114+ setSourceSize(QSize(-1, -1));

115+ }

116+}

117+

118+void CroppedImageSizer::calculateSourceSize()

119+{

120+ if (m_source.isValid() && m_width > 0 && m_height > 0 && !m_worker) {

121+ if (!m_imageSize.isEmpty()) {

122+ const qreal ar = m_width / m_height;

123+ const qreal ssar = m_imageSize.width() / (qreal)m_imageSize.height();

124+ if (ar > ssar) {

125+ setSourceSize(QSize(m_width, 0));

126+ } else {

127+ setSourceSize(QSize(0, m_height));

128+ }

129+ } else {

130+ qWarning() << "Invalid size for " << m_source << m_imageSize;

131+ setSourceSize(QSize(0, 0));

132+ }

133+ } else {

134+ setSourceSize(QSize(-1, -1));

135+ }

136+}

plugins/Dash/croppedimagesizer.hnew file+72

@@ -0,0 +1,72 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#ifndef CROPPEDIMAGESIZER_H

18+#define CROPPEDIMAGESIZER_H

19+

20+#include <QImageReader>

21+#include <QObject>

22+#include <QSize>

23+#include <QUrl>

24+

25+class CroppedImageSizerAsyncWorker;

26+

27+class CroppedImageSizer : public QObject

28+{

29+ Q_OBJECT

30+

31+ Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)

32+ Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY inputParamsChanged)

33+ Q_PROPERTY(qreal height READ height WRITE setHeight NOTIFY inputParamsChanged)

34+ Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)

35+

36+public:

37+ CroppedImageSizer();

38+ ~CroppedImageSizer();

39+

40+ QUrl source() const;

41+ void setSource(const QUrl &source);

42+

43+ qreal width() const;

44+ void setWidth(qreal width);

45+

46+ qreal height() const;

47+ void setHeight(qreal height);

48+

49+ QSize sourceSize() const;

50+ void setSourceSize(const QSize &sourceSize);

51+

52+ Q_INVOKABLE void setImageSize(const QSize &imageSize);

53+

54+Q_SIGNALS:

55+ void inputParamsChanged();

56+ void sourceChanged();

57+ void sourceSizeChanged();

58+

59+private Q_SLOT:

60+ void calculateSourceSize();

61+ void requestImage();

62+

63+private:

64+ QUrl m_source;

65+ qreal m_width;

66+ qreal m_height;

67+ QSize m_sourceSize;

68+ QSize m_imageSize;

69+ QPointer<CroppedImageSizerAsyncWorker> m_worker;

70+};

71+

72+#endif

plugins/Dash/croppedimagesizerasyncworker.cppnew file+74

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

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include "croppedimagesizerasyncworker.h"

18+

19+#include "croppedimagesizer.h"

20+

21+#include <QNetworkReply>

22+#include <QtConcurrentRun>

23+

24+CroppedImageSizerAsyncWorker::CroppedImageSizerAsyncWorker(CroppedImageSizer *sizer, QNetworkReply *reply)

25+ : m_sizer(sizer),

26+ m_reply(reply),

27+ m_ignoreAbort(false)

28+{

29+ connect(m_reply, &QNetworkReply::finished, this, &CroppedImageSizerAsyncWorker::requestFinished);

30+}

31+

32+void CroppedImageSizerAsyncWorker::abort()

33+{

34+ // This runs on main thread

35+ QMutexLocker locker(&m_mutex);

36+ m_sizer = nullptr;

37+ // If we already started the future run we can't abort the reply

38+ // since we don't know at which stage the future is, just let it finish

39+ if (!m_ignoreAbort) {

40+ QMetaObject::invokeMethod(m_reply, "abort", Qt::QueuedConnection);

41+ }

42+}

43+

44+void CroppedImageSizerAsyncWorker::requestFinished()

45+{

46+ // This runs on main thread

47+ QMutexLocker locker(&m_mutex);

48+ if (m_sizer) {

49+ m_ignoreAbort = true;

50+ QtConcurrent::run(processRequestFinished, this);

51+ } else {

52+ // We were aborted delete ourselves

53+ m_reply->deleteLater();

54+ deleteLater();

55+ }

56+}

57+

58+void CroppedImageSizerAsyncWorker::processRequestFinished(CroppedImageSizerAsyncWorker *worker)

59+{

60+ // This runs on non main thread

61+ // m_reply has finished at this point and is protected against change by m_ignoreAbort

62+ QImageReader reader(worker->m_reply);

63+ const QSize imageSize = reader.size();

64+

65+ worker->m_mutex.lock();

66+ if (worker->m_sizer) {

67+ QMetaObject::invokeMethod(worker->m_sizer, "setImageSize", Qt::QueuedConnection, Q_ARG(QSize, imageSize));

68+ }

69+ worker->m_mutex.unlock();

70+

71+ // All work is done, delete ourselves

72+ worker->m_reply->deleteLater();

73+ worker->deleteLater();

74+}

plugins/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()

184 }

184 }

185}

185}

186

186

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

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

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

189+#else

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

191+#endif

188{

192{

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

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

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

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

191 const int indexToRemove = remove.index + i;

195 const int indexToRemove = remove.index + i;

192 // We only support removing from the end so

196 // We only support removing from the end so

plugins/Dash/horizontaljournal.h+4

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

52 void calculateImplicitHeight() override;

52 void calculateImplicitHeight() override;

53 void doRelayout() override;

53 void doRelayout() override;

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

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

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

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

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

57+#else

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

59+#endif

56

60

57 int m_firstVisibleIndex;

61 int m_firstVisibleIndex;

58 QList<QQuickItem*> m_visibleItems;

62 QList<QQuickItem*> m_visibleItems;

plugins/Dash/listviewwithpageheader.cpp+9−4

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

334 return m_headerItemShownHeight;

334 return m_headerItemShownHeight;

335}

335}

336

336

337−qreal ListViewWithPageHeader::cacheBuffer() const

337+int ListViewWithPageHeader::cacheBuffer() const

338{

338{

339 return m_cacheBuffer;

339 return m_cacheBuffer;

340}

340}

341

341

342−void ListViewWithPageHeader::setCacheBuffer(qreal cacheBuffer)

342+void ListViewWithPageHeader::setCacheBuffer(int cacheBuffer)

343{

343{

344+ if (cacheBuffer < 0) {

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

346+ return;

347+ }

348+

344 if (cacheBuffer != m_cacheBuffer) {

349 if (cacheBuffer != m_cacheBuffer) {

345 m_cacheBuffer = cacheBuffer;

350 m_cacheBuffer = cacheBuffer;

346 Q_EMIT cacheBufferChanged();

351 Q_EMIT cacheBufferChanged();

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

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

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

937 const auto oldFirstVisibleIndex = m_firstVisibleIndex;

942 const auto oldFirstVisibleIndex = m_firstVisibleIndex;

938

943

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

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

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

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

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

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

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

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

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

990 }

995 }

991 }

996 }

992

997

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

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

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

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

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

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

996 const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();

1001 const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();

plugins/Dash/listviewwithpageheader.h+4−4

@@ -54,7 +54,7 @@ class ListViewWithPageHeader : public QQuickFlickable, public QQuickItemChangeLi

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

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

55 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)

55 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)

56 Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)

56 Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)

57− Q_PROPERTY(qreal cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)

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

58

58

59 friend class ListViewWithPageHeaderTest;

59 friend class ListViewWithPageHeaderTest;

60 friend class ListViewWithPageHeaderTestSection;

60 friend class ListViewWithPageHeaderTestSection;

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

85 int stickyHeaderHeight() const;

85 int stickyHeaderHeight() const;

86 qreal headerItemShownHeight() const;

86 qreal headerItemShownHeight() const;

87

87

88− qreal cacheBuffer() const;

88+ int cacheBuffer() const;

89− void setCacheBuffer(qreal cacheBuffer);

89+ void setCacheBuffer(int cacheBuffer);

90

90

91 Q_INVOKABLE void positionAtBeginning();

91 Q_INVOKABLE void positionAtBeginning();

92 Q_INVOKABLE void showHeader();

92 Q_INVOKABLE void showHeader();

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

204 bool m_forceNoClip;

204 bool m_forceNoClip;

205 bool m_inLayout;

205 bool m_inLayout;

206 bool m_inContentHeightKeepHeaderShown;

206 bool m_inContentHeightKeepHeaderShown;

207− qreal m_cacheBuffer;

207+ int m_cacheBuffer;

208

208

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

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

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

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

plugins/Dash/organicgrid.cpp+5−1

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

237 }

237 }

238}

238}

239

239

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

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

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

242+#else

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

244+#endif

241{

245{

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

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

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

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

244 const int indexToRemove = remove.index + i;

248 const int indexToRemove = remove.index + i;

245 // We only support removing from the end

249 // We only support removing from the end

plugins/Dash/organicgrid.h+4

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

79 void doRelayout() override;

79 void doRelayout() override;

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

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

81 void calculateImplicitHeight() override;

81 void calculateImplicitHeight() override;

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

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

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

84+#else

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

86+#endif

83

87

84 QSizeF m_smallDelegateSize;

88 QSizeF m_smallDelegateSize;

85 QSizeF m_bigDelegateSize;

89 QSizeF m_bigDelegateSize;

plugins/Dash/plugin.cpp+2

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

17

17

18#include "plugin.h"

18#include "plugin.h"

19

19

20+#include "croppedimagesizer.h"

20#include "horizontaljournal.h"

21#include "horizontaljournal.h"

21#include "listviewwithpageheader.h"

22#include "listviewwithpageheader.h"

22#include "organicgrid.h"

23#include "organicgrid.h"

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

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

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

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

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

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

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

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

35}

37}

plugins/Dash/verticaljournal.cpp+5−1

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

239 }

239 }

240}

240}

241

241

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

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

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

244+#else

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

246+#endif

243{

247{

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

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

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

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

246 const int indexToRemove = remove.index + i;

250 const int indexToRemove = remove.index + i;

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

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

plugins/Dash/verticaljournal.h+4

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

90 void calculateImplicitHeight() override;

90 void calculateImplicitHeight() override;

91 void doRelayout() override;

91 void doRelayout() override;

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

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

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

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

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

95+#else

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

97+#endif

94

98

95 QVector<QList<ViewItem>> m_columnVisibleItems;

99 QVector<QList<ViewItem>> m_columnVisibleItems;

96 QHash<int, int> m_indexColumnMap;

100 QHash<int, int> m_indexColumnMap;

plugins/LightDM/CMakeLists.txt+1−1

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

15)

15)

16

16

17set(QMLPLUGIN_SRC

17set(QMLPLUGIN_SRC

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

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

19 DBusGreeter.cpp

19 DBusGreeter.cpp

20 DBusGreeterList.cpp

20 DBusGreeterList.cpp

21 Greeter.cpp

21 Greeter.cpp

plugins/LightDM/UsersModel.cpp+1−1

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

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

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

59

59

60UsersModel::UsersModel(QObject* parent)

60UsersModel::UsersModel(QObject* parent)

61− : QSortFilterProxyModelQML(parent)

61+ : UnitySortFilterProxyModelQML(parent)

62{

62{

63 setModel(new MangleModel(this));

63 setModel(new MangleModel(this));

64 setSortCaseSensitivity(Qt::CaseInsensitive);

64 setSortCaseSensitivity(Qt::CaseInsensitive);

plugins/LightDM/UsersModel.h+2−2

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

23#ifndef UNITY_USERSMODEL_H

23#ifndef UNITY_USERSMODEL_H

24#define UNITY_USERSMODEL_H

24#define UNITY_USERSMODEL_H

25

25

26−#include <qsortfilterproxymodelqml.h>

26+#include <unitysortfilterproxymodelqml.h>

27#include <QtCore/QObject>

27#include <QtCore/QObject>

28

28

29−class UsersModel : public QSortFilterProxyModelQML

29+class UsersModel : public UnitySortFilterProxyModelQML

30{

30{

31 Q_OBJECT

31 Q_OBJECT

32

32

plugins/Lights/Lights.cpp+9−24

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

44

44

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

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

46{

46{

47+ if (!init()) {

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

49+ return;

50+ }

51+

47 if (m_state != newState) {

52 if (m_state != newState) {

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

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

49 turnOn();

54 turnOn();

50 } else {

55 } else {

51 turnOff();

56 turnOff();

52 }

57 }

58+

59+ m_state = newState;

60+ Q_EMIT stateChanged(m_state);

53 }

61 }

54}

62}

55

63

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

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

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

116 if (err == 0) {

124 if (err == 0) {

117 m_lightDevice = (light_device_t*)device;

125 m_lightDevice = (light_device_t*)device;

126+ turnOff();

118 return true;

127 return true;

119 } else {

128 } else {

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

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

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

127

136

128void Lights::turnOn()

137void Lights::turnOn()

129{

138{

130− if (!init()) {

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

132− return;

133− }

134−

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

136− return;

137− }

138−

139 // pulse

139 // pulse

140 light_state_t state;

140 light_state_t state;

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

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

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

147

147

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

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

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

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

150− } else {

151− m_state = Lights::On;

152− Q_EMIT stateChanged(m_state);

153 }

150 }

154}

151}

155

152

156void Lights::turnOff()

153void Lights::turnOff()

157{

154{

158− if (!init()) {

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

160− return;

161− }

162−

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

164− return;

165− }

166−

167 light_state_t state;

155 light_state_t state;

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

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

169 state.color = 0x00000000;

157 state.color = 0x00000000;

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

174

162

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

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

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

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

177− } else {

178− m_state = Lights::Off;

179− Q_EMIT stateChanged(m_state);

180 }

165 }

181}

166}

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

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

18

18

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

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

20{

20{

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

21+ return type == Direction::Leftwards

22+ || type == Direction::Rightwards

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

22}

24}

23

25

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

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

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

28

30

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

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

30{

32{

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

33+ return type == Rightwards

34+ || type == Downwards

35+ || type == Horizontal;

32}

36}

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

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

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

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

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

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

35 Downwards, // Along the positive direction of the Y axis

35 Downwards, // Along the positive direction of the Y axis

36− Upwards // Along the negative direction of the Y axis

36+ Upwards, // Along the negative direction of the Y axis

37+ Horizontal // Along the X axis, in any direction

37 };

38 };

38

39

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

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

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

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

36using namespace UbuntuGestures;

36using namespace UbuntuGestures;

37

37

38#if DIRECTIONALDRAGAREA_DEBUG

38#if DIRECTIONALDRAGAREA_DEBUG

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

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

40#include "DebugHelpers.h"

40#include "DebugHelpers.h"

41

41

42namespace {

42namespace {

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

53

53

54} // namespace {

54} // namespace {

55#else // DIRECTIONALDRAGAREA_DEBUG

55#else // DIRECTIONALDRAGAREA_DEBUG

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

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

57#endif // DIRECTIONALDRAGAREA_DEBUG

57#endif // DIRECTIONALDRAGAREA_DEBUG

58

58

59

59

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

253 if (event->gained()) {

253 if (event->gained()) {

254 QVector<int> ids;

254 QVector<int> ids;

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

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

256− DDA_DEBUG("grabbing touch");

256+ ddaDebug("grabbing touch");

257 grabTouchPoints(ids);

257 grabTouchPoints(ids);

258

258

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

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

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

265 if (window()) {

265 if (window()) {

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

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

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

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

268− DDA_DEBUG("removing mouse grabber");

268+ ddaDebug("removing mouse grabber");

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

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

270 }

270 }

271 }

271 }

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

283

283

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

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

285

285

286− #if DIRECTIONALDRAGAREA_DEBUG

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

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

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

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

290− #endif

291

287

292 switch (m_status) {

288 switch (m_status) {

293 case WaitingForTouch:

289 case WaitingForTouch:

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

322

318

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

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

324 // touch has ended before recognition concluded

320 // touch has ended before recognition concluded

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

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

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

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

327 emitSignalIfTapped();

323 emitSignalIfTapped();

328 setStatus(WaitingForTouch);

324 setStatus(WaitingForTouch);

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

335 updateVelocityCalculator(touchScenePos);

331 updateVelocityCalculator(touchScenePos);

336

332

337 if (!pointInsideAllowedArea()) {

333 if (!pointInsideAllowedArea()) {

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

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

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

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

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

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

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

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

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

344 }

340 }

345

341

346 if (!movingInRightDirection()) {

342 if (!movingInRightDirection()) {

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

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

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

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

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

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

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

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

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

358 if (isWithinTouchCompositionWindow()) {

354 if (isWithinTouchCompositionWindow()) {

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

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

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

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

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

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

362 return;

358 return;

363 }

359 }

364

360

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

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

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

367 setStatus(Recognized);

363 setStatus(Recognized);

368 } else {

364 } else {

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

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

370 }

366 }

371}

367}

372

368

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

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

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

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

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

377

373

378− #if DIRECTIONALDRAGAREA_DEBUG

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

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

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

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

382− #endif

383

375

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

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

385 QQuickItem::touchEvent(event);

377 QQuickItem::touchEvent(event);

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

416 if (isWithinTouchCompositionWindow()) {

408 if (isWithinTouchCompositionWindow()) {

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

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

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

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

419− #if DIRECTIONALDRAGAREA_DEBUG

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

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

421− #endif

422 allGood = false;

412 allGood = false;

423 }

413 }

424

414

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

456

446

457 if (recognitionIsDisabled()) {

447 if (recognitionIsDisabled()) {

458 // Behave like a dumb TouchArea

448 // Behave like a dumb TouchArea

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

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

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

460 setStatus(Recognized);

451 setStatus(Recognized);

461 event->accept();

452 event->accept();

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

487

478

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

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

489 // multi-finger drags are not accepted

480 // multi-finger drags are not accepted

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

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

491

482

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

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

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

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

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

581

572

582bool DirectionalDragArea::movingInRightDirection() const

573bool DirectionalDragArea::movingInRightDirection() const

583{

574{

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

576+ return true;

577+ } else {

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

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

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

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

586

580

587− qreal scalarProjection = projectOntoDirectionVector(movementVector);

581+ qreal scalarProjection = projectOntoDirectionVector(movementVector);

588

582

589− return scalarProjection >= 0.;

583+ return scalarProjection >= 0.;

584+ }

590}

585}

591

586

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

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

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

614 qreal minSpeedMsecs = m_minSpeed / 1000.0;

609 qreal minSpeedMsecs = m_minSpeed / 1000.0;

615

610

616 if (speed < minSpeedMsecs) {

611 if (speed < minSpeedMsecs) {

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

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

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

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

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

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

620 setStatus(WaitingForTouch);

615 setStatus(WaitingForTouch);

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

625 m_silenceTime += m_recognitionTimer->interval();

620 m_silenceTime += m_recognitionTimer->interval();

626

621

627 if (m_silenceTime > m_maxSilenceTime) {

622 if (m_silenceTime > m_maxSilenceTime) {

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

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

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

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

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

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

631 setStatus(WaitingForTouch);

626 setStatus(WaitingForTouch);

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

646 }

641 }

647

642

648 if (m_status != WaitingForTouch) {

643 if (m_status != WaitingForTouch) {

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

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

650 setStatus(WaitingForTouch);

645 setStatus(WaitingForTouch);

651 }

646 }

652 }

647 }

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

666 m_status = newStatus;

661 m_status = newStatus;

667 Q_EMIT statusChanged(m_status);

662 Q_EMIT statusChanged(m_status);

668

663

669− #if DIRECTIONALDRAGAREA_DEBUG

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

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

671− #endif

672

665

673 switch (newStatus) {

666 switch (newStatus) {

674 case WaitingForTouch:

667 case WaitingForTouch:

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

875 localDirection.rx() = -1.;

868 localDirection.rx() = -1.;

876 localDirection.ry() = 0.;

869 localDirection.ry() = 0.;

877 break;

870 break;

878− default: // Direction::Rightwards:

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

879 localDirection.rx() = 1.;

872 localDirection.rx() = 1.;

880 localDirection.ry() = 0.;

873 localDirection.ry() = 0.;

881 break;

874 break;

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

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

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

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

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

893}

886}

894−

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

896−#include "DirectionalDragArea.moc"

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

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

16)

16)

17

17

18set(IndicatorsQML_SOURCES

18set(IndicatorsQML_SOURCES

19+ actionrootstate.cpp

19 indicator.cpp

20 indicator.cpp

20 indicators.h

21 indicators.h

21 indicatorsmanager.cpp

22 indicatorsmanager.cpp

22 indicatorsmodel.cpp

23 indicatorsmodel.cpp

23 menucontentactivator.cpp

24 menucontentactivator.cpp

25+ modelactionrootstate.cpp

24 modelprinter.cpp

26 modelprinter.cpp

25 plugin.cpp

27 plugin.cpp

26− rootactionstate.cpp

28+ rootstateparser.cpp

27 sharedunitymenumodel.cpp

29 sharedunitymenumodel.cpp

28 unitymenumodelcache.cpp

30 unitymenumodelcache.cpp

29 unitymenumodelstack.cpp

31 unitymenumodelstack.cpp

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

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

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

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

8

8

9Module {

9Module {

10+ Component {

11+ name: "ActionRootState"

12+ prototype: "RootStateObject"

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

14+ exportMetaObjectRevisions: [0]

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

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

17+ }

10 Component {

18 Component {

11 name: "ActionState"

19 name: "ActionState"

12 prototype: "QObject"

20 prototype: "QObject"

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

23 }

31 }

24 }

32 }

25 }

33 }

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

27 Component {

34 Component {

28 name: "FlatMenuProxyModelRole"

35 name: "FlatMenuProxyModelRole"

29 prototype: "QObject"

36 prototype: "QObject"

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

146 exportMetaObjectRevisions: [0]

153 exportMetaObjectRevisions: [0]

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

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

148 }

155 }

156+ Component {

157+ name: "ModelActionRootState"

158+ prototype: "RootStateObject"

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

160+ exportMetaObjectRevisions: [0]

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

162+ Signal { name: "indexChanged" }

163+ }

149 Component {

164 Component {

150 name: "ModelPrinter"

165 name: "ModelPrinter"

151 prototype: "QObject"

166 prototype: "QObject"

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

192 }

207 }

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

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

194 Component {

209 Component {

195− name: "RootActionState"

210+ name: "RootStateObject"

196− prototype: "ActionStateParser"

211+ prototype: "QObject"

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

198− exportMetaObjectRevisions: [0]

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

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

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

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

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

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

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

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

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

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

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

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

207 Signal { name: "updated" }

219 Signal { name: "updated" }

208− Signal { name: "indexChanged" }

209 }

220 }

210 Component {

221 Component {

211 name: "SharedUnityMenuModel"

222 name: "SharedUnityMenuModel"

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

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

1+/*

2+ * Copyright 2014 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#include "actionrootstate.h"

18+

19+#include <qdbusactiongroup.h>

20+#include <QDebug>

21+

22+ActionRootState::ActionRootState(QObject *parent)

23+ : RootStateObject(parent)

24+ , m_actionGroup(nullptr)

25+{

26+}

27+

28+QDBusActionGroup *ActionRootState::actionGroup() const

29+{

30+ return m_actionGroup;

31+}

32+

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

34+{

35+ if (m_actionGroup != actionGroup) {

36+ bool wasValid = valid();

37+

38+ if (m_actionGroup) {

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

40+ }

41+ m_actionGroup = actionGroup;

42+

43+ if (m_actionGroup) {

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

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

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

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

48+

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

50+ }

51+ updateActionState();

52+ Q_EMIT actionGroupChanged();

53+

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

55+ }

56+}

57+

58+QString ActionRootState::actionName() const

59+{

60+ return m_actionName;

61+}

62+

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

64+{

65+ if (m_actionName != actionName) {

66+ bool wasValid = valid();

67+

68+ m_actionName = actionName;

69+ updateActionState();

70+

71+ Q_EMIT actionNameChanged();

72+

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

74+ }

75+}

76+

77+bool ActionRootState::valid() const

78+{

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

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

81+}

82+

83+void ActionRootState::updateActionState()

84+{

85+ if (valid()) {

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

87+ m_actionGroup->setActionStateParser(&m_parser);

88+

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

90+

91+ m_actionGroup->setActionStateParser(oldParser);

92+

93+ setCurrentState(state);

94+ } else {

95+ setCurrentState(QVariantMap());

96+ }

97+}

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

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

1+/*

2+ * Copyright 2014 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ */

16+

17+#ifndef ACTIONROOTSTATE_H

18+#define ACTIONROOTSTATE_H

19+

20+#include "unityindicatorsglobal.h"

21+

22+#include "rootstateparser.h"

23+

24+class QDBusActionGroup;

25+

26+class UNITYINDICATORS_EXPORT ActionRootState : public RootStateObject

27+{

28+ Q_OBJECT

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

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

31+

32+public:

33+ ActionRootState(QObject *parent = 0);

34+

35+ QDBusActionGroup *actionGroup() const;

36+ void setActionGroup(QDBusActionGroup *actionGroup);

37+

38+ QString actionName() const;

39+ void setActionName(const QString& actionName);

40+

41+ bool valid() const override;

42+

43+Q_SIGNALS:

44+ void actionGroupChanged();

45+ void actionNameChanged();

46+

47+private Q_SLOTS:

48+ void updateActionState();

49+

50+private:

51+ QDBusActionGroup* m_actionGroup;

52+ QString m_actionName;

53+};

54+

55+#endif // ACTIONROOTSTATE_H

plugins/Unity/Indicators/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 @@

24#include "plugin.h"

24#include "plugin.h"

25

25

26// local

26// local

27+#include "actionrootstate.h"

27#include "indicators.h"

28#include "indicators.h"

28#include "indicatorsmanager.h"

29#include "indicatorsmanager.h"

29#include "indicatorsmodel.h"

30#include "indicatorsmodel.h"

30#include "menucontentactivator.h"

31#include "menucontentactivator.h"

32+#include "modelactionrootstate.h"

31#include "modelprinter.h"

33#include "modelprinter.h"

32−#include "rootactionstate.h"

33#include "sharedunitymenumodel.h"

34#include "sharedunitymenumodel.h"

34#include "unitymenumodelcache.h"

35#include "unitymenumodelcache.h"

35#include "unitymenumodelstack.h"

36#include "unitymenumodelstack.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

12 *

12 *

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

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

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

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

15− *

16− * Authors:

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

18 */

15 */

19

16

20−#include "rootactionstate.h"

17+#include "rootstateparser.h"

21−#include "indicators.h"

22−

23−#include <unitymenumodel.h>

24−#include <QVariant>

25−#include <QIcon>

26

18

27extern "C" {

19extern "C" {

28#include <glib.h>

20#include <glib.h>

29#include <gio/gio.h>

21#include <gio/gio.h>

30}

22}

31

23

32−RootActionState::RootActionState(QObject *parent)

24+RootStateParser::RootStateParser(QObject* parent)

33− : ActionStateParser(parent),

25+ : ActionStateParser(parent)

34− m_menu(nullptr)

35−{

36−}

37−

38−RootActionState::~RootActionState()

39−{

40−}

41−

42−UnityMenuModel* RootActionState::menu() const

43−{

44− return m_menu;

45−}

46−

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

48−{

49− if (m_menu != menu) {

50− if (m_menu) {

51− m_menu->disconnect(this);

52− }

53− m_menu = menu;

54−

55− if (m_menu) {

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

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

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

59−

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

61− }

62− updateActionState();

63− Q_EMIT menuChanged();

64− }

65−}

66−

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

68{

26{

69− Q_UNUSED(parent);

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

71− updateActionState();

72− }

73−}

74−

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

76−{

77− Q_UNUSED(parent);

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

79− updateActionState();

80− }

81−}

82−

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

84−{

85− Q_UNUSED(roles);

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

87− return;

88− }

89−

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

91− updateActionState();

92− }

93−}

94−

95−void RootActionState::reset()

96−{

97− m_cachedState.clear();

98− m_menu = nullptr;

99−

100− Q_EMIT menuChanged();

101− Q_EMIT updated();

102−}

103−

104−void RootActionState::updateActionState()

105−{

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

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

108− m_menu->setActionStateParser(this);

109−

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

111−

112− m_menu->setActionStateParser(oldParser);

113− } else {

114− m_cachedState.clear();

115− }

116− Q_EMIT updated();

117−}

118−

119−bool RootActionState::isValid() const

120−{

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

122−}

123−

124−QString RootActionState::title() const

125−{

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

127−

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

129−}

130−

131−QString RootActionState::leftLabel() const

132−{

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

134−

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

136−}

137−

138−QString RootActionState::rightLabel() const

139−{

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

141−

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

143−}

144−

145−QStringList RootActionState::icons() const

146−{

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

148−

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

150−}

151−

152−QString RootActionState::accessibleName() const

153−{

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

155−

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

157−}

158−

159−bool RootActionState::indicatorVisible() const

160−{

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

162−

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

164}

27}

165

28

166static QString iconUri(GIcon *icon)

29static QString iconUri(GIcon *icon)

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

209 return uri;

72 return uri;

210}

73}

211

74

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

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

213{

76{

214 if (!state) {

77 if (!state) {

215 return QVariant();

78 return QVariant();

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

296 }

159 }

297 return ActionStateParser::toQVariant(state);

160 return ActionStateParser::toQVariant(state);

298}

161}

162+

163+

164+RootStateObject::RootStateObject(QObject* parent)

165+ : QObject(parent)

166+{

167+}

168+

169+QString RootStateObject::title() const

170+{

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

172+

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

174+}

175+

176+QString RootStateObject::leftLabel() const

177+{

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

179+

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

181+}

182+

183+QString RootStateObject::rightLabel() const

184+{

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

186+

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

188+}

189+

190+QStringList RootStateObject::icons() const

191+{

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

193+

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

195+}

196+

197+QString RootStateObject::accessibleName() const

198+{

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

200+

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

202+}

203+

204+bool RootStateObject::indicatorVisible() const

205+{

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

207+

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

209+}

210+

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

212+{

213+ QString oldTitle = title();

214+ QString oldLeftLabel = leftLabel();

215+ QString oldRightLabel = rightLabel();

216+ QStringList oldIcons = icons();

217+ QString oldAccessibleName = accessibleName();

218+ bool oldIndicatorVisible = indicatorVisible();

219+

220+ if (m_currentState != newState) {

221+ m_currentState = newState;

222+ Q_EMIT updated();

223+

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

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

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

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

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

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

230+ }

231+}

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

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

12 *

12 *

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

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

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

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

15− *

16− * Authors:

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

18 */

15 */

19

16

20−#ifndef ROOTACTIONSTATE_H

17+#ifndef ROOTSTATEPARSER_H

21−#define ROOTACTIONSTATE_H

18+#define ROOTSTATEPARSER_H

22

19

23#include "unityindicatorsglobal.h"

20#include "unityindicatorsglobal.h"

24

21

25#include <actionstateparser.h>

22#include <actionstateparser.h>

26

23

27−class UnityMenuModel;

24+class UNITYINDICATORS_EXPORT RootStateParser : public ActionStateParser

25+{

26+public:

27+ RootStateParser(QObject* parent = nullptr);

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

29+};

28

30

29−class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser

31+class UNITYINDICATORS_EXPORT RootStateObject : public QObject

30{

32{

31 Q_OBJECT

33 Q_OBJECT

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

33

34

34− Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)

35+ Q_PROPERTY(bool valid READ valid NOTIFY validChanged)

35 Q_PROPERTY(QString title READ title NOTIFY titleChanged)

36 Q_PROPERTY(QString title READ title NOTIFY titleChanged)

36 Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)

37 Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)

37 Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)

38 Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)

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

39 Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)

40 Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)

40 Q_PROPERTY(bool indicatorVisible READ indicatorVisible NOTIFY indicatorVisibleChanged)

41 Q_PROPERTY(bool indicatorVisible READ indicatorVisible NOTIFY indicatorVisibleChanged)

41public:

42public:

42− RootActionState(QObject *parent = 0);

43+ RootStateObject(QObject* parent = 0);

43− virtual ~RootActionState();

44

44

45− UnityMenuModel* menu() const;

45+ virtual bool valid() const = 0;

46− void setMenu(UnityMenuModel* menu);

47

46

48− int index() const;

49− void setIndex(int index);

50−

51− bool isValid() const;

52 QString title() const;

47 QString title() const;

53 QString leftLabel() const;

48 QString leftLabel() const;

54 QString rightLabel() const;

49 QString rightLabel() const;

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

56 QString accessibleName() const;

51 QString accessibleName() const;

57 bool indicatorVisible() const;

52 bool indicatorVisible() const;

58

53

59− // from ActionStateParser

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

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

55+ void setCurrentState(const QVariantMap& currentState);

61

56

62Q_SIGNALS:

57Q_SIGNALS:

63 void updated();

58 void updated();

64

59

65− void menuChanged();

66− void indexChanged();

67−

68 void validChanged();

60 void validChanged();

69 void titleChanged();

61 void titleChanged();

70 void leftLabelChanged();

62 void leftLabelChanged();

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

73 void accessibleNameChanged();

65 void accessibleNameChanged();

74 void indicatorVisibleChanged();

66 void indicatorVisibleChanged();

75

67

76−private Q_SLOTS:

68+protected:

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

69+ RootStateParser m_parser;

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

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

80− void reset();

81−

82−private:

83− void updateActionState();

84−

85− UnityMenuModel* m_menu;

86− QVariantMap m_cachedState;

70+ QVariantMap m_currentState;

87};

71};

88

72

89−#endif // ROOTACTIONSTATE_H

73+#endif // ROOTSTATEPARSER_H

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

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

110 settings.beginGroup("Desktop Entry");

110 settings.beginGroup("Desktop Entry");

111

111

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

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

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

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

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

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

115

115

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

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

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

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

60{

60{

61 if (m_name != name) {

61 if (m_name != name) {

62 m_name = name;

62 m_name = name;

63+ QuickListEntry entry;

64+ entry.setActionId("launch_item");

65+ entry.setText(m_name);

66+ m_quickList->updateAction(entry);

63 Q_EMIT nameChanged(name);

67 Q_EMIT nameChanged(name);

64 }

68 }

65}

69}

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

86{

90{

87 if (m_pinned != pinned) {

91 if (m_pinned != pinned) {

88 m_pinned = pinned;

92 m_pinned = pinned;

89− QuickListEntry entry;

90− entry.setActionId("pin_item");

91− entry.setText(pinned ? gettext("Unpin shortcut") : gettext("Pin shortcut"));

92− m_quickList->updateAction(entry);

93 Q_EMIT pinnedChanged(pinned);

93 Q_EMIT pinnedChanged(pinned);

94 }

94 }

95+

96+ // Even if pinned status didn't change, we want to update text in case

97+ // the locale has changed since we last set pinned status.

98+ QuickListEntry entry;

99+ entry.setActionId("pin_item");

100+ entry.setText(pinned ? gettext("Unpin shortcut") : gettext("Pin shortcut"));

101+ m_quickList->updateAction(entry);

95}

102}

96

103

97bool LauncherItem::running() const

104bool LauncherItem::running() const

plugins/Unity/Launcher/launchermodel.cpp+1

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

370 int idx = m_list.indexOf(item);

370 int idx = m_list.indexOf(item);

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

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

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

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

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

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

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

374 }

375 }

375 }

376 }

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

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

58

58

59public Q_SLOTS:

59public Q_SLOTS:

60 void requestRemove(const QString &appId);

60 void requestRemove(const QString &appId);

61+ Q_INVOKABLE void refresh();

61

62

62private:

63private:

63 void storeAppList();

64 void storeAppList();

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

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

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

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

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

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

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

71− void refresh();

72

72

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

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

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

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

plugins/Unity/Session/dbusunitysessionservice.h+5

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

35 DBusUnitySessionService();

35 DBusUnitySessionService();

36 ~DBusUnitySessionService();

36 ~DBusUnitySessionService();

37

37

38+ // For use in QML. Javascript doesn't accept functions beginning with capital letters

39+ Q_INVOKABLE void logout() { Logout(); }

40+ Q_INVOKABLE void reboot() { Reboot(); }

41+ Q_INVOKABLE void shutdown() { Shutdown(); }

42+

38Q_SIGNALS:

43Q_SIGNALS:

39 /**

44 /**

40 * logoutRequested signal

45 * logoutRequested signal

plugins/Utils/CMakeLists.txt+1−1

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

12

12

13set(QMLPLUGIN_SRC

13set(QMLPLUGIN_SRC

14 qlimitproxymodelqml.cpp

14 qlimitproxymodelqml.cpp

15− qsortfilterproxymodelqml.cpp

15+ unitysortfilterproxymodelqml.cpp

16 relativetimeformatter.cpp

16 relativetimeformatter.cpp

17 timeformatter.cpp

17 timeformatter.cpp

18 unitymenumodelpaths.cpp

18 unitymenumodelpaths.cpp

plugins/Utils/plugin.cpp+2−2

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

27

27

28// local

28// local

29#include "qlimitproxymodelqml.h"

29#include "qlimitproxymodelqml.h"

30−#include "qsortfilterproxymodelqml.h"

30+#include "unitysortfilterproxymodelqml.h"

31#include "relativetimeformatter.h"

31#include "relativetimeformatter.h"

32#include "timeformatter.h"

32#include "timeformatter.h"

33#include "unitymenumodelpaths.h"

33#include "unitymenumodelpaths.h"

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

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

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

40 qmlRegisterType<QAbstractItemModel>();

40 qmlRegisterType<QAbstractItemModel>();

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

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

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

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

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

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

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

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

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

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

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

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

15 */

15 */

16

16

17// self

17// self

18−#include "qsortfilterproxymodelqml.h"

18+#include "unitysortfilterproxymodelqml.h"

19

19

20// Qt

20// Qt

21#include <QDebug>

21#include <QDebug>

22

22

23−QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)

23+UnitySortFilterProxyModelQML::UnitySortFilterProxyModelQML(QObject *parent)

24 : QSortFilterProxyModel(parent)

24 : QSortFilterProxyModel(parent)

25 , m_invertMatch(false)

25 , m_invertMatch(false)

26{

26{

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

32/*

32/*

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

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

34 */

34 */

35−int QSortFilterProxyModelQML::mapRowToSource(int row)

35+int UnitySortFilterProxyModelQML::mapRowToSource(int row)

36{

36{

37 if (sourceModel() == nullptr)

37 if (sourceModel() == nullptr)

38 return -1;

38 return -1;

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

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

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

41}

41}

42

42

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

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

44{

44{

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

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

46}

46}

47

47

48void

48void

49−QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)

49+UnitySortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)

50{

50{

51 if (itemModel == nullptr) {

51 if (itemModel == nullptr) {

52 return;

52 return;

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

69}

69}

70

70

71QVariantMap

71QVariantMap

72−QSortFilterProxyModelQML::get(int row)

72+UnitySortFilterProxyModelQML::get(int row)

73{

73{

74 QVariantMap res;

74 QVariantMap res;

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

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

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

81}

81}

82

82

83QVariant

83QVariant

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

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

85{

85{

86 if (sourceModel() == nullptr) {

86 if (sourceModel() == nullptr) {

87 return QVariant();

87 return QVariant();

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

91}

91}

92

92

93int

93int

94−QSortFilterProxyModelQML::totalCount() const

94+UnitySortFilterProxyModelQML::totalCount() const

95{

95{

96 if (sourceModel() != nullptr) {

96 if (sourceModel() != nullptr) {

97 return sourceModel()->rowCount();

97 return sourceModel()->rowCount();

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

101}

101}

102

102

103int

103int

104−QSortFilterProxyModelQML::count()

104+UnitySortFilterProxyModelQML::count()

105{

105{

106 return rowCount();

106 return rowCount();

107}

107}

108

108

109bool

109bool

110−QSortFilterProxyModelQML::invertMatch() const

110+UnitySortFilterProxyModelQML::invertMatch() const

111{

111{

112 return m_invertMatch;

112 return m_invertMatch;

113}

113}

114

114

115void

115void

116−QSortFilterProxyModelQML::setInvertMatch(bool invertMatch)

116+UnitySortFilterProxyModelQML::setInvertMatch(bool invertMatch)

117{

117{

118 if (invertMatch != m_invertMatch) {

118 if (invertMatch != m_invertMatch) {

119 m_invertMatch = invertMatch;

119 m_invertMatch = invertMatch;

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

123}

123}

124

124

125bool

125bool

126−QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,

126+UnitySortFilterProxyModelQML::filterAcceptsRow(int sourceRow,

127 const QModelIndex &sourceParent) const

127 const QModelIndex &sourceParent) const

128{

128{

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

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

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

136}

136}

137

137

138int

138int

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

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

140{

140{

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

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

142 if (!matches.isEmpty()) {

142 if (!matches.isEmpty()) {

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

147}

147}

148

148

149int

149int

150−QSortFilterProxyModelQML::mapFromSource(int row)

150+UnitySortFilterProxyModelQML::mapFromSource(int row)

151{

151{

152 if (sourceModel() != nullptr) {

152 if (sourceModel() != nullptr) {

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

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

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

157}

157}

158

158

159int

159int

160−QSortFilterProxyModelQML::mapToSource(int row)

160+UnitySortFilterProxyModelQML::mapToSource(int row)

161{

161{

162 if (sourceModel() != nullptr) {

162 if (sourceModel() != nullptr) {

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

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

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

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

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

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

15 */

15 */

16

16

17−#ifndef QSORTFILTERPROXYMODELQML_H

17+#ifndef UNITYSORTFILTERPROXYMODELQML_H

18−#define QSORTFILTERPROXYMODELQML_H

18+#define UNITYSORTFILTERPROXYMODELQML_H

19

19

20#include <QSortFilterProxyModel>

20#include <QSortFilterProxyModel>

21

21

22−class QSortFilterProxyModelQML : public QSortFilterProxyModel

22+class UnitySortFilterProxyModelQML : public QSortFilterProxyModel

23{

23{

24 Q_OBJECT

24 Q_OBJECT

25

25

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

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

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

30

30

31public:

31public:

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

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

33

33

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

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

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

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

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

60 bool m_invertMatch;

60 bool m_invertMatch;

61};

61};

62

62

63−#endif // QSORTFILTERPROXYMODELQML_H

63+#endif // UNITYSORTFILTERPROXYMODELQML_H

plugins/Wizard/50-com.canonical.unity.wizard.pklanew file+6

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

1+[Allow welcome wizard to set AccountsService fields]

2+Identity=unix-user:lightdm

3+Action=org.freedesktop.accounts.user-administration

4+ResultActive=yes

5+ResultInactive=no

6+ResultAny=no

plugins/Wizard/CMakeLists.txtnew file+11

@@ -0,0 +1,11 @@

1+add_library(Wizard-qml MODULE

2+ plugin.cpp

3+ PageList.cpp

4+ System.cpp

5+)

6+

7+qt5_use_modules(Wizard-qml DBus Qml)

8+add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)

9+

10+set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")

11+install(FILES 50-com.canonical.unity.wizard.pkla DESTINATION ${POLKIT_LIB_DIR}/localauthority/10-vendor.d)

plugins/Wizard/PageList.cppnew file+112

@@ -0,0 +1,112 @@

1+/*

2+ * Copyright (C) 2014 Canonical Ltd.

3+ *

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

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

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

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

10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+/**

18+ * This class lets the list of wizard pages be dynamic.

19+ * - To add new ones, drop them into

20+ * $XDG_DATA_DIRS/Wizard/Pages with a numbered prefix,

21+ * like "21-custom-page.qml". The number determines the order in the page

22+ * sequence that your page will appear.

23+ * - To disable an existing page, add a file like "21-custom-page.qml.disabled"

24+ * - To go to the next page, use pageStack.next()

25+ * - To go back to the previous page, use pageStack.prev()

26+ * - To load a page outside of the normal flow (so that it doesn't affect the

27+ * back button), use pageStack.push(Qt.resolvedUrl("custom-page.qml")) in

28+ * your page.

29+ * - See default pages for plenty of examples.

30+ */

31+

32+#include "PageList.h"

33+#include <paths.h>

34+#include <QDir>

35+#include <QSet>

36+#include <QStandardPaths>

37+

38+PageList::PageList(QObject *parent)

39+ : QObject(parent),

40+ m_index(-1),

41+ m_pages()

42+{

43+ QString qmlSuffix = ".qml";

44+ QString disabledSuffix = ".disabled";

45+ QSet<QString> disabledPages;

46+ QStringList dataDirs;

47+

48+ if (!isRunningInstalled() && getenv("UNITY_TEST_ENV") == nullptr) {

49+ dataDirs = QStringList() << qmlDirectory();

50+ } else {

51+ dataDirs = shellDataDirs();

52+ }

53+

54+ Q_FOREACH(const QString &dataDir, dataDirs) {

55+ QDir dir(dataDir + "/Wizard/Pages");

56+ QStringList entries = dir.entryList(QStringList("[0-9]*"), QDir::Files | QDir::Readable);

57+ Q_FOREACH(const QString &entry, entries) {

58+ if (!m_pages.contains(entry) && entry.endsWith(qmlSuffix))

59+ m_pages.insert(entry, dir.absoluteFilePath(entry));

60+ else if (entry.endsWith(qmlSuffix + disabledSuffix))

61+ disabledPages.insert(entry.left(entry.size() - disabledSuffix.size()));

62+ }

63+ }

64+

65+ // Now remove any explicitly disabled entries

66+ Q_FOREACH(const QString &page, disabledPages) {

67+ m_pages.remove(page);

68+ }

69+}

70+

71+QStringList PageList::entries() const

72+{

73+ return m_pages.keys();

74+}

75+

76+QStringList PageList::paths() const

77+{

78+ return m_pages.values();

79+}

80+

81+int PageList::index() const

82+{

83+ return m_index;

84+}

85+

86+int PageList::numPages() const

87+{

88+ return m_pages.size();

89+}

90+

91+QString PageList::prev()

92+{

93+ if (m_index > 0)

94+ return m_pages.values()[setIndex(m_index - 1)];

95+ else

96+ return QString();

97+}

98+

99+QString PageList::next()

100+{

101+ if (m_index < m_pages.count() - 1)

102+ return m_pages.values()[setIndex(m_index + 1)];

103+ else

104+ return QString();

105+}

106+

107+int PageList::setIndex(int index)

108+{

109+ m_index = index;

110+ Q_EMIT indexChanged();

111+ return m_index;

112+}

plugins/Wizard/PageList.hnew file+53

@@ -0,0 +1,53 @@

1+/*

2+ * Copyright (C) 2014 Canonical Ltd.

3+ *

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

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

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

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

10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#ifndef WIZARD_PAGELIST_H

18+#define WIZARD_PAGELIST_H

19+

20+#include <QMap>

21+#include <QObject>

22+#include <QString>

23+

24+class PageList : public QObject

25+{

26+ Q_OBJECT

27+ Q_PROPERTY(int index READ index NOTIFY indexChanged)

28+ Q_PROPERTY(int numPages READ numPages NOTIFY numPagesChanged)

29+

30+public:

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

32+

33+ QStringList entries() const;

34+ QStringList paths() const;

35+ int index() const;

36+ int numPages() const;

37+

38+public Q_SLOTS:

39+ QString prev();

40+ QString next();

41+

42+Q_SIGNALS:

43+ void indexChanged();

44+ void numPagesChanged(); // never emitted, just here to quiet Qml warnings

45+

46+private:

47+ int setIndex(int index);

48+

49+ int m_index;

50+ QMap<QString, QString> m_pages;

51+};

52+

53+#endif // WIZARD_PAGELIST_H

plugins/Wizard/System.cppnew file+99

@@ -0,0 +1,99 @@

1+/*

2+ * Copyright (C) 2014 Canonical Ltd.

3+ *

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

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

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

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

10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include "System.h"

18+

19+#include <QDBusInterface>

20+#include <QDBusMetaType>

21+#include <QDir>

22+#include <QFile>

23+#include <QLocale>

24+#include <QMap>

25+#include <QProcess>

26+

27+System::System()

28+ : QObject(),

29+ m_fsWatcher()

30+{

31+ // Register the argument needed for UpdateActivationEnvironment below

32+ qDBusRegisterMetaType<QMap<QString,QString>>();

33+

34+ m_fsWatcher.addPath(wizardEnabledPath());

35+ connect(&m_fsWatcher, SIGNAL(fileChanged(const QString &)),

36+ this, SIGNAL(wizardEnabledChanged()));

37+}

38+

39+QString System::wizardEnabledPath()

40+{

41+ // Uses ubuntu-system-settings namespace for historic compatibility reasons

42+ return QDir::home().filePath(".config/ubuntu-system-settings/wizard-has-run");

43+}

44+

45+bool System::wizardEnabled() const

46+{

47+ return !QFile::exists(wizardEnabledPath());

48+}

49+

50+void System::setWizardEnabled(bool enabled)

51+{

52+ if (wizardEnabled() == enabled)

53+ return;

54+

55+ if (enabled) {

56+ QFile::remove(wizardEnabledPath());

57+ } else {

58+ QDir(wizardEnabledPath()).mkpath("..");

59+ QFile(wizardEnabledPath()).open(QIODevice::WriteOnly);

60+ m_fsWatcher.addPath(wizardEnabledPath());

61+ wizardEnabledChanged();

62+ }

63+}

64+

65+void System::setSessionVariable(const QString &variable, const QString &value)

66+{

67+ // We need to update both upstart's and DBus's environment

68+ QProcess::execute(QString("initctl set-env --global %1=%2").arg(variable, value));

69+

70+ QDBusInterface iface("org.freedesktop.DBus",

71+ "/org/freedesktop/DBus",

72+ "org.freedesktop.DBus",

73+ QDBusConnection::sessionBus());

74+

75+ QMap<QString,QString> valueMap;

76+ valueMap.insert(variable, value);

77+ iface.call("UpdateActivationEnvironment", QVariant::fromValue(valueMap));

78+}

79+

80+void System::updateSessionLanguage(const QString &locale)

81+{

82+ QString language = locale.split(".")[0];

83+

84+ setSessionVariable("LANGUAGE", language);

85+ setSessionVariable("LANG", locale);

86+ setSessionVariable("LC_ALL", locale);

87+

88+ // QLocale caches the default locale on startup, and Qt uses that cached

89+ // copy when formatting dates. So manually update it here.

90+ QLocale::setDefault(QLocale(locale));

91+

92+ // Restart bits of the session to pick up new language.

93+ QProcess::startDetached("sh -c \"initctl emit indicator-services-end; \

94+ initctl stop scope-registry; \

95+ initctl stop smart-scopes-proxy; \

96+ initctl emit --no-wait indicator-services-start; \

97+ initctl restart --no-wait maliit-server; \

98+ initctl restart --no-wait unity8-dash\"");

99+}

plugins/Wizard/System.hnew file+50

@@ -0,0 +1,50 @@

1+/*

2+ * Copyright (C) 2014 Canonical Ltd.

3+ *

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

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

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

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

10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#ifndef WIZARD_SYSTEM_H

18+#define WIZARD_SYSTEM_H

19+

20+#include <QFileSystemWatcher>

21+#include <QObject>

22+#include <QString>

23+

24+class System : public QObject

25+{

26+ Q_OBJECT

27+ Q_PROPERTY(bool wizardEnabled READ wizardEnabled WRITE setWizardEnabled NOTIFY wizardEnabledChanged)

28+

29+public:

30+ System();

31+

32+ bool wizardEnabled() const;

33+ void setWizardEnabled(bool enabled);

34+

35+public Q_SLOTS:

36+ void updateSessionLanguage(const QString &locale);

37+

38+Q_SIGNALS:

39+ void wizardEnabledChanged();

40+

41+private:

42+ Q_DISABLE_COPY(System)

43+

44+ static QString wizardEnabledPath();

45+ static void setSessionVariable(const QString &variable, const QString &value);

46+

47+ QFileSystemWatcher m_fsWatcher;

48+};

49+

50+#endif

plugins/Wizard/Wizard.qmltypesnew file+36

@@ -0,0 +1,36 @@

1+import QtQuick.tooling 1.1

2+

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

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

5+//

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

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

8+

9+Module {

10+ Component {

11+ name: "PageList"

12+ prototype: "QObject"

13+ exports: ["Wizard/PageList 0.1"]

14+ isCreatable: false

15+ isSingleton: true

16+ exportMetaObjectRevisions: [0]

17+ Property { name: "index"; type: "int"; isReadonly: true }

18+ Property { name: "numPages"; type: "int"; isReadonly: true }

19+ Method { name: "prev"; type: "string" }

20+ Method { name: "next"; type: "string" }

21+ }

22+ Component {

23+ name: "System"

24+ prototype: "QObject"

25+ exports: ["Wizard/System 0.1"]

26+ isCreatable: false

27+ isSingleton: true

28+ exportMetaObjectRevisions: [0]

29+ Property { name: "wizardEnabled"; type: "bool" }

30+ Method {

31+ name: "updateSessionLanguage"

32+ Parameter { name: "locale"; type: "string" }

33+ }

34+ }

35+}

36+

plugins/Wizard/plugin.cppnew file+35

@@ -0,0 +1,35 @@

1+/*

2+ * Copyright (C) 2014 Canonical Ltd.

3+ *

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

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

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

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

10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include "plugin.h"

18+#include "PageList.h"

19+#include "System.h"

20+

21+#include <QtQml/qqml.h>

22+

23+static QObject *system_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

24+{

25+ Q_UNUSED(engine)

26+ Q_UNUSED(scriptEngine)

27+ return new System();

28+}

29+

30+void WizardPlugin::registerTypes(const char *uri)

31+{

32+ Q_ASSERT(uri == QLatin1String("Wizard"));

33+ qmlRegisterType<PageList>(uri, 0, 1, "PageList");

34+ qmlRegisterSingletonType<System>(uri, 0, 1, "System", system_provider);

35+}

plugins/Wizard/plugin.hnew file+32

@@ -0,0 +1,32 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#ifndef WIZARD_PLUGIN_H

18+#define WIZARD_PLUGIN_H

19+

20+#include <QtQml/QQmlEngine>

21+#include <QtQml/QQmlExtensionPlugin>

22+

23+class WizardPlugin : public QQmlExtensionPlugin

24+{

25+ Q_OBJECT

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

27+

28+public:

29+ void registerTypes(const char *uri);

30+};

31+

32+#endif

plugins/Wizard/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module Wizard

2+plugin Wizard-qml

3+typeinfo Wizard.qmltypes

po/am.po+237−49

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

7msgstr ""

7msgstr ""

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

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

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

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

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

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

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

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

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

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

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

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

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-28 06:07+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

@@ -175,20 +175,24 @@ msgstr "አነስተኛ መመልከቻ"

175msgid "See all"

175msgid "See all"

176msgstr "ሁሉንም መመልከቻ"

176msgstr "ሁሉንም መመልከቻ"

177

177

178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

178+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268

179#: qml/Panel/SearchIndicator.qml:27

179#: qml/Panel/SearchIndicator.qml:27

180msgid "Search"

180msgid "Search"

181msgstr "መፈለጊያ"

181msgstr "መፈለጊያ"

182

182

183−#: qml/Dash/PageHeader.qml:268

183+#: qml/Dash/PageHeader.qml:261

184+msgid "Store"

185+msgstr "ማስቀመጫ"

186+

187+#: qml/Dash/PageHeader.qml:278

184msgid "Settings"

188msgid "Settings"

185msgstr "ማሰናጃ"

189msgstr "ማሰናጃ"

186

190

187−#: qml/Dash/PageHeader.qml:275

191+#: qml/Dash/PageHeader.qml:285

188msgid "Remove from Favorites"

192msgid "Remove from Favorites"

189msgstr "ከምወዳቸው ማስወገጃ"

193msgstr "ከምወዳቸው ማስወገጃ"

190

194

191−#: qml/Dash/PageHeader.qml:275

195+#: qml/Dash/PageHeader.qml:285

192msgid "Add to Favorites"

196msgid "Add to Favorites"

193msgstr "ወደምወዳቸው መጨመሪያ"

197msgstr "ወደምወዳቸው መጨመሪያ"

194

198

@@ -220,31 +224,23 @@ msgstr "ይሳቡ ለማነቃቃት…"

220msgid "Release to refresh…"

224msgid "Release to refresh…"

221msgstr "ይልቀቁ ለማነቃቃት…"

225msgstr "ይልቀቁ ለማነቃቃት…"

222

226

223−#: qml/Dash/ScopesOverview.qml:215

227+#: qml/Dash/ScopesList.qml:63

224−msgid "Manage Scopes"

228+msgid "Manage"

225−msgstr "የ ክልል አስተዳዳሪ"

229+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 "ማስቀመጫ"

234

230

235−#: qml/Dash/ScopesOverviewTab.qml:36

231+#: qml/Dash/ScopesList.qml:107

236−msgid "Favorites"

232+msgid "Home"

237−msgstr "የምወዳቸው"

233+msgstr "ቤት"

238

234

239−#: qml/Dash/ScopesOverviewTab.qml:54

235+#: qml/Dash/ScopesList.qml:108

240−msgid "All"

236+msgid "Also installed"

241−msgstr "ሁሉንም"

237+msgstr "እንዲሁም የተገጠሙ"

242

238

243#: qml/Greeter/Greeter.qml:174

239#: qml/Greeter/Greeter.qml:174

244msgid "Unlock"

240msgid "Unlock"

245msgstr "መክፈቻ"

241msgstr "መክፈቻ"

246

242

247−#: qml/Notifications/NotificationMenuItemFactory.qml:116

243+#: qml/Notifications/NotificationMenuItemFactory.qml:128

248msgid "Show password"

244msgid "Show password"

249msgstr "የመግቢያ ቃል ማሳያ"

245msgstr "የመግቢያ ቃል ማሳያ"

250

246

@@ -292,49 +288,49 @@ msgstr "ሲም መክፈቻ"

292msgid "Roaming"

288msgid "Roaming"

293msgstr "ማዘዋወሪያ"

289msgstr "ማዘዋወሪያ"

294

290

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

296msgid "Enter passphrase"

297msgid "Enter passphrase"

297msgstr "የ ማለፊያ ሀረግ ያስገቡ"

298msgstr "የ ማለፊያ ሀረግ ያስገቡ"

298

299

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

300msgid "Sorry, incorrect passphrase"

310msgid "Sorry, incorrect passphrase"

301msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"

311msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"

302

312

303−#: qml/Shell.qml:393

313+#: qml/Shell.qml:396

304msgid "Please re-enter"

314msgid "Please re-enter"

305msgstr "እባክዎን እንደገና-ያስገቡ"

315msgstr "እባክዎን እንደገና-ያስገቡ"

306

316

307−#: qml/Shell.qml:395

317+#: qml/Shell.qml:399

308−msgid "Enter passcode"

309−msgstr "የ ማለፊያ ኮድ ያስገቡ"

310−

311−#: qml/Shell.qml:396

312msgid "Sorry, incorrect passcode"

318msgid "Sorry, incorrect passcode"

313msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"

319msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"

314

320

315−#: qml/Shell.qml:399

321+#: qml/Shell.qml:444

316−#, qt-format

317−msgid "Enter %1"

318−msgstr "ማስገቢያ %1"

319−

320−#: qml/Shell.qml:400

321−#, qt-format

322−msgid "Sorry, incorrect %1"

323−msgstr "አዝናለሁ: የተሳሳተ%1"

324−

325−#: qml/Shell.qml:441

326msgid "Sorry, incorrect passphrase."

322msgid "Sorry, incorrect passphrase."

327msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"

323msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"

328

324

329−#: qml/Shell.qml:442

325+#: qml/Shell.qml:445

330msgid "Sorry, incorrect passcode."

326msgid "Sorry, incorrect passcode."

331msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"

327msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"

332

328

333−#: qml/Shell.qml:443

329+#: qml/Shell.qml:446

334msgid "This will be your last attempt."

330msgid "This will be your last attempt."

335msgstr "ይህ የመጨረሻ ሙከራዎ ነው"

331msgstr "ይህ የመጨረሻ ሙከራዎ ነው"

336

332

337−#: qml/Shell.qml:445

333+#: qml/Shell.qml:448

338msgid ""

334msgid ""

339"If passphrase is entered incorrectly, your phone will conduct a factory "

335"If passphrase is entered incorrectly, your phone will conduct a factory "

340"reset and all personal data will be deleted."

336"reset and all personal data will be deleted."

@@ -342,7 +338,7 @@ msgstr ""

342"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

338"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

343"ይጠፋል"

339"ይጠፋል"

344

340

345−#: qml/Shell.qml:446

341+#: qml/Shell.qml:449

346msgid ""

342msgid ""

347"If passcode is entered incorrectly, your phone will conduct a factory reset "

343"If passcode is entered incorrectly, your phone will conduct a factory reset "

348"and all personal data will be deleted."

344"and all personal data will be deleted."

@@ -350,6 +346,186 @@ msgstr ""

350"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

346"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

351"ይጠፋል"

347"ይጠፋል"

352

348

349+#: qml/Wizard/Page.qml:89

350+msgid "Back"

351+msgstr "ወደ ኋላ"

352+

353+#: qml/Wizard/Pages/10-welcome.qml:27

354+msgid "Hi!"

355+msgstr "ሰላም"

356+

357+#: qml/Wizard/Pages/10-welcome.qml:44

358+msgid "Welcome to your Ubuntu phone."

359+msgstr "እንኳን ደህና መጡ ወደ እርስዎ ኡቡንቱ ስልክ"

360+

361+#: qml/Wizard/Pages/10-welcome.qml:52

362+msgid "Let’s get started."

363+msgstr "ስራ እንጀምር"

364+

365+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

366+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

367+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

368+#: qml/Wizard/Pages/passwd-set.qml:90

369+msgid "Continue"

370+msgstr "ይቀጥሉ"

371+

372+#: qml/Wizard/Pages/20-sim.qml:25

373+msgid "Add a SIM card and restart your device"

374+msgstr "የ ሲም ካርድ ይጨምሩ እና አካሉን እንደገና ያስነሱ"

375+

376+#: qml/Wizard/Pages/20-sim.qml:55

377+msgid "Without it, you won’t be able to make calls or use text messaging."

378+msgstr "ያለ እሱ ጥሪ መፈጸም ወይንም የ ጽሁፍ መልእክት መላክ አይችሉም"

379+

380+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

381+msgid "Skip"

382+msgstr "መዝለያ"

383+

384+#: qml/Wizard/Pages/30-passwd-type.qml:39

385+msgid "Lock security"

386+msgstr "ደህንነት መቆለፊያ"

387+

388+#: qml/Wizard/Pages/30-passwd-type.qml:74

389+msgid "Please select how you’d like to unlock your phone."

390+msgstr "እባክዎን የ እርስዎን ስልክ እንዴት እንደሚከፍቱ ይምረጡ"

391+

392+#: qml/Wizard/Pages/30-passwd-type.qml:97

393+msgid "Swipe"

394+msgstr "መጥረጊያ"

395+

396+#: qml/Wizard/Pages/30-passwd-type.qml:98

397+msgid "No security"

398+msgstr "ደህንነት አልተገኘም"

399+

400+#: qml/Wizard/Pages/30-passwd-type.qml:100

401+msgid "Passcode"

402+msgstr "ማለፊያ ኮድ"

403+

404+#: qml/Wizard/Pages/30-passwd-type.qml:101

405+msgid "4 digits only"

406+msgstr "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+

353#~ msgid "Type or say a command"

529#~ msgid "Type or say a command"

354#~ msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"

530#~ msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"

355

531

@@ -364,3 +540,15 @@ msgstr ""

364

540

365#~ msgid "Confirm"

541#~ msgid "Confirm"

366#~ msgstr "ማረጋገጫ"

542#~ 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 ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-05-22 08:22+0000\n"

11"PO-Revision-Date: 2014-05-22 08:22+0000\n"

12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"

12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"

13"Language-Team: Arabic <ar@li.org>\n"

13"Language-Team: Arabic <ar@li.org>\n"

@@ -16,19 +16,19 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "

17"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "

18"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"

18"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"

19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

20−"X-Generator: Launchpad (build 17231)\n"

20+"X-Generator: Launchpad (build 17286)\n"

21

21

22#: plugins/LightDM/Greeter.cpp:130

22#: plugins/LightDM/Greeter.cpp:130

23msgid "Password: "

23msgid "Password: "

24msgstr ""

24msgstr ""

25

25

26#: plugins/Unity/Launcher/launcheritem.cpp:45

26#: plugins/Unity/Launcher/launcheritem.cpp:45

27−#: plugins/Unity/Launcher/launcheritem.cpp:91

27+#: plugins/Unity/Launcher/launcheritem.cpp:100

28msgid "Pin shortcut"

28msgid "Pin shortcut"

29msgstr ""

29msgstr ""

30

30

31−#: plugins/Unity/Launcher/launcheritem.cpp:91

31+#: plugins/Unity/Launcher/launcheritem.cpp:100

32msgid "Unpin shortcut"

32msgid "Unpin shortcut"

33msgstr ""

33msgstr ""

34

34

@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

51msgstr[0] ""

51msgstr[0] ""

52msgstr[1] ""

52msgstr[1] ""

53

53

54−#: qml/Components/Dialogs.qml:74

54+#: qml/Components/Dialogs.qml:70

55msgid "Log out"

55msgid "Log out"

56msgstr ""

56msgstr ""

57

57

58−#: qml/Components/Dialogs.qml:75

58+#: qml/Components/Dialogs.qml:71

59msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

60msgstr ""

60msgstr ""

61

61

62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63−#: qml/Components/Dialogs.qml:126

63+#: qml/Components/Dialogs.qml:122

64msgid "No"

64msgid "No"

65msgstr ""

65msgstr ""

66

66

67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68−#: qml/Components/Dialogs.qml:133

68+#: qml/Components/Dialogs.qml:129

69msgid "Yes"

69msgid "Yes"

70msgstr ""

70msgstr ""

71

71

72−#: qml/Components/Dialogs.qml:98

72+#: qml/Components/Dialogs.qml:94

73msgid "Shut down"

73msgid "Shut down"

74msgstr ""

74msgstr ""

75

75

76−#: qml/Components/Dialogs.qml:99

76+#: qml/Components/Dialogs.qml:95

77msgid "Are you sure you want to shut down?"

77msgid "Are you sure you want to shut down?"

78msgstr ""

78msgstr ""

79

79

80−#: qml/Components/Dialogs.qml:123

80+#: qml/Components/Dialogs.qml:119

81msgid "Reboot"

81msgid "Reboot"

82msgstr ""

82msgstr ""

83

83

84−#: qml/Components/Dialogs.qml:124

84+#: qml/Components/Dialogs.qml:120

85msgid "Are you sure you want to reboot?"

85msgid "Are you sure you want to reboot?"

86msgstr ""

86msgstr ""

87

87

88−#: qml/Components/Dialogs.qml:148

88+#: qml/Components/Dialogs.qml:144

89msgid "Power"

89msgid "Power"

90msgstr ""

90msgstr ""

91

91

92−#: qml/Components/Dialogs.qml:149

92+#: qml/Components/Dialogs.qml:145

93msgid ""

93msgid ""

94"Are you sure you would like\n"

94"Are you sure you would like\n"

95"to power off?"

95"to power off?"

96msgstr ""

96msgstr ""

97

97

98−#: qml/Components/Dialogs.qml:151

98+#: qml/Components/Dialogs.qml:147

99msgid "Power off"

99msgid "Power off"

100msgstr ""

100msgstr ""

101

101

102−#: qml/Components/Dialogs.qml:161

102+#: qml/Components/Dialogs.qml:157

103msgid "Restart"

103msgid "Restart"

104msgstr ""

104msgstr ""

105

105

106−#: qml/Components/Dialogs.qml:171

106+#: qml/Components/Dialogs.qml:167

107msgid "Cancel"

107msgid "Cancel"

108msgstr ""

108msgstr ""

109

109

@@ -111,44 +111,44 @@ msgstr ""

111msgid "Skip intro"

111msgid "Skip intro"

112msgstr "تخطي المقدمة"

112msgstr "تخطي المقدمة"

113

113

114−#: qml/Components/EdgeDemo.qml:112

114+#: qml/Components/EdgeDemo.qml:125

115msgid "Right edge"

115msgid "Right edge"

116msgstr "الحافة اليمنى"

116msgstr "الحافة اليمنى"

117

117

118−#: qml/Components/EdgeDemo.qml:113

118+#: qml/Components/EdgeDemo.qml:126

119msgid "Try swiping from the right edge to unlock the phone"

119msgid "Try swiping from the right edge to unlock the phone"

120msgstr "اسحب اصبعك من الحافة اليمنى لفتح قفل الهاتف"

120msgstr "اسحب اصبعك من الحافة اليمنى لفتح قفل الهاتف"

121

121

122−#: qml/Components/EdgeDemo.qml:144

122+#: qml/Components/EdgeDemo.qml:157

123msgid "Top edge"

123msgid "Top edge"

124msgstr "الحافة العلوية"

124msgstr "الحافة العلوية"

125

125

126−#: qml/Components/EdgeDemo.qml:145

126+#: qml/Components/EdgeDemo.qml:158

127msgid "Try swiping from the top edge to access the indicators"

127msgid "Try swiping from the top edge to access the indicators"

128msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"

128msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"

129

129

130−#: qml/Components/EdgeDemo.qml:170

130+#: qml/Components/EdgeDemo.qml:183

131msgid "Close"

131msgid "Close"

132msgstr "أغلق"

132msgstr "أغلق"

133

133

134−#: qml/Components/EdgeDemo.qml:171

134+#: qml/Components/EdgeDemo.qml:184

135msgid "Swipe up again to close the settings screen"

135msgid "Swipe up again to close the settings screen"

136msgstr "اسحب اصعبك لأعلى مرة أخرى لغلق شاشة الإعدادات"

136msgstr "اسحب اصعبك لأعلى مرة أخرى لغلق شاشة الإعدادات"

137

137

138−#: qml/Components/EdgeDemo.qml:201

138+#: qml/Components/EdgeDemo.qml:214

139msgid "Left edge"

139msgid "Left edge"

140msgstr "الحافة اليسرى"

140msgstr "الحافة اليسرى"

141

141

142−#: qml/Components/EdgeDemo.qml:202

142+#: qml/Components/EdgeDemo.qml:215

143msgid "Swipe from the left to reveal the launcher for quick access to apps"

143msgid "Swipe from the left to reveal the launcher for quick access to apps"

144msgstr ""

144msgstr ""

145"اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"

145"اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"

146

146

147−#: qml/Components/EdgeDemo.qml:229

147+#: qml/Components/EdgeDemo.qml:242

148msgid "Well done"

148msgid "Well done"

149msgstr "أحسنت!"

149msgstr "أحسنت!"

150

150

151−#: qml/Components/EdgeDemo.qml:230

151+#: qml/Components/EdgeDemo.qml:243

152msgid ""

152msgid ""

153"You have now mastered the edge gestures and can start using the "

153"You have now mastered the edge gestures and can start using the "

154"phone<br><br>Tap on the screen to start"

154"phone<br><br>Tap on the screen to start"

@@ -156,40 +156,44 @@ msgstr ""

156"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "

156"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "

157"الشاشة للبدء"

157"الشاشة للبدء"

158

158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160msgid "Return to Call"

160msgid "Return to Call"

161msgstr ""

161msgstr ""

162

162

163−#: qml/Components/Lockscreen.qml:223

163+#: qml/Components/Lockscreen.qml:238

164msgid "Emergency Call"

164msgid "Emergency Call"

165msgstr "مكالمة طوارئ"

165msgstr "مكالمة طوارئ"

166

166

167−#: qml/Components/Lockscreen.qml:255

167+#: qml/Components/Lockscreen.qml:270

168msgid "OK"

168msgid "OK"

169msgstr ""

169msgstr ""

170

170

171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

172msgid "See less"

172msgid "See less"

173msgstr "شاهد أقل"

173msgstr "شاهد أقل"

174

174

175−#: qml/Dash/GenericScopeView.qml:434

175+#: qml/Dash/GenericScopeView.qml:431

176msgid "See all"

176msgid "See all"

177msgstr ""

177msgstr ""

178

178

179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

180#: qml/Panel/SearchIndicator.qml:27

180#: qml/Panel/SearchIndicator.qml:27

181msgid "Search"

181msgid "Search"

182msgstr "ابحث"

182msgstr "ابحث"

183

183

184−#: qml/Dash/PageHeader.qml:268

184+#: qml/Dash/PageHeader.qml:260

185+msgid "Store"

186+msgstr ""

187+

188+#: qml/Dash/PageHeader.qml:277

185msgid "Settings"

189msgid "Settings"

186msgstr ""

190msgstr ""

187

191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189msgid "Remove from Favorites"

193msgid "Remove from Favorites"

190msgstr ""

194msgstr ""

191

195

192−#: qml/Dash/PageHeader.qml:275

196+#: qml/Dash/PageHeader.qml:284

193msgid "Add to Favorites"

197msgid "Add to Favorites"

194msgstr ""

198msgstr ""

195

199

@@ -221,31 +225,23 @@ msgstr ""

221msgid "Release to refresh…"

225msgid "Release to refresh…"

222msgstr ""

226msgstr ""

223

227

224−#: qml/Dash/ScopesOverview.qml:215

228+#: qml/Dash/ScopesList.qml:63

225−msgid "Manage Scopes"

229+msgid "Manage"

226−msgstr ""

227−

228−#: qml/Dash/ScopesOverview.qml:437

229−msgid "Done"

230−msgstr ""

231−

232−#: qml/Dash/ScopesOverview.qml:463

233−msgid "Store"

234msgstr ""

230msgstr ""

235

231

236−#: qml/Dash/ScopesOverviewTab.qml:36

232+#: qml/Dash/ScopesList.qml:107

237−msgid "Favorites"

233+msgid "Home"

238msgstr ""

234msgstr ""

239

235

240−#: qml/Dash/ScopesOverviewTab.qml:54

236+#: qml/Dash/ScopesList.qml:108

241−msgid "All"

237+msgid "Also installed"

242msgstr ""

238msgstr ""

243

239

244#: qml/Greeter/Greeter.qml:174

240#: qml/Greeter/Greeter.qml:174

245msgid "Unlock"

241msgid "Unlock"

246msgstr ""

242msgstr ""

247

243

248−#: qml/Notifications/NotificationMenuItemFactory.qml:116

244+#: qml/Notifications/NotificationMenuItemFactory.qml:128

249msgid "Show password"

245msgid "Show password"

250msgstr "عرض كلمة السر"

246msgstr "عرض كلمة السر"

251

247

@@ -293,60 +289,237 @@ msgstr ""

293msgid "Roaming"

289msgid "Roaming"

294msgstr ""

290msgstr ""

295

291

296−#: qml/Shell.qml:391

292+#: qml/Shell.qml:367

293+#, qt-format

297−msgid "Enter passphrase"

294+msgid "Enter %1"

298msgstr ""

295msgstr ""

299

296

300−#: qml/Shell.qml:392

297+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

301−msgid "Sorry, incorrect passphrase"

298+msgid "Enter passphrase"

302msgstr ""

299msgstr ""

303

300

304−#: qml/Shell.qml:393

301+#: qml/Shell.qml:369

305−msgid "Please re-enter"

302+msgid "Enter passcode"

306msgstr ""

303msgstr ""

307

304

308−#: qml/Shell.qml:395

305+#: qml/Shell.qml:370

309−msgid "Enter passcode"

306+#, qt-format

307+msgid "Sorry, incorrect %1"

310msgstr ""

308msgstr ""

311

309

312−#: qml/Shell.qml:396

310+#: qml/Shell.qml:371

313−msgid "Sorry, incorrect passcode"

311+msgid "Sorry, incorrect passphrase"

314msgstr ""

312msgstr ""

315

313

316−#: qml/Shell.qml:399

314+#: qml/Shell.qml:372

317−#, qt-format

315+msgid "Please re-enter"

318−msgid "Enter %1"

319msgstr ""

316msgstr ""

320

317

321−#: qml/Shell.qml:400

318+#: qml/Shell.qml:373

322−#, qt-format

323−msgid "Sorry, incorrect %1"

319+msgid "Sorry, incorrect passcode"

324msgstr ""

320msgstr ""

325

321

326−#: qml/Shell.qml:441

322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

327msgid "Sorry, incorrect passphrase."

323msgid "Sorry, incorrect passphrase."

328msgstr ""

324msgstr ""

329

325

330−#: qml/Shell.qml:442

326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

331msgid "Sorry, incorrect passcode."

327msgid "Sorry, incorrect passcode."

332msgstr ""

328msgstr ""

333

329

334−#: qml/Shell.qml:443

330+#: qml/Shell.qml:469

335msgid "This will be your last attempt."

331msgid "This will be your last attempt."

336msgstr ""

332msgstr ""

337

333

338−#: qml/Shell.qml:445

334+#: qml/Shell.qml:471

339msgid ""

335msgid ""

340"If passphrase is entered incorrectly, your phone will conduct a factory "

336"If passphrase is entered incorrectly, your phone will conduct a factory "

341"reset and all personal data will be deleted."

337"reset and all personal data will be deleted."

342msgstr ""

338msgstr ""

343

339

344−#: qml/Shell.qml:446

340+#: qml/Shell.qml:472

345msgid ""

341msgid ""

346"If passcode is entered incorrectly, your phone will conduct a factory reset "

342"If passcode is entered incorrectly, your phone will conduct a factory reset "

347"and all personal data will be deleted."

343"and all personal data will be deleted."

348msgstr ""

344msgstr ""

349

345

346+#: qml/Wizard/Page.qml:89

347+msgid "Back"

348+msgstr ""

349+

350+#: qml/Wizard/Pages/10-welcome.qml:27

351+msgid "Hi!"

352+msgstr ""

353+

354+#: qml/Wizard/Pages/10-welcome.qml:44

355+msgid "Welcome to your Ubuntu phone."

356+msgstr ""

357+

358+#: qml/Wizard/Pages/10-welcome.qml:52

359+msgid "Let’s get started."

360+msgstr ""

361+

362+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

363+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

364+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

365+#: qml/Wizard/Pages/passwd-set.qml:90

366+msgid "Continue"

367+msgstr ""

368+

369+#: qml/Wizard/Pages/20-sim.qml:25

370+msgid "Add a SIM card and restart your device"

371+msgstr ""

372+

373+#: qml/Wizard/Pages/20-sim.qml:55

374+msgid "Without it, you won’t be able to make calls or use text messaging."

375+msgstr ""

376+

377+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

378+msgid "Skip"

379+msgstr ""

380+

381+#: qml/Wizard/Pages/30-passwd-type.qml:39

382+msgid "Lock security"

383+msgstr ""

384+

385+#: qml/Wizard/Pages/30-passwd-type.qml:74

386+msgid "Please select how you’d like to unlock your phone."

387+msgstr ""

388+

389+#: qml/Wizard/Pages/30-passwd-type.qml:97

390+msgid "Swipe"

391+msgstr ""

392+

393+#: qml/Wizard/Pages/30-passwd-type.qml:98

394+msgid "No security"

395+msgstr ""

396+

397+#: qml/Wizard/Pages/30-passwd-type.qml:100

398+msgid "Passcode"

399+msgstr ""

400+

401+#: qml/Wizard/Pages/30-passwd-type.qml:101

402+msgid "4 digits only"

403+msgstr ""

404+

405+#: qml/Wizard/Pages/30-passwd-type.qml:103

406+msgid "Passphrase"

407+msgstr ""

408+

409+#: qml/Wizard/Pages/30-passwd-type.qml:104

410+msgid "Numbers and letters"

411+msgstr ""

412+

413+#: qml/Wizard/Pages/40-wifi.qml:28

414+msgid "Connect to Wi‑Fi"

415+msgstr ""

416+

417+#: qml/Wizard/Pages/40-wifi.qml:147

418+msgid "Available networks…"

419+msgstr ""

420+

421+#: qml/Wizard/Pages/40-wifi.qml:148

422+msgid "No available networks."

423+msgstr ""

424+

425+#: qml/Wizard/Pages/50-location.qml:27

426+msgid "Location"

427+msgstr ""

428+

429+#: qml/Wizard/Pages/50-location.qml:62

430+msgid "Let the phone detect your location:"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/50-location.qml:69

434+msgid "Using GPS only (less accurate)"

435+msgstr ""

436+

437+#: qml/Wizard/Pages/50-location.qml:86

438+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

439+msgstr ""

440+

441+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

442+#: qml/Wizard/Pages/50-location.qml:103

443+msgid ""

444+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

445+"conditions</a>."

446+msgstr ""

447+

448+#: qml/Wizard/Pages/50-location.qml:112

449+msgid "Not at all"

450+msgstr ""

451+

452+#: qml/Wizard/Pages/50-location.qml:124

453+msgid "You can change your mind later in <b>System Settings</b>."

454+msgstr ""

455+

456+#: qml/Wizard/Pages/60-reporting.qml:24

457+msgid "Improving your experience"

458+msgstr ""

459+

460+#: qml/Wizard/Pages/60-reporting.qml:36

461+msgid ""

462+"Your phone is set up to automatically report errors to Canonical and its "

463+"partners, the makers of the operating system."

464+msgstr ""

465+

466+#: qml/Wizard/Pages/60-reporting.qml:43

467+msgid ""

468+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

469+"Privacy</b>"

470+msgstr ""

471+

472+#: qml/Wizard/Pages/80-finished.qml:24

473+msgid "All done"

474+msgstr ""

475+

476+#: qml/Wizard/Pages/80-finished.qml:39

477+msgid "Nice work!"

478+msgstr ""

479+

480+#: qml/Wizard/Pages/80-finished.qml:46

481+msgid "Your phone is now ready to use."

482+msgstr ""

483+

484+#: qml/Wizard/Pages/80-finished.qml:53

485+msgid "Finish"

486+msgstr ""

487+

488+#: qml/Wizard/Pages/here-terms.qml:27

489+msgid "Terms & Conditions"

490+msgstr ""

491+

492+#: qml/Wizard/Pages/passwd-confirm.qml:49

493+msgid "Confirm passphrase"

494+msgstr ""

495+

496+#: qml/Wizard/Pages/passwd-confirm.qml:50

497+msgid "Confirm passcode"

498+msgstr ""

499+

500+#: qml/Wizard/Pages/passwd-confirm.qml:53

501+#: qml/Wizard/Pages/passwd-confirm.qml:54

502+msgid "Please try again."

503+msgstr ""

504+

505+#: qml/Wizard/Pages/passwd-set.qml:61

506+msgid "Choose your passcode"

507+msgstr ""

508+

509+#: qml/Wizard/Pages/passwd-set.qml:68

510+msgid "Passphrase must be 4 characters long"

511+msgstr ""

512+

513+#: qml/Wizard/StackButton.qml:39

514+#, qt-format

515+msgid "〈 %1"

516+msgstr ""

517+

518+#: qml/Wizard/StackButton.qml:42

519+#, qt-format

520+msgid "%1 〉"

521+msgstr ""

522+

350#~ msgid "Confirm"

523#~ msgid "Confirm"

351#~ msgstr "التأكيد"

524#~ msgstr "التأكيد"

352

525

po/ast.po+265−80

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-11-08 18:24+0000\n"

11"PO-Revision-Date: 2014-11-08 18:24+0000\n"

12"Last-Translator: ivarela <ivarela@ubuntu.com>\n"

12"Last-Translator: ivarela <ivarela@ubuntu.com>\n"

13"Language-Team: Asturian <ast@li.org>\n"

13"Language-Team: Asturian <ast@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Contraseña: "

23msgstr "Contraseña: "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Anclar"

28msgstr "Anclar"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Desanclar"

32msgstr "Desanclar"

33

33

@@ -51,45 +51,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

51msgstr[0] "Espera %1 minutu y vuelvi a intentalo…"

51msgstr[0] "Espera %1 minutu y vuelvi a intentalo…"

52msgstr[1] "Espera %1 minutos y vuelvi a intentalo…"

52msgstr[1] "Espera %1 minutos y vuelvi a intentalo…"

53

53

54−#: qml/Components/Dialogs.qml:74

54+#: qml/Components/Dialogs.qml:70

55msgid "Log out"

55msgid "Log out"

56msgstr "Zarrar sesión"

56msgstr "Zarrar sesión"

57

57

58−#: qml/Components/Dialogs.qml:75

58+#: qml/Components/Dialogs.qml:71

59msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

60msgstr "De xuru que quies zarrar la sesión?"

60msgstr "De xuru que quies zarrar la sesión?"

61

61

62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63−#: qml/Components/Dialogs.qml:126

63+#: qml/Components/Dialogs.qml:122

64msgid "No"

64msgid "No"

65msgstr "Non"

65msgstr "Non"

66

66

67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68−#: qml/Components/Dialogs.qml:133

68+#: qml/Components/Dialogs.qml:129

69msgid "Yes"

69msgid "Yes"

70msgstr "Sí"

70msgstr "Sí"

71

71

72−#: qml/Components/Dialogs.qml:98

72+#: qml/Components/Dialogs.qml:94

73msgid "Shut down"

73msgid "Shut down"

74msgstr "Apagar"

74msgstr "Apagar"

75

75

76−#: qml/Components/Dialogs.qml:99

76+#: qml/Components/Dialogs.qml:95

77msgid "Are you sure you want to shut down?"

77msgid "Are you sure you want to shut down?"

78msgstr "De xuru que quies apagar?"

78msgstr "De xuru que quies apagar?"

79

79

80−#: qml/Components/Dialogs.qml:123

80+#: qml/Components/Dialogs.qml:119

81msgid "Reboot"

81msgid "Reboot"

82msgstr "Reaniciar"

82msgstr "Reaniciar"

83

83

84−#: qml/Components/Dialogs.qml:124

84+#: qml/Components/Dialogs.qml:120

85msgid "Are you sure you want to reboot?"

85msgid "Are you sure you want to reboot?"

86msgstr "De xuru que quies reaniciar?"

86msgstr "De xuru que quies reaniciar?"

87

87

88−#: qml/Components/Dialogs.qml:148

88+#: qml/Components/Dialogs.qml:144

89msgid "Power"

89msgid "Power"

90msgstr "Enerxía"

90msgstr "Enerxía"

91

91

92−#: qml/Components/Dialogs.qml:149

92+#: qml/Components/Dialogs.qml:145

93msgid ""

93msgid ""

94"Are you sure you would like\n"

94"Are you sure you would like\n"

95"to power off?"

95"to power off?"

@@ -97,15 +97,15 @@ msgstr ""

97"De xuru que quies\n"

97"De xuru que quies\n"

98"apagar?"

98"apagar?"

99

99

100−#: qml/Components/Dialogs.qml:151

100+#: qml/Components/Dialogs.qml:147

101msgid "Power off"

101msgid "Power off"

102msgstr "Apagar"

102msgstr "Apagar"

103

103

104−#: qml/Components/Dialogs.qml:161

104+#: qml/Components/Dialogs.qml:157

105msgid "Restart"

105msgid "Restart"

106msgstr "Reaniciar"

106msgstr "Reaniciar"

107

107

108−#: qml/Components/Dialogs.qml:171

108+#: qml/Components/Dialogs.qml:167

109msgid "Cancel"

109msgid "Cancel"

110msgstr "Encaboxar"

110msgstr "Encaboxar"

111

111

@@ -113,45 +113,45 @@ msgstr "Encaboxar"

113msgid "Skip intro"

113msgid "Skip intro"

114msgstr "Omitir la intro"

114msgstr "Omitir la intro"

115

115

116−#: qml/Components/EdgeDemo.qml:112

116+#: qml/Components/EdgeDemo.qml:125

117msgid "Right edge"

117msgid "Right edge"

118msgstr "Berbesu drechu"

118msgstr "Berbesu drechu"

119

119

120−#: qml/Components/EdgeDemo.qml:113

120+#: qml/Components/EdgeDemo.qml:126

121msgid "Try swiping from the right edge to unlock the phone"

121msgid "Try swiping from the right edge to unlock the phone"

122msgstr "Esliza'l deu dende'l berbesu drechu pa desbloquiar el teléfonu"

122msgstr "Esliza'l deu dende'l berbesu drechu pa desbloquiar el teléfonu"

123

123

124−#: qml/Components/EdgeDemo.qml:144

124+#: qml/Components/EdgeDemo.qml:157

125msgid "Top edge"

125msgid "Top edge"

126msgstr "Berbesu superior"

126msgstr "Berbesu superior"

127

127

128−#: qml/Components/EdgeDemo.qml:145

128+#: qml/Components/EdgeDemo.qml:158

129msgid "Try swiping from the top edge to access the indicators"

129msgid "Try swiping from the top edge to access the indicators"

130msgstr "Esliza'l deu dende'l berbesu superior p'acceder a los menús"

130msgstr "Esliza'l deu dende'l berbesu superior p'acceder a los menús"

131

131

132−#: qml/Components/EdgeDemo.qml:170

132+#: qml/Components/EdgeDemo.qml:183

133msgid "Close"

133msgid "Close"

134msgstr "Zarrar"

134msgstr "Zarrar"

135

135

136−#: qml/Components/EdgeDemo.qml:171

136+#: qml/Components/EdgeDemo.qml:184

137msgid "Swipe up again to close the settings screen"

137msgid "Swipe up again to close the settings screen"

138msgstr "Esliza hacia arriba pa zarrar la pantalla d'axustes"

138msgstr "Esliza hacia arriba pa zarrar la pantalla d'axustes"

139

139

140−#: qml/Components/EdgeDemo.qml:201

140+#: qml/Components/EdgeDemo.qml:214

141msgid "Left edge"

141msgid "Left edge"

142msgstr "Berbesu esquierdu"

142msgstr "Berbesu esquierdu"

143

143

144−#: qml/Components/EdgeDemo.qml:202

144+#: qml/Components/EdgeDemo.qml:215

145msgid "Swipe from the left to reveal the launcher for quick access to apps"

145msgid "Swipe from the left to reveal the launcher for quick access to apps"

146msgstr ""

146msgstr ""

147"Esliza'l deu dende la esquierda p'amosar el llanzador y acceder rápidamente "

147"Esliza'l deu dende la esquierda p'amosar el llanzador y acceder rápidamente "

148"a les aplicaciones"

148"a les aplicaciones"

149

149

150−#: qml/Components/EdgeDemo.qml:229

150+#: qml/Components/EdgeDemo.qml:242

151msgid "Well done"

151msgid "Well done"

152msgstr "Bien fecho"

152msgstr "Bien fecho"

153

153

154−#: qml/Components/EdgeDemo.qml:230

154+#: qml/Components/EdgeDemo.qml:243

155msgid ""

155msgid ""

156"You have now mastered the edge gestures and can start using the "

156"You have now mastered the edge gestures and can start using the "

157"phone<br><br>Tap on the screen to start"

157"phone<br><br>Tap on the screen to start"

@@ -159,40 +159,44 @@ msgstr ""

159"Agora yá domines los xestos de los berbesos y pues entamar a usar el "

159"Agora yá domines los xestos de los berbesos y pues entamar a usar el "

160"teléfonu<br><br>Toca la pantalla pa comenzar"

160"teléfonu<br><br>Toca la pantalla pa comenzar"

161

161

162−#: qml/Components/Lockscreen.qml:223

162+#: qml/Components/Lockscreen.qml:238

163msgid "Return to Call"

163msgid "Return to Call"

164msgstr "Tornar a la llamada"

164msgstr "Tornar a la llamada"

165

165

166−#: qml/Components/Lockscreen.qml:223

166+#: qml/Components/Lockscreen.qml:238

167msgid "Emergency Call"

167msgid "Emergency Call"

168msgstr "Llamada d'emerxencia"

168msgstr "Llamada d'emerxencia"

169

169

170−#: qml/Components/Lockscreen.qml:255

170+#: qml/Components/Lockscreen.qml:270

171msgid "OK"

171msgid "OK"

172msgstr "Aceutar"

172msgstr "Aceutar"

173

173

174−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

174+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

175msgid "See less"

175msgid "See less"

176msgstr "Ver menos"

176msgstr "Ver menos"

177

177

178−#: qml/Dash/GenericScopeView.qml:434

178+#: qml/Dash/GenericScopeView.qml:431

179msgid "See all"

179msgid "See all"

180msgstr "Ver too"

180msgstr "Ver too"

181

181

182−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

182+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

183#: qml/Panel/SearchIndicator.qml:27

183#: qml/Panel/SearchIndicator.qml:27

184msgid "Search"

184msgid "Search"

185msgstr "Guetar"

185msgstr "Guetar"

186

186

187−#: qml/Dash/PageHeader.qml:268

187+#: qml/Dash/PageHeader.qml:260

188+msgid "Store"

189+msgstr "Tienda"

190+

191+#: qml/Dash/PageHeader.qml:277

188msgid "Settings"

192msgid "Settings"

189msgstr "Axustes"

193msgstr "Axustes"

190

194

191−#: qml/Dash/PageHeader.qml:275

195+#: qml/Dash/PageHeader.qml:284

192msgid "Remove from Favorites"

196msgid "Remove from Favorites"

193msgstr "Desaniciar de favoritos"

197msgstr "Desaniciar de favoritos"

194

198

195−#: qml/Dash/PageHeader.qml:275

199+#: qml/Dash/PageHeader.qml:284

196msgid "Add to Favorites"

200msgid "Add to Favorites"

197msgstr "Amestar a favoritos"

201msgstr "Amestar a favoritos"

198

202

@@ -224,31 +228,23 @@ msgstr "Tirar p'anovar..."

224msgid "Release to refresh…"

228msgid "Release to refresh…"

225msgstr "Soltar p'anovar..."

229msgstr "Soltar p'anovar..."

226

230

227−#: qml/Dash/ScopesOverview.qml:215

231+#: qml/Dash/ScopesList.qml:63

228−msgid "Manage Scopes"

232+msgid "Manage"

229−msgstr "Xestionar ámbitos"

233+msgstr ""

230−

231−#: qml/Dash/ScopesOverview.qml:437

232−msgid "Done"

233−msgstr "Fecho"

234−

235−#: qml/Dash/ScopesOverview.qml:463

236−msgid "Store"

237−msgstr "Tienda"

238

234

239−#: qml/Dash/ScopesOverviewTab.qml:36

235+#: qml/Dash/ScopesList.qml:107

240−msgid "Favorites"

236+msgid "Home"

241−msgstr "Favoritos"

237+msgstr ""

242

238

243−#: qml/Dash/ScopesOverviewTab.qml:54

239+#: qml/Dash/ScopesList.qml:108

244−msgid "All"

240+msgid "Also installed"

245−msgstr "Too"

241+msgstr ""

246

242

247#: qml/Greeter/Greeter.qml:174

243#: qml/Greeter/Greeter.qml:174

248msgid "Unlock"

244msgid "Unlock"

249msgstr "Desbloquiar"

245msgstr "Desbloquiar"

250

246

251−#: qml/Notifications/NotificationMenuItemFactory.qml:116

247+#: qml/Notifications/NotificationMenuItemFactory.qml:128

252msgid "Show password"

248msgid "Show password"

253msgstr "Amosar contraseña"

249msgstr "Amosar contraseña"

254

250

@@ -296,49 +292,49 @@ msgstr "Desbloquiar SIM"

296msgid "Roaming"

292msgid "Roaming"

297msgstr "Roaming"

293msgstr "Roaming"

298

294

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

300msgid "Enter passphrase"

301msgid "Enter passphrase"

301msgstr "Escribi la frase contraseña"

302msgstr "Escribi la frase contraseña"

302

303

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

304msgid "Sorry, incorrect passphrase"

314msgid "Sorry, incorrect passphrase"

305msgstr "Sentímoslo, contraseña incorreuta"

315msgstr "Sentímoslo, contraseña incorreuta"

306

316

307−#: qml/Shell.qml:393

317+#: qml/Shell.qml:372

308msgid "Please re-enter"

318msgid "Please re-enter"

309msgstr "Vuelvi a escribila"

319msgstr "Vuelvi a escribila"

310

320

311−#: qml/Shell.qml:395

321+#: qml/Shell.qml:373

312−msgid "Enter passcode"

313−msgstr "Escribi'l códigu de pasu"

314−

315−#: qml/Shell.qml:396

316msgid "Sorry, incorrect passcode"

322msgid "Sorry, incorrect passcode"

317msgstr "Sentímoslo, códigu de pasu incorreutu"

323msgstr "Sentímoslo, códigu de pasu incorreutu"

318

324

319−#: qml/Shell.qml:399

325+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

320−#, qt-format

321−msgid "Enter %1"

322−msgstr "Escribi %1"

323−

324−#: qml/Shell.qml:400

325−#, qt-format

326−msgid "Sorry, incorrect %1"

327−msgstr "Sentímoslo, %1 incorreutu"

328−

329−#: qml/Shell.qml:441

330msgid "Sorry, incorrect passphrase."

326msgid "Sorry, incorrect passphrase."

331msgstr "Fras de pasu incorreuta"

327msgstr "Fras de pasu incorreuta"

332

328

333−#: qml/Shell.qml:442

329+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

334msgid "Sorry, incorrect passcode."

330msgid "Sorry, incorrect passcode."

335msgstr "Códigu de pasu incorreutu"

331msgstr "Códigu de pasu incorreutu"

336

332

337−#: qml/Shell.qml:443

333+#: qml/Shell.qml:469

338msgid "This will be your last attempt."

334msgid "This will be your last attempt."

339msgstr "Esti ye'l caberu intentu."

335msgstr "Esti ye'l caberu intentu."

340

336

341−#: qml/Shell.qml:445

337+#: qml/Shell.qml:471

342msgid ""

338msgid ""

343"If passphrase is entered incorrectly, your phone will conduct a factory "

339"If passphrase is entered incorrectly, your phone will conduct a factory "

344"reset and all personal data will be deleted."

340"reset and all personal data will be deleted."

@@ -346,7 +342,7 @@ msgstr ""

346"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "

342"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "

347"configuración de fábrica y van perdese tolos datos personales."

343"configuración de fábrica y van perdese tolos datos personales."

348

344

349−#: qml/Shell.qml:446

345+#: qml/Shell.qml:472

350msgid ""

346msgid ""

351"If passcode is entered incorrectly, your phone will conduct a factory reset "

347"If passcode is entered incorrectly, your phone will conduct a factory reset "

352"and all personal data will be deleted."

348"and all personal data will be deleted."

@@ -354,6 +350,183 @@ msgstr ""

354"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "

350"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "

355"configuración de fábrica y van perdese tolos datos personales."

351"configuración de fábrica y van perdese tolos datos personales."

356

352

353+#: qml/Wizard/Page.qml:89

354+msgid "Back"

355+msgstr ""

356+

357+#: qml/Wizard/Pages/10-welcome.qml:27

358+msgid "Hi!"

359+msgstr ""

360+

361+#: qml/Wizard/Pages/10-welcome.qml:44

362+msgid "Welcome to your Ubuntu phone."

363+msgstr ""

364+

365+#: qml/Wizard/Pages/10-welcome.qml:52

366+msgid "Let’s get started."

367+msgstr ""

368+

369+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

370+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

371+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

372+#: qml/Wizard/Pages/passwd-set.qml:90

373+msgid "Continue"

374+msgstr ""

375+

376+#: qml/Wizard/Pages/20-sim.qml:25

377+msgid "Add a SIM card and restart your device"

378+msgstr ""

379+

380+#: qml/Wizard/Pages/20-sim.qml:55

381+msgid "Without it, you won’t be able to make calls or use text messaging."

382+msgstr ""

383+

384+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

385+msgid "Skip"

386+msgstr ""

387+

388+#: qml/Wizard/Pages/30-passwd-type.qml:39

389+msgid "Lock security"

390+msgstr ""

391+

392+#: qml/Wizard/Pages/30-passwd-type.qml:74

393+msgid "Please select how you’d like to unlock your phone."

394+msgstr ""

395+

396+#: qml/Wizard/Pages/30-passwd-type.qml:97

397+msgid "Swipe"

398+msgstr ""

399+

400+#: qml/Wizard/Pages/30-passwd-type.qml:98

401+msgid "No security"

402+msgstr ""

403+

404+#: qml/Wizard/Pages/30-passwd-type.qml:100

405+msgid "Passcode"

406+msgstr ""

407+

408+#: qml/Wizard/Pages/30-passwd-type.qml:101

409+msgid "4 digits only"

410+msgstr ""

411+

412+#: qml/Wizard/Pages/30-passwd-type.qml:103

413+msgid "Passphrase"

414+msgstr ""

415+

416+#: qml/Wizard/Pages/30-passwd-type.qml:104

417+msgid "Numbers and letters"

418+msgstr ""

419+

420+#: qml/Wizard/Pages/40-wifi.qml:28

421+msgid "Connect to Wi‑Fi"

422+msgstr ""

423+

424+#: qml/Wizard/Pages/40-wifi.qml:147

425+msgid "Available networks…"

426+msgstr ""

427+

428+#: qml/Wizard/Pages/40-wifi.qml:148

429+msgid "No available networks."

430+msgstr ""

431+

432+#: qml/Wizard/Pages/50-location.qml:27

433+msgid "Location"

434+msgstr ""

435+

436+#: qml/Wizard/Pages/50-location.qml:62

437+msgid "Let the phone detect your location:"

438+msgstr ""

439+

440+#: qml/Wizard/Pages/50-location.qml:69

441+msgid "Using GPS only (less accurate)"

442+msgstr ""

443+

444+#: qml/Wizard/Pages/50-location.qml:86

445+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

446+msgstr ""

447+

448+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

449+#: qml/Wizard/Pages/50-location.qml:103

450+msgid ""

451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

452+"conditions</a>."

453+msgstr ""

454+

455+#: qml/Wizard/Pages/50-location.qml:112

456+msgid "Not at all"

457+msgstr ""

458+

459+#: qml/Wizard/Pages/50-location.qml:124

460+msgid "You can change your mind later in <b>System Settings</b>."

461+msgstr ""

462+

463+#: qml/Wizard/Pages/60-reporting.qml:24

464+msgid "Improving your experience"

465+msgstr ""

466+

467+#: qml/Wizard/Pages/60-reporting.qml:36

468+msgid ""

469+"Your phone is set up to automatically report errors to Canonical and its "

470+"partners, the makers of the operating system."

471+msgstr ""

472+

473+#: qml/Wizard/Pages/60-reporting.qml:43

474+msgid ""

475+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

476+"Privacy</b>"

477+msgstr ""

478+

479+#: qml/Wizard/Pages/80-finished.qml:24

480+msgid "All done"

481+msgstr ""

482+

483+#: qml/Wizard/Pages/80-finished.qml:39

484+msgid "Nice work!"

485+msgstr ""

486+

487+#: qml/Wizard/Pages/80-finished.qml:46

488+msgid "Your phone is now ready to use."

489+msgstr ""

490+

491+#: qml/Wizard/Pages/80-finished.qml:53

492+msgid "Finish"

493+msgstr ""

494+

495+#: qml/Wizard/Pages/here-terms.qml:27

496+msgid "Terms & Conditions"

497+msgstr ""

498+

499+#: qml/Wizard/Pages/passwd-confirm.qml:49

500+msgid "Confirm passphrase"

501+msgstr ""

502+

503+#: qml/Wizard/Pages/passwd-confirm.qml:50

504+msgid "Confirm passcode"

505+msgstr ""

506+

507+#: qml/Wizard/Pages/passwd-confirm.qml:53

508+#: qml/Wizard/Pages/passwd-confirm.qml:54

509+msgid "Please try again."

510+msgstr ""

511+

512+#: qml/Wizard/Pages/passwd-set.qml:61

513+msgid "Choose your passcode"

514+msgstr ""

515+

516+#: qml/Wizard/Pages/passwd-set.qml:68

517+msgid "Passphrase must be 4 characters long"

518+msgstr ""

519+

520+#: qml/Wizard/StackButton.qml:39

521+#, qt-format

522+msgid "〈 %1"

523+msgstr ""

524+

525+#: qml/Wizard/StackButton.qml:42

526+#, qt-format

527+msgid "%1 〉"

528+msgstr ""

529+

357#~ msgid "Confirm"

530#~ msgid "Confirm"

358#~ msgstr "Confirmar"

531#~ msgstr "Confirmar"

359

532

@@ -368,3 +541,15 @@ msgstr ""

368

541

369#~ msgid "Speak Now..."

542#~ msgid "Speak Now..."

370#~ msgstr "Fala agora…"

543#~ msgstr "Fala agora…"

544+

545+#~ msgid "Done"

546+#~ msgstr "Fecho"

547+

548+#~ msgid "Favorites"

549+#~ msgstr "Favoritos"

550+

551+#~ msgid "All"

552+#~ msgstr "Too"

553+

554+#~ msgid "Manage Scopes"

555+#~ msgstr "Xestionar ámbitos"

po/az.po+260−78

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-09-03 16:39+0000\n"

11"PO-Revision-Date: 2014-09-03 16:39+0000\n"

12"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"

12"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"

13"Language-Team: Azerbaijani <az@li.org>\n"

13"Language-Team: Azerbaijani <az@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Şifrә: "

23msgstr "Şifrә: "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Pin qısayolu"

28msgstr "Pin qısayolu"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Açma qısayolu"

32msgstr "Açma qısayolu"

33

33

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] ""

50msgstr[0] ""

51msgstr[1] ""

51msgstr[1] ""

52

52

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

54msgid "Log out"

54msgid "Log out"

55msgstr "Çıxış"

55msgstr "Çıxış"

56

56

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

58msgid "Are you sure you want to log out?"

58msgid "Are you sure you want to log out?"

59msgstr "Çıxmaq istәdiyinizdәn әminsiniz?"

59msgstr "Çıxmaq istәdiyinizdәn әminsiniz?"

60

60

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:122

63msgid "No"

63msgid "No"

64msgstr "Yox"

64msgstr "Yox"

65

65

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:129

68msgid "Yes"

68msgid "Yes"

69msgstr "Hə"

69msgstr "Hə"

70

70

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

72msgid "Shut down"

72msgid "Shut down"

73msgstr "Sistemi Söndür"

73msgstr "Sistemi Söndür"

74

74

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

76msgid "Are you sure you want to shut down?"

76msgid "Are you sure you want to shut down?"

77msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"

77msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"

78

78

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

80msgid "Reboot"

80msgid "Reboot"

81msgstr "Yenidən yüklə"

81msgstr "Yenidən yüklə"

82

82

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

84msgid "Are you sure you want to reboot?"

84msgid "Are you sure you want to reboot?"

85msgstr "Yenidәn başlatmaq istәdiyinizә әminsiniz?"

85msgstr "Yenidәn başlatmaq istәdiyinizә әminsiniz?"

86

86

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

88msgid "Power"

88msgid "Power"

89msgstr ""

89msgstr ""

90

90

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

92msgid ""

92msgid ""

93"Are you sure you would like\n"

93"Are you sure you would like\n"

94"to power off?"

94"to power off?"

95msgstr ""

95msgstr ""

96

96

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

98msgid "Power off"

98msgid "Power off"

99msgstr "Söndür"

99msgstr "Söndür"

100

100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102msgid "Restart"

102msgid "Restart"

103msgstr ""

103msgstr ""

104

104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106msgid "Cancel"

106msgid "Cancel"

107msgstr "İmtina"

107msgstr "İmtina"

108

108

@@ -110,44 +110,44 @@ msgstr "İmtina"

110msgid "Skip intro"

110msgid "Skip intro"

111msgstr "Tәqdimatı keç"

111msgstr "Tәqdimatı keç"

112

112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114msgid "Right edge"

114msgid "Right edge"

115msgstr "Sağ Künc"

115msgstr "Sağ Künc"

116

116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118msgid "Try swiping from the right edge to unlock the phone"

118msgid "Try swiping from the right edge to unlock the phone"

119msgstr "Kilidi açmaq üçün sağ küncdən sürüşdürün"

119msgstr "Kilidi açmaq üçün sağ küncdən sürüşdürün"

120

120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122msgid "Top edge"

122msgid "Top edge"

123msgstr "Yuxarı künc"

123msgstr "Yuxarı künc"

124

124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126msgid "Try swiping from the top edge to access the indicators"

126msgid "Try swiping from the top edge to access the indicators"

127msgstr "Göstəriciləri görmәk üçün yuxarı küncdən sürüşdürün"

127msgstr "Göstəriciləri görmәk üçün yuxarı küncdən sürüşdürün"

128

128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130msgid "Close"

130msgid "Close"

131msgstr "Bağla"

131msgstr "Bağla"

132

132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134msgid "Swipe up again to close the settings screen"

134msgid "Swipe up again to close the settings screen"

135msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı sürüşdürün"

135msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı sürüşdürün"

136

136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138msgid "Left edge"

138msgid "Left edge"

139msgstr "Sol künc"

139msgstr "Sol künc"

140

140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143msgstr ""

143msgstr ""

144"Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"

144"Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"

145

145

146−#: qml/Components/EdgeDemo.qml:229

146+#: qml/Components/EdgeDemo.qml:242

147msgid "Well done"

147msgid "Well done"

148msgstr "Təbriklər"

148msgstr "Təbriklər"

149

149

150−#: qml/Components/EdgeDemo.qml:230

150+#: qml/Components/EdgeDemo.qml:243

151msgid ""

151msgid ""

152"You have now mastered the edge gestures and can start using the "

152"You have now mastered the edge gestures and can start using the "

153"phone<br><br>Tap on the screen to start"

153"phone<br><br>Tap on the screen to start"

@@ -155,40 +155,44 @@ msgstr ""

155"Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "

155"Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "

156"bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"

156"bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"

157

157

158−#: qml/Components/Lockscreen.qml:223

158+#: qml/Components/Lockscreen.qml:238

159msgid "Return to Call"

159msgid "Return to Call"

160msgstr ""

160msgstr ""

161

161

162−#: qml/Components/Lockscreen.qml:223

162+#: qml/Components/Lockscreen.qml:238

163msgid "Emergency Call"

163msgid "Emergency Call"

164msgstr "Zərurət zəngi"

164msgstr "Zərurət zəngi"

165

165

166−#: qml/Components/Lockscreen.qml:255

166+#: qml/Components/Lockscreen.qml:270

167msgid "OK"

167msgid "OK"

168msgstr "Oldu"

168msgstr "Oldu"

169

169

170−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

170+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

171msgid "See less"

171msgid "See less"

172msgstr "Daha azını gör"

172msgstr "Daha azını gör"

173

173

174−#: qml/Dash/GenericScopeView.qml:434

174+#: qml/Dash/GenericScopeView.qml:431

175msgid "See all"

175msgid "See all"

176msgstr "Hamısını gör"

176msgstr "Hamısını gör"

177

177

178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

178+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

179#: qml/Panel/SearchIndicator.qml:27

179#: qml/Panel/SearchIndicator.qml:27

180msgid "Search"

180msgid "Search"

181msgstr "Axtar"

181msgstr "Axtar"

182

182

183−#: qml/Dash/PageHeader.qml:268

183+#: qml/Dash/PageHeader.qml:260

184+msgid "Store"

185+msgstr ""

186+

187+#: qml/Dash/PageHeader.qml:277

184msgid "Settings"

188msgid "Settings"

185msgstr "Tənzimləmələr"

189msgstr "Tənzimləmələr"

186

190

187−#: qml/Dash/PageHeader.qml:275

191+#: qml/Dash/PageHeader.qml:284

188msgid "Remove from Favorites"

192msgid "Remove from Favorites"

189msgstr "Seçilmişlәrdәn çıxart"

193msgstr "Seçilmişlәrdәn çıxart"

190

194

191−#: qml/Dash/PageHeader.qml:275

195+#: qml/Dash/PageHeader.qml:284

192msgid "Add to Favorites"

196msgid "Add to Favorites"

193msgstr "Seçilmişlәrә әlavә et"

197msgstr "Seçilmişlәrә әlavә et"

194

198

@@ -220,31 +224,23 @@ msgstr ""

220msgid "Release to refresh…"

224msgid "Release to refresh…"

221msgstr ""

225msgstr ""

222

226

223−#: qml/Dash/ScopesOverview.qml:215

227+#: qml/Dash/ScopesList.qml:63

224−msgid "Manage Scopes"

228+msgid "Manage"

225msgstr ""

229msgstr ""

226

230

227−#: qml/Dash/ScopesOverview.qml:437

231+#: qml/Dash/ScopesList.qml:107

228−msgid "Done"

232+msgid "Home"

229−msgstr "Başa çatdı"

230−

231−#: qml/Dash/ScopesOverview.qml:463

232−msgid "Store"

233msgstr ""

233msgstr ""

234

234

235−#: qml/Dash/ScopesOverviewTab.qml:36

235+#: qml/Dash/ScopesList.qml:108

236−msgid "Favorites"

236+msgid "Also installed"

237−msgstr "Seçilmişlər"

238−

239−#: qml/Dash/ScopesOverviewTab.qml:54

240−msgid "All"

241−msgstr "Hamısı"

237+msgstr ""

242

238

243#: qml/Greeter/Greeter.qml:174

239#: qml/Greeter/Greeter.qml:174

244msgid "Unlock"

240msgid "Unlock"

245msgstr ""

241msgstr ""

246

242

247−#: qml/Notifications/NotificationMenuItemFactory.qml:116

243+#: qml/Notifications/NotificationMenuItemFactory.qml:128

248msgid "Show password"

244msgid "Show password"

249msgstr "Şifrәni göstәr"

245msgstr "Şifrәni göstәr"

250

246

@@ -292,49 +288,49 @@ msgstr "SIM kilidini aç"

292msgid "Roaming"

288msgid "Roaming"

293msgstr "Rominq"

289msgstr "Rominq"

294

290

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

296msgid "Enter passphrase"

297msgid "Enter passphrase"

297msgstr ""

298msgstr ""

298

299

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

300msgid "Sorry, incorrect passphrase"

310msgid "Sorry, incorrect passphrase"

301msgstr "Bağışlayın, açar söz yanlışdır"

311msgstr "Bağışlayın, açar söz yanlışdır"

302

312

303−#: qml/Shell.qml:393

313+#: qml/Shell.qml:372

304msgid "Please re-enter"

314msgid "Please re-enter"

305msgstr ""

315msgstr ""

306

316

307−#: qml/Shell.qml:395

317+#: qml/Shell.qml:373

308−msgid "Enter passcode"

309−msgstr ""

310−

311−#: qml/Shell.qml:396

312msgid "Sorry, incorrect passcode"

318msgid "Sorry, incorrect passcode"

313msgstr ""

319msgstr ""

314

320

315−#: qml/Shell.qml:399

321+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

316−#, qt-format

317−msgid "Enter %1"

318−msgstr ""

319−

320−#: qml/Shell.qml:400

321−#, qt-format

322−msgid "Sorry, incorrect %1"

323−msgstr "Bağışlayın, %1 yanlışdır"

324−

325−#: qml/Shell.qml:441

326msgid "Sorry, incorrect passphrase."

322msgid "Sorry, incorrect passphrase."

327msgstr "Bağışlayın, açar söz yanlışdır."

323msgstr "Bağışlayın, açar söz yanlışdır."

328

324

329−#: qml/Shell.qml:442

325+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

330msgid "Sorry, incorrect passcode."

326msgid "Sorry, incorrect passcode."

331msgstr "Təəssüf ki, açar kod yanlışdır."

327msgstr "Təəssüf ki, açar kod yanlışdır."

332

328

333−#: qml/Shell.qml:443

329+#: qml/Shell.qml:469

334msgid "This will be your last attempt."

330msgid "This will be your last attempt."

335msgstr "Bu sizin son cəhdiniz olacaq."

331msgstr "Bu sizin son cəhdiniz olacaq."

336

332

337−#: qml/Shell.qml:445

333+#: qml/Shell.qml:471

338msgid ""

334msgid ""

339"If passphrase is entered incorrectly, your phone will conduct a factory "

335"If passphrase is entered incorrectly, your phone will conduct a factory "

340"reset and all personal data will be deleted."

336"reset and all personal data will be deleted."

@@ -342,7 +338,7 @@ msgstr ""

342"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "

338"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "

343"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."

339"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."

344

340

345−#: qml/Shell.qml:446

341+#: qml/Shell.qml:472

346msgid ""

342msgid ""

347"If passcode is entered incorrectly, your phone will conduct a factory reset "

343"If passcode is entered incorrectly, your phone will conduct a factory reset "

348"and all personal data will be deleted."

344"and all personal data will be deleted."

@@ -350,6 +346,183 @@ msgstr ""

350"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "

346"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "

351"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."

347"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."

352

348

349+#: qml/Wizard/Page.qml:89

350+msgid "Back"

351+msgstr ""

352+

353+#: qml/Wizard/Pages/10-welcome.qml:27

354+msgid "Hi!"

355+msgstr ""

356+

357+#: qml/Wizard/Pages/10-welcome.qml:44

358+msgid "Welcome to your Ubuntu phone."

359+msgstr ""

360+

361+#: qml/Wizard/Pages/10-welcome.qml:52

362+msgid "Let’s get started."

363+msgstr ""

364+

365+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

366+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

367+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

368+#: qml/Wizard/Pages/passwd-set.qml:90

369+msgid "Continue"

370+msgstr ""

371+

372+#: qml/Wizard/Pages/20-sim.qml:25

373+msgid "Add a SIM card and restart your device"

374+msgstr ""

375+

376+#: qml/Wizard/Pages/20-sim.qml:55

377+msgid "Without it, you won’t be able to make calls or use text messaging."

378+msgstr ""

379+

380+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

381+msgid "Skip"

382+msgstr ""

383+

384+#: qml/Wizard/Pages/30-passwd-type.qml:39

385+msgid "Lock security"

386+msgstr ""

387+

388+#: qml/Wizard/Pages/30-passwd-type.qml:74

389+msgid "Please select how you’d like to unlock your phone."

390+msgstr ""

391+

392+#: qml/Wizard/Pages/30-passwd-type.qml:97

393+msgid "Swipe"

394+msgstr ""

395+

396+#: qml/Wizard/Pages/30-passwd-type.qml:98

397+msgid "No security"

398+msgstr ""

399+

400+#: qml/Wizard/Pages/30-passwd-type.qml:100

401+msgid "Passcode"

402+msgstr ""

403+

404+#: qml/Wizard/Pages/30-passwd-type.qml:101

405+msgid "4 digits only"

406+msgstr ""

407+

408+#: qml/Wizard/Pages/30-passwd-type.qml:103

409+msgid "Passphrase"

410+msgstr ""

411+

412+#: qml/Wizard/Pages/30-passwd-type.qml:104

413+msgid "Numbers and letters"

414+msgstr ""

415+

416+#: qml/Wizard/Pages/40-wifi.qml:28

417+msgid "Connect to Wi‑Fi"

418+msgstr ""

419+

420+#: qml/Wizard/Pages/40-wifi.qml:147

421+msgid "Available networks…"

422+msgstr ""

423+

424+#: qml/Wizard/Pages/40-wifi.qml:148

425+msgid "No available networks."

426+msgstr ""

427+

428+#: qml/Wizard/Pages/50-location.qml:27

429+msgid "Location"

430+msgstr ""

431+

432+#: qml/Wizard/Pages/50-location.qml:62

433+msgid "Let the phone detect your location:"

434+msgstr ""

435+

436+#: qml/Wizard/Pages/50-location.qml:69

437+msgid "Using GPS only (less accurate)"

438+msgstr ""

439+

440+#: qml/Wizard/Pages/50-location.qml:86

441+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

442+msgstr ""

443+

444+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

445+#: qml/Wizard/Pages/50-location.qml:103

446+msgid ""

447+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

448+"conditions</a>."

449+msgstr ""

450+

451+#: qml/Wizard/Pages/50-location.qml:112

452+msgid "Not at all"

453+msgstr ""

454+

455+#: qml/Wizard/Pages/50-location.qml:124

456+msgid "You can change your mind later in <b>System Settings</b>."

457+msgstr ""

458+

459+#: qml/Wizard/Pages/60-reporting.qml:24

460+msgid "Improving your experience"

461+msgstr ""

462+

463+#: qml/Wizard/Pages/60-reporting.qml:36

464+msgid ""

465+"Your phone is set up to automatically report errors to Canonical and its "

466+"partners, the makers of the operating system."

467+msgstr ""

468+

469+#: qml/Wizard/Pages/60-reporting.qml:43

470+msgid ""

471+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

472+"Privacy</b>"

473+msgstr ""

474+

475+#: qml/Wizard/Pages/80-finished.qml:24

476+msgid "All done"

477+msgstr ""

478+

479+#: qml/Wizard/Pages/80-finished.qml:39

480+msgid "Nice work!"

481+msgstr ""

482+

483+#: qml/Wizard/Pages/80-finished.qml:46

484+msgid "Your phone is now ready to use."

485+msgstr ""

486+

487+#: qml/Wizard/Pages/80-finished.qml:53

488+msgid "Finish"

489+msgstr ""

490+

491+#: qml/Wizard/Pages/here-terms.qml:27

492+msgid "Terms & Conditions"

493+msgstr ""

494+

495+#: qml/Wizard/Pages/passwd-confirm.qml:49

496+msgid "Confirm passphrase"

497+msgstr ""

498+

499+#: qml/Wizard/Pages/passwd-confirm.qml:50

500+msgid "Confirm passcode"

501+msgstr ""

502+

503+#: qml/Wizard/Pages/passwd-confirm.qml:53

504+#: qml/Wizard/Pages/passwd-confirm.qml:54

505+msgid "Please try again."

506+msgstr ""

507+

508+#: qml/Wizard/Pages/passwd-set.qml:61

509+msgid "Choose your passcode"

510+msgstr ""

511+

512+#: qml/Wizard/Pages/passwd-set.qml:68

513+msgid "Passphrase must be 4 characters long"

514+msgstr ""

515+

516+#: qml/Wizard/StackButton.qml:39

517+#, qt-format

518+msgid "〈 %1"

519+msgstr ""

520+

521+#: qml/Wizard/StackButton.qml:42

522+#, qt-format

523+msgid "%1 〉"

524+msgstr ""

525+

353#~ msgid "Confirm"

526#~ msgid "Confirm"

354#~ msgstr "Təsdiqlə"

527#~ msgstr "Təsdiqlə"

355

528

@@ -362,5 +535,14 @@ msgstr ""

362#~ msgid "Speak Now..."

535#~ msgid "Speak Now..."

363#~ msgstr "Danışın..."

536#~ msgstr "Danışın..."

364

537

538+#~ msgid "All"

539+#~ msgstr "Hamısı"

540+

541+#~ msgid "Favorites"

542+#~ msgstr "Seçilmişlər"

543+

544+#~ msgid "Done"

545+#~ msgstr "Başa çatdı"

546+

365#~ msgid "Type or say a command"

547#~ msgid "Type or say a command"

366#~ msgstr "Bir әmr söyləyin və ya yazın"

548#~ msgstr "Bir әmr söyləyin və ya yazın"

po/be.po+248−75

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-09-24 17:12+0000\n"

11"PO-Revision-Date: 2014-09-24 17:12+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Belarusian <be@li.org>\n"

13"Language-Team: Belarusian <be@li.org>\n"

@@ -16,19 +16,19 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

17"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

20−"X-Generator: Launchpad (build 17231)\n"

20+"X-Generator: Launchpad (build 17286)\n"

21

21

22#: plugins/LightDM/Greeter.cpp:130

22#: plugins/LightDM/Greeter.cpp:130

23msgid "Password: "

23msgid "Password: "

24msgstr ""

24msgstr ""

25

25

26#: plugins/Unity/Launcher/launcheritem.cpp:45

26#: plugins/Unity/Launcher/launcheritem.cpp:45

27−#: plugins/Unity/Launcher/launcheritem.cpp:91

27+#: plugins/Unity/Launcher/launcheritem.cpp:100

28msgid "Pin shortcut"

28msgid "Pin shortcut"

29msgstr ""

29msgstr ""

30

30

31−#: plugins/Unity/Launcher/launcheritem.cpp:91

31+#: plugins/Unity/Launcher/launcheritem.cpp:100

32msgid "Unpin shortcut"

32msgid "Unpin shortcut"

33msgstr ""

33msgstr ""

34

34

@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

51msgstr[0] ""

51msgstr[0] ""

52msgstr[1] ""

52msgstr[1] ""

53

53

54−#: qml/Components/Dialogs.qml:74

54+#: qml/Components/Dialogs.qml:70

55msgid "Log out"

55msgid "Log out"

56msgstr ""

56msgstr ""

57

57

58−#: qml/Components/Dialogs.qml:75

58+#: qml/Components/Dialogs.qml:71

59msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

60msgstr ""

60msgstr ""

61

61

62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63−#: qml/Components/Dialogs.qml:126

63+#: qml/Components/Dialogs.qml:122

64msgid "No"

64msgid "No"

65msgstr ""

65msgstr ""

66

66

67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68−#: qml/Components/Dialogs.qml:133

68+#: qml/Components/Dialogs.qml:129

69msgid "Yes"

69msgid "Yes"

70msgstr ""

70msgstr ""

71

71

72−#: qml/Components/Dialogs.qml:98

72+#: qml/Components/Dialogs.qml:94

73msgid "Shut down"

73msgid "Shut down"

74msgstr ""

74msgstr ""

75

75

76−#: qml/Components/Dialogs.qml:99

76+#: qml/Components/Dialogs.qml:95

77msgid "Are you sure you want to shut down?"

77msgid "Are you sure you want to shut down?"

78msgstr ""

78msgstr ""

79

79

80−#: qml/Components/Dialogs.qml:123

80+#: qml/Components/Dialogs.qml:119

81msgid "Reboot"

81msgid "Reboot"

82msgstr ""

82msgstr ""

83

83

84−#: qml/Components/Dialogs.qml:124

84+#: qml/Components/Dialogs.qml:120

85msgid "Are you sure you want to reboot?"

85msgid "Are you sure you want to reboot?"

86msgstr ""

86msgstr ""

87

87

88−#: qml/Components/Dialogs.qml:148

88+#: qml/Components/Dialogs.qml:144

89msgid "Power"

89msgid "Power"

90msgstr ""

90msgstr ""

91

91

92−#: qml/Components/Dialogs.qml:149

92+#: qml/Components/Dialogs.qml:145

93msgid ""

93msgid ""

94"Are you sure you would like\n"

94"Are you sure you would like\n"

95"to power off?"

95"to power off?"

96msgstr ""

96msgstr ""

97

97

98−#: qml/Components/Dialogs.qml:151

98+#: qml/Components/Dialogs.qml:147

99msgid "Power off"

99msgid "Power off"

100msgstr ""

100msgstr ""

101

101

102−#: qml/Components/Dialogs.qml:161

102+#: qml/Components/Dialogs.qml:157

103msgid "Restart"

103msgid "Restart"

104msgstr ""

104msgstr ""

105

105

106−#: qml/Components/Dialogs.qml:171

106+#: qml/Components/Dialogs.qml:167

107msgid "Cancel"

107msgid "Cancel"

108msgstr ""

108msgstr ""

109

109

@@ -111,82 +111,86 @@ msgstr ""

111msgid "Skip intro"

111msgid "Skip intro"

112msgstr ""

112msgstr ""

113

113

114−#: qml/Components/EdgeDemo.qml:112

114+#: qml/Components/EdgeDemo.qml:125

115msgid "Right edge"

115msgid "Right edge"

116msgstr ""

116msgstr ""

117

117

118−#: qml/Components/EdgeDemo.qml:113

118+#: qml/Components/EdgeDemo.qml:126

119msgid "Try swiping from the right edge to unlock the phone"

119msgid "Try swiping from the right edge to unlock the phone"

120msgstr ""

120msgstr ""

121

121

122−#: qml/Components/EdgeDemo.qml:144

122+#: qml/Components/EdgeDemo.qml:157

123msgid "Top edge"

123msgid "Top edge"

124msgstr ""

124msgstr ""

125

125

126−#: qml/Components/EdgeDemo.qml:145

126+#: qml/Components/EdgeDemo.qml:158

127msgid "Try swiping from the top edge to access the indicators"

127msgid "Try swiping from the top edge to access the indicators"

128msgstr ""

128msgstr ""

129

129

130−#: qml/Components/EdgeDemo.qml:170

130+#: qml/Components/EdgeDemo.qml:183

131msgid "Close"

131msgid "Close"

132msgstr ""

132msgstr ""

133

133

134−#: qml/Components/EdgeDemo.qml:171

134+#: qml/Components/EdgeDemo.qml:184

135msgid "Swipe up again to close the settings screen"

135msgid "Swipe up again to close the settings screen"

136msgstr ""

136msgstr ""

137

137

138−#: qml/Components/EdgeDemo.qml:201

138+#: qml/Components/EdgeDemo.qml:214

139msgid "Left edge"

139msgid "Left edge"

140msgstr ""

140msgstr ""

141

141

142−#: qml/Components/EdgeDemo.qml:202

142+#: qml/Components/EdgeDemo.qml:215

143msgid "Swipe from the left to reveal the launcher for quick access to apps"

143msgid "Swipe from the left to reveal the launcher for quick access to apps"

144msgstr ""

144msgstr ""

145

145

146−#: qml/Components/EdgeDemo.qml:229

146+#: qml/Components/EdgeDemo.qml:242

147msgid "Well done"

147msgid "Well done"

148msgstr ""

148msgstr ""

149

149

150−#: qml/Components/EdgeDemo.qml:230

150+#: qml/Components/EdgeDemo.qml:243

151msgid ""

151msgid ""

152"You have now mastered the edge gestures and can start using the "

152"You have now mastered the edge gestures and can start using the "

153"phone<br><br>Tap on the screen to start"

153"phone<br><br>Tap on the screen to start"

154msgstr ""

154msgstr ""

155

155

156−#: qml/Components/Lockscreen.qml:223

156+#: qml/Components/Lockscreen.qml:238

157msgid "Return to Call"

157msgid "Return to Call"

158msgstr ""

158msgstr ""

159

159

160−#: qml/Components/Lockscreen.qml:223

160+#: qml/Components/Lockscreen.qml:238

161msgid "Emergency Call"

161msgid "Emergency Call"

162msgstr ""

162msgstr ""

163

163

164−#: qml/Components/Lockscreen.qml:255

164+#: qml/Components/Lockscreen.qml:270

165msgid "OK"

165msgid "OK"

166msgstr ""

166msgstr ""

167

167

168−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

168+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

169msgid "See less"

169msgid "See less"

170msgstr ""

170msgstr ""

171

171

172−#: qml/Dash/GenericScopeView.qml:434

172+#: qml/Dash/GenericScopeView.qml:431

173msgid "See all"

173msgid "See all"

174msgstr ""

174msgstr ""

175

175

176−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

176+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

177#: qml/Panel/SearchIndicator.qml:27

177#: qml/Panel/SearchIndicator.qml:27

178msgid "Search"

178msgid "Search"

179msgstr ""

179msgstr ""

180

180

181−#: qml/Dash/PageHeader.qml:268

181+#: qml/Dash/PageHeader.qml:260

182+msgid "Store"

183+msgstr ""

184+

185+#: qml/Dash/PageHeader.qml:277

182msgid "Settings"

186msgid "Settings"

183msgstr ""

187msgstr ""

184

188

185−#: qml/Dash/PageHeader.qml:275

189+#: qml/Dash/PageHeader.qml:284

186msgid "Remove from Favorites"

190msgid "Remove from Favorites"

187msgstr ""

191msgstr ""

188

192

189−#: qml/Dash/PageHeader.qml:275

193+#: qml/Dash/PageHeader.qml:284

190msgid "Add to Favorites"

194msgid "Add to Favorites"

191msgstr ""

195msgstr ""

192

196

@@ -218,31 +222,23 @@ msgstr ""

218msgid "Release to refresh…"

222msgid "Release to refresh…"

219msgstr ""

223msgstr ""

220

224

221−#: qml/Dash/ScopesOverview.qml:215

225+#: qml/Dash/ScopesList.qml:63

222−msgid "Manage Scopes"

226+msgid "Manage"

223−msgstr ""

224−

225−#: qml/Dash/ScopesOverview.qml:437

226−msgid "Done"

227−msgstr ""

228−

229−#: qml/Dash/ScopesOverview.qml:463

230−msgid "Store"

231msgstr ""

227msgstr ""

232

228

233−#: qml/Dash/ScopesOverviewTab.qml:36

229+#: qml/Dash/ScopesList.qml:107

234−msgid "Favorites"

230+msgid "Home"

235msgstr ""

231msgstr ""

236

232

237−#: qml/Dash/ScopesOverviewTab.qml:54

233+#: qml/Dash/ScopesList.qml:108

238−msgid "All"

234+msgid "Also installed"

239msgstr ""

235msgstr ""

240

236

241#: qml/Greeter/Greeter.qml:174

237#: qml/Greeter/Greeter.qml:174

242msgid "Unlock"

238msgid "Unlock"

243msgstr ""

239msgstr ""

244

240

245−#: qml/Notifications/NotificationMenuItemFactory.qml:116

241+#: qml/Notifications/NotificationMenuItemFactory.qml:128

246msgid "Show password"

242msgid "Show password"

247msgstr ""

243msgstr ""

248

244

@@ -290,56 +286,233 @@ msgstr ""

290msgid "Roaming"

286msgid "Roaming"

291msgstr ""

287msgstr ""

292

288

293−#: qml/Shell.qml:391

289+#: qml/Shell.qml:367

290+#, qt-format

294−msgid "Enter passphrase"

291+msgid "Enter %1"

295msgstr ""

292msgstr ""

296

293

297−#: qml/Shell.qml:392

294+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

298−msgid "Sorry, incorrect passphrase"

295+msgid "Enter passphrase"

299msgstr ""

296msgstr ""

300

297

301−#: qml/Shell.qml:393

298+#: qml/Shell.qml:369

302−msgid "Please re-enter"

299+msgid "Enter passcode"

303msgstr ""

300msgstr ""

304

301

305−#: qml/Shell.qml:395

302+#: qml/Shell.qml:370

306−msgid "Enter passcode"

303+#, qt-format

304+msgid "Sorry, incorrect %1"

307msgstr ""

305msgstr ""

308

306

309−#: qml/Shell.qml:396

307+#: qml/Shell.qml:371

310−msgid "Sorry, incorrect passcode"

308+msgid "Sorry, incorrect passphrase"

311msgstr ""

309msgstr ""

312

310

313−#: qml/Shell.qml:399

311+#: qml/Shell.qml:372

314−#, qt-format

312+msgid "Please re-enter"

315−msgid "Enter %1"

316msgstr ""

313msgstr ""

317

314

318−#: qml/Shell.qml:400

315+#: qml/Shell.qml:373

319−#, qt-format

320−msgid "Sorry, incorrect %1"

316+msgid "Sorry, incorrect passcode"

321msgstr ""

317msgstr ""

322

318

323−#: qml/Shell.qml:441

319+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

324msgid "Sorry, incorrect passphrase."

320msgid "Sorry, incorrect passphrase."

325msgstr ""

321msgstr ""

326

322

327−#: qml/Shell.qml:442

323+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

328msgid "Sorry, incorrect passcode."

324msgid "Sorry, incorrect passcode."

329msgstr ""

325msgstr ""

330

326

331−#: qml/Shell.qml:443

327+#: qml/Shell.qml:469

332msgid "This will be your last attempt."

328msgid "This will be your last attempt."

333msgstr ""

329msgstr ""

334

330

335−#: qml/Shell.qml:445

331+#: qml/Shell.qml:471

336msgid ""

332msgid ""

337"If passphrase is entered incorrectly, your phone will conduct a factory "

333"If passphrase is entered incorrectly, your phone will conduct a factory "

338"reset and all personal data will be deleted."

334"reset and all personal data will be deleted."

339msgstr ""

335msgstr ""

340

336

341−#: qml/Shell.qml:446

337+#: qml/Shell.qml:472

342msgid ""

338msgid ""

343"If passcode is entered incorrectly, your phone will conduct a factory reset "

339"If passcode is entered incorrectly, your phone will conduct a factory reset "

344"and all personal data will be deleted."

340"and all personal data will be deleted."

345msgstr ""

341msgstr ""

342+

343+#: qml/Wizard/Page.qml:89

344+msgid "Back"

345+msgstr ""

346+

347+#: qml/Wizard/Pages/10-welcome.qml:27

348+msgid "Hi!"

349+msgstr ""

350+

351+#: qml/Wizard/Pages/10-welcome.qml:44

352+msgid "Welcome to your Ubuntu phone."

353+msgstr ""

354+

355+#: qml/Wizard/Pages/10-welcome.qml:52

356+msgid "Let’s get started."

357+msgstr ""

358+

359+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

360+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

361+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

362+#: qml/Wizard/Pages/passwd-set.qml:90

363+msgid "Continue"

364+msgstr ""

365+

366+#: qml/Wizard/Pages/20-sim.qml:25

367+msgid "Add a SIM card and restart your device"

368+msgstr ""

369+

370+#: qml/Wizard/Pages/20-sim.qml:55

371+msgid "Without it, you won’t be able to make calls or use text messaging."

372+msgstr ""

373+

374+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

375+msgid "Skip"

376+msgstr ""

377+

378+#: qml/Wizard/Pages/30-passwd-type.qml:39

379+msgid "Lock security"

380+msgstr ""

381+

382+#: qml/Wizard/Pages/30-passwd-type.qml:74

383+msgid "Please select how you’d like to unlock your phone."

384+msgstr ""

385+

386+#: qml/Wizard/Pages/30-passwd-type.qml:97

387+msgid "Swipe"

388+msgstr ""

389+

390+#: qml/Wizard/Pages/30-passwd-type.qml:98

391+msgid "No security"

392+msgstr ""

393+

394+#: qml/Wizard/Pages/30-passwd-type.qml:100

395+msgid "Passcode"

396+msgstr ""

397+

398+#: qml/Wizard/Pages/30-passwd-type.qml:101

399+msgid "4 digits only"

400+msgstr ""

401+

402+#: qml/Wizard/Pages/30-passwd-type.qml:103

403+msgid "Passphrase"

404+msgstr ""

405+

406+#: qml/Wizard/Pages/30-passwd-type.qml:104

407+msgid "Numbers and letters"

408+msgstr ""

409+

410+#: qml/Wizard/Pages/40-wifi.qml:28

411+msgid "Connect to Wi‑Fi"

412+msgstr ""

413+

414+#: qml/Wizard/Pages/40-wifi.qml:147

415+msgid "Available networks…"

416+msgstr ""

417+

418+#: qml/Wizard/Pages/40-wifi.qml:148

419+msgid "No available networks."

420+msgstr ""

421+

422+#: qml/Wizard/Pages/50-location.qml:27

423+msgid "Location"

424+msgstr ""

425+

426+#: qml/Wizard/Pages/50-location.qml:62

427+msgid "Let the phone detect your location:"

428+msgstr ""

429+

430+#: qml/Wizard/Pages/50-location.qml:69

431+msgid "Using GPS only (less accurate)"

432+msgstr ""

433+

434+#: qml/Wizard/Pages/50-location.qml:86

435+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

436+msgstr ""

437+

438+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

439+#: qml/Wizard/Pages/50-location.qml:103

440+msgid ""

441+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

442+"conditions</a>."

443+msgstr ""

444+

445+#: qml/Wizard/Pages/50-location.qml:112

446+msgid "Not at all"

447+msgstr ""

448+

449+#: qml/Wizard/Pages/50-location.qml:124

450+msgid "You can change your mind later in <b>System Settings</b>."

451+msgstr ""

452+

453+#: qml/Wizard/Pages/60-reporting.qml:24

454+msgid "Improving your experience"

455+msgstr ""

456+

457+#: qml/Wizard/Pages/60-reporting.qml:36

458+msgid ""

459+"Your phone is set up to automatically report errors to Canonical and its "

460+"partners, the makers of the operating system."

461+msgstr ""

462+

463+#: qml/Wizard/Pages/60-reporting.qml:43

464+msgid ""

465+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

466+"Privacy</b>"

467+msgstr ""

468+

469+#: qml/Wizard/Pages/80-finished.qml:24

470+msgid "All done"

471+msgstr ""

472+

473+#: qml/Wizard/Pages/80-finished.qml:39

474+msgid "Nice work!"

475+msgstr ""

476+

477+#: qml/Wizard/Pages/80-finished.qml:46

478+msgid "Your phone is now ready to use."

479+msgstr ""

480+

481+#: qml/Wizard/Pages/80-finished.qml:53

482+msgid "Finish"

483+msgstr ""

484+

485+#: qml/Wizard/Pages/here-terms.qml:27

486+msgid "Terms & Conditions"

487+msgstr ""

488+

489+#: qml/Wizard/Pages/passwd-confirm.qml:49

490+msgid "Confirm passphrase"

491+msgstr ""

492+

493+#: qml/Wizard/Pages/passwd-confirm.qml:50

494+msgid "Confirm passcode"

495+msgstr ""

496+

497+#: qml/Wizard/Pages/passwd-confirm.qml:53

498+#: qml/Wizard/Pages/passwd-confirm.qml:54

499+msgid "Please try again."

500+msgstr ""

501+

502+#: qml/Wizard/Pages/passwd-set.qml:61

503+msgid "Choose your passcode"

504+msgstr ""

505+

506+#: qml/Wizard/Pages/passwd-set.qml:68

507+msgid "Passphrase must be 4 characters long"

508+msgstr ""

509+

510+#: qml/Wizard/StackButton.qml:39

511+#, qt-format

512+msgid "〈 %1"

513+msgstr ""

514+

515+#: qml/Wizard/StackButton.qml:42

516+#, qt-format

517+msgid "%1 〉"

518+msgstr ""

po/bg.po+248−75

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-04-01 14:08+0000\n"

11"PO-Revision-Date: 2014-04-01 14:08+0000\n"

12"Last-Translator: Atanas Kovachki <Unknown>\n"

12"Last-Translator: Atanas Kovachki <Unknown>\n"

13"Language-Team: Bulgarian <bg@li.org>\n"

13"Language-Team: Bulgarian <bg@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr ""

23msgstr ""

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr ""

28msgstr ""

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr ""

32msgstr ""

33

33

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] ""

50msgstr[0] ""

51msgstr[1] ""

51msgstr[1] ""

52

52

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

54msgid "Log out"

54msgid "Log out"

55msgstr ""

55msgstr ""

56

56

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

58msgid "Are you sure you want to log out?"

58msgid "Are you sure you want to log out?"

59msgstr ""

59msgstr ""

60

60

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:122

63msgid "No"

63msgid "No"

64msgstr ""

64msgstr ""

65

65

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:129

68msgid "Yes"

68msgid "Yes"

69msgstr ""

69msgstr ""

70

70

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

72msgid "Shut down"

72msgid "Shut down"

73msgstr ""

73msgstr ""

74

74

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

76msgid "Are you sure you want to shut down?"

76msgid "Are you sure you want to shut down?"

77msgstr ""

77msgstr ""

78

78

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

80msgid "Reboot"

80msgid "Reboot"

81msgstr ""

81msgstr ""

82

82

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

84msgid "Are you sure you want to reboot?"

84msgid "Are you sure you want to reboot?"

85msgstr ""

85msgstr ""

86

86

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

88msgid "Power"

88msgid "Power"

89msgstr ""

89msgstr ""

90

90

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

92msgid ""

92msgid ""

93"Are you sure you would like\n"

93"Are you sure you would like\n"

94"to power off?"

94"to power off?"

95msgstr ""

95msgstr ""

96

96

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

98msgid "Power off"

98msgid "Power off"

99msgstr ""

99msgstr ""

100

100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102msgid "Restart"

102msgid "Restart"

103msgstr ""

103msgstr ""

104

104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106msgid "Cancel"

106msgid "Cancel"

107msgstr ""

107msgstr ""

108

108

@@ -110,89 +110,93 @@ msgstr ""

110msgid "Skip intro"

110msgid "Skip intro"

111msgstr "Пропусни интрото"

111msgstr "Пропусни интрото"

112

112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114msgid "Right edge"

114msgid "Right edge"

115msgstr "Десен край"

115msgstr "Десен край"

116

116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118msgid "Try swiping from the right edge to unlock the phone"

118msgid "Try swiping from the right edge to unlock the phone"

119msgstr ""

119msgstr ""

120"Опитайте се да приплъзнете пръста си от десния край към левия, за да "

120"Опитайте се да приплъзнете пръста си от десния край към левия, за да "

121"отключите телефона"

121"отключите телефона"

122

122

123−#: qml/Components/EdgeDemo.qml:144

123+#: qml/Components/EdgeDemo.qml:157

124msgid "Top edge"

124msgid "Top edge"

125msgstr "Горен край"

125msgstr "Горен край"

126

126

127−#: qml/Components/EdgeDemo.qml:145

127+#: qml/Components/EdgeDemo.qml:158

128msgid "Try swiping from the top edge to access the indicators"

128msgid "Try swiping from the top edge to access the indicators"

129msgstr ""

129msgstr ""

130"Опитайте се да приплъзнете пръста си от горния край към долния, за да "

130"Опитайте се да приплъзнете пръста си от горния край към долния, за да "

131"получите достъп до индикаторите"

131"получите достъп до индикаторите"

132

132

133−#: qml/Components/EdgeDemo.qml:170

133+#: qml/Components/EdgeDemo.qml:183

134msgid "Close"

134msgid "Close"

135msgstr "Затвори"

135msgstr "Затвори"

136

136

137−#: qml/Components/EdgeDemo.qml:171

137+#: qml/Components/EdgeDemo.qml:184

138msgid "Swipe up again to close the settings screen"

138msgid "Swipe up again to close the settings screen"

139msgstr ""

139msgstr ""

140"Отново приплъзнете пръста си нагоре за да затворите екрана с настройките"

140"Отново приплъзнете пръста си нагоре за да затворите екрана с настройките"

141

141

142−#: qml/Components/EdgeDemo.qml:201

142+#: qml/Components/EdgeDemo.qml:214

143msgid "Left edge"

143msgid "Left edge"

144msgstr "Ляв край"

144msgstr "Ляв край"

145

145

146−#: qml/Components/EdgeDemo.qml:202

146+#: qml/Components/EdgeDemo.qml:215

147msgid "Swipe from the left to reveal the launcher for quick access to apps"

147msgid "Swipe from the left to reveal the launcher for quick access to apps"

148msgstr ""

148msgstr ""

149"Приплъзнете пръста си от левия край към десния, за да отворите стартера за "

149"Приплъзнете пръста си от левия край към десния, за да отворите стартера за "

150"бърз достъп до приложенията"

150"бърз достъп до приложенията"

151

151

152−#: qml/Components/EdgeDemo.qml:229

152+#: qml/Components/EdgeDemo.qml:242

153msgid "Well done"

153msgid "Well done"

154msgstr "Великолепно"

154msgstr "Великолепно"

155

155

156−#: qml/Components/EdgeDemo.qml:230

156+#: qml/Components/EdgeDemo.qml:243

157msgid ""

157msgid ""

158"You have now mastered the edge gestures and can start using the "

158"You have now mastered the edge gestures and can start using the "

159"phone<br><br>Tap on the screen to start"

159"phone<br><br>Tap on the screen to start"

160msgstr ""

160msgstr ""

161

161

162−#: qml/Components/Lockscreen.qml:223

162+#: qml/Components/Lockscreen.qml:238

163msgid "Return to Call"

163msgid "Return to Call"

164msgstr ""

164msgstr ""

165

165

166−#: qml/Components/Lockscreen.qml:223

166+#: qml/Components/Lockscreen.qml:238

167msgid "Emergency Call"

167msgid "Emergency Call"

168msgstr "Спешно повикване"

168msgstr "Спешно повикване"

169

169

170−#: qml/Components/Lockscreen.qml:255

170+#: qml/Components/Lockscreen.qml:270

171msgid "OK"

171msgid "OK"

172msgstr ""

172msgstr ""

173

173

174−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

174+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

175msgid "See less"

175msgid "See less"

176msgstr ""

176msgstr ""

177

177

178−#: qml/Dash/GenericScopeView.qml:434

178+#: qml/Dash/GenericScopeView.qml:431

179msgid "See all"

179msgid "See all"

180msgstr ""

180msgstr ""

181

181

182−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

182+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

183#: qml/Panel/SearchIndicator.qml:27

183#: qml/Panel/SearchIndicator.qml:27

184msgid "Search"

184msgid "Search"

185msgstr "Търсене"

185msgstr "Търсене"

186

186

187−#: qml/Dash/PageHeader.qml:268

187+#: qml/Dash/PageHeader.qml:260

188+msgid "Store"

189+msgstr ""

190+

191+#: qml/Dash/PageHeader.qml:277

188msgid "Settings"

192msgid "Settings"

189msgstr ""

193msgstr ""

190

194

191−#: qml/Dash/PageHeader.qml:275

195+#: qml/Dash/PageHeader.qml:284

192msgid "Remove from Favorites"

196msgid "Remove from Favorites"

193msgstr ""

197msgstr ""

194

198

195−#: qml/Dash/PageHeader.qml:275

199+#: qml/Dash/PageHeader.qml:284

196msgid "Add to Favorites"

200msgid "Add to Favorites"

197msgstr ""

201msgstr ""

198

202

@@ -224,31 +228,23 @@ msgstr ""

224msgid "Release to refresh…"

228msgid "Release to refresh…"

225msgstr ""

229msgstr ""

226

230

227−#: qml/Dash/ScopesOverview.qml:215

231+#: qml/Dash/ScopesList.qml:63

228−msgid "Manage Scopes"

232+msgid "Manage"

229−msgstr ""

230−

231−#: qml/Dash/ScopesOverview.qml:437

232−msgid "Done"

233−msgstr ""

234−

235−#: qml/Dash/ScopesOverview.qml:463

236−msgid "Store"

237msgstr ""

233msgstr ""

238

234

239−#: qml/Dash/ScopesOverviewTab.qml:36

235+#: qml/Dash/ScopesList.qml:107

240−msgid "Favorites"

236+msgid "Home"

241msgstr ""

237msgstr ""

242

238

243−#: qml/Dash/ScopesOverviewTab.qml:54

239+#: qml/Dash/ScopesList.qml:108

244−msgid "All"

240+msgid "Also installed"

245msgstr ""

241msgstr ""

246

242

247#: qml/Greeter/Greeter.qml:174

243#: qml/Greeter/Greeter.qml:174

248msgid "Unlock"

244msgid "Unlock"

249msgstr ""

245msgstr ""

250

246

251−#: qml/Notifications/NotificationMenuItemFactory.qml:116

247+#: qml/Notifications/NotificationMenuItemFactory.qml:128

252msgid "Show password"

248msgid "Show password"

253msgstr "Покажи паролата"

249msgstr "Покажи паролата"

254

250

@@ -296,60 +292,237 @@ msgstr ""

296msgid "Roaming"

292msgid "Roaming"

297msgstr ""

293msgstr ""

298

294

299−#: qml/Shell.qml:391

295+#: qml/Shell.qml:367

296+#, qt-format

300−msgid "Enter passphrase"

297+msgid "Enter %1"

301msgstr ""

298msgstr ""

302

299

303−#: qml/Shell.qml:392

300+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

304−msgid "Sorry, incorrect passphrase"

301+msgid "Enter passphrase"

305msgstr ""

302msgstr ""

306

303

307−#: qml/Shell.qml:393

304+#: qml/Shell.qml:369

308−msgid "Please re-enter"

305+msgid "Enter passcode"

309msgstr ""

306msgstr ""

310

307

311−#: qml/Shell.qml:395

308+#: qml/Shell.qml:370

312−msgid "Enter passcode"

309+#, qt-format

310+msgid "Sorry, incorrect %1"

313msgstr ""

311msgstr ""

314

312

315−#: qml/Shell.qml:396

313+#: qml/Shell.qml:371

316−msgid "Sorry, incorrect passcode"

314+msgid "Sorry, incorrect passphrase"

317msgstr ""

315msgstr ""

318

316

319−#: qml/Shell.qml:399

317+#: qml/Shell.qml:372

320−#, qt-format

318+msgid "Please re-enter"

321−msgid "Enter %1"

322msgstr ""

319msgstr ""

323

320

324−#: qml/Shell.qml:400

321+#: qml/Shell.qml:373

325−#, qt-format

326−msgid "Sorry, incorrect %1"

322+msgid "Sorry, incorrect passcode"

327msgstr ""

323msgstr ""

328

324

329−#: qml/Shell.qml:441

325+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

330msgid "Sorry, incorrect passphrase."

326msgid "Sorry, incorrect passphrase."

331msgstr ""

327msgstr ""

332

328

333−#: qml/Shell.qml:442

329+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

334msgid "Sorry, incorrect passcode."

330msgid "Sorry, incorrect passcode."

335msgstr ""

331msgstr ""

336

332

337−#: qml/Shell.qml:443

333+#: qml/Shell.qml:469

338msgid "This will be your last attempt."

334msgid "This will be your last attempt."

339msgstr ""

335msgstr ""

340

336

341−#: qml/Shell.qml:445

337+#: qml/Shell.qml:471

342msgid ""

338msgid ""

343"If passphrase is entered incorrectly, your phone will conduct a factory "

339"If passphrase is entered incorrectly, your phone will conduct a factory "

344"reset and all personal data will be deleted."

340"reset and all personal data will be deleted."

345msgstr ""

341msgstr ""

346

342

347−#: qml/Shell.qml:446

343+#: qml/Shell.qml:472

348msgid ""

344msgid ""

349"If passcode is entered incorrectly, your phone will conduct a factory reset "

345"If passcode is entered incorrectly, your phone will conduct a factory reset "

350"and all personal data will be deleted."

346"and all personal data will be deleted."

351msgstr ""

347msgstr ""

352

348

349+#: qml/Wizard/Page.qml:89

350+msgid "Back"

351+msgstr ""

352+

353+#: qml/Wizard/Pages/10-welcome.qml:27

354+msgid "Hi!"

355+msgstr ""

356+

357+#: qml/Wizard/Pages/10-welcome.qml:44

358+msgid "Welcome to your Ubuntu phone."

359+msgstr ""

360+

361+#: qml/Wizard/Pages/10-welcome.qml:52

362+msgid "Let’s get started."

363+msgstr ""

364+

365+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

366+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

367+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

368+#: qml/Wizard/Pages/passwd-set.qml:90

369+msgid "Continue"

370+msgstr ""

371+

372+#: qml/Wizard/Pages/20-sim.qml:25

373+msgid "Add a SIM card and restart your device"

374+msgstr ""

375+

376+#: qml/Wizard/Pages/20-sim.qml:55

377+msgid "Without it, you won’t be able to make calls or use text messaging."

378+msgstr ""

379+

380+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

381+msgid "Skip"

382+msgstr ""

383+

384+#: qml/Wizard/Pages/30-passwd-type.qml:39

385+msgid "Lock security"

386+msgstr ""

387+

388+#: qml/Wizard/Pages/30-passwd-type.qml:74

389+msgid "Please select how you’d like to unlock your phone."

390+msgstr ""

391+

392+#: qml/Wizard/Pages/30-passwd-type.qml:97

393+msgid "Swipe"

394+msgstr ""

395+

396+#: qml/Wizard/Pages/30-passwd-type.qml:98

397+msgid "No security"

398+msgstr ""

399+

400+#: qml/Wizard/Pages/30-passwd-type.qml:100

401+msgid "Passcode"

402+msgstr ""

403+

404+#: qml/Wizard/Pages/30-passwd-type.qml:101

405+msgid "4 digits only"

406+msgstr ""

407+

408+#: qml/Wizard/Pages/30-passwd-type.qml:103

409+msgid "Passphrase"

410+msgstr ""

411+

412+#: qml/Wizard/Pages/30-passwd-type.qml:104

413+msgid "Numbers and letters"

414+msgstr ""

415+

416+#: qml/Wizard/Pages/40-wifi.qml:28

417+msgid "Connect to Wi‑Fi"

418+msgstr ""

419+

420+#: qml/Wizard/Pages/40-wifi.qml:147

421+msgid "Available networks…"

422+msgstr ""

423+

424+#: qml/Wizard/Pages/40-wifi.qml:148

425+msgid "No available networks."

426+msgstr ""

427+

428+#: qml/Wizard/Pages/50-location.qml:27

429+msgid "Location"

430+msgstr ""

431+

432+#: qml/Wizard/Pages/50-location.qml:62

433+msgid "Let the phone detect your location:"

434+msgstr ""

435+

436+#: qml/Wizard/Pages/50-location.qml:69

437+msgid "Using GPS only (less accurate)"

438+msgstr ""

439+

440+#: qml/Wizard/Pages/50-location.qml:86

441+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

442+msgstr ""

443+

444+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

445+#: qml/Wizard/Pages/50-location.qml:103

446+msgid ""

447+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

448+"conditions</a>."

449+msgstr ""

450+

451+#: qml/Wizard/Pages/50-location.qml:112

452+msgid "Not at all"

453+msgstr ""

454+

455+#: qml/Wizard/Pages/50-location.qml:124

456+msgid "You can change your mind later in <b>System Settings</b>."

457+msgstr ""

458+

459+#: qml/Wizard/Pages/60-reporting.qml:24

460+msgid "Improving your experience"

461+msgstr ""

462+

463+#: qml/Wizard/Pages/60-reporting.qml:36

464+msgid ""

465+"Your phone is set up to automatically report errors to Canonical and its "

466+"partners, the makers of the operating system."

467+msgstr ""

468+

469+#: qml/Wizard/Pages/60-reporting.qml:43

470+msgid ""

471+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

472+"Privacy</b>"

473+msgstr ""

474+

475+#: qml/Wizard/Pages/80-finished.qml:24

476+msgid "All done"

477+msgstr ""

478+

479+#: qml/Wizard/Pages/80-finished.qml:39

480+msgid "Nice work!"

481+msgstr ""

482+

483+#: qml/Wizard/Pages/80-finished.qml:46

484+msgid "Your phone is now ready to use."

485+msgstr ""

486+

487+#: qml/Wizard/Pages/80-finished.qml:53

488+msgid "Finish"

489+msgstr ""

490+

491+#: qml/Wizard/Pages/here-terms.qml:27

492+msgid "Terms & Conditions"

493+msgstr ""

494+

495+#: qml/Wizard/Pages/passwd-confirm.qml:49

496+msgid "Confirm passphrase"

497+msgstr ""

498+

499+#: qml/Wizard/Pages/passwd-confirm.qml:50

500+msgid "Confirm passcode"

501+msgstr ""

502+

503+#: qml/Wizard/Pages/passwd-confirm.qml:53

504+#: qml/Wizard/Pages/passwd-confirm.qml:54

505+msgid "Please try again."

506+msgstr ""

507+

508+#: qml/Wizard/Pages/passwd-set.qml:61

509+msgid "Choose your passcode"

510+msgstr ""

511+

512+#: qml/Wizard/Pages/passwd-set.qml:68

513+msgid "Passphrase must be 4 characters long"

514+msgstr ""

515+

516+#: qml/Wizard/StackButton.qml:39

517+#, qt-format

518+msgid "〈 %1"

519+msgstr ""

520+

521+#: qml/Wizard/StackButton.qml:42

522+#, qt-format

523+msgid "%1 〉"

524+msgstr ""

525+

353#~ msgid "Confirm"

526#~ msgid "Confirm"

354#~ msgstr "Потвърди"

527#~ msgstr "Потвърди"

355

528

po/br.po+274−81

@@ -7,27 +7,27 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-05 07:24+0000\n"

11+"PO-Revision-Date: 2014-12-16 07:27+0000\n"

12"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"

12"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"

13"Language-Team: Breton <br@li.org>\n"

13"Language-Team: Breton <br@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-17 07:06+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Ger-tremen : "

23msgstr "Ger-tremen : "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Spilhennañ ar verradenn"

28msgstr "Spilhennañ ar verradenn"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Dispilhennañ ar verradenn"

32msgstr "Dispilhennañ ar verradenn"

33

33

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

54msgstr[0] "Gortozit %1 vunutenn, mar plij, hag esaeit en-dro..."

54msgstr[0] "Gortozit %1 vunutenn, mar plij, hag esaeit en-dro..."

55msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."

55msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."

56

56

57−#: qml/Components/Dialogs.qml:74

57+#: qml/Components/Dialogs.qml:70

58msgid "Log out"

58msgid "Log out"

59msgstr "Digevreañ"

59msgstr "Digevreañ"

60

60

61−#: qml/Components/Dialogs.qml:75

61+#: qml/Components/Dialogs.qml:71

62msgid "Are you sure you want to log out?"

62msgid "Are you sure you want to log out?"

63msgstr "Ha sur oc'h e fell deoc'h digevreañ ?"

63msgstr "Ha sur oc'h e fell deoc'h digevreañ ?"

64

64

65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

65+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66−#: qml/Components/Dialogs.qml:126

66+#: qml/Components/Dialogs.qml:122

67msgid "No"

67msgid "No"

68msgstr "N'on ket"

68msgstr "N'on ket"

69

69

70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

70+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71−#: qml/Components/Dialogs.qml:133

71+#: qml/Components/Dialogs.qml:129

72msgid "Yes"

72msgid "Yes"

73msgstr "Ya"

73msgstr "Ya"

74

74

75−#: qml/Components/Dialogs.qml:98

75+#: qml/Components/Dialogs.qml:94

76msgid "Shut down"

76msgid "Shut down"

77msgstr "Lazhañ ar benveg"

77msgstr "Lazhañ ar benveg"

78

78

79−#: qml/Components/Dialogs.qml:99

79+#: qml/Components/Dialogs.qml:95

80msgid "Are you sure you want to shut down?"

80msgid "Are you sure you want to shut down?"

81msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"

81msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"

82

82

83−#: qml/Components/Dialogs.qml:123

83+#: qml/Components/Dialogs.qml:119

84msgid "Reboot"

84msgid "Reboot"

85msgstr "Adloc'hañ"

85msgstr "Adloc'hañ"

86

86

87−#: qml/Components/Dialogs.qml:124

87+#: qml/Components/Dialogs.qml:120

88msgid "Are you sure you want to reboot?"

88msgid "Are you sure you want to reboot?"

89msgstr "Ha sur oc'h e fell deoc'h adloc'hañ ?"

89msgstr "Ha sur oc'h e fell deoc'h adloc'hañ ?"

90

90

91−#: qml/Components/Dialogs.qml:148

91+#: qml/Components/Dialogs.qml:144

92msgid "Power"

92msgid "Power"

93msgstr "Tredan"

93msgstr "Tredan"

94

94

95−#: qml/Components/Dialogs.qml:149

95+#: qml/Components/Dialogs.qml:145

96msgid ""

96msgid ""

97"Are you sure you would like\n"

97"Are you sure you would like\n"

98"to power off?"

98"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100"Ha sur oc'h e fell deoc'h\n"

100"Ha sur oc'h e fell deoc'h\n"

101"troc'hañ an tredan ?"

101"troc'hañ an tredan ?"

102

102

103−#: qml/Components/Dialogs.qml:151

103+#: qml/Components/Dialogs.qml:147

104msgid "Power off"

104msgid "Power off"

105msgstr "Lazhañ"

105msgstr "Lazhañ"

106

106

107−#: qml/Components/Dialogs.qml:161

107+#: qml/Components/Dialogs.qml:157

108msgid "Restart"

108msgid "Restart"

109msgstr "Adloc'hañ"

109msgstr "Adloc'hañ"

110

110

111−#: qml/Components/Dialogs.qml:171

111+#: qml/Components/Dialogs.qml:167

112msgid "Cancel"

112msgid "Cancel"

113msgstr "Nullañ"

113msgstr "Nullañ"

114

114

@@ -116,48 +116,48 @@ msgstr "Nullañ"

116msgid "Skip intro"

116msgid "Skip intro"

117msgstr "Tremen hep sellet ouzh an digoradur"

117msgstr "Tremen hep sellet ouzh an digoradur"

118

118

119−#: qml/Components/EdgeDemo.qml:112

119+#: qml/Components/EdgeDemo.qml:125

120msgid "Right edge"

120msgid "Right edge"

121msgstr "Bord dehoù"

121msgstr "Bord dehoù"

122

122

123−#: qml/Components/EdgeDemo.qml:113

123+#: qml/Components/EdgeDemo.qml:126

124msgid "Try swiping from the right edge to unlock the phone"

124msgid "Try swiping from the right edge to unlock the phone"

125msgstr ""

125msgstr ""

126"Lakait ho piz da riklañ adalek ar bord dehoù da zibrennañ ar pellgomzer."

126"Lakait ho piz da riklañ adalek ar bord dehoù da zibrennañ ar pellgomzer."

127

127

128−#: qml/Components/EdgeDemo.qml:144

128+#: qml/Components/EdgeDemo.qml:157

129msgid "Top edge"

129msgid "Top edge"

130msgstr "Bord uhelañ"

130msgstr "Bord uhelañ"

131

131

132−#: qml/Components/EdgeDemo.qml:145

132+#: qml/Components/EdgeDemo.qml:158

133msgid "Try swiping from the top edge to access the indicators"

133msgid "Try swiping from the top edge to access the indicators"

134msgstr ""

134msgstr ""

135"Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war wel."

135"Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war wel."

136

136

137−#: qml/Components/EdgeDemo.qml:170

137+#: qml/Components/EdgeDemo.qml:183

138msgid "Close"

138msgid "Close"

139msgstr "Serriñ"

139msgstr "Serriñ"

140

140

141−#: qml/Components/EdgeDemo.qml:171

141+#: qml/Components/EdgeDemo.qml:184

142msgid "Swipe up again to close the settings screen"

142msgid "Swipe up again to close the settings screen"

143msgstr ""

143msgstr ""

144"Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an arventennoù"

144"Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an arventennoù"

145

145

146−#: qml/Components/EdgeDemo.qml:201

146+#: qml/Components/EdgeDemo.qml:214

147msgid "Left edge"

147msgid "Left edge"

148msgstr "Bord kleiz"

148msgstr "Bord kleiz"

149

149

150−#: qml/Components/EdgeDemo.qml:202

150+#: qml/Components/EdgeDemo.qml:215

151msgid "Swipe from the left to reveal the launcher for quick access to apps"

151msgid "Swipe from the left to reveal the launcher for quick access to apps"

152msgstr ""

152msgstr ""

153"Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser arloadoù "

153"Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser arloadoù "

154"prim."

154"prim."

155

155

156−#: qml/Components/EdgeDemo.qml:229

156+#: qml/Components/EdgeDemo.qml:242

157msgid "Well done"

157msgid "Well done"

158msgstr "Gourc'hemennoù !"

158msgstr "Gourc'hemennoù !"

159

159

160−#: qml/Components/EdgeDemo.qml:230

160+#: qml/Components/EdgeDemo.qml:243

161msgid ""

161msgid ""

162"You have now mastered the edge gestures and can start using the "

162"You have now mastered the edge gestures and can start using the "

163"phone<br><br>Tap on the screen to start"

163"phone<br><br>Tap on the screen to start"

@@ -165,40 +165,44 @@ msgstr ""

165"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "

165"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "

166"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"

166"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"

167

167

168−#: qml/Components/Lockscreen.qml:223

168+#: qml/Components/Lockscreen.qml:238

169msgid "Return to Call"

169msgid "Return to Call"

170msgstr "Distreiñ d'ar bellgomzadenn"

170msgstr "Distreiñ d'ar bellgomzadenn"

171

171

172−#: qml/Components/Lockscreen.qml:223

172+#: qml/Components/Lockscreen.qml:238

173msgid "Emergency Call"

173msgid "Emergency Call"

174msgstr "Pellgomzadenn vallus"

174msgstr "Pellgomzadenn vallus"

175

175

176−#: qml/Components/Lockscreen.qml:255

176+#: qml/Components/Lockscreen.qml:270

177msgid "OK"

177msgid "OK"

178msgstr "Mat eo"

178msgstr "Mat eo"

179

179

180−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

180+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

181msgid "See less"

181msgid "See less"

182msgstr "Gwelet nebeutoc'h"

182msgstr "Gwelet nebeutoc'h"

183

183

184−#: qml/Dash/GenericScopeView.qml:434

184+#: qml/Dash/GenericScopeView.qml:431

185msgid "See all"

185msgid "See all"

186msgstr "Gwelet pep tra"

186msgstr "Gwelet pep tra"

187

187

188−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

188+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

189#: qml/Panel/SearchIndicator.qml:27

189#: qml/Panel/SearchIndicator.qml:27

190msgid "Search"

190msgid "Search"

191msgstr "Klask"

191msgstr "Klask"

192

192

193−#: qml/Dash/PageHeader.qml:268

193+#: qml/Dash/PageHeader.qml:260

194+msgid "Store"

195+msgstr "Enrollañ"

196+

197+#: qml/Dash/PageHeader.qml:277

194msgid "Settings"

198msgid "Settings"

195msgstr "Arventennoù"

199msgstr "Arventennoù"

196

200

197−#: qml/Dash/PageHeader.qml:275

201+#: qml/Dash/PageHeader.qml:284

198msgid "Remove from Favorites"

202msgid "Remove from Favorites"

199msgstr "Lemel eus ar sinedoù"

203msgstr "Lemel eus ar sinedoù"

200

204

201−#: qml/Dash/PageHeader.qml:275

205+#: qml/Dash/PageHeader.qml:284

202msgid "Add to Favorites"

206msgid "Add to Favorites"

203msgstr "Ouzhpennañ d'ar sinedoù"

207msgstr "Ouzhpennañ d'ar sinedoù"

204

208

@@ -230,31 +234,23 @@ msgstr "Tennañ evit freskaat..."

230msgid "Release to refresh…"

234msgid "Release to refresh…"

231msgstr "Lezel da vont evit freskaat..."

235msgstr "Lezel da vont evit freskaat..."

232

236

233−#: qml/Dash/ScopesOverview.qml:215

237+#: qml/Dash/ScopesList.qml:63

234−msgid "Manage Scopes"

238+msgid "Manage"

235−msgstr "Merañ ar c'hefluskerioù enklask"

239+msgstr "Merañ"

236

240

237−#: qml/Dash/ScopesOverview.qml:437

241+#: qml/Dash/ScopesList.qml:107

238−msgid "Done"

242+msgid "Home"

239−msgstr "Graet eo"

243+msgstr "Er gêr"

240−

241−#: qml/Dash/ScopesOverview.qml:463

242−msgid "Store"

243−msgstr "Enrollañ"

244

244

245−#: qml/Dash/ScopesOverviewTab.qml:36

245+#: qml/Dash/ScopesList.qml:108

246−msgid "Favorites"

246+msgid "Also installed"

247−msgstr "Gwellañ deuet"

247+msgstr "Staliet ivez"

248−

249−#: qml/Dash/ScopesOverviewTab.qml:54

250−msgid "All"

251−msgstr "An holl anezho"

252

248

253#: qml/Greeter/Greeter.qml:174

249#: qml/Greeter/Greeter.qml:174

254msgid "Unlock"

250msgid "Unlock"

255msgstr "Dibrennañ"

251msgstr "Dibrennañ"

256

252

257−#: qml/Notifications/NotificationMenuItemFactory.qml:116

253+#: qml/Notifications/NotificationMenuItemFactory.qml:128

258msgid "Show password"

254msgid "Show password"

259msgstr "Diskouez ar ger-tremen"

255msgstr "Diskouez ar ger-tremen"

260

256

@@ -302,49 +298,49 @@ msgstr "Dibrennañ ar gartenn SIM"

302msgid "Roaming"

298msgid "Roaming"

303msgstr "O kantren"

299msgstr "O kantren"

304

300

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

306msgid "Enter passphrase"

307msgid "Enter passphrase"

307msgstr "Merkañ ar frazenn-dremen"

308msgstr "Merkañ ar frazenn-dremen"

308

309

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

310msgid "Sorry, incorrect passphrase"

320msgid "Sorry, incorrect passphrase"

311msgstr "Siwazh, frazenn-dremen direizh"

321msgstr "Siwazh, frazenn-dremen direizh"

312

322

313−#: qml/Shell.qml:393

323+#: qml/Shell.qml:372

314msgid "Please re-enter"

324msgid "Please re-enter"

315msgstr "Adverkañ, mar plij"

325msgstr "Adverkañ, mar plij"

316

326

317−#: qml/Shell.qml:395

327+#: qml/Shell.qml:373

318−msgid "Enter passcode"

319−msgstr "Merkañ ar c'hod-tremen"

320−

321−#: qml/Shell.qml:396

322msgid "Sorry, incorrect passcode"

328msgid "Sorry, incorrect passcode"

323msgstr "Digarezit, kod-tremen direizh"

329msgstr "Digarezit, kod-tremen direizh"

324

330

325−#: qml/Shell.qml:399

331+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

326−#, qt-format

327−msgid "Enter %1"

328−msgstr "Merkañ %1"

329−

330−#: qml/Shell.qml:400

331−#, qt-format

332−msgid "Sorry, incorrect %1"

333−msgstr "Siwazh, %1 direizh"

334−

335−#: qml/Shell.qml:441

336msgid "Sorry, incorrect passphrase."

332msgid "Sorry, incorrect passphrase."

337msgstr "Siwazh, frazenn-dremen direizh"

333msgstr "Siwazh, frazenn-dremen direizh"

338

334

339−#: qml/Shell.qml:442

335+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

340msgid "Sorry, incorrect passcode."

336msgid "Sorry, incorrect passcode."

341msgstr "Siwazh, kod-tremen direizh"

337msgstr "Siwazh, kod-tremen direizh"

342

338

343−#: qml/Shell.qml:443

339+#: qml/Shell.qml:469

344msgid "This will be your last attempt."

340msgid "This will be your last attempt."

345msgstr "Ho taol-esae diwezhañ e vo."

341msgstr "Ho taol-esae diwezhañ e vo."

346

342

347−#: qml/Shell.qml:445

343+#: qml/Shell.qml:471

348msgid ""

344msgid ""

349"If passphrase is entered incorrectly, your phone will conduct a factory "

345"If passphrase is entered incorrectly, your phone will conduct a factory "

350"reset and all personal data will be deleted."

346"reset and all personal data will be deleted."

@@ -352,7 +348,7 @@ msgstr ""

352"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "

348"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "

353"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"

349"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"

354

350

355−#: qml/Shell.qml:446

351+#: qml/Shell.qml:472

356msgid ""

352msgid ""

357"If passcode is entered incorrectly, your phone will conduct a factory reset "

353"If passcode is entered incorrectly, your phone will conduct a factory reset "

358"and all personal data will be deleted."

354"and all personal data will be deleted."

@@ -360,6 +356,191 @@ msgstr ""

360"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "

356"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "

361"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."

357"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."

362

358

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+

363#~ msgid "Loading. Please Wait..."

544#~ msgid "Loading. Please Wait..."

364#~ msgstr "O kargañ. Gortozit, mar plij..."

545#~ msgstr "O kargañ. Gortozit, mar plij..."

365

546

@@ -374,3 +555,15 @@ msgstr ""

374

555

375#~ msgid "Type or say a command"

556#~ msgid "Type or say a command"

376#~ msgstr "Skrivit pe lavarit un urzhiad"

557#~ msgstr "Skrivit pe lavarit un urzhiad"

558+

559+#~ msgid "Done"

560+#~ msgstr "Graet eo"

561+

562+#~ msgid "All"

563+#~ msgstr "An holl anezho"

564+

565+#~ msgid "Favorites"

566+#~ msgstr "Gwellañ deuet"

567+

568+#~ msgid "Manage Scopes"

569+#~ msgstr "Merañ ar c'hefluskerioù enklask"

po/bs.po+248−75

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-01-16 22:33+0000\n"

11"PO-Revision-Date: 2014-01-16 22:33+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Bosnian <bs@li.org>\n"

13"Language-Team: Bosnian <bs@li.org>\n"

@@ -16,19 +16,19 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

20−"X-Generator: Launchpad (build 17231)\n"

20+"X-Generator: Launchpad (build 17286)\n"

21

21

22#: plugins/LightDM/Greeter.cpp:130

22#: plugins/LightDM/Greeter.cpp:130

23msgid "Password: "

23msgid "Password: "

24msgstr ""

24msgstr ""

25

25

26#: plugins/Unity/Launcher/launcheritem.cpp:45

26#: plugins/Unity/Launcher/launcheritem.cpp:45

27−#: plugins/Unity/Launcher/launcheritem.cpp:91

27+#: plugins/Unity/Launcher/launcheritem.cpp:100

28msgid "Pin shortcut"

28msgid "Pin shortcut"

29msgstr ""

29msgstr ""

30

30

31−#: plugins/Unity/Launcher/launcheritem.cpp:91

31+#: plugins/Unity/Launcher/launcheritem.cpp:100

32msgid "Unpin shortcut"

32msgid "Unpin shortcut"

33msgstr ""

33msgstr ""

34

34

@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

51msgstr[0] ""

51msgstr[0] ""

52msgstr[1] ""

52msgstr[1] ""

53

53

54−#: qml/Components/Dialogs.qml:74

54+#: qml/Components/Dialogs.qml:70

55msgid "Log out"

55msgid "Log out"

56msgstr ""

56msgstr ""

57

57

58−#: qml/Components/Dialogs.qml:75

58+#: qml/Components/Dialogs.qml:71

59msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

60msgstr ""

60msgstr ""

61

61

62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63−#: qml/Components/Dialogs.qml:126

63+#: qml/Components/Dialogs.qml:122

64msgid "No"

64msgid "No"

65msgstr ""

65msgstr ""

66

66

67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68−#: qml/Components/Dialogs.qml:133

68+#: qml/Components/Dialogs.qml:129

69msgid "Yes"

69msgid "Yes"

70msgstr ""

70msgstr ""

71

71

72−#: qml/Components/Dialogs.qml:98

72+#: qml/Components/Dialogs.qml:94

73msgid "Shut down"

73msgid "Shut down"

74msgstr ""

74msgstr ""

75

75

76−#: qml/Components/Dialogs.qml:99

76+#: qml/Components/Dialogs.qml:95

77msgid "Are you sure you want to shut down?"

77msgid "Are you sure you want to shut down?"

78msgstr ""

78msgstr ""

79

79

80−#: qml/Components/Dialogs.qml:123

80+#: qml/Components/Dialogs.qml:119

81msgid "Reboot"

81msgid "Reboot"

82msgstr ""

82msgstr ""

83

83

84−#: qml/Components/Dialogs.qml:124

84+#: qml/Components/Dialogs.qml:120

85msgid "Are you sure you want to reboot?"

85msgid "Are you sure you want to reboot?"

86msgstr ""

86msgstr ""

87

87

88−#: qml/Components/Dialogs.qml:148

88+#: qml/Components/Dialogs.qml:144

89msgid "Power"

89msgid "Power"

90msgstr ""

90msgstr ""

91

91

92−#: qml/Components/Dialogs.qml:149

92+#: qml/Components/Dialogs.qml:145

93msgid ""

93msgid ""

94"Are you sure you would like\n"

94"Are you sure you would like\n"

95"to power off?"

95"to power off?"

96msgstr ""

96msgstr ""

97

97

98−#: qml/Components/Dialogs.qml:151

98+#: qml/Components/Dialogs.qml:147

99msgid "Power off"

99msgid "Power off"

100msgstr ""

100msgstr ""

101

101

102−#: qml/Components/Dialogs.qml:161

102+#: qml/Components/Dialogs.qml:157

103msgid "Restart"

103msgid "Restart"

104msgstr ""

104msgstr ""

105

105

106−#: qml/Components/Dialogs.qml:171

106+#: qml/Components/Dialogs.qml:167

107msgid "Cancel"

107msgid "Cancel"

108msgstr ""

108msgstr ""

109

109

@@ -111,82 +111,86 @@ msgstr ""

111msgid "Skip intro"

111msgid "Skip intro"

112msgstr "Preskoči uvod"

112msgstr "Preskoči uvod"

113

113

114−#: qml/Components/EdgeDemo.qml:112

114+#: qml/Components/EdgeDemo.qml:125

115msgid "Right edge"

115msgid "Right edge"

116msgstr "Desna ivica"

116msgstr "Desna ivica"

117

117

118−#: qml/Components/EdgeDemo.qml:113

118+#: qml/Components/EdgeDemo.qml:126

119msgid "Try swiping from the right edge to unlock the phone"

119msgid "Try swiping from the right edge to unlock the phone"

120msgstr ""

120msgstr ""

121

121

122−#: qml/Components/EdgeDemo.qml:144

122+#: qml/Components/EdgeDemo.qml:157

123msgid "Top edge"

123msgid "Top edge"

124msgstr "Gornja ivica"

124msgstr "Gornja ivica"

125

125

126−#: qml/Components/EdgeDemo.qml:145

126+#: qml/Components/EdgeDemo.qml:158

127msgid "Try swiping from the top edge to access the indicators"

127msgid "Try swiping from the top edge to access the indicators"

128msgstr ""

128msgstr ""

129

129

130−#: qml/Components/EdgeDemo.qml:170

130+#: qml/Components/EdgeDemo.qml:183

131msgid "Close"

131msgid "Close"

132msgstr "Zatvori"

132msgstr "Zatvori"

133

133

134−#: qml/Components/EdgeDemo.qml:171

134+#: qml/Components/EdgeDemo.qml:184

135msgid "Swipe up again to close the settings screen"

135msgid "Swipe up again to close the settings screen"

136msgstr ""

136msgstr ""

137

137

138−#: qml/Components/EdgeDemo.qml:201

138+#: qml/Components/EdgeDemo.qml:214

139msgid "Left edge"

139msgid "Left edge"

140msgstr ""

140msgstr ""

141

141

142−#: qml/Components/EdgeDemo.qml:202

142+#: qml/Components/EdgeDemo.qml:215

143msgid "Swipe from the left to reveal the launcher for quick access to apps"

143msgid "Swipe from the left to reveal the launcher for quick access to apps"

144msgstr ""

144msgstr ""

145

145

146−#: qml/Components/EdgeDemo.qml:229

146+#: qml/Components/EdgeDemo.qml:242

147msgid "Well done"

147msgid "Well done"

148msgstr ""

148msgstr ""

149

149

150−#: qml/Components/EdgeDemo.qml:230

150+#: qml/Components/EdgeDemo.qml:243

151msgid ""

151msgid ""

152"You have now mastered the edge gestures and can start using the "

152"You have now mastered the edge gestures and can start using the "

153"phone<br><br>Tap on the screen to start"

153"phone<br><br>Tap on the screen to start"

154msgstr ""

154msgstr ""

155

155

156−#: qml/Components/Lockscreen.qml:223

156+#: qml/Components/Lockscreen.qml:238

157msgid "Return to Call"

157msgid "Return to Call"

158msgstr ""

158msgstr ""

159

159

160−#: qml/Components/Lockscreen.qml:223

160+#: qml/Components/Lockscreen.qml:238

161msgid "Emergency Call"

161msgid "Emergency Call"

162msgstr ""

162msgstr ""

163

163

164−#: qml/Components/Lockscreen.qml:255

164+#: qml/Components/Lockscreen.qml:270

165msgid "OK"

165msgid "OK"

166msgstr ""

166msgstr ""

167

167

168−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

168+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

169msgid "See less"

169msgid "See less"

170msgstr ""

170msgstr ""

171

171

172−#: qml/Dash/GenericScopeView.qml:434

172+#: qml/Dash/GenericScopeView.qml:431

173msgid "See all"

173msgid "See all"

174msgstr ""

174msgstr ""

175

175

176−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

176+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

177#: qml/Panel/SearchIndicator.qml:27

177#: qml/Panel/SearchIndicator.qml:27

178msgid "Search"

178msgid "Search"

179msgstr ""

179msgstr ""

180

180

181−#: qml/Dash/PageHeader.qml:268

181+#: qml/Dash/PageHeader.qml:260

182+msgid "Store"

183+msgstr ""

184+

185+#: qml/Dash/PageHeader.qml:277

182msgid "Settings"

186msgid "Settings"

183msgstr ""

187msgstr ""

184

188

185−#: qml/Dash/PageHeader.qml:275

189+#: qml/Dash/PageHeader.qml:284

186msgid "Remove from Favorites"

190msgid "Remove from Favorites"

187msgstr ""

191msgstr ""

188

192

189−#: qml/Dash/PageHeader.qml:275

193+#: qml/Dash/PageHeader.qml:284

190msgid "Add to Favorites"

194msgid "Add to Favorites"

191msgstr ""

195msgstr ""

192

196

@@ -218,31 +222,23 @@ msgstr ""

218msgid "Release to refresh…"

222msgid "Release to refresh…"

219msgstr ""

223msgstr ""

220

224

221−#: qml/Dash/ScopesOverview.qml:215

225+#: qml/Dash/ScopesList.qml:63

222−msgid "Manage Scopes"

226+msgid "Manage"

223−msgstr ""

224−

225−#: qml/Dash/ScopesOverview.qml:437

226−msgid "Done"

227−msgstr ""

228−

229−#: qml/Dash/ScopesOverview.qml:463

230−msgid "Store"

231msgstr ""

227msgstr ""

232

228

233−#: qml/Dash/ScopesOverviewTab.qml:36

229+#: qml/Dash/ScopesList.qml:107

234−msgid "Favorites"

230+msgid "Home"

235msgstr ""

231msgstr ""

236

232

237−#: qml/Dash/ScopesOverviewTab.qml:54

233+#: qml/Dash/ScopesList.qml:108

238−msgid "All"

234+msgid "Also installed"

239msgstr ""

235msgstr ""

240

236

241#: qml/Greeter/Greeter.qml:174

237#: qml/Greeter/Greeter.qml:174

242msgid "Unlock"

238msgid "Unlock"

243msgstr ""

239msgstr ""

244

240

245−#: qml/Notifications/NotificationMenuItemFactory.qml:116

241+#: qml/Notifications/NotificationMenuItemFactory.qml:128

246msgid "Show password"

242msgid "Show password"

247msgstr ""

243msgstr ""

248

244

@@ -290,56 +286,233 @@ msgstr ""

290msgid "Roaming"

286msgid "Roaming"

291msgstr ""

287msgstr ""

292

288

293−#: qml/Shell.qml:391

289+#: qml/Shell.qml:367

290+#, qt-format

294−msgid "Enter passphrase"

291+msgid "Enter %1"

295msgstr ""

292msgstr ""

296

293

297−#: qml/Shell.qml:392

294+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

298−msgid "Sorry, incorrect passphrase"

295+msgid "Enter passphrase"

299msgstr ""

296msgstr ""

300

297

301−#: qml/Shell.qml:393

298+#: qml/Shell.qml:369

302−msgid "Please re-enter"

299+msgid "Enter passcode"

303msgstr ""

300msgstr ""

304

301

305−#: qml/Shell.qml:395

302+#: qml/Shell.qml:370

306−msgid "Enter passcode"

303+#, qt-format

304+msgid "Sorry, incorrect %1"

307msgstr ""

305msgstr ""

308

306

309−#: qml/Shell.qml:396

307+#: qml/Shell.qml:371

310−msgid "Sorry, incorrect passcode"

308+msgid "Sorry, incorrect passphrase"

311msgstr ""

309msgstr ""

312

310

313−#: qml/Shell.qml:399

311+#: qml/Shell.qml:372

314−#, qt-format

312+msgid "Please re-enter"

315−msgid "Enter %1"

316msgstr ""

313msgstr ""

317

314

318−#: qml/Shell.qml:400

315+#: qml/Shell.qml:373

319−#, qt-format

320−msgid "Sorry, incorrect %1"

316+msgid "Sorry, incorrect passcode"

321msgstr ""

317msgstr ""

322

318

323−#: qml/Shell.qml:441

319+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

324msgid "Sorry, incorrect passphrase."

320msgid "Sorry, incorrect passphrase."

325msgstr ""

321msgstr ""

326

322

327−#: qml/Shell.qml:442

323+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

328msgid "Sorry, incorrect passcode."

324msgid "Sorry, incorrect passcode."

329msgstr ""

325msgstr ""

330

326

331−#: qml/Shell.qml:443

327+#: qml/Shell.qml:469

332msgid "This will be your last attempt."

328msgid "This will be your last attempt."

333msgstr ""

329msgstr ""

334

330

335−#: qml/Shell.qml:445

331+#: qml/Shell.qml:471

336msgid ""

332msgid ""

337"If passphrase is entered incorrectly, your phone will conduct a factory "

333"If passphrase is entered incorrectly, your phone will conduct a factory "

338"reset and all personal data will be deleted."

334"reset and all personal data will be deleted."

339msgstr ""

335msgstr ""

340

336

341−#: qml/Shell.qml:446

337+#: qml/Shell.qml:472

342msgid ""

338msgid ""

343"If passcode is entered incorrectly, your phone will conduct a factory reset "

339"If passcode is entered incorrectly, your phone will conduct a factory reset "

344"and all personal data will be deleted."

340"and all personal data will be deleted."

345msgstr ""

341msgstr ""

342+

343+#: qml/Wizard/Page.qml:89

344+msgid "Back"

345+msgstr ""

346+

347+#: qml/Wizard/Pages/10-welcome.qml:27

348+msgid "Hi!"

349+msgstr ""

350+

351+#: qml/Wizard/Pages/10-welcome.qml:44

352+msgid "Welcome to your Ubuntu phone."

353+msgstr ""

354+

355+#: qml/Wizard/Pages/10-welcome.qml:52

356+msgid "Let’s get started."

357+msgstr ""

358+

359+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

360+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

361+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

362+#: qml/Wizard/Pages/passwd-set.qml:90

363+msgid "Continue"

364+msgstr ""

365+

366+#: qml/Wizard/Pages/20-sim.qml:25

367+msgid "Add a SIM card and restart your device"

368+msgstr ""

369+

370+#: qml/Wizard/Pages/20-sim.qml:55

371+msgid "Without it, you won’t be able to make calls or use text messaging."

372+msgstr ""

373+

374+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

375+msgid "Skip"

376+msgstr ""

377+

378+#: qml/Wizard/Pages/30-passwd-type.qml:39

379+msgid "Lock security"

380+msgstr ""

381+

382+#: qml/Wizard/Pages/30-passwd-type.qml:74

383+msgid "Please select how you’d like to unlock your phone."

384+msgstr ""

385+

386+#: qml/Wizard/Pages/30-passwd-type.qml:97

387+msgid "Swipe"

388+msgstr ""

389+

390+#: qml/Wizard/Pages/30-passwd-type.qml:98

391+msgid "No security"

392+msgstr ""

393+

394+#: qml/Wizard/Pages/30-passwd-type.qml:100

395+msgid "Passcode"

396+msgstr ""

397+

398+#: qml/Wizard/Pages/30-passwd-type.qml:101

399+msgid "4 digits only"

400+msgstr ""

401+

402+#: qml/Wizard/Pages/30-passwd-type.qml:103

403+msgid "Passphrase"

404+msgstr ""

405+

406+#: qml/Wizard/Pages/30-passwd-type.qml:104

407+msgid "Numbers and letters"

408+msgstr ""

409+

410+#: qml/Wizard/Pages/40-wifi.qml:28

411+msgid "Connect to Wi‑Fi"

412+msgstr ""

413+

414+#: qml/Wizard/Pages/40-wifi.qml:147

415+msgid "Available networks…"

416+msgstr ""

417+

418+#: qml/Wizard/Pages/40-wifi.qml:148

419+msgid "No available networks."

420+msgstr ""

421+

422+#: qml/Wizard/Pages/50-location.qml:27

423+msgid "Location"

424+msgstr ""

425+

426+#: qml/Wizard/Pages/50-location.qml:62

427+msgid "Let the phone detect your location:"

428+msgstr ""

429+

430+#: qml/Wizard/Pages/50-location.qml:69

431+msgid "Using GPS only (less accurate)"

432+msgstr ""

433+

434+#: qml/Wizard/Pages/50-location.qml:86

435+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

436+msgstr ""

437+

438+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

439+#: qml/Wizard/Pages/50-location.qml:103

440+msgid ""

441+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

442+"conditions</a>."

443+msgstr ""

444+

445+#: qml/Wizard/Pages/50-location.qml:112

446+msgid "Not at all"

447+msgstr ""

448+

449+#: qml/Wizard/Pages/50-location.qml:124

450+msgid "You can change your mind later in <b>System Settings</b>."

451+msgstr ""

452+

453+#: qml/Wizard/Pages/60-reporting.qml:24

454+msgid "Improving your experience"

455+msgstr ""

456+

457+#: qml/Wizard/Pages/60-reporting.qml:36

458+msgid ""

459+"Your phone is set up to automatically report errors to Canonical and its "

460+"partners, the makers of the operating system."

461+msgstr ""

462+

463+#: qml/Wizard/Pages/60-reporting.qml:43

464+msgid ""

465+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

466+"Privacy</b>"

467+msgstr ""

468+

469+#: qml/Wizard/Pages/80-finished.qml:24

470+msgid "All done"

471+msgstr ""

472+

473+#: qml/Wizard/Pages/80-finished.qml:39

474+msgid "Nice work!"

475+msgstr ""

476+

477+#: qml/Wizard/Pages/80-finished.qml:46

478+msgid "Your phone is now ready to use."

479+msgstr ""

480+

481+#: qml/Wizard/Pages/80-finished.qml:53

482+msgid "Finish"

483+msgstr ""

484+

485+#: qml/Wizard/Pages/here-terms.qml:27

486+msgid "Terms & Conditions"

487+msgstr ""

488+

489+#: qml/Wizard/Pages/passwd-confirm.qml:49

490+msgid "Confirm passphrase"

491+msgstr ""

492+

493+#: qml/Wizard/Pages/passwd-confirm.qml:50

494+msgid "Confirm passcode"

495+msgstr ""

496+

497+#: qml/Wizard/Pages/passwd-confirm.qml:53

498+#: qml/Wizard/Pages/passwd-confirm.qml:54

499+msgid "Please try again."

500+msgstr ""

501+

502+#: qml/Wizard/Pages/passwd-set.qml:61

503+msgid "Choose your passcode"

504+msgstr ""

505+

506+#: qml/Wizard/Pages/passwd-set.qml:68

507+msgid "Passphrase must be 4 characters long"

508+msgstr ""

509+

510+#: qml/Wizard/StackButton.qml:39

511+#, qt-format

512+msgid "〈 %1"

513+msgstr ""

514+

515+#: qml/Wizard/StackButton.qml:42

516+#, qt-format

517+msgid "%1 〉"

518+msgstr ""

po/ca.po+265−80

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-11-10 09:22+0000\n"

11"PO-Revision-Date: 2014-11-10 09:22+0000\n"

12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

13"Language-Team: Catalan <ca@li.org>\n"

13"Language-Team: Catalan <ca@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-11 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17241)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Contrasenya: "

23msgstr "Contrasenya: "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Enganxa la drecera"

28msgstr "Enganxa la drecera"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Desenganxa la drecera"

32msgstr "Desenganxa la drecera"

33

33

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

54msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."

54msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."

55msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."

55msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."

56

56

57−#: qml/Components/Dialogs.qml:74

57+#: qml/Components/Dialogs.qml:70

58msgid "Log out"

58msgid "Log out"

59msgstr "Surt"

59msgstr "Surt"

60

60

61−#: qml/Components/Dialogs.qml:75

61+#: qml/Components/Dialogs.qml:71

62msgid "Are you sure you want to log out?"

62msgid "Are you sure you want to log out?"

63msgstr "Segur que voleu sortir?"

63msgstr "Segur que voleu sortir?"

64

64

65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

65+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66−#: qml/Components/Dialogs.qml:126

66+#: qml/Components/Dialogs.qml:122

67msgid "No"

67msgid "No"

68msgstr "No"

68msgstr "No"

69

69

70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

70+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71−#: qml/Components/Dialogs.qml:133

71+#: qml/Components/Dialogs.qml:129

72msgid "Yes"

72msgid "Yes"

73msgstr "Sí"

73msgstr "Sí"

74

74

75−#: qml/Components/Dialogs.qml:98

75+#: qml/Components/Dialogs.qml:94

76msgid "Shut down"

76msgid "Shut down"

77msgstr "Apaga"

77msgstr "Apaga"

78

78

79−#: qml/Components/Dialogs.qml:99

79+#: qml/Components/Dialogs.qml:95

80msgid "Are you sure you want to shut down?"

80msgid "Are you sure you want to shut down?"

81msgstr "Segur que voleu apagar?"

81msgstr "Segur que voleu apagar?"

82

82

83−#: qml/Components/Dialogs.qml:123

83+#: qml/Components/Dialogs.qml:119

84msgid "Reboot"

84msgid "Reboot"

85msgstr "Reinicia"

85msgstr "Reinicia"

86

86

87−#: qml/Components/Dialogs.qml:124

87+#: qml/Components/Dialogs.qml:120

88msgid "Are you sure you want to reboot?"

88msgid "Are you sure you want to reboot?"

89msgstr "Segur que voleu reiniciar?"

89msgstr "Segur que voleu reiniciar?"

90

90

91−#: qml/Components/Dialogs.qml:148

91+#: qml/Components/Dialogs.qml:144

92msgid "Power"

92msgid "Power"

93msgstr "Energia"

93msgstr "Energia"

94

94

95−#: qml/Components/Dialogs.qml:149

95+#: qml/Components/Dialogs.qml:145

96msgid ""

96msgid ""

97"Are you sure you would like\n"

97"Are you sure you would like\n"

98"to power off?"

98"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100"Segur que voleu\n"

100"Segur que voleu\n"

101"apagar?"

101"apagar?"

102

102

103−#: qml/Components/Dialogs.qml:151

103+#: qml/Components/Dialogs.qml:147

104msgid "Power off"

104msgid "Power off"

105msgstr "Apaga"

105msgstr "Apaga"

106

106

107−#: qml/Components/Dialogs.qml:161

107+#: qml/Components/Dialogs.qml:157

108msgid "Restart"

108msgid "Restart"

109msgstr "Reinicia"

109msgstr "Reinicia"

110

110

111−#: qml/Components/Dialogs.qml:171

111+#: qml/Components/Dialogs.qml:167

112msgid "Cancel"

112msgid "Cancel"

113msgstr "Cancel·la"

113msgstr "Cancel·la"

114

114

@@ -116,49 +116,49 @@ msgstr "Cancel·la"

116msgid "Skip intro"

116msgid "Skip intro"

117msgstr "Omet la introducció"

117msgstr "Omet la introducció"

118

118

119−#: qml/Components/EdgeDemo.qml:112

119+#: qml/Components/EdgeDemo.qml:125

120msgid "Right edge"

120msgid "Right edge"

121msgstr "Vora dreta"

121msgstr "Vora dreta"

122

122

123−#: qml/Components/EdgeDemo.qml:113

123+#: qml/Components/EdgeDemo.qml:126

124msgid "Try swiping from the right edge to unlock the phone"

124msgid "Try swiping from the right edge to unlock the phone"

125msgstr ""

125msgstr ""

126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"

126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"

127

127

128−#: qml/Components/EdgeDemo.qml:144

128+#: qml/Components/EdgeDemo.qml:157

129msgid "Top edge"

129msgid "Top edge"

130msgstr "Vora superior"

130msgstr "Vora superior"

131

131

132−#: qml/Components/EdgeDemo.qml:145

132+#: qml/Components/EdgeDemo.qml:158

133msgid "Try swiping from the top edge to access the indicators"

133msgid "Try swiping from the top edge to access the indicators"

134msgstr ""

134msgstr ""

135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"

135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"

136

136

137−#: qml/Components/EdgeDemo.qml:170

137+#: qml/Components/EdgeDemo.qml:183

138msgid "Close"

138msgid "Close"

139msgstr "Tanca"

139msgstr "Tanca"

140

140

141−#: qml/Components/EdgeDemo.qml:171

141+#: qml/Components/EdgeDemo.qml:184

142msgid "Swipe up again to close the settings screen"

142msgid "Swipe up again to close the settings screen"

143msgstr ""

143msgstr ""

144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "

144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "

145"configuració"

145"configuració"

146

146

147−#: qml/Components/EdgeDemo.qml:201

147+#: qml/Components/EdgeDemo.qml:214

148msgid "Left edge"

148msgid "Left edge"

149msgstr "Vora esquerra"

149msgstr "Vora esquerra"

150

150

151−#: qml/Components/EdgeDemo.qml:202

151+#: qml/Components/EdgeDemo.qml:215

152msgid "Swipe from the left to reveal the launcher for quick access to apps"

152msgid "Swipe from the left to reveal the launcher for quick access to apps"

153msgstr ""

153msgstr ""

154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

155"ràpidament a les aplicacions"

155"ràpidament a les aplicacions"

156

156

157−#: qml/Components/EdgeDemo.qml:229

157+#: qml/Components/EdgeDemo.qml:242

158msgid "Well done"

158msgid "Well done"

159msgstr "Enhorabona!"

159msgstr "Enhorabona!"

160

160

161−#: qml/Components/EdgeDemo.qml:230

161+#: qml/Components/EdgeDemo.qml:243

162msgid ""

162msgid ""

163"You have now mastered the edge gestures and can start using the "

163"You have now mastered the edge gestures and can start using the "

164"phone<br><br>Tap on the screen to start"

164"phone<br><br>Tap on the screen to start"

@@ -166,40 +166,44 @@ msgstr ""

166"Ja heu après com utilitzar els gestos de les vores per fer servir el "

166"Ja heu après com utilitzar els gestos de les vores per fer servir el "

167"telèfon<br><br>Feu un toc a la pantalla per començar"

167"telèfon<br><br>Feu un toc a la pantalla per començar"

168

168

169−#: qml/Components/Lockscreen.qml:223

169+#: qml/Components/Lockscreen.qml:238

170msgid "Return to Call"

170msgid "Return to Call"

171msgstr "Torna a la trucada"

171msgstr "Torna a la trucada"

172

172

173−#: qml/Components/Lockscreen.qml:223

173+#: qml/Components/Lockscreen.qml:238

174msgid "Emergency Call"

174msgid "Emergency Call"

175msgstr "Trucada d'emergència"

175msgstr "Trucada d'emergència"

176

176

177−#: qml/Components/Lockscreen.qml:255

177+#: qml/Components/Lockscreen.qml:270

178msgid "OK"

178msgid "OK"

179msgstr "D'acord"

179msgstr "D'acord"

180

180

181−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

181+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

182msgid "See less"

182msgid "See less"

183msgstr "Mostra'n menys"

183msgstr "Mostra'n menys"

184

184

185−#: qml/Dash/GenericScopeView.qml:434

185+#: qml/Dash/GenericScopeView.qml:431

186msgid "See all"

186msgid "See all"

187msgstr "Mostra-ho tot"

187msgstr "Mostra-ho tot"

188

188

189−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

189+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

190#: qml/Panel/SearchIndicator.qml:27

190#: qml/Panel/SearchIndicator.qml:27

191msgid "Search"

191msgid "Search"

192msgstr "Cerca"

192msgstr "Cerca"

193

193

194−#: qml/Dash/PageHeader.qml:268

194+#: qml/Dash/PageHeader.qml:260

195+msgid "Store"

196+msgstr "Botiga"

197+

198+#: qml/Dash/PageHeader.qml:277

195msgid "Settings"

199msgid "Settings"

196msgstr "Paràmetres"

200msgstr "Paràmetres"

197

201

198−#: qml/Dash/PageHeader.qml:275

202+#: qml/Dash/PageHeader.qml:284

199msgid "Remove from Favorites"

203msgid "Remove from Favorites"

200msgstr "Suprimeix dels preferits"

204msgstr "Suprimeix dels preferits"

201

205

202−#: qml/Dash/PageHeader.qml:275

206+#: qml/Dash/PageHeader.qml:284

203msgid "Add to Favorites"

207msgid "Add to Favorites"

204msgstr "Afegeix als preferits"

208msgstr "Afegeix als preferits"

205

209

@@ -231,31 +235,23 @@ msgstr "Estireu per actualitzar..."

231msgid "Release to refresh…"

235msgid "Release to refresh…"

232msgstr "Deixeu anar per actualitzar..."

236msgstr "Deixeu anar per actualitzar..."

233

237

234−#: qml/Dash/ScopesOverview.qml:215

238+#: qml/Dash/ScopesList.qml:63

235−msgid "Manage Scopes"

239+msgid "Manage"

236−msgstr "Gestioneu les lents"

240+msgstr ""

237−

238−#: qml/Dash/ScopesOverview.qml:437

239−msgid "Done"

240−msgstr "Fet"

241−

242−#: qml/Dash/ScopesOverview.qml:463

243−msgid "Store"

244−msgstr "Botiga"

245

241

246−#: qml/Dash/ScopesOverviewTab.qml:36

242+#: qml/Dash/ScopesList.qml:107

247−msgid "Favorites"

243+msgid "Home"

248−msgstr "Preferides"

244+msgstr ""

249

245

250−#: qml/Dash/ScopesOverviewTab.qml:54

246+#: qml/Dash/ScopesList.qml:108

251−msgid "All"

247+msgid "Also installed"

252−msgstr "Totes"

248+msgstr ""

253

249

254#: qml/Greeter/Greeter.qml:174

250#: qml/Greeter/Greeter.qml:174

255msgid "Unlock"

251msgid "Unlock"

256msgstr "Desbloca"

252msgstr "Desbloca"

257

253

258−#: qml/Notifications/NotificationMenuItemFactory.qml:116

254+#: qml/Notifications/NotificationMenuItemFactory.qml:128

259msgid "Show password"

255msgid "Show password"

260msgstr "Mostra la contrasenya"

256msgstr "Mostra la contrasenya"

261

257

@@ -303,49 +299,49 @@ msgstr "Desbloca la SIM"

303msgid "Roaming"

299msgid "Roaming"

304msgstr "Itinerància"

300msgstr "Itinerància"

305

301

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

307msgid "Enter passphrase"

308msgid "Enter passphrase"

308msgstr "Introduïu la contrasenya"

309msgstr "Introduïu la contrasenya"

309

310

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

311msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

312msgstr "La contrasenya no és correcta"

322msgstr "La contrasenya no és correcta"

313

323

314−#: qml/Shell.qml:393

324+#: qml/Shell.qml:372

315msgid "Please re-enter"

325msgid "Please re-enter"

316msgstr "Torneu-ho a introduir"

326msgstr "Torneu-ho a introduir"

317

327

318−#: qml/Shell.qml:395

328+#: qml/Shell.qml:373

319−msgid "Enter passcode"

320−msgstr "Introduïu el codi d'accés"

321−

322−#: qml/Shell.qml:396

323msgid "Sorry, incorrect passcode"

329msgid "Sorry, incorrect passcode"

324msgstr "El codi d'accés no és correcte"

330msgstr "El codi d'accés no és correcte"

325

331

326−#: qml/Shell.qml:399

332+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

327−#, qt-format

328−msgid "Enter %1"

329−msgstr "Introduïu: %1"

330−

331−#: qml/Shell.qml:400

332−#, qt-format

333−msgid "Sorry, incorrect %1"

334−msgstr "Incorrecte (%1)"

335−

336−#: qml/Shell.qml:441

337msgid "Sorry, incorrect passphrase."

333msgid "Sorry, incorrect passphrase."

338msgstr "La contrasenya és incorrecta"

334msgstr "La contrasenya és incorrecta"

339

335

340−#: qml/Shell.qml:442

336+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

341msgid "Sorry, incorrect passcode."

337msgid "Sorry, incorrect passcode."

342msgstr "El codi d'accés no és correcte"

338msgstr "El codi d'accés no és correcte"

343

339

344−#: qml/Shell.qml:443

340+#: qml/Shell.qml:469

345msgid "This will be your last attempt."

341msgid "This will be your last attempt."

346msgstr "Aquest serà el darrer intent."

342msgstr "Aquest serà el darrer intent."

347

343

348−#: qml/Shell.qml:445

344+#: qml/Shell.qml:471

349msgid ""

345msgid ""

350"If passphrase is entered incorrectly, your phone will conduct a factory "

346"If passphrase is entered incorrectly, your phone will conduct a factory "

351"reset and all personal data will be deleted."

347"reset and all personal data will be deleted."

@@ -354,7 +350,7 @@ msgstr ""

354"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

350"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

355"personals."

351"personals."

356

352

357−#: qml/Shell.qml:446

353+#: qml/Shell.qml:472

358msgid ""

354msgid ""

359"If passcode is entered incorrectly, your phone will conduct a factory reset "

355"If passcode is entered incorrectly, your phone will conduct a factory reset "

360"and all personal data will be deleted."

356"and all personal data will be deleted."

@@ -363,6 +359,183 @@ msgstr ""

363"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

359"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

364"personals."

360"personals."

365

361

362+#: qml/Wizard/Page.qml:89

363+msgid "Back"

364+msgstr ""

365+

366+#: qml/Wizard/Pages/10-welcome.qml:27

367+msgid "Hi!"

368+msgstr ""

369+

370+#: qml/Wizard/Pages/10-welcome.qml:44

371+msgid "Welcome to your Ubuntu phone."

372+msgstr ""

373+

374+#: qml/Wizard/Pages/10-welcome.qml:52

375+msgid "Let’s get started."

376+msgstr ""

377+

378+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

379+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

380+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

381+#: qml/Wizard/Pages/passwd-set.qml:90

382+msgid "Continue"

383+msgstr ""

384+

385+#: qml/Wizard/Pages/20-sim.qml:25

386+msgid "Add a SIM card and restart your device"

387+msgstr ""

388+

389+#: qml/Wizard/Pages/20-sim.qml:55

390+msgid "Without it, you won’t be able to make calls or use text messaging."

391+msgstr ""

392+

393+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

394+msgid "Skip"

395+msgstr ""

396+

397+#: qml/Wizard/Pages/30-passwd-type.qml:39

398+msgid "Lock security"

399+msgstr ""

400+

401+#: qml/Wizard/Pages/30-passwd-type.qml:74

402+msgid "Please select how you’d like to unlock your phone."

403+msgstr ""

404+

405+#: qml/Wizard/Pages/30-passwd-type.qml:97

406+msgid "Swipe"

407+msgstr ""

408+

409+#: qml/Wizard/Pages/30-passwd-type.qml:98

410+msgid "No security"

411+msgstr ""

412+

413+#: qml/Wizard/Pages/30-passwd-type.qml:100

414+msgid "Passcode"

415+msgstr ""

416+

417+#: qml/Wizard/Pages/30-passwd-type.qml:101

418+msgid "4 digits only"

419+msgstr ""

420+

421+#: qml/Wizard/Pages/30-passwd-type.qml:103

422+msgid "Passphrase"

423+msgstr ""

424+

425+#: qml/Wizard/Pages/30-passwd-type.qml:104

426+msgid "Numbers and letters"

427+msgstr ""

428+

429+#: qml/Wizard/Pages/40-wifi.qml:28

430+msgid "Connect to Wi‑Fi"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/40-wifi.qml:147

434+msgid "Available networks…"

435+msgstr ""

436+

437+#: qml/Wizard/Pages/40-wifi.qml:148

438+msgid "No available networks."

439+msgstr ""

440+

441+#: qml/Wizard/Pages/50-location.qml:27

442+msgid "Location"

443+msgstr ""

444+

445+#: qml/Wizard/Pages/50-location.qml:62

446+msgid "Let the phone detect your location:"

447+msgstr ""

448+

449+#: qml/Wizard/Pages/50-location.qml:69

450+msgid "Using GPS only (less accurate)"

451+msgstr ""

452+

453+#: qml/Wizard/Pages/50-location.qml:86

454+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

455+msgstr ""

456+

457+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

458+#: qml/Wizard/Pages/50-location.qml:103

459+msgid ""

460+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

461+"conditions</a>."

462+msgstr ""

463+

464+#: qml/Wizard/Pages/50-location.qml:112

465+msgid "Not at all"

466+msgstr ""

467+

468+#: qml/Wizard/Pages/50-location.qml:124

469+msgid "You can change your mind later in <b>System Settings</b>."

470+msgstr ""

471+

472+#: qml/Wizard/Pages/60-reporting.qml:24

473+msgid "Improving your experience"

474+msgstr ""

475+

476+#: qml/Wizard/Pages/60-reporting.qml:36

477+msgid ""

478+"Your phone is set up to automatically report errors to Canonical and its "

479+"partners, the makers of the operating system."

480+msgstr ""

481+

482+#: qml/Wizard/Pages/60-reporting.qml:43

483+msgid ""

484+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

485+"Privacy</b>"

486+msgstr ""

487+

488+#: qml/Wizard/Pages/80-finished.qml:24

489+msgid "All done"

490+msgstr ""

491+

492+#: qml/Wizard/Pages/80-finished.qml:39

493+msgid "Nice work!"

494+msgstr ""

495+

496+#: qml/Wizard/Pages/80-finished.qml:46

497+msgid "Your phone is now ready to use."

498+msgstr ""

499+

500+#: qml/Wizard/Pages/80-finished.qml:53

501+msgid "Finish"

502+msgstr ""

503+

504+#: qml/Wizard/Pages/here-terms.qml:27

505+msgid "Terms & Conditions"

506+msgstr ""

507+

508+#: qml/Wizard/Pages/passwd-confirm.qml:49

509+msgid "Confirm passphrase"

510+msgstr ""

511+

512+#: qml/Wizard/Pages/passwd-confirm.qml:50

513+msgid "Confirm passcode"

514+msgstr ""

515+

516+#: qml/Wizard/Pages/passwd-confirm.qml:53

517+#: qml/Wizard/Pages/passwd-confirm.qml:54

518+msgid "Please try again."

519+msgstr ""

520+

521+#: qml/Wizard/Pages/passwd-set.qml:61

522+msgid "Choose your passcode"

523+msgstr ""

524+

525+#: qml/Wizard/Pages/passwd-set.qml:68

526+msgid "Passphrase must be 4 characters long"

527+msgstr ""

528+

529+#: qml/Wizard/StackButton.qml:39

530+#, qt-format

531+msgid "〈 %1"

532+msgstr ""

533+

534+#: qml/Wizard/StackButton.qml:42

535+#, qt-format

536+msgid "%1 〉"

537+msgstr ""

538+

366#~ msgid "Confirm"

539#~ msgid "Confirm"

367#~ msgstr "Confirma"

540#~ msgstr "Confirma"

368

541

@@ -377,3 +550,15 @@ msgstr ""

377

550

378#~ msgid "Speaking..."

551#~ msgid "Speaking..."

379#~ msgstr "S'està parlant..."

552#~ msgstr "S'està parlant..."

553+

554+#~ msgid "Done"

555+#~ msgstr "Fet"

556+

557+#~ msgid "Favorites"

558+#~ msgstr "Preferides"

559+

560+#~ msgid "All"

561+#~ msgstr "Totes"

562+

563+#~ msgid "Manage Scopes"

564+#~ msgstr "Gestioneu les lents"

po/ca@valencia.po+272−87

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-11-23 07:17+0000\n"

11"PO-Revision-Date: 2014-11-23 07:17+0000\n"

12"Last-Translator: Pau Iranzo <Unknown>\n"

12"Last-Translator: Pau Iranzo <Unknown>\n"

13"Language-Team: Catalan <ca@li.org>\n"

13"Language-Team: Catalan <ca@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-24 06:20+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17252)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Contrasenya: "

23msgstr "Contrasenya: "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Apega la drecera"

28msgstr "Apega la drecera"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Desenganxa la drecera"

32msgstr "Desenganxa la drecera"

33

33

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

54msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."

54msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."

55msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."

55msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."

56

56

57−#: qml/Components/Dialogs.qml:74

57+#: qml/Components/Dialogs.qml:70

58msgid "Log out"

58msgid "Log out"

59msgstr "Ix"

59msgstr "Ix"

60

60

61−#: qml/Components/Dialogs.qml:75

61+#: qml/Components/Dialogs.qml:71

62msgid "Are you sure you want to log out?"

62msgid "Are you sure you want to log out?"

63msgstr "Segur que voleu eixir?"

63msgstr "Segur que voleu eixir?"

64

64

65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

65+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66−#: qml/Components/Dialogs.qml:126

66+#: qml/Components/Dialogs.qml:122

67msgid "No"

67msgid "No"

68msgstr "No"

68msgstr "No"

69

69

70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

70+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71−#: qml/Components/Dialogs.qml:133

71+#: qml/Components/Dialogs.qml:129

72msgid "Yes"

72msgid "Yes"

73msgstr "Sí"

73msgstr "Sí"

74

74

75−#: qml/Components/Dialogs.qml:98

75+#: qml/Components/Dialogs.qml:94

76msgid "Shut down"

76msgid "Shut down"

77msgstr "Apaga"

77msgstr "Apaga"

78

78

79−#: qml/Components/Dialogs.qml:99

79+#: qml/Components/Dialogs.qml:95

80msgid "Are you sure you want to shut down?"

80msgid "Are you sure you want to shut down?"

81msgstr "Segur que voleu apagar?"

81msgstr "Segur que voleu apagar?"

82

82

83−#: qml/Components/Dialogs.qml:123

83+#: qml/Components/Dialogs.qml:119

84msgid "Reboot"

84msgid "Reboot"

85msgstr "Reinicia"

85msgstr "Reinicia"

86

86

87−#: qml/Components/Dialogs.qml:124

87+#: qml/Components/Dialogs.qml:120

88msgid "Are you sure you want to reboot?"

88msgid "Are you sure you want to reboot?"

89msgstr "Segur que voleu reiniciar?"

89msgstr "Segur que voleu reiniciar?"

90

90

91−#: qml/Components/Dialogs.qml:148

91+#: qml/Components/Dialogs.qml:144

92msgid "Power"

92msgid "Power"

93msgstr "Energia"

93msgstr "Energia"

94

94

95−#: qml/Components/Dialogs.qml:149

95+#: qml/Components/Dialogs.qml:145

96msgid ""

96msgid ""

97"Are you sure you would like\n"

97"Are you sure you would like\n"

98"to power off?"

98"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100"Segur que voleu\n"

100"Segur que voleu\n"

101"apagar?"

101"apagar?"

102

102

103−#: qml/Components/Dialogs.qml:151

103+#: qml/Components/Dialogs.qml:147

104msgid "Power off"

104msgid "Power off"

105msgstr "Apaga"

105msgstr "Apaga"

106

106

107−#: qml/Components/Dialogs.qml:161

107+#: qml/Components/Dialogs.qml:157

108msgid "Restart"

108msgid "Restart"

109msgstr "Reinicia"

109msgstr "Reinicia"

110

110

111−#: qml/Components/Dialogs.qml:171

111+#: qml/Components/Dialogs.qml:167

112msgid "Cancel"

112msgid "Cancel"

113msgstr "Cancel·la"

113msgstr "Cancel·la"

114

114

@@ -116,49 +116,49 @@ msgstr "Cancel·la"

116msgid "Skip intro"

116msgid "Skip intro"

117msgstr "Omet la introducció"

117msgstr "Omet la introducció"

118

118

119−#: qml/Components/EdgeDemo.qml:112

119+#: qml/Components/EdgeDemo.qml:125

120msgid "Right edge"

120msgid "Right edge"

121msgstr "Vora dreta"

121msgstr "Vora dreta"

122

122

123−#: qml/Components/EdgeDemo.qml:113

123+#: qml/Components/EdgeDemo.qml:126

124msgid "Try swiping from the right edge to unlock the phone"

124msgid "Try swiping from the right edge to unlock the phone"

125msgstr ""

125msgstr ""

126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"

126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"

127

127

128−#: qml/Components/EdgeDemo.qml:144

128+#: qml/Components/EdgeDemo.qml:157

129msgid "Top edge"

129msgid "Top edge"

130msgstr "Vora superior"

130msgstr "Vora superior"

131

131

132−#: qml/Components/EdgeDemo.qml:145

132+#: qml/Components/EdgeDemo.qml:158

133msgid "Try swiping from the top edge to access the indicators"

133msgid "Try swiping from the top edge to access the indicators"

134msgstr ""

134msgstr ""

135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"

135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"

136

136

137−#: qml/Components/EdgeDemo.qml:170

137+#: qml/Components/EdgeDemo.qml:183

138msgid "Close"

138msgid "Close"

139msgstr "Tanca"

139msgstr "Tanca"

140

140

141−#: qml/Components/EdgeDemo.qml:171

141+#: qml/Components/EdgeDemo.qml:184

142msgid "Swipe up again to close the settings screen"

142msgid "Swipe up again to close the settings screen"

143msgstr ""

143msgstr ""

144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "

144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "

145"configuració"

145"configuració"

146

146

147−#: qml/Components/EdgeDemo.qml:201

147+#: qml/Components/EdgeDemo.qml:214

148msgid "Left edge"

148msgid "Left edge"

149msgstr "Vora esquerra"

149msgstr "Vora esquerra"

150

150

151−#: qml/Components/EdgeDemo.qml:202

151+#: qml/Components/EdgeDemo.qml:215

152msgid "Swipe from the left to reveal the launcher for quick access to apps"

152msgid "Swipe from the left to reveal the launcher for quick access to apps"

153msgstr ""

153msgstr ""

154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

155"ràpidament a les aplicacions"

155"ràpidament a les aplicacions"

156

156

157−#: qml/Components/EdgeDemo.qml:229

157+#: qml/Components/EdgeDemo.qml:242

158msgid "Well done"

158msgid "Well done"

159msgstr "Enhorabona!"

159msgstr "Enhorabona!"

160

160

161−#: qml/Components/EdgeDemo.qml:230

161+#: qml/Components/EdgeDemo.qml:243

162msgid ""

162msgid ""

163"You have now mastered the edge gestures and can start using the "

163"You have now mastered the edge gestures and can start using the "

164"phone<br><br>Tap on the screen to start"

164"phone<br><br>Tap on the screen to start"

@@ -166,40 +166,44 @@ msgstr ""

166"Ja heu aprés com utilitzar els gestos de les vores per fer servir el "

166"Ja heu aprés com utilitzar els gestos de les vores per fer servir el "

167"telèfon<br><br>Feu un toc a la pantalla per començar"

167"telèfon<br><br>Feu un toc a la pantalla per començar"

168

168

169−#: qml/Components/Lockscreen.qml:223

169+#: qml/Components/Lockscreen.qml:238

170msgid "Return to Call"

170msgid "Return to Call"

171msgstr "Torna a la trucada"

171msgstr "Torna a la trucada"

172

172

173−#: qml/Components/Lockscreen.qml:223

173+#: qml/Components/Lockscreen.qml:238

174msgid "Emergency Call"

174msgid "Emergency Call"

175msgstr "Cridada d'emergència"

175msgstr "Cridada d'emergència"

176

176

177−#: qml/Components/Lockscreen.qml:255

177+#: qml/Components/Lockscreen.qml:270

178msgid "OK"

178msgid "OK"

179msgstr "D'acord"

179msgstr "D'acord"

180

180

181−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

181+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

182msgid "See less"

182msgid "See less"

183msgstr "Mostra'n menys"

183msgstr "Mostra'n menys"

184

184

185−#: qml/Dash/GenericScopeView.qml:434

185+#: qml/Dash/GenericScopeView.qml:431

186msgid "See all"

186msgid "See all"

187msgstr "Mostra-ho tot"

187msgstr "Mostra-ho tot"

188

188

189−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

189+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

190#: qml/Panel/SearchIndicator.qml:27

190#: qml/Panel/SearchIndicator.qml:27

191msgid "Search"

191msgid "Search"

192msgstr "Cerca"

192msgstr "Cerca"

193

193

194−#: qml/Dash/PageHeader.qml:268

194+#: qml/Dash/PageHeader.qml:260

195+msgid "Store"

196+msgstr "Botiga"

197+

198+#: qml/Dash/PageHeader.qml:277

195msgid "Settings"

199msgid "Settings"

196msgstr "Paràmetres"

200msgstr "Paràmetres"

197

201

198−#: qml/Dash/PageHeader.qml:275

202+#: qml/Dash/PageHeader.qml:284

199msgid "Remove from Favorites"

203msgid "Remove from Favorites"

200msgstr "Suprimeix dels preferits"

204msgstr "Suprimeix dels preferits"

201

205

202−#: qml/Dash/PageHeader.qml:275

206+#: qml/Dash/PageHeader.qml:284

203msgid "Add to Favorites"

207msgid "Add to Favorites"

204msgstr "Afig als preferits"

208msgstr "Afig als preferits"

205

209

@@ -231,31 +235,23 @@ msgstr "Estireu per actualitzar..."

231msgid "Release to refresh…"

235msgid "Release to refresh…"

232msgstr "Deixeu anar per actualitzar..."

236msgstr "Deixeu anar per actualitzar..."

233

237

234−#: qml/Dash/ScopesOverview.qml:215

238+#: qml/Dash/ScopesList.qml:63

235−msgid "Manage Scopes"

239+msgid "Manage"

236−msgstr "Gestioneu les lents"

240+msgstr ""

237−

238−#: qml/Dash/ScopesOverview.qml:437

239−msgid "Done"

240−msgstr "Fet"

241−

242−#: qml/Dash/ScopesOverview.qml:463

243−msgid "Store"

244−msgstr "Botiga"

245

241

246−#: qml/Dash/ScopesOverviewTab.qml:36

242+#: qml/Dash/ScopesList.qml:107

247−msgid "Favorites"

243+msgid "Home"

248−msgstr "Preferides"

244+msgstr ""

249

245

250−#: qml/Dash/ScopesOverviewTab.qml:54

246+#: qml/Dash/ScopesList.qml:108

251−msgid "All"

247+msgid "Also installed"

252−msgstr "Totes"

248+msgstr ""

253

249

254#: qml/Greeter/Greeter.qml:174

250#: qml/Greeter/Greeter.qml:174

255msgid "Unlock"

251msgid "Unlock"

256msgstr "Desbloca"

252msgstr "Desbloca"

257

253

258−#: qml/Notifications/NotificationMenuItemFactory.qml:116

254+#: qml/Notifications/NotificationMenuItemFactory.qml:128

259msgid "Show password"

255msgid "Show password"

260msgstr "Mostra la contrasenya"

256msgstr "Mostra la contrasenya"

261

257

@@ -267,31 +263,31 @@ msgstr "Feu un toc per tornar a la cridada..."

267msgid "Conference"

263msgid "Conference"

268msgstr "Conferència"

264msgstr "Conferència"

269

265

270−#: qml/Panel/Indicators/MenuItemFactory.qml:615

266+#: qml/Panel/Indicators/MenuItemFactory.qml:643

271msgid "Nothing is playing"

267msgid "Nothing is playing"

272msgstr "No s'està reproduint res"

268msgstr "No s'està reproduint res"

273

269

274−#: qml/Panel/Indicators/MenuItemFactory.qml:763

270+#: qml/Panel/Indicators/MenuItemFactory.qml:791

275msgid "In queue…"

271msgid "In queue…"

276msgstr "A la cua..."

272msgstr "A la cua..."

277

273

278−#: qml/Panel/Indicators/MenuItemFactory.qml:767

274+#: qml/Panel/Indicators/MenuItemFactory.qml:795

279msgid "Downloading"

275msgid "Downloading"

280msgstr "S'està baixant"

276msgstr "S'està baixant"

281

277

282−#: qml/Panel/Indicators/MenuItemFactory.qml:769

278+#: qml/Panel/Indicators/MenuItemFactory.qml:797

283msgid "Paused, tap to resume"

279msgid "Paused, tap to resume"

284msgstr "En pausa, feu un toc per continuar"

280msgstr "En pausa, feu un toc per continuar"

285

281

286−#: qml/Panel/Indicators/MenuItemFactory.qml:771

282+#: qml/Panel/Indicators/MenuItemFactory.qml:799

287msgid "Canceled"

283msgid "Canceled"

288msgstr "S'ha cancel·lat"

284msgstr "S'ha cancel·lat"

289

285

290−#: qml/Panel/Indicators/MenuItemFactory.qml:773

286+#: qml/Panel/Indicators/MenuItemFactory.qml:801

291msgid "Finished"

287msgid "Finished"

292msgstr "S'ha finalitzat"

288msgstr "S'ha finalitzat"

293

289

294−#: qml/Panel/Indicators/MenuItemFactory.qml:775

290+#: qml/Panel/Indicators/MenuItemFactory.qml:803

295msgid "Failed, tap to retry"

291msgid "Failed, tap to retry"

296msgstr "Ha fallat, feu un toc per tornar-ho a intentar"

292msgstr "Ha fallat, feu un toc per tornar-ho a intentar"

297

293

@@ -303,49 +299,49 @@ msgstr "Desbloca la SIM"

303msgid "Roaming"

299msgid "Roaming"

304msgstr "Itinerància"

300msgstr "Itinerància"

305

301

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

307msgid "Enter passphrase"

308msgid "Enter passphrase"

308msgstr "Introduïu la contrasenya"

309msgstr "Introduïu la contrasenya"

309

310

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

311msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

312msgstr "La contrasenya no és correcta"

322msgstr "La contrasenya no és correcta"

313

323

314−#: qml/Shell.qml:383

324+#: qml/Shell.qml:372

315msgid "Please re-enter"

325msgid "Please re-enter"

316msgstr "Torneu-ho a introduir"

326msgstr "Torneu-ho a introduir"

317

327

318−#: qml/Shell.qml:385

328+#: qml/Shell.qml:373

319−msgid "Enter passcode"

320−msgstr "Introduïu el codi d'accés"

321−

322−#: qml/Shell.qml:386

323msgid "Sorry, incorrect passcode"

329msgid "Sorry, incorrect passcode"

324msgstr "El codi d'accés no és correcte"

330msgstr "El codi d'accés no és correcte"

325

331

326−#: qml/Shell.qml:389

332+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

327−#, qt-format

328−msgid "Enter %1"

329−msgstr "Introduïu: %1"

330−

331−#: qml/Shell.qml:390

332−#, qt-format

333−msgid "Sorry, incorrect %1"

334−msgstr "Incorrecte (%1)"

335−

336−#: qml/Shell.qml:431

337msgid "Sorry, incorrect passphrase."

333msgid "Sorry, incorrect passphrase."

338msgstr "La contrasenya és incorrecta"

334msgstr "La contrasenya és incorrecta"

339

335

340−#: qml/Shell.qml:432

336+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

341msgid "Sorry, incorrect passcode."

337msgid "Sorry, incorrect passcode."

342msgstr "El codi d'accés no és correcte"

338msgstr "El codi d'accés no és correcte"

343

339

344−#: qml/Shell.qml:433

340+#: qml/Shell.qml:469

345msgid "This will be your last attempt."

341msgid "This will be your last attempt."

346msgstr "Este serà el darrer intent."

342msgstr "Este serà el darrer intent."

347

343

348−#: qml/Shell.qml:435

344+#: qml/Shell.qml:471

349msgid ""

345msgid ""

350"If passphrase is entered incorrectly, your phone will conduct a factory "

346"If passphrase is entered incorrectly, your phone will conduct a factory "

351"reset and all personal data will be deleted."

347"reset and all personal data will be deleted."

@@ -354,7 +350,7 @@ msgstr ""

354"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

350"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

355"personals."

351"personals."

356

352

357−#: qml/Shell.qml:436

353+#: qml/Shell.qml:472

358msgid ""

354msgid ""

359"If passcode is entered incorrectly, your phone will conduct a factory reset "

355"If passcode is entered incorrectly, your phone will conduct a factory reset "

360"and all personal data will be deleted."

356"and all personal data will be deleted."

@@ -363,6 +359,195 @@ msgstr ""

363"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

359"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

364"personals."

360"personals."

365

361

362+#: qml/Wizard/Page.qml:89

363+msgid "Back"

364+msgstr ""

365+

366+#: qml/Wizard/Pages/10-welcome.qml:27

367+msgid "Hi!"

368+msgstr ""

369+

370+#: qml/Wizard/Pages/10-welcome.qml:44

371+msgid "Welcome to your Ubuntu phone."

372+msgstr ""

373+

374+#: qml/Wizard/Pages/10-welcome.qml:52

375+msgid "Let’s get started."

376+msgstr ""

377+

378+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

379+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

380+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

381+#: qml/Wizard/Pages/passwd-set.qml:90

382+msgid "Continue"

383+msgstr ""

384+

385+#: qml/Wizard/Pages/20-sim.qml:25

386+msgid "Add a SIM card and restart your device"

387+msgstr ""

388+

389+#: qml/Wizard/Pages/20-sim.qml:55

390+msgid "Without it, you won’t be able to make calls or use text messaging."

391+msgstr ""

392+

393+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

394+msgid "Skip"

395+msgstr ""

396+

397+#: qml/Wizard/Pages/30-passwd-type.qml:39

398+msgid "Lock security"

399+msgstr ""

400+

401+#: qml/Wizard/Pages/30-passwd-type.qml:74

402+msgid "Please select how you’d like to unlock your phone."

403+msgstr ""

404+

405+#: qml/Wizard/Pages/30-passwd-type.qml:97

406+msgid "Swipe"

407+msgstr ""

408+

409+#: qml/Wizard/Pages/30-passwd-type.qml:98

410+msgid "No security"

411+msgstr ""

412+

413+#: qml/Wizard/Pages/30-passwd-type.qml:100

414+msgid "Passcode"

415+msgstr ""

416+

417+#: qml/Wizard/Pages/30-passwd-type.qml:101

418+msgid "4 digits only"

419+msgstr ""

420+

421+#: qml/Wizard/Pages/30-passwd-type.qml:103

422+msgid "Passphrase"

423+msgstr ""

424+

425+#: qml/Wizard/Pages/30-passwd-type.qml:104

426+msgid "Numbers and letters"

427+msgstr ""

428+

429+#: qml/Wizard/Pages/40-wifi.qml:28

430+msgid "Connect to Wi‑Fi"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/40-wifi.qml:147

434+msgid "Available networks…"

435+msgstr ""

436+

437+#: qml/Wizard/Pages/40-wifi.qml:148

438+msgid "No available networks."

439+msgstr ""

440+

441+#: qml/Wizard/Pages/50-location.qml:27

442+msgid "Location"

443+msgstr ""

444+

445+#: qml/Wizard/Pages/50-location.qml:62

446+msgid "Let the phone detect your location:"

447+msgstr ""

448+

449+#: qml/Wizard/Pages/50-location.qml:69

450+msgid "Using GPS only (less accurate)"

451+msgstr ""

452+

453+#: qml/Wizard/Pages/50-location.qml:86

454+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

455+msgstr ""

456+

457+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

458+#: qml/Wizard/Pages/50-location.qml:103

459+msgid ""

460+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

461+"conditions</a>."

462+msgstr ""

463+

464+#: qml/Wizard/Pages/50-location.qml:112

465+msgid "Not at all"

466+msgstr ""

467+

468+#: qml/Wizard/Pages/50-location.qml:124

469+msgid "You can change your mind later in <b>System Settings</b>."

470+msgstr ""

471+

472+#: qml/Wizard/Pages/60-reporting.qml:24

473+msgid "Improving your experience"

474+msgstr ""

475+

476+#: qml/Wizard/Pages/60-reporting.qml:36

477+msgid ""

478+"Your phone is set up to automatically report errors to Canonical and its "

479+"partners, the makers of the operating system."

480+msgstr ""

481+

482+#: qml/Wizard/Pages/60-reporting.qml:43

483+msgid ""

484+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

485+"Privacy</b>"

486+msgstr ""

487+

488+#: qml/Wizard/Pages/80-finished.qml:24

489+msgid "All done"

490+msgstr ""

491+

492+#: qml/Wizard/Pages/80-finished.qml:39

493+msgid "Nice work!"

494+msgstr ""

495+

496+#: qml/Wizard/Pages/80-finished.qml:46

497+msgid "Your phone is now ready to use."

498+msgstr ""

499+

500+#: qml/Wizard/Pages/80-finished.qml:53

501+msgid "Finish"

502+msgstr ""

503+

504+#: qml/Wizard/Pages/here-terms.qml:27

505+msgid "Terms & Conditions"

506+msgstr ""

507+

508+#: qml/Wizard/Pages/passwd-confirm.qml:49

509+msgid "Confirm passphrase"

510+msgstr ""

511+

512+#: qml/Wizard/Pages/passwd-confirm.qml:50

513+msgid "Confirm passcode"

514+msgstr ""

515+

516+#: qml/Wizard/Pages/passwd-confirm.qml:53

517+#: qml/Wizard/Pages/passwd-confirm.qml:54

518+msgid "Please try again."

519+msgstr ""

520+

521+#: qml/Wizard/Pages/passwd-set.qml:61

522+msgid "Choose your passcode"

523+msgstr ""

524+

525+#: qml/Wizard/Pages/passwd-set.qml:68

526+msgid "Passphrase must be 4 characters long"

527+msgstr ""

528+

529+#: qml/Wizard/StackButton.qml:39

530+#, qt-format

531+msgid "〈 %1"

532+msgstr ""

533+

534+#: qml/Wizard/StackButton.qml:42

535+#, qt-format

536+msgid "%1 〉"

537+msgstr ""

538+

539+#~ msgid "Manage Scopes"

540+#~ msgstr "Gestioneu les lents"

541+

542+#~ msgid "Done"

543+#~ msgstr "Fet"

544+

545+#~ msgid "Favorites"

546+#~ msgstr "Preferides"

547+

548+#~ msgid "All"

549+#~ msgstr "Totes"

550+

366#~ msgid "Confirm"

551#~ msgid "Confirm"

367#~ msgstr "Confirma"

552#~ msgstr "Confirma"

368

553

po/ckb.po+248−75

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-01-21 11:05+0000\n"

11"PO-Revision-Date: 2014-01-21 11:05+0000\n"

12"Last-Translator: Aras <aras.noori@gmail.com>\n"

12"Last-Translator: Aras <aras.noori@gmail.com>\n"

13"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"

13"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr ""

23msgstr ""

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr ""

28msgstr ""

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr ""

32msgstr ""

33

33

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] ""

50msgstr[0] ""

51msgstr[1] ""

51msgstr[1] ""

52

52

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

54msgid "Log out"

54msgid "Log out"

55msgstr ""

55msgstr ""

56

56

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

58msgid "Are you sure you want to log out?"

58msgid "Are you sure you want to log out?"

59msgstr ""

59msgstr ""

60

60

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:122

63msgid "No"

63msgid "No"

64msgstr ""

64msgstr ""

65

65

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:129

68msgid "Yes"

68msgid "Yes"

69msgstr ""

69msgstr ""

70

70

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

72msgid "Shut down"

72msgid "Shut down"

73msgstr ""

73msgstr ""

74

74

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

76msgid "Are you sure you want to shut down?"

76msgid "Are you sure you want to shut down?"

77msgstr ""

77msgstr ""

78

78

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

80msgid "Reboot"

80msgid "Reboot"

81msgstr ""

81msgstr ""

82

82

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

84msgid "Are you sure you want to reboot?"

84msgid "Are you sure you want to reboot?"

85msgstr ""

85msgstr ""

86

86

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

88msgid "Power"

88msgid "Power"

89msgstr ""

89msgstr ""

90

90

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

92msgid ""

92msgid ""

93"Are you sure you would like\n"

93"Are you sure you would like\n"

94"to power off?"

94"to power off?"

95msgstr ""

95msgstr ""

96

96

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

98msgid "Power off"

98msgid "Power off"

99msgstr ""

99msgstr ""

100

100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102msgid "Restart"

102msgid "Restart"

103msgstr ""

103msgstr ""

104

104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106msgid "Cancel"

106msgid "Cancel"

107msgstr ""

107msgstr ""

108

108

@@ -110,82 +110,86 @@ msgstr ""

110msgid "Skip intro"

110msgid "Skip intro"

111msgstr "پێشەکیی بپەڕێنە"

111msgstr "پێشەکیی بپەڕێنە"

112

112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114msgid "Right edge"

114msgid "Right edge"

115msgstr "لێواری ڕاست"

115msgstr "لێواری ڕاست"

116

116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118msgid "Try swiping from the right edge to unlock the phone"

118msgid "Try swiping from the right edge to unlock the phone"

119msgstr "لێواری ڕاست ڕابکێشە بۆ کردنەوەی مۆبایلەکە"

119msgstr "لێواری ڕاست ڕابکێشە بۆ کردنەوەی مۆبایلەکە"

120

120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122msgid "Top edge"

122msgid "Top edge"

123msgstr "لێواری سەرەوە"

123msgstr "لێواری سەرەوە"

124

124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126msgid "Try swiping from the top edge to access the indicators"

126msgid "Try swiping from the top edge to access the indicators"

127msgstr "لێواری سەرەوە ڕابکێشە بۆ گەیشتن بە نیشاندەرەکان"

127msgstr "لێواری سەرەوە ڕابکێشە بۆ گەیشتن بە نیشاندەرەکان"

128

128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130msgid "Close"

130msgid "Close"

131msgstr "داخستن"

131msgstr "داخستن"

132

132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134msgid "Swipe up again to close the settings screen"

134msgid "Swipe up again to close the settings screen"

135msgstr "ڕایکێشەوە سەرەوە جارێکی تر بۆ داخستنی پەردەی ڕێکخستنەکان"

135msgstr "ڕایکێشەوە سەرەوە جارێکی تر بۆ داخستنی پەردەی ڕێکخستنەکان"

136

136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138msgid "Left edge"

138msgid "Left edge"

139msgstr "لێواری چەپ"

139msgstr "لێواری چەپ"

140

140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143msgstr "لە چەپەوە بچۆرەوە سەر دەستپێک بۆئەوەی بتوانی هەموو ئەپەکان ببینی"

143msgstr "لە چەپەوە بچۆرەوە سەر دەستپێک بۆئەوەی بتوانی هەموو ئەپەکان ببینی"

144

144

145−#: qml/Components/EdgeDemo.qml:229

145+#: qml/Components/EdgeDemo.qml:242

146msgid "Well done"

146msgid "Well done"

147msgstr "دەستخۆش"

147msgstr "دەستخۆش"

148

148

149−#: qml/Components/EdgeDemo.qml:230

149+#: qml/Components/EdgeDemo.qml:243

150msgid ""

150msgid ""

151"You have now mastered the edge gestures and can start using the "

151"You have now mastered the edge gestures and can start using the "

152"phone<br><br>Tap on the screen to start"

152"phone<br><br>Tap on the screen to start"

153msgstr ""

153msgstr ""

154

154

155−#: qml/Components/Lockscreen.qml:223

155+#: qml/Components/Lockscreen.qml:238

156msgid "Return to Call"

156msgid "Return to Call"

157msgstr ""

157msgstr ""

158

158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160msgid "Emergency Call"

160msgid "Emergency Call"

161msgstr "هێڵی فریاگوزاری"

161msgstr "هێڵی فریاگوزاری"

162

162

163−#: qml/Components/Lockscreen.qml:255

163+#: qml/Components/Lockscreen.qml:270

164msgid "OK"

164msgid "OK"

165msgstr ""

165msgstr ""

166

166

167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

168msgid "See less"

168msgid "See less"

169msgstr ""

169msgstr ""

170

170

171−#: qml/Dash/GenericScopeView.qml:434

171+#: qml/Dash/GenericScopeView.qml:431

172msgid "See all"

172msgid "See all"

173msgstr ""

173msgstr ""

174

174

175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176#: qml/Panel/SearchIndicator.qml:27

176#: qml/Panel/SearchIndicator.qml:27

177msgid "Search"

177msgid "Search"

178msgstr "گەڕان"

178msgstr "گەڕان"

179

179

180−#: qml/Dash/PageHeader.qml:268

180+#: qml/Dash/PageHeader.qml:260

181+msgid "Store"

182+msgstr ""

183+

184+#: qml/Dash/PageHeader.qml:277

181msgid "Settings"

185msgid "Settings"

182msgstr ""

186msgstr ""

183

187

184−#: qml/Dash/PageHeader.qml:275

188+#: qml/Dash/PageHeader.qml:284

185msgid "Remove from Favorites"

189msgid "Remove from Favorites"

186msgstr ""

190msgstr ""

187

191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189msgid "Add to Favorites"

193msgid "Add to Favorites"

190msgstr ""

194msgstr ""

191

195

@@ -217,31 +221,23 @@ msgstr ""

217msgid "Release to refresh…"

221msgid "Release to refresh…"

218msgstr ""

222msgstr ""

219

223

220−#: qml/Dash/ScopesOverview.qml:215

224+#: qml/Dash/ScopesList.qml:63

221−msgid "Manage Scopes"

225+msgid "Manage"

222−msgstr ""

223−

224−#: qml/Dash/ScopesOverview.qml:437

225−msgid "Done"

226−msgstr ""

227−

228−#: qml/Dash/ScopesOverview.qml:463

229−msgid "Store"

230msgstr ""

226msgstr ""

231

227

232−#: qml/Dash/ScopesOverviewTab.qml:36

228+#: qml/Dash/ScopesList.qml:107

233−msgid "Favorites"

229+msgid "Home"

234msgstr ""

230msgstr ""

235

231

236−#: qml/Dash/ScopesOverviewTab.qml:54

232+#: qml/Dash/ScopesList.qml:108

237−msgid "All"

233+msgid "Also installed"

238msgstr ""

234msgstr ""

239

235

240#: qml/Greeter/Greeter.qml:174

236#: qml/Greeter/Greeter.qml:174

241msgid "Unlock"

237msgid "Unlock"

242msgstr ""

238msgstr ""

243

239

244−#: qml/Notifications/NotificationMenuItemFactory.qml:116

240+#: qml/Notifications/NotificationMenuItemFactory.qml:128

245msgid "Show password"

241msgid "Show password"

246msgstr "تێپەڕەوشە پیشان بدە"

242msgstr "تێپەڕەوشە پیشان بدە"

247

243

@@ -289,60 +285,237 @@ msgstr ""

289msgid "Roaming"

285msgid "Roaming"

290msgstr ""

286msgstr ""

291

287

292−#: qml/Shell.qml:391

288+#: qml/Shell.qml:367

289+#, qt-format

293−msgid "Enter passphrase"

290+msgid "Enter %1"

294msgstr ""

291msgstr ""

295

292

296−#: qml/Shell.qml:392

293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

297−msgid "Sorry, incorrect passphrase"

294+msgid "Enter passphrase"

298msgstr ""

295msgstr ""

299

296

300−#: qml/Shell.qml:393

297+#: qml/Shell.qml:369

301−msgid "Please re-enter"

298+msgid "Enter passcode"

302msgstr ""

299msgstr ""

303

300

304−#: qml/Shell.qml:395

301+#: qml/Shell.qml:370

305−msgid "Enter passcode"

302+#, qt-format

303+msgid "Sorry, incorrect %1"

306msgstr ""

304msgstr ""

307

305

308−#: qml/Shell.qml:396

306+#: qml/Shell.qml:371

309−msgid "Sorry, incorrect passcode"

307+msgid "Sorry, incorrect passphrase"

310msgstr ""

308msgstr ""

311

309

312−#: qml/Shell.qml:399

310+#: qml/Shell.qml:372

313−#, qt-format

311+msgid "Please re-enter"

314−msgid "Enter %1"

315msgstr ""

312msgstr ""

316

313

317−#: qml/Shell.qml:400

314+#: qml/Shell.qml:373

318−#, qt-format

319−msgid "Sorry, incorrect %1"

315+msgid "Sorry, incorrect passcode"

320msgstr ""

316msgstr ""

321

317

322−#: qml/Shell.qml:441

318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

323msgid "Sorry, incorrect passphrase."

319msgid "Sorry, incorrect passphrase."

324msgstr ""

320msgstr ""

325

321

326−#: qml/Shell.qml:442

322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

327msgid "Sorry, incorrect passcode."

323msgid "Sorry, incorrect passcode."

328msgstr ""

324msgstr ""

329

325

330−#: qml/Shell.qml:443

326+#: qml/Shell.qml:469

331msgid "This will be your last attempt."

327msgid "This will be your last attempt."

332msgstr ""

328msgstr ""

333

329

334−#: qml/Shell.qml:445

330+#: qml/Shell.qml:471

335msgid ""

331msgid ""

336"If passphrase is entered incorrectly, your phone will conduct a factory "

332"If passphrase is entered incorrectly, your phone will conduct a factory "

337"reset and all personal data will be deleted."

333"reset and all personal data will be deleted."

338msgstr ""

334msgstr ""

339

335

340−#: qml/Shell.qml:446

336+#: qml/Shell.qml:472

341msgid ""

337msgid ""

342"If passcode is entered incorrectly, your phone will conduct a factory reset "

338"If passcode is entered incorrectly, your phone will conduct a factory reset "

343"and all personal data will be deleted."

339"and all personal data will be deleted."

344msgstr ""

340msgstr ""

345

341

342+#: qml/Wizard/Page.qml:89

343+msgid "Back"

344+msgstr ""

345+

346+#: qml/Wizard/Pages/10-welcome.qml:27

347+msgid "Hi!"

348+msgstr ""

349+

350+#: qml/Wizard/Pages/10-welcome.qml:44

351+msgid "Welcome to your Ubuntu phone."

352+msgstr ""

353+

354+#: qml/Wizard/Pages/10-welcome.qml:52

355+msgid "Let’s get started."

356+msgstr ""

357+

358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

361+#: qml/Wizard/Pages/passwd-set.qml:90

362+msgid "Continue"

363+msgstr ""

364+

365+#: qml/Wizard/Pages/20-sim.qml:25

366+msgid "Add a SIM card and restart your device"

367+msgstr ""

368+

369+#: qml/Wizard/Pages/20-sim.qml:55

370+msgid "Without it, you won’t be able to make calls or use text messaging."

371+msgstr ""

372+

373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

374+msgid "Skip"

375+msgstr ""

376+

377+#: qml/Wizard/Pages/30-passwd-type.qml:39

378+msgid "Lock security"

379+msgstr ""

380+

381+#: qml/Wizard/Pages/30-passwd-type.qml:74

382+msgid "Please select how you’d like to unlock your phone."

383+msgstr ""

384+

385+#: qml/Wizard/Pages/30-passwd-type.qml:97

386+msgid "Swipe"

387+msgstr ""

388+

389+#: qml/Wizard/Pages/30-passwd-type.qml:98

390+msgid "No security"

391+msgstr ""

392+

393+#: qml/Wizard/Pages/30-passwd-type.qml:100

394+msgid "Passcode"

395+msgstr ""

396+

397+#: qml/Wizard/Pages/30-passwd-type.qml:101

398+msgid "4 digits only"

399+msgstr ""

400+

401+#: qml/Wizard/Pages/30-passwd-type.qml:103

402+msgid "Passphrase"

403+msgstr ""

404+

405+#: qml/Wizard/Pages/30-passwd-type.qml:104

406+msgid "Numbers and letters"

407+msgstr ""

408+

409+#: qml/Wizard/Pages/40-wifi.qml:28

410+msgid "Connect to Wi‑Fi"

411+msgstr ""

412+

413+#: qml/Wizard/Pages/40-wifi.qml:147

414+msgid "Available networks…"

415+msgstr ""

416+

417+#: qml/Wizard/Pages/40-wifi.qml:148

418+msgid "No available networks."

419+msgstr ""

420+

421+#: qml/Wizard/Pages/50-location.qml:27

422+msgid "Location"

423+msgstr ""

424+

425+#: qml/Wizard/Pages/50-location.qml:62

426+msgid "Let the phone detect your location:"

427+msgstr ""

428+

429+#: qml/Wizard/Pages/50-location.qml:69

430+msgid "Using GPS only (less accurate)"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/50-location.qml:86

434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

435+msgstr ""

436+

437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

438+#: qml/Wizard/Pages/50-location.qml:103

439+msgid ""

440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

441+"conditions</a>."

442+msgstr ""

443+

444+#: qml/Wizard/Pages/50-location.qml:112

445+msgid "Not at all"

446+msgstr ""

447+

448+#: qml/Wizard/Pages/50-location.qml:124

449+msgid "You can change your mind later in <b>System Settings</b>."

450+msgstr ""

451+

452+#: qml/Wizard/Pages/60-reporting.qml:24

453+msgid "Improving your experience"

454+msgstr ""

455+

456+#: qml/Wizard/Pages/60-reporting.qml:36

457+msgid ""

458+"Your phone is set up to automatically report errors to Canonical and its "

459+"partners, the makers of the operating system."

460+msgstr ""

461+

462+#: qml/Wizard/Pages/60-reporting.qml:43

463+msgid ""

464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

465+"Privacy</b>"

466+msgstr ""

467+

468+#: qml/Wizard/Pages/80-finished.qml:24

469+msgid "All done"

470+msgstr ""

471+

472+#: qml/Wizard/Pages/80-finished.qml:39

473+msgid "Nice work!"

474+msgstr ""

475+

476+#: qml/Wizard/Pages/80-finished.qml:46

477+msgid "Your phone is now ready to use."

478+msgstr ""

479+

480+#: qml/Wizard/Pages/80-finished.qml:53

481+msgid "Finish"

482+msgstr ""

483+

484+#: qml/Wizard/Pages/here-terms.qml:27

485+msgid "Terms & Conditions"

486+msgstr ""

487+

488+#: qml/Wizard/Pages/passwd-confirm.qml:49

489+msgid "Confirm passphrase"

490+msgstr ""

491+

492+#: qml/Wizard/Pages/passwd-confirm.qml:50

493+msgid "Confirm passcode"

494+msgstr ""

495+

496+#: qml/Wizard/Pages/passwd-confirm.qml:53

497+#: qml/Wizard/Pages/passwd-confirm.qml:54

498+msgid "Please try again."

499+msgstr ""

500+

501+#: qml/Wizard/Pages/passwd-set.qml:61

502+msgid "Choose your passcode"

503+msgstr ""

504+

505+#: qml/Wizard/Pages/passwd-set.qml:68

506+msgid "Passphrase must be 4 characters long"

507+msgstr ""

508+

509+#: qml/Wizard/StackButton.qml:39

510+#, qt-format

511+msgid "〈 %1"

512+msgstr ""

513+

514+#: qml/Wizard/StackButton.qml:42

515+#, qt-format

516+msgid "%1 〉"

517+msgstr ""

518+

346#~ msgid "Speaking..."

519#~ msgid "Speaking..."

347#~ msgstr "قسە دەکات..."

520#~ msgstr "قسە دەکات..."

348

521

po/cs.po+248−75

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-01-08 10:11+0000\n"

11"PO-Revision-Date: 2014-01-08 10:11+0000\n"

12"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"

12"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"

13"Language-Team: Czech <cs@li.org>\n"

13"Language-Team: Czech <cs@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

17"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr ""

23msgstr ""

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr ""

28msgstr ""

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr ""

32msgstr ""

33

33

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] ""

50msgstr[0] ""

51msgstr[1] ""

51msgstr[1] ""

52

52

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

54msgid "Log out"

54msgid "Log out"

55msgstr ""

55msgstr ""

56

56

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

58msgid "Are you sure you want to log out?"

58msgid "Are you sure you want to log out?"

59msgstr ""

59msgstr ""

60

60

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:122

63msgid "No"

63msgid "No"

64msgstr ""

64msgstr ""

65

65

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:129

68msgid "Yes"

68msgid "Yes"

69msgstr ""

69msgstr ""

70

70

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

72msgid "Shut down"

72msgid "Shut down"

73msgstr ""

73msgstr ""

74

74

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

76msgid "Are you sure you want to shut down?"

76msgid "Are you sure you want to shut down?"

77msgstr ""

77msgstr ""

78

78

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

80msgid "Reboot"

80msgid "Reboot"

81msgstr ""

81msgstr ""

82

82

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

84msgid "Are you sure you want to reboot?"

84msgid "Are you sure you want to reboot?"

85msgstr ""

85msgstr ""

86

86

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

88msgid "Power"

88msgid "Power"

89msgstr ""

89msgstr ""

90

90

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

92msgid ""

92msgid ""

93"Are you sure you would like\n"

93"Are you sure you would like\n"

94"to power off?"

94"to power off?"

95msgstr ""

95msgstr ""

96

96

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

98msgid "Power off"

98msgid "Power off"

99msgstr ""

99msgstr ""

100

100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102msgid "Restart"

102msgid "Restart"

103msgstr ""

103msgstr ""

104

104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106msgid "Cancel"

106msgid "Cancel"

107msgstr ""

107msgstr ""

108

108

@@ -110,82 +110,86 @@ msgstr ""

110msgid "Skip intro"

110msgid "Skip intro"

111msgstr "Přeskočit intro"

111msgstr "Přeskočit intro"

112

112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114msgid "Right edge"

114msgid "Right edge"

115msgstr "Pravý okraj"

115msgstr "Pravý okraj"

116

116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118msgid "Try swiping from the right edge to unlock the phone"

118msgid "Try swiping from the right edge to unlock the phone"

119msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."

119msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."

120

120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122msgid "Top edge"

122msgid "Top edge"

123msgstr "Horní okraj"

123msgstr "Horní okraj"

124

124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126msgid "Try swiping from the top edge to access the indicators"

126msgid "Try swiping from the top edge to access the indicators"

127msgstr "Pokuste se zpřístupnit indikátory potažením prstu z horního okraje"

127msgstr "Pokuste se zpřístupnit indikátory potažením prstu z horního okraje"

128

128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130msgid "Close"

130msgid "Close"

131msgstr "Uzavřít"

131msgstr "Uzavřít"

132

132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134msgid "Swipe up again to close the settings screen"

134msgid "Swipe up again to close the settings screen"

135msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"

135msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"

136

136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138msgid "Left edge"

138msgid "Left edge"

139msgstr "Levý okraj"

139msgstr "Levý okraj"

140

140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143msgstr "Pro rychlý přístup k aplikacím potáhněte prst z levého okraje."

143msgstr "Pro rychlý přístup k aplikacím potáhněte prst z levého okraje."

144

144

145−#: qml/Components/EdgeDemo.qml:229

145+#: qml/Components/EdgeDemo.qml:242

146msgid "Well done"

146msgid "Well done"

147msgstr "Výborně"

147msgstr "Výborně"

148

148

149−#: qml/Components/EdgeDemo.qml:230

149+#: qml/Components/EdgeDemo.qml:243

150msgid ""

150msgid ""

151"You have now mastered the edge gestures and can start using the "

151"You have now mastered the edge gestures and can start using the "

152"phone<br><br>Tap on the screen to start"

152"phone<br><br>Tap on the screen to start"

153msgstr ""

153msgstr ""

154

154

155−#: qml/Components/Lockscreen.qml:223

155+#: qml/Components/Lockscreen.qml:238

156msgid "Return to Call"

156msgid "Return to Call"

157msgstr ""

157msgstr ""

158

158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160msgid "Emergency Call"

160msgid "Emergency Call"

161msgstr "Tísňové volání"

161msgstr "Tísňové volání"

162

162

163−#: qml/Components/Lockscreen.qml:255

163+#: qml/Components/Lockscreen.qml:270

164msgid "OK"

164msgid "OK"

165msgstr ""

165msgstr ""

166

166

167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

168msgid "See less"

168msgid "See less"

169msgstr ""

169msgstr ""

170

170

171−#: qml/Dash/GenericScopeView.qml:434

171+#: qml/Dash/GenericScopeView.qml:431

172msgid "See all"

172msgid "See all"

173msgstr ""

173msgstr ""

174

174

175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176#: qml/Panel/SearchIndicator.qml:27

176#: qml/Panel/SearchIndicator.qml:27

177msgid "Search"

177msgid "Search"

178msgstr "Hledat"

178msgstr "Hledat"

179

179

180−#: qml/Dash/PageHeader.qml:268

180+#: qml/Dash/PageHeader.qml:260

181+msgid "Store"

182+msgstr ""

183+

184+#: qml/Dash/PageHeader.qml:277

181msgid "Settings"

185msgid "Settings"

182msgstr ""

186msgstr ""

183

187

184−#: qml/Dash/PageHeader.qml:275

188+#: qml/Dash/PageHeader.qml:284

185msgid "Remove from Favorites"

189msgid "Remove from Favorites"

186msgstr ""

190msgstr ""

187

191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189msgid "Add to Favorites"

193msgid "Add to Favorites"

190msgstr ""

194msgstr ""

191

195

@@ -217,31 +221,23 @@ msgstr ""

217msgid "Release to refresh…"

221msgid "Release to refresh…"

218msgstr ""

222msgstr ""

219

223

220−#: qml/Dash/ScopesOverview.qml:215

224+#: qml/Dash/ScopesList.qml:63

221−msgid "Manage Scopes"

225+msgid "Manage"

222−msgstr ""

223−

224−#: qml/Dash/ScopesOverview.qml:437

225−msgid "Done"

226−msgstr ""

227−

228−#: qml/Dash/ScopesOverview.qml:463

229−msgid "Store"

230msgstr ""

226msgstr ""

231

227

232−#: qml/Dash/ScopesOverviewTab.qml:36

228+#: qml/Dash/ScopesList.qml:107

233−msgid "Favorites"

229+msgid "Home"

234msgstr ""

230msgstr ""

235

231

236−#: qml/Dash/ScopesOverviewTab.qml:54

232+#: qml/Dash/ScopesList.qml:108

237−msgid "All"

233+msgid "Also installed"

238msgstr ""

234msgstr ""

239

235

240#: qml/Greeter/Greeter.qml:174

236#: qml/Greeter/Greeter.qml:174

241msgid "Unlock"

237msgid "Unlock"

242msgstr ""

238msgstr ""

243

239

244−#: qml/Notifications/NotificationMenuItemFactory.qml:116

240+#: qml/Notifications/NotificationMenuItemFactory.qml:128

245msgid "Show password"

241msgid "Show password"

246msgstr "Zobrazit heslo"

242msgstr "Zobrazit heslo"

247

243

@@ -289,60 +285,237 @@ msgstr ""

289msgid "Roaming"

285msgid "Roaming"

290msgstr ""

286msgstr ""

291

287

292−#: qml/Shell.qml:391

288+#: qml/Shell.qml:367

289+#, qt-format

293−msgid "Enter passphrase"

290+msgid "Enter %1"

294msgstr ""

291msgstr ""

295

292

296−#: qml/Shell.qml:392

293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

297−msgid "Sorry, incorrect passphrase"

294+msgid "Enter passphrase"

298msgstr ""

295msgstr ""

299

296

300−#: qml/Shell.qml:393

297+#: qml/Shell.qml:369

301−msgid "Please re-enter"

298+msgid "Enter passcode"

302msgstr ""

299msgstr ""

303

300

304−#: qml/Shell.qml:395

301+#: qml/Shell.qml:370

305−msgid "Enter passcode"

302+#, qt-format

303+msgid "Sorry, incorrect %1"

306msgstr ""

304msgstr ""

307

305

308−#: qml/Shell.qml:396

306+#: qml/Shell.qml:371

309−msgid "Sorry, incorrect passcode"

307+msgid "Sorry, incorrect passphrase"

310msgstr ""

308msgstr ""

311

309

312−#: qml/Shell.qml:399

310+#: qml/Shell.qml:372

313−#, qt-format

311+msgid "Please re-enter"

314−msgid "Enter %1"

315msgstr ""

312msgstr ""

316

313

317−#: qml/Shell.qml:400

314+#: qml/Shell.qml:373

318−#, qt-format

319−msgid "Sorry, incorrect %1"

315+msgid "Sorry, incorrect passcode"

320msgstr ""

316msgstr ""

321

317

322−#: qml/Shell.qml:441

318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

323msgid "Sorry, incorrect passphrase."

319msgid "Sorry, incorrect passphrase."

324msgstr ""

320msgstr ""

325

321

326−#: qml/Shell.qml:442

322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

327msgid "Sorry, incorrect passcode."

323msgid "Sorry, incorrect passcode."

328msgstr ""

324msgstr ""

329

325

330−#: qml/Shell.qml:443

326+#: qml/Shell.qml:469

331msgid "This will be your last attempt."

327msgid "This will be your last attempt."

332msgstr ""

328msgstr ""

333

329

334−#: qml/Shell.qml:445

330+#: qml/Shell.qml:471

335msgid ""

331msgid ""

336"If passphrase is entered incorrectly, your phone will conduct a factory "

332"If passphrase is entered incorrectly, your phone will conduct a factory "

337"reset and all personal data will be deleted."

333"reset and all personal data will be deleted."

338msgstr ""

334msgstr ""

339

335

340−#: qml/Shell.qml:446

336+#: qml/Shell.qml:472

341msgid ""

337msgid ""

342"If passcode is entered incorrectly, your phone will conduct a factory reset "

338"If passcode is entered incorrectly, your phone will conduct a factory reset "

343"and all personal data will be deleted."

339"and all personal data will be deleted."

344msgstr ""

340msgstr ""

345

341

342+#: qml/Wizard/Page.qml:89

343+msgid "Back"

344+msgstr ""

345+

346+#: qml/Wizard/Pages/10-welcome.qml:27

347+msgid "Hi!"

348+msgstr ""

349+

350+#: qml/Wizard/Pages/10-welcome.qml:44

351+msgid "Welcome to your Ubuntu phone."

352+msgstr ""

353+

354+#: qml/Wizard/Pages/10-welcome.qml:52

355+msgid "Let’s get started."

356+msgstr ""

357+

358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

361+#: qml/Wizard/Pages/passwd-set.qml:90

362+msgid "Continue"

363+msgstr ""

364+

365+#: qml/Wizard/Pages/20-sim.qml:25

366+msgid "Add a SIM card and restart your device"

367+msgstr ""

368+

369+#: qml/Wizard/Pages/20-sim.qml:55

370+msgid "Without it, you won’t be able to make calls or use text messaging."

371+msgstr ""

372+

373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

374+msgid "Skip"

375+msgstr ""

376+

377+#: qml/Wizard/Pages/30-passwd-type.qml:39

378+msgid "Lock security"

379+msgstr ""

380+

381+#: qml/Wizard/Pages/30-passwd-type.qml:74

382+msgid "Please select how you’d like to unlock your phone."

383+msgstr ""

384+

385+#: qml/Wizard/Pages/30-passwd-type.qml:97

386+msgid "Swipe"

387+msgstr ""

388+

389+#: qml/Wizard/Pages/30-passwd-type.qml:98

390+msgid "No security"

391+msgstr ""

392+

393+#: qml/Wizard/Pages/30-passwd-type.qml:100

394+msgid "Passcode"

395+msgstr ""

396+

397+#: qml/Wizard/Pages/30-passwd-type.qml:101

398+msgid "4 digits only"

399+msgstr ""

400+

401+#: qml/Wizard/Pages/30-passwd-type.qml:103

402+msgid "Passphrase"

403+msgstr ""

404+

405+#: qml/Wizard/Pages/30-passwd-type.qml:104

406+msgid "Numbers and letters"

407+msgstr ""

408+

409+#: qml/Wizard/Pages/40-wifi.qml:28

410+msgid "Connect to Wi‑Fi"

411+msgstr ""

412+

413+#: qml/Wizard/Pages/40-wifi.qml:147

414+msgid "Available networks…"

415+msgstr ""

416+

417+#: qml/Wizard/Pages/40-wifi.qml:148

418+msgid "No available networks."

419+msgstr ""

420+

421+#: qml/Wizard/Pages/50-location.qml:27

422+msgid "Location"

423+msgstr ""

424+

425+#: qml/Wizard/Pages/50-location.qml:62

426+msgid "Let the phone detect your location:"

427+msgstr ""

428+

429+#: qml/Wizard/Pages/50-location.qml:69

430+msgid "Using GPS only (less accurate)"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/50-location.qml:86

434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

435+msgstr ""

436+

437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

438+#: qml/Wizard/Pages/50-location.qml:103

439+msgid ""

440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

441+"conditions</a>."

442+msgstr ""

443+

444+#: qml/Wizard/Pages/50-location.qml:112

445+msgid "Not at all"

446+msgstr ""

447+

448+#: qml/Wizard/Pages/50-location.qml:124

449+msgid "You can change your mind later in <b>System Settings</b>."

450+msgstr ""

451+

452+#: qml/Wizard/Pages/60-reporting.qml:24

453+msgid "Improving your experience"

454+msgstr ""

455+

456+#: qml/Wizard/Pages/60-reporting.qml:36

457+msgid ""

458+"Your phone is set up to automatically report errors to Canonical and its "

459+"partners, the makers of the operating system."

460+msgstr ""

461+

462+#: qml/Wizard/Pages/60-reporting.qml:43

463+msgid ""

464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

465+"Privacy</b>"

466+msgstr ""

467+

468+#: qml/Wizard/Pages/80-finished.qml:24

469+msgid "All done"

470+msgstr ""

471+

472+#: qml/Wizard/Pages/80-finished.qml:39

473+msgid "Nice work!"

474+msgstr ""

475+

476+#: qml/Wizard/Pages/80-finished.qml:46

477+msgid "Your phone is now ready to use."

478+msgstr ""

479+

480+#: qml/Wizard/Pages/80-finished.qml:53

481+msgid "Finish"

482+msgstr ""

483+

484+#: qml/Wizard/Pages/here-terms.qml:27

485+msgid "Terms & Conditions"

486+msgstr ""

487+

488+#: qml/Wizard/Pages/passwd-confirm.qml:49

489+msgid "Confirm passphrase"

490+msgstr ""

491+

492+#: qml/Wizard/Pages/passwd-confirm.qml:50

493+msgid "Confirm passcode"

494+msgstr ""

495+

496+#: qml/Wizard/Pages/passwd-confirm.qml:53

497+#: qml/Wizard/Pages/passwd-confirm.qml:54

498+msgid "Please try again."

499+msgstr ""

500+

501+#: qml/Wizard/Pages/passwd-set.qml:61

502+msgid "Choose your passcode"

503+msgstr ""

504+

505+#: qml/Wizard/Pages/passwd-set.qml:68

506+msgid "Passphrase must be 4 characters long"

507+msgstr ""

508+

509+#: qml/Wizard/StackButton.qml:39

510+#, qt-format

511+msgid "〈 %1"

512+msgstr ""

513+

514+#: qml/Wizard/StackButton.qml:42

515+#, qt-format

516+msgid "%1 〉"

517+msgstr ""

518+

346#~ msgid "Loading. Please Wait..."

519#~ msgid "Loading. Please Wait..."

347#~ msgstr "Načítám. Čekejte prosím..."

520#~ msgstr "Načítám. Čekejte prosím..."

348

521

po/da.po+248−75

@@ -8,7 +8,7 @@ msgid ""

8msgstr ""

8msgstr ""

9"Project-Id-Version: unity8\n"

9"Project-Id-Version: unity8\n"

10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

11−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

11+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

12"PO-Revision-Date: 2014-07-30 12:37+0000\n"

12"PO-Revision-Date: 2014-07-30 12:37+0000\n"

13"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"

13"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"

14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"

14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"

@@ -16,19 +16,19 @@ msgstr ""

16"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

17"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

20−"X-Generator: Launchpad (build 17231)\n"

20+"X-Generator: Launchpad (build 17286)\n"

21

21

22#: plugins/LightDM/Greeter.cpp:130

22#: plugins/LightDM/Greeter.cpp:130

23msgid "Password: "

23msgid "Password: "

24msgstr ""

24msgstr ""

25

25

26#: plugins/Unity/Launcher/launcheritem.cpp:45

26#: plugins/Unity/Launcher/launcheritem.cpp:45

27−#: plugins/Unity/Launcher/launcheritem.cpp:91

27+#: plugins/Unity/Launcher/launcheritem.cpp:100

28msgid "Pin shortcut"

28msgid "Pin shortcut"

29msgstr "Fastgør genvej"

29msgstr "Fastgør genvej"

30

30

31−#: plugins/Unity/Launcher/launcheritem.cpp:91

31+#: plugins/Unity/Launcher/launcheritem.cpp:100

32msgid "Unpin shortcut"

32msgid "Unpin shortcut"

33msgstr "Gør genvej flytbar"

33msgstr "Gør genvej flytbar"

34

34

@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

51msgstr[0] ""

51msgstr[0] ""

52msgstr[1] ""

52msgstr[1] ""

53

53

54−#: qml/Components/Dialogs.qml:74

54+#: qml/Components/Dialogs.qml:70

55msgid "Log out"

55msgid "Log out"

56msgstr ""

56msgstr ""

57

57

58−#: qml/Components/Dialogs.qml:75

58+#: qml/Components/Dialogs.qml:71

59msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

60msgstr ""

60msgstr ""

61

61

62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63−#: qml/Components/Dialogs.qml:126

63+#: qml/Components/Dialogs.qml:122

64msgid "No"

64msgid "No"

65msgstr ""

65msgstr ""

66

66

67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68−#: qml/Components/Dialogs.qml:133

68+#: qml/Components/Dialogs.qml:129

69msgid "Yes"

69msgid "Yes"

70msgstr ""

70msgstr ""

71

71

72−#: qml/Components/Dialogs.qml:98

72+#: qml/Components/Dialogs.qml:94

73msgid "Shut down"

73msgid "Shut down"

74msgstr ""

74msgstr ""

75

75

76−#: qml/Components/Dialogs.qml:99

76+#: qml/Components/Dialogs.qml:95

77msgid "Are you sure you want to shut down?"

77msgid "Are you sure you want to shut down?"

78msgstr ""

78msgstr ""

79

79

80−#: qml/Components/Dialogs.qml:123

80+#: qml/Components/Dialogs.qml:119

81msgid "Reboot"

81msgid "Reboot"

82msgstr ""

82msgstr ""

83

83

84−#: qml/Components/Dialogs.qml:124

84+#: qml/Components/Dialogs.qml:120

85msgid "Are you sure you want to reboot?"

85msgid "Are you sure you want to reboot?"

86msgstr ""

86msgstr ""

87

87

88−#: qml/Components/Dialogs.qml:148

88+#: qml/Components/Dialogs.qml:144

89msgid "Power"

89msgid "Power"

90msgstr ""

90msgstr ""

91

91

92−#: qml/Components/Dialogs.qml:149

92+#: qml/Components/Dialogs.qml:145

93msgid ""

93msgid ""

94"Are you sure you would like\n"

94"Are you sure you would like\n"

95"to power off?"

95"to power off?"

96msgstr ""

96msgstr ""

97

97

98−#: qml/Components/Dialogs.qml:151

98+#: qml/Components/Dialogs.qml:147

99msgid "Power off"

99msgid "Power off"

100msgstr ""

100msgstr ""

101

101

102−#: qml/Components/Dialogs.qml:161

102+#: qml/Components/Dialogs.qml:157

103msgid "Restart"

103msgid "Restart"

104msgstr ""

104msgstr ""

105

105

106−#: qml/Components/Dialogs.qml:171

106+#: qml/Components/Dialogs.qml:167

107msgid "Cancel"

107msgid "Cancel"

108msgstr ""

108msgstr ""

109

109

@@ -111,43 +111,43 @@ msgstr ""

111msgid "Skip intro"

111msgid "Skip intro"

112msgstr "Spring intro over"

112msgstr "Spring intro over"

113

113

114−#: qml/Components/EdgeDemo.qml:112

114+#: qml/Components/EdgeDemo.qml:125

115msgid "Right edge"

115msgid "Right edge"

116msgstr "Højre kant"

116msgstr "Højre kant"

117

117

118−#: qml/Components/EdgeDemo.qml:113

118+#: qml/Components/EdgeDemo.qml:126

119msgid "Try swiping from the right edge to unlock the phone"

119msgid "Try swiping from the right edge to unlock the phone"

120msgstr "Prøv at stryge fra højre kant for at låse telefonen op"

120msgstr "Prøv at stryge fra højre kant for at låse telefonen op"

121

121

122−#: qml/Components/EdgeDemo.qml:144

122+#: qml/Components/EdgeDemo.qml:157

123msgid "Top edge"

123msgid "Top edge"

124msgstr "Øvre kant"

124msgstr "Øvre kant"

125

125

126−#: qml/Components/EdgeDemo.qml:145

126+#: qml/Components/EdgeDemo.qml:158

127msgid "Try swiping from the top edge to access the indicators"

127msgid "Try swiping from the top edge to access the indicators"

128msgstr "Prøv at stryge fra den øvre kant for at tilgå indikatorerne"

128msgstr "Prøv at stryge fra den øvre kant for at tilgå indikatorerne"

129

129

130−#: qml/Components/EdgeDemo.qml:170

130+#: qml/Components/EdgeDemo.qml:183

131msgid "Close"

131msgid "Close"

132msgstr "Luk"

132msgstr "Luk"

133

133

134−#: qml/Components/EdgeDemo.qml:171

134+#: qml/Components/EdgeDemo.qml:184

135msgid "Swipe up again to close the settings screen"

135msgid "Swipe up again to close the settings screen"

136msgstr "Stryg op igen for at låse indstillingsskærmen"

136msgstr "Stryg op igen for at låse indstillingsskærmen"

137

137

138−#: qml/Components/EdgeDemo.qml:201

138+#: qml/Components/EdgeDemo.qml:214

139msgid "Left edge"

139msgid "Left edge"

140msgstr "Venstre kant"

140msgstr "Venstre kant"

141

141

142−#: qml/Components/EdgeDemo.qml:202

142+#: qml/Components/EdgeDemo.qml:215

143msgid "Swipe from the left to reveal the launcher for quick access to apps"

143msgid "Swipe from the left to reveal the launcher for quick access to apps"

144msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"

144msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"

145

145

146−#: qml/Components/EdgeDemo.qml:229

146+#: qml/Components/EdgeDemo.qml:242

147msgid "Well done"

147msgid "Well done"

148msgstr "Godt gjort"

148msgstr "Godt gjort"

149

149

150−#: qml/Components/EdgeDemo.qml:230

150+#: qml/Components/EdgeDemo.qml:243

151msgid ""

151msgid ""

152"You have now mastered the edge gestures and can start using the "

152"You have now mastered the edge gestures and can start using the "

153"phone<br><br>Tap on the screen to start"

153"phone<br><br>Tap on the screen to start"

@@ -155,40 +155,44 @@ msgstr ""

155"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "

155"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "

156"på skærmen for at starte"

156"på skærmen for at starte"

157

157

158−#: qml/Components/Lockscreen.qml:223

158+#: qml/Components/Lockscreen.qml:238

159msgid "Return to Call"

159msgid "Return to Call"

160msgstr ""

160msgstr ""

161

161

162−#: qml/Components/Lockscreen.qml:223

162+#: qml/Components/Lockscreen.qml:238

163msgid "Emergency Call"

163msgid "Emergency Call"

164msgstr "Nødopkald"

164msgstr "Nødopkald"

165

165

166−#: qml/Components/Lockscreen.qml:255

166+#: qml/Components/Lockscreen.qml:270

167msgid "OK"

167msgid "OK"

168msgstr "O.k."

168msgstr "O.k."

169

169

170−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

170+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

171msgid "See less"

171msgid "See less"

172msgstr "Vis mindre"

172msgstr "Vis mindre"

173

173

174−#: qml/Dash/GenericScopeView.qml:434

174+#: qml/Dash/GenericScopeView.qml:431

175msgid "See all"

175msgid "See all"

176msgstr "Se alle"

176msgstr "Se alle"

177

177

178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

178+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

179#: qml/Panel/SearchIndicator.qml:27

179#: qml/Panel/SearchIndicator.qml:27

180msgid "Search"

180msgid "Search"

181msgstr "Søg"

181msgstr "Søg"

182

182

183−#: qml/Dash/PageHeader.qml:268

183+#: qml/Dash/PageHeader.qml:260

184+msgid "Store"

185+msgstr ""

186+

187+#: qml/Dash/PageHeader.qml:277

184msgid "Settings"

188msgid "Settings"

185msgstr ""

189msgstr ""

186

190

187−#: qml/Dash/PageHeader.qml:275

191+#: qml/Dash/PageHeader.qml:284

188msgid "Remove from Favorites"

192msgid "Remove from Favorites"

189msgstr ""

193msgstr ""

190

194

191−#: qml/Dash/PageHeader.qml:275

195+#: qml/Dash/PageHeader.qml:284

192msgid "Add to Favorites"

196msgid "Add to Favorites"

193msgstr ""

197msgstr ""

194

198

@@ -220,31 +224,23 @@ msgstr ""

220msgid "Release to refresh…"

224msgid "Release to refresh…"

221msgstr ""

225msgstr ""

222

226

223−#: qml/Dash/ScopesOverview.qml:215

227+#: qml/Dash/ScopesList.qml:63

224−msgid "Manage Scopes"

228+msgid "Manage"

225−msgstr ""

226−

227−#: qml/Dash/ScopesOverview.qml:437

228−msgid "Done"

229−msgstr ""

230−

231−#: qml/Dash/ScopesOverview.qml:463

232−msgid "Store"

233msgstr ""

229msgstr ""

234

230

235−#: qml/Dash/ScopesOverviewTab.qml:36

231+#: qml/Dash/ScopesList.qml:107

236−msgid "Favorites"

232+msgid "Home"

237msgstr ""

233msgstr ""

238

234

239−#: qml/Dash/ScopesOverviewTab.qml:54

235+#: qml/Dash/ScopesList.qml:108

240−msgid "All"

236+msgid "Also installed"

241msgstr ""

237msgstr ""

242

238

243#: qml/Greeter/Greeter.qml:174

239#: qml/Greeter/Greeter.qml:174

244msgid "Unlock"

240msgid "Unlock"

245msgstr ""

241msgstr ""

246

242

247−#: qml/Notifications/NotificationMenuItemFactory.qml:116

243+#: qml/Notifications/NotificationMenuItemFactory.qml:128

248msgid "Show password"

244msgid "Show password"

249msgstr "Vis adgangskode"

245msgstr "Vis adgangskode"

250

246

@@ -292,60 +288,237 @@ msgstr ""

292msgid "Roaming"

288msgid "Roaming"

293msgstr ""

289msgstr ""

294

290

295−#: qml/Shell.qml:391

291+#: qml/Shell.qml:367

292+#, qt-format

296−msgid "Enter passphrase"

293+msgid "Enter %1"

297msgstr ""

294msgstr ""

298

295

299−#: qml/Shell.qml:392

296+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

300−msgid "Sorry, incorrect passphrase"

297+msgid "Enter passphrase"

301msgstr ""

298msgstr ""

302

299

303−#: qml/Shell.qml:393

300+#: qml/Shell.qml:369

304−msgid "Please re-enter"

301+msgid "Enter passcode"

305msgstr ""

302msgstr ""

306

303

307−#: qml/Shell.qml:395

304+#: qml/Shell.qml:370

308−msgid "Enter passcode"

305+#, qt-format

306+msgid "Sorry, incorrect %1"

309msgstr ""

307msgstr ""

310

308

311−#: qml/Shell.qml:396

309+#: qml/Shell.qml:371

312−msgid "Sorry, incorrect passcode"

310+msgid "Sorry, incorrect passphrase"

313msgstr ""

311msgstr ""

314

312

315−#: qml/Shell.qml:399

313+#: qml/Shell.qml:372

316−#, qt-format

314+msgid "Please re-enter"

317−msgid "Enter %1"

318msgstr ""

315msgstr ""

319

316

320−#: qml/Shell.qml:400

317+#: qml/Shell.qml:373

321−#, qt-format

322−msgid "Sorry, incorrect %1"

318+msgid "Sorry, incorrect passcode"

323msgstr ""

319msgstr ""

324

320

325−#: qml/Shell.qml:441

321+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

326msgid "Sorry, incorrect passphrase."

322msgid "Sorry, incorrect passphrase."

327msgstr ""

323msgstr ""

328

324

329−#: qml/Shell.qml:442

325+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

330msgid "Sorry, incorrect passcode."

326msgid "Sorry, incorrect passcode."

331msgstr ""

327msgstr ""

332

328

333−#: qml/Shell.qml:443

329+#: qml/Shell.qml:469

334msgid "This will be your last attempt."

330msgid "This will be your last attempt."

335msgstr ""

331msgstr ""

336

332

337−#: qml/Shell.qml:445

333+#: qml/Shell.qml:471

338msgid ""

334msgid ""

339"If passphrase is entered incorrectly, your phone will conduct a factory "

335"If passphrase is entered incorrectly, your phone will conduct a factory "

340"reset and all personal data will be deleted."

336"reset and all personal data will be deleted."

341msgstr ""

337msgstr ""

342

338

343−#: qml/Shell.qml:446

339+#: qml/Shell.qml:472

344msgid ""

340msgid ""

345"If passcode is entered incorrectly, your phone will conduct a factory reset "

341"If passcode is entered incorrectly, your phone will conduct a factory reset "

346"and all personal data will be deleted."

342"and all personal data will be deleted."

347msgstr ""

343msgstr ""

348

344

345+#: qml/Wizard/Page.qml:89

346+msgid "Back"

347+msgstr ""

348+

349+#: qml/Wizard/Pages/10-welcome.qml:27

350+msgid "Hi!"

351+msgstr ""

352+

353+#: qml/Wizard/Pages/10-welcome.qml:44

354+msgid "Welcome to your Ubuntu phone."

355+msgstr ""

356+

357+#: qml/Wizard/Pages/10-welcome.qml:52

358+msgid "Let’s get started."

359+msgstr ""

360+

361+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

362+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

363+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

364+#: qml/Wizard/Pages/passwd-set.qml:90

365+msgid "Continue"

366+msgstr ""

367+

368+#: qml/Wizard/Pages/20-sim.qml:25

369+msgid "Add a SIM card and restart your device"

370+msgstr ""

371+

372+#: qml/Wizard/Pages/20-sim.qml:55

373+msgid "Without it, you won’t be able to make calls or use text messaging."

374+msgstr ""

375+

376+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

377+msgid "Skip"

378+msgstr ""

379+

380+#: qml/Wizard/Pages/30-passwd-type.qml:39

381+msgid "Lock security"

382+msgstr ""

383+

384+#: qml/Wizard/Pages/30-passwd-type.qml:74

385+msgid "Please select how you’d like to unlock your phone."

386+msgstr ""

387+

388+#: qml/Wizard/Pages/30-passwd-type.qml:97

389+msgid "Swipe"

390+msgstr ""

391+

392+#: qml/Wizard/Pages/30-passwd-type.qml:98

393+msgid "No security"

394+msgstr ""

395+

396+#: qml/Wizard/Pages/30-passwd-type.qml:100

397+msgid "Passcode"

398+msgstr ""

399+

400+#: qml/Wizard/Pages/30-passwd-type.qml:101

401+msgid "4 digits only"

402+msgstr ""

403+

404+#: qml/Wizard/Pages/30-passwd-type.qml:103

405+msgid "Passphrase"

406+msgstr ""

407+

408+#: qml/Wizard/Pages/30-passwd-type.qml:104

409+msgid "Numbers and letters"

410+msgstr ""

411+

412+#: qml/Wizard/Pages/40-wifi.qml:28

413+msgid "Connect to Wi‑Fi"

414+msgstr ""

415+

416+#: qml/Wizard/Pages/40-wifi.qml:147

417+msgid "Available networks…"

418+msgstr ""

419+

420+#: qml/Wizard/Pages/40-wifi.qml:148

421+msgid "No available networks."

422+msgstr ""

423+

424+#: qml/Wizard/Pages/50-location.qml:27

425+msgid "Location"

426+msgstr ""

427+

428+#: qml/Wizard/Pages/50-location.qml:62

429+msgid "Let the phone detect your location:"

430+msgstr ""

431+

432+#: qml/Wizard/Pages/50-location.qml:69

433+msgid "Using GPS only (less accurate)"

434+msgstr ""

435+

436+#: qml/Wizard/Pages/50-location.qml:86

437+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

438+msgstr ""

439+

440+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

441+#: qml/Wizard/Pages/50-location.qml:103

442+msgid ""

443+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

444+"conditions</a>."

445+msgstr ""

446+

447+#: qml/Wizard/Pages/50-location.qml:112

448+msgid "Not at all"

449+msgstr ""

450+

451+#: qml/Wizard/Pages/50-location.qml:124

452+msgid "You can change your mind later in <b>System Settings</b>."

453+msgstr ""

454+

455+#: qml/Wizard/Pages/60-reporting.qml:24

456+msgid "Improving your experience"

457+msgstr ""

458+

459+#: qml/Wizard/Pages/60-reporting.qml:36

460+msgid ""

461+"Your phone is set up to automatically report errors to Canonical and its "

462+"partners, the makers of the operating system."

463+msgstr ""

464+

465+#: qml/Wizard/Pages/60-reporting.qml:43

466+msgid ""

467+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

468+"Privacy</b>"

469+msgstr ""

470+

471+#: qml/Wizard/Pages/80-finished.qml:24

472+msgid "All done"

473+msgstr ""

474+

475+#: qml/Wizard/Pages/80-finished.qml:39

476+msgid "Nice work!"

477+msgstr ""

478+

479+#: qml/Wizard/Pages/80-finished.qml:46

480+msgid "Your phone is now ready to use."

481+msgstr ""

482+

483+#: qml/Wizard/Pages/80-finished.qml:53

484+msgid "Finish"

485+msgstr ""

486+

487+#: qml/Wizard/Pages/here-terms.qml:27

488+msgid "Terms & Conditions"

489+msgstr ""

490+

491+#: qml/Wizard/Pages/passwd-confirm.qml:49

492+msgid "Confirm passphrase"

493+msgstr ""

494+

495+#: qml/Wizard/Pages/passwd-confirm.qml:50

496+msgid "Confirm passcode"

497+msgstr ""

498+

499+#: qml/Wizard/Pages/passwd-confirm.qml:53

500+#: qml/Wizard/Pages/passwd-confirm.qml:54

501+msgid "Please try again."

502+msgstr ""

503+

504+#: qml/Wizard/Pages/passwd-set.qml:61

505+msgid "Choose your passcode"

506+msgstr ""

507+

508+#: qml/Wizard/Pages/passwd-set.qml:68

509+msgid "Passphrase must be 4 characters long"

510+msgstr ""

511+

512+#: qml/Wizard/StackButton.qml:39

513+#, qt-format

514+msgid "〈 %1"

515+msgstr ""

516+

517+#: qml/Wizard/StackButton.qml:42

518+#, qt-format

519+msgid "%1 〉"

520+msgstr ""

521+

349#~ msgid "Speaking..."

522#~ msgid "Speaking..."

350#~ msgstr "Taler..."

523#~ msgstr "Taler..."

351

524

po/de.po+268−83

@@ -7,27 +7,27 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-10-21 11:26+0000\n"

11+"PO-Revision-Date: 2014-12-12 01:42+0000\n"

12−"Last-Translator: Alexander Dobetsberger <Unknown>\n"

12+"Last-Translator: Niklas Wenzel <nikwen.developer@gmail.com>\n"

13"Language-Team: German <de@li.org>\n"

13"Language-Team: German <de@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Passwort: "

23msgstr "Passwort: "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Verknüpfung anheften"

28msgstr "Verknüpfung anheften"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Verknüpfung entfernen"

32msgstr "Verknüpfung entfernen"

33

33

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

54msgstr[0] "Bitte warten Sie %1 Minute und versuchen Sie es dann erneut..."

54msgstr[0] "Bitte warten Sie %1 Minute und versuchen Sie es dann erneut..."

55msgstr[1] "Bitte warten Sie %1 Minuten und versuchen Sie es dann erneut..."

55msgstr[1] "Bitte warten Sie %1 Minuten und versuchen Sie es dann erneut..."

56

56

57−#: qml/Components/Dialogs.qml:74

57+#: qml/Components/Dialogs.qml:70

58msgid "Log out"

58msgid "Log out"

59msgstr "Abmelden"

59msgstr "Abmelden"

60

60

61−#: qml/Components/Dialogs.qml:75

61+#: qml/Components/Dialogs.qml:71

62msgid "Are you sure you want to log out?"

62msgid "Are you sure you want to log out?"

63msgstr "Sind Sie sicher, dass Sie sich abmelden wollen?"

63msgstr "Sind Sie sicher, dass Sie sich abmelden wollen?"

64

64

65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

65+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66−#: qml/Components/Dialogs.qml:126

66+#: qml/Components/Dialogs.qml:122

67msgid "No"

67msgid "No"

68msgstr "Nein"

68msgstr "Nein"

69

69

70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

70+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71−#: qml/Components/Dialogs.qml:133

71+#: qml/Components/Dialogs.qml:129

72msgid "Yes"

72msgid "Yes"

73msgstr "Ja"

73msgstr "Ja"

74

74

75−#: qml/Components/Dialogs.qml:98

75+#: qml/Components/Dialogs.qml:94

76msgid "Shut down"

76msgid "Shut down"

77msgstr "Herunterfahren"

77msgstr "Herunterfahren"

78

78

79−#: qml/Components/Dialogs.qml:99

79+#: qml/Components/Dialogs.qml:95

80msgid "Are you sure you want to shut down?"

80msgid "Are you sure you want to shut down?"

81msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"

81msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"

82

82

83−#: qml/Components/Dialogs.qml:123

83+#: qml/Components/Dialogs.qml:119

84msgid "Reboot"

84msgid "Reboot"

85msgstr "Neustart"

85msgstr "Neustart"

86

86

87−#: qml/Components/Dialogs.qml:124

87+#: qml/Components/Dialogs.qml:120

88msgid "Are you sure you want to reboot?"

88msgid "Are you sure you want to reboot?"

89msgstr "Sind Sie sicher, dass Sie neu starten wollen?"

89msgstr "Sind Sie sicher, dass Sie neu starten wollen?"

90

90

91−#: qml/Components/Dialogs.qml:148

91+#: qml/Components/Dialogs.qml:144

92msgid "Power"

92msgid "Power"

93msgstr "Energie"

93msgstr "Energie"

94

94

95−#: qml/Components/Dialogs.qml:149

95+#: qml/Components/Dialogs.qml:145

96msgid ""

96msgid ""

97"Are you sure you would like\n"

97"Are you sure you would like\n"

98"to power off?"

98"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100"Sind Sie sicher, dass Sie das\n"

100"Sind Sie sicher, dass Sie das\n"

101"Gerät ausschalten wollen?"

101"Gerät ausschalten wollen?"

102

102

103−#: qml/Components/Dialogs.qml:151

103+#: qml/Components/Dialogs.qml:147

104msgid "Power off"

104msgid "Power off"

105msgstr "Ausschalten"

105msgstr "Ausschalten"

106

106

107−#: qml/Components/Dialogs.qml:161

107+#: qml/Components/Dialogs.qml:157

108msgid "Restart"

108msgid "Restart"

109msgstr "Neustarten"

109msgstr "Neustarten"

110

110

111−#: qml/Components/Dialogs.qml:171

111+#: qml/Components/Dialogs.qml:167

112msgid "Cancel"

112msgid "Cancel"

113msgstr "Abbrechen"

113msgstr "Abbrechen"

114

114

@@ -116,46 +116,46 @@ msgstr "Abbrechen"

116msgid "Skip intro"

116msgid "Skip intro"

117msgstr "Einführung überspringen"

117msgstr "Einführung überspringen"

118

118

119−#: qml/Components/EdgeDemo.qml:112

119+#: qml/Components/EdgeDemo.qml:125

120msgid "Right edge"

120msgid "Right edge"

121msgstr "Rechter Bildschirmrand"

121msgstr "Rechter Bildschirmrand"

122

122

123−#: qml/Components/EdgeDemo.qml:113

123+#: qml/Components/EdgeDemo.qml:126

124msgid "Try swiping from the right edge to unlock the phone"

124msgid "Try swiping from the right edge to unlock the phone"

125msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"

125msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"

126

126

127−#: qml/Components/EdgeDemo.qml:144

127+#: qml/Components/EdgeDemo.qml:157

128msgid "Top edge"

128msgid "Top edge"

129msgstr "Oberer Bildschirmrand"

129msgstr "Oberer Bildschirmrand"

130

130

131−#: qml/Components/EdgeDemo.qml:145

131+#: qml/Components/EdgeDemo.qml:158

132msgid "Try swiping from the top edge to access the indicators"

132msgid "Try swiping from the top edge to access the indicators"

133msgstr ""

133msgstr ""

134"Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"

134"Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"

135

135

136−#: qml/Components/EdgeDemo.qml:170

136+#: qml/Components/EdgeDemo.qml:183

137msgid "Close"

137msgid "Close"

138msgstr "Schließen"

138msgstr "Schließen"

139

139

140−#: qml/Components/EdgeDemo.qml:171

140+#: qml/Components/EdgeDemo.qml:184

141msgid "Swipe up again to close the settings screen"

141msgid "Swipe up again to close the settings screen"

142msgstr "Wischen Sie erneut nach oben, um das Einstellungsmenü zu schließen"

142msgstr "Wischen Sie erneut nach oben, um das Einstellungsmenü zu schließen"

143

143

144−#: qml/Components/EdgeDemo.qml:201

144+#: qml/Components/EdgeDemo.qml:214

145msgid "Left edge"

145msgid "Left edge"

146msgstr "Linker Rand"

146msgstr "Linker Rand"

147

147

148−#: qml/Components/EdgeDemo.qml:202

148+#: qml/Components/EdgeDemo.qml:215

149msgid "Swipe from the left to reveal the launcher for quick access to apps"

149msgid "Swipe from the left to reveal the launcher for quick access to apps"

150msgstr ""

150msgstr ""

151"Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"

151"Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"

152"Schnellzugriff aufzurufen"

152"Schnellzugriff aufzurufen"

153

153

154−#: qml/Components/EdgeDemo.qml:229

154+#: qml/Components/EdgeDemo.qml:242

155msgid "Well done"

155msgid "Well done"

156msgstr "Gut gemacht"

156msgstr "Gut gemacht"

157

157

158−#: qml/Components/EdgeDemo.qml:230

158+#: qml/Components/EdgeDemo.qml:243

159msgid ""

159msgid ""

160"You have now mastered the edge gestures and can start using the "

160"You have now mastered the edge gestures and can start using the "

161"phone<br><br>Tap on the screen to start"

161"phone<br><br>Tap on the screen to start"

@@ -163,40 +163,44 @@ msgstr ""

163"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "

163"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "

164"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"

164"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"

165

165

166−#: qml/Components/Lockscreen.qml:223

166+#: qml/Components/Lockscreen.qml:238

167msgid "Return to Call"

167msgid "Return to Call"

168−msgstr ""

168+msgstr "Zu Anruf zurückkehren"

169

169

170−#: qml/Components/Lockscreen.qml:223

170+#: qml/Components/Lockscreen.qml:238

171msgid "Emergency Call"

171msgid "Emergency Call"

172msgstr "Notruf"

172msgstr "Notruf"

173

173

174−#: qml/Components/Lockscreen.qml:255

174+#: qml/Components/Lockscreen.qml:270

175msgid "OK"

175msgid "OK"

176msgstr "OK"

176msgstr "OK"

177

177

178−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

178+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

179msgid "See less"

179msgid "See less"

180msgstr "Weniger ansehen"

180msgstr "Weniger ansehen"

181

181

182−#: qml/Dash/GenericScopeView.qml:434

182+#: qml/Dash/GenericScopeView.qml:431

183msgid "See all"

183msgid "See all"

184msgstr "Alle anzeigen"

184msgstr "Alle anzeigen"

185

185

186−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

186+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

187#: qml/Panel/SearchIndicator.qml:27

187#: qml/Panel/SearchIndicator.qml:27

188msgid "Search"

188msgid "Search"

189msgstr "Suchen"

189msgstr "Suchen"

190

190

191−#: qml/Dash/PageHeader.qml:268

191+#: qml/Dash/PageHeader.qml:260

192+msgid "Store"

193+msgstr "Store"

194+

195+#: qml/Dash/PageHeader.qml:277

192msgid "Settings"

196msgid "Settings"

193msgstr "Einstellungen"

197msgstr "Einstellungen"

194

198

195−#: qml/Dash/PageHeader.qml:275

199+#: qml/Dash/PageHeader.qml:284

196msgid "Remove from Favorites"

200msgid "Remove from Favorites"

197msgstr "Aus den Favoriten entfernen"

201msgstr "Aus den Favoriten entfernen"

198

202

199−#: qml/Dash/PageHeader.qml:275

203+#: qml/Dash/PageHeader.qml:284

200msgid "Add to Favorites"

204msgid "Add to Favorites"

201msgstr "Zu Favoriten hinzufügen"

205msgstr "Zu Favoriten hinzufügen"

202

206

@@ -228,31 +232,23 @@ msgstr "Zum Aktualisieren ziehen …"

228msgid "Release to refresh…"

232msgid "Release to refresh…"

229msgstr "Zum Aktualisieren loslassen …"

233msgstr "Zum Aktualisieren loslassen …"

230

234

231−#: qml/Dash/ScopesOverview.qml:215

235+#: qml/Dash/ScopesList.qml:63

232−msgid "Manage Scopes"

236+msgid "Manage"

233−msgstr "Filter verwalten"

237+msgstr "Verwalten"

234−

235−#: qml/Dash/ScopesOverview.qml:437

236−msgid "Done"

237−msgstr "Erledigt"

238−

239−#: qml/Dash/ScopesOverview.qml:463

240−msgid "Store"

241−msgstr "Store"

242

238

243−#: qml/Dash/ScopesOverviewTab.qml:36

239+#: qml/Dash/ScopesList.qml:107

244−msgid "Favorites"

240+msgid "Home"

245−msgstr "Favoriten"

241+msgstr ""

246

242

247−#: qml/Dash/ScopesOverviewTab.qml:54

243+#: qml/Dash/ScopesList.qml:108

248−msgid "All"

244+msgid "Also installed"

249−msgstr "Alle"

245+msgstr ""

250

246

251#: qml/Greeter/Greeter.qml:174

247#: qml/Greeter/Greeter.qml:174

252msgid "Unlock"

248msgid "Unlock"

253msgstr "Entsperren"

249msgstr "Entsperren"

254

250

255−#: qml/Notifications/NotificationMenuItemFactory.qml:116

251+#: qml/Notifications/NotificationMenuItemFactory.qml:128

256msgid "Show password"

252msgid "Show password"

257msgstr "Passwort anzeigen"

253msgstr "Passwort anzeigen"

258

254

@@ -300,49 +296,49 @@ msgstr "SIM-Karte entsperren"

300msgid "Roaming"

296msgid "Roaming"

301msgstr "Roaming"

297msgstr "Roaming"

302

298

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

304msgid "Enter passphrase"

305msgid "Enter passphrase"

305msgstr "Passwort eingeben"

306msgstr "Passwort eingeben"

306

307

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

308msgid "Sorry, incorrect passphrase"

318msgid "Sorry, incorrect passphrase"

309msgstr "Das Passwort ist nicht korrekt"

319msgstr "Das Passwort ist nicht korrekt"

310

320

311−#: qml/Shell.qml:393

321+#: qml/Shell.qml:372

312msgid "Please re-enter"

322msgid "Please re-enter"

313msgstr "Bitte erneut eingeben"

323msgstr "Bitte erneut eingeben"

314

324

315−#: qml/Shell.qml:395

325+#: qml/Shell.qml:373

316−msgid "Enter passcode"

317−msgstr "PIN eingeben"

318−

319−#: qml/Shell.qml:396

320msgid "Sorry, incorrect passcode"

326msgid "Sorry, incorrect passcode"

321msgstr "Falsches Passwort"

327msgstr "Falsches Passwort"

322

328

323−#: qml/Shell.qml:399

329+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

324−#, qt-format

325−msgid "Enter %1"

326−msgstr "%1 eingeben"

327−

328−#: qml/Shell.qml:400

329−#, qt-format

330−msgid "Sorry, incorrect %1"

331−msgstr "%1 falsch"

332−

333−#: qml/Shell.qml:441

334msgid "Sorry, incorrect passphrase."

330msgid "Sorry, incorrect passphrase."

335msgstr "Entschuldigung, falsches Passwort."

331msgstr "Entschuldigung, falsches Passwort."

336

332

337−#: qml/Shell.qml:442

333+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

338msgid "Sorry, incorrect passcode."

334msgid "Sorry, incorrect passcode."

339msgstr "Falsche PIN"

335msgstr "Falsche PIN"

340

336

341−#: qml/Shell.qml:443

337+#: qml/Shell.qml:469

342msgid "This will be your last attempt."

338msgid "This will be your last attempt."

343msgstr "Dies ist Ihr letzter Versuch."

339msgstr "Dies ist Ihr letzter Versuch."

344

340

345−#: qml/Shell.qml:445

341+#: qml/Shell.qml:471

346msgid ""

342msgid ""

347"If passphrase is entered incorrectly, your phone will conduct a factory "

343"If passphrase is entered incorrectly, your phone will conduct a factory "

348"reset and all personal data will be deleted."

344"reset and all personal data will be deleted."

@@ -350,7 +346,7 @@ msgstr ""

350"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "

346"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "

351"zurückgesetzt und alle Daten werden gelöscht."

347"zurückgesetzt und alle Daten werden gelöscht."

352

348

353−#: qml/Shell.qml:446

349+#: qml/Shell.qml:472

354msgid ""

350msgid ""

355"If passcode is entered incorrectly, your phone will conduct a factory reset "

351"If passcode is entered incorrectly, your phone will conduct a factory reset "

356"and all personal data will be deleted."

352"and all personal data will be deleted."

@@ -358,6 +354,183 @@ msgstr ""

358"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "

354"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "

359"zurückgesetzt und alle Daten werden gelöscht."

355"zurückgesetzt und alle Daten werden gelöscht."

360

356

357+#: qml/Wizard/Page.qml:89

358+msgid "Back"

359+msgstr ""

360+

361+#: qml/Wizard/Pages/10-welcome.qml:27

362+msgid "Hi!"

363+msgstr ""

364+

365+#: qml/Wizard/Pages/10-welcome.qml:44

366+msgid "Welcome to your Ubuntu phone."

367+msgstr ""

368+

369+#: qml/Wizard/Pages/10-welcome.qml:52

370+msgid "Let’s get started."

371+msgstr ""

372+

373+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

374+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

375+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

376+#: qml/Wizard/Pages/passwd-set.qml:90

377+msgid "Continue"

378+msgstr ""

379+

380+#: qml/Wizard/Pages/20-sim.qml:25

381+msgid "Add a SIM card and restart your device"

382+msgstr ""

383+

384+#: qml/Wizard/Pages/20-sim.qml:55

385+msgid "Without it, you won’t be able to make calls or use text messaging."

386+msgstr ""

387+

388+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

389+msgid "Skip"

390+msgstr ""

391+

392+#: qml/Wizard/Pages/30-passwd-type.qml:39

393+msgid "Lock security"

394+msgstr ""

395+

396+#: qml/Wizard/Pages/30-passwd-type.qml:74

397+msgid "Please select how you’d like to unlock your phone."

398+msgstr ""

399+

400+#: qml/Wizard/Pages/30-passwd-type.qml:97

401+msgid "Swipe"

402+msgstr ""

403+

404+#: qml/Wizard/Pages/30-passwd-type.qml:98

405+msgid "No security"

406+msgstr ""

407+

408+#: qml/Wizard/Pages/30-passwd-type.qml:100

409+msgid "Passcode"

410+msgstr ""

411+

412+#: qml/Wizard/Pages/30-passwd-type.qml:101

413+msgid "4 digits only"

414+msgstr ""

415+

416+#: qml/Wizard/Pages/30-passwd-type.qml:103

417+msgid "Passphrase"

418+msgstr ""

419+

420+#: qml/Wizard/Pages/30-passwd-type.qml:104

421+msgid "Numbers and letters"

422+msgstr ""

423+

424+#: qml/Wizard/Pages/40-wifi.qml:28

425+msgid "Connect to Wi‑Fi"

426+msgstr ""

427+

428+#: qml/Wizard/Pages/40-wifi.qml:147

429+msgid "Available networks…"

430+msgstr ""

431+

432+#: qml/Wizard/Pages/40-wifi.qml:148

433+msgid "No available networks."

434+msgstr ""

435+

436+#: qml/Wizard/Pages/50-location.qml:27

437+msgid "Location"

438+msgstr ""

439+

440+#: qml/Wizard/Pages/50-location.qml:62

441+msgid "Let the phone detect your location:"

442+msgstr ""

443+

444+#: qml/Wizard/Pages/50-location.qml:69

445+msgid "Using GPS only (less accurate)"

446+msgstr ""

447+

448+#: qml/Wizard/Pages/50-location.qml:86

449+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

450+msgstr ""

451+

452+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

453+#: qml/Wizard/Pages/50-location.qml:103

454+msgid ""

455+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

456+"conditions</a>."

457+msgstr ""

458+

459+#: qml/Wizard/Pages/50-location.qml:112

460+msgid "Not at all"

461+msgstr ""

462+

463+#: qml/Wizard/Pages/50-location.qml:124

464+msgid "You can change your mind later in <b>System Settings</b>."

465+msgstr ""

466+

467+#: qml/Wizard/Pages/60-reporting.qml:24

468+msgid "Improving your experience"

469+msgstr ""

470+

471+#: qml/Wizard/Pages/60-reporting.qml:36

472+msgid ""

473+"Your phone is set up to automatically report errors to Canonical and its "

474+"partners, the makers of the operating system."

475+msgstr ""

476+

477+#: qml/Wizard/Pages/60-reporting.qml:43

478+msgid ""

479+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

480+"Privacy</b>"

481+msgstr ""

482+

483+#: qml/Wizard/Pages/80-finished.qml:24

484+msgid "All done"

485+msgstr ""

486+

487+#: qml/Wizard/Pages/80-finished.qml:39

488+msgid "Nice work!"

489+msgstr ""

490+

491+#: qml/Wizard/Pages/80-finished.qml:46

492+msgid "Your phone is now ready to use."

493+msgstr ""

494+

495+#: qml/Wizard/Pages/80-finished.qml:53

496+msgid "Finish"

497+msgstr ""

498+

499+#: qml/Wizard/Pages/here-terms.qml:27

500+msgid "Terms & Conditions"

501+msgstr ""

502+

503+#: qml/Wizard/Pages/passwd-confirm.qml:49

504+msgid "Confirm passphrase"

505+msgstr ""

506+

507+#: qml/Wizard/Pages/passwd-confirm.qml:50

508+msgid "Confirm passcode"

509+msgstr ""

510+

511+#: qml/Wizard/Pages/passwd-confirm.qml:53

512+#: qml/Wizard/Pages/passwd-confirm.qml:54

513+msgid "Please try again."

514+msgstr ""

515+

516+#: qml/Wizard/Pages/passwd-set.qml:61

517+msgid "Choose your passcode"

518+msgstr ""

519+

520+#: qml/Wizard/Pages/passwd-set.qml:68

521+msgid "Passphrase must be 4 characters long"

522+msgstr ""

523+

524+#: qml/Wizard/StackButton.qml:39

525+#, qt-format

526+msgid "〈 %1"

527+msgstr ""

528+

529+#: qml/Wizard/StackButton.qml:42

530+#, qt-format

531+msgid "%1 〉"

532+msgstr ""

533+

361#~ msgid "Confirm"

534#~ msgid "Confirm"

362#~ msgstr "Bestätigen"

535#~ msgstr "Bestätigen"

363

536

@@ -372,3 +545,15 @@ msgstr ""

372

545

373#~ msgid "Speaking..."

546#~ msgid "Speaking..."

374#~ msgstr "Sprechen Sie …"

547#~ msgstr "Sprechen Sie …"

548+

549+#~ msgid "All"

550+#~ msgstr "Alle"

551+

552+#~ msgid "Done"

553+#~ msgstr "Erledigt"

554+

555+#~ msgid "Favorites"

556+#~ msgstr "Favoriten"

557+

558+#~ msgid "Manage Scopes"

559+#~ msgstr "Filter verwalten"

po/el.po+262−80

@@ -7,27 +7,27 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-11-08 18:38+0000\n"

11"PO-Revision-Date: 2014-11-08 18:38+0000\n"

12−"Last-Translator: Stathis Iosifidis <Unknown>\n"

12+"Last-Translator: Efstathios Iosifidis <Unknown>\n"

13"Language-Team: Greek <el@li.org>\n"

13"Language-Team: Greek <el@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Κωδικός πρόσβασης: "

23msgstr "Κωδικός πρόσβασης: "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Καρφίτσωμα συντόμευσης"

28msgstr "Καρφίτσωμα συντόμευσης"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Ξεκαρφίτσωμα συντόμευσης"

32msgstr "Ξεκαρφίτσωμα συντόμευσης"

33

33

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

54msgstr[0] "Παρακαλώ περιμένετε %1 λεπτό και δοκιμάστε ξανά..."

54msgstr[0] "Παρακαλώ περιμένετε %1 λεπτό και δοκιμάστε ξανά..."

55msgstr[1] "Παρακαλώ περιμένετε %1 λεπτά και δοκιμάστε ξανά..."

55msgstr[1] "Παρακαλώ περιμένετε %1 λεπτά και δοκιμάστε ξανά..."

56

56

57−#: qml/Components/Dialogs.qml:74

57+#: qml/Components/Dialogs.qml:70

58msgid "Log out"

58msgid "Log out"

59msgstr "Αποσύνδεση"

59msgstr "Αποσύνδεση"

60

60

61−#: qml/Components/Dialogs.qml:75

61+#: qml/Components/Dialogs.qml:71

62msgid "Are you sure you want to log out?"

62msgid "Are you sure you want to log out?"

63msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε;"

63msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε;"

64

64

65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

65+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66−#: qml/Components/Dialogs.qml:126

66+#: qml/Components/Dialogs.qml:122

67msgid "No"

67msgid "No"

68msgstr "Όχι"

68msgstr "Όχι"

69

69

70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

70+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71−#: qml/Components/Dialogs.qml:133

71+#: qml/Components/Dialogs.qml:129

72msgid "Yes"

72msgid "Yes"

73msgstr "Ναι"

73msgstr "Ναι"

74

74

75−#: qml/Components/Dialogs.qml:98

75+#: qml/Components/Dialogs.qml:94

76msgid "Shut down"

76msgid "Shut down"

77msgstr "Τερματισμός λειτουργίας"

77msgstr "Τερματισμός λειτουργίας"

78

78

79−#: qml/Components/Dialogs.qml:99

79+#: qml/Components/Dialogs.qml:95

80msgid "Are you sure you want to shut down?"

80msgid "Are you sure you want to shut down?"

81msgstr "Επιθυμείτε σίγουρα τερματισμό;"

81msgstr "Επιθυμείτε σίγουρα τερματισμό;"

82

82

83−#: qml/Components/Dialogs.qml:123

83+#: qml/Components/Dialogs.qml:119

84msgid "Reboot"

84msgid "Reboot"

85msgstr "Επανεκκίνηση"

85msgstr "Επανεκκίνηση"

86

86

87−#: qml/Components/Dialogs.qml:124

87+#: qml/Components/Dialogs.qml:120

88msgid "Are you sure you want to reboot?"

88msgid "Are you sure you want to reboot?"

89msgstr "Επιθυμείτε σίγουρα επανεκκίνηση;"

89msgstr "Επιθυμείτε σίγουρα επανεκκίνηση;"

90

90

91−#: qml/Components/Dialogs.qml:148

91+#: qml/Components/Dialogs.qml:144

92msgid "Power"

92msgid "Power"

93msgstr ""

93msgstr ""

94

94

95−#: qml/Components/Dialogs.qml:149

95+#: qml/Components/Dialogs.qml:145

96msgid ""

96msgid ""

97"Are you sure you would like\n"

97"Are you sure you would like\n"

98"to power off?"

98"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100"Επιθυμείτε σίγουρα τον\n"

100"Επιθυμείτε σίγουρα τον\n"

101"τερματισμό λειτουργίας;"

101"τερματισμό λειτουργίας;"

102

102

103−#: qml/Components/Dialogs.qml:151

103+#: qml/Components/Dialogs.qml:147

104msgid "Power off"

104msgid "Power off"

105msgstr "Τερματισμός"

105msgstr "Τερματισμός"

106

106

107−#: qml/Components/Dialogs.qml:161

107+#: qml/Components/Dialogs.qml:157

108msgid "Restart"

108msgid "Restart"

109msgstr "Επανεκκίνηση"

109msgstr "Επανεκκίνηση"

110

110

111−#: qml/Components/Dialogs.qml:171

111+#: qml/Components/Dialogs.qml:167

112msgid "Cancel"

112msgid "Cancel"

113msgstr "Ακύρωση"

113msgstr "Ακύρωση"

114

114

@@ -116,45 +116,45 @@ msgstr "Ακύρωση"

116msgid "Skip intro"

116msgid "Skip intro"

117msgstr "Παράλειψη εισαγωγής"

117msgstr "Παράλειψη εισαγωγής"

118

118

119−#: qml/Components/EdgeDemo.qml:112

119+#: qml/Components/EdgeDemo.qml:125

120msgid "Right edge"

120msgid "Right edge"

121msgstr "Δεξί άκρο"

121msgstr "Δεξί άκρο"

122

122

123−#: qml/Components/EdgeDemo.qml:113

123+#: qml/Components/EdgeDemo.qml:126

124msgid "Try swiping from the right edge to unlock the phone"

124msgid "Try swiping from the right edge to unlock the phone"

125msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"

125msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"

126

126

127−#: qml/Components/EdgeDemo.qml:144

127+#: qml/Components/EdgeDemo.qml:157

128msgid "Top edge"

128msgid "Top edge"

129msgstr "Πάνω άκρο"

129msgstr "Πάνω άκρο"

130

130

131−#: qml/Components/EdgeDemo.qml:145

131+#: qml/Components/EdgeDemo.qml:158

132msgid "Try swiping from the top edge to access the indicators"

132msgid "Try swiping from the top edge to access the indicators"

133msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"

133msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"

134

134

135−#: qml/Components/EdgeDemo.qml:170

135+#: qml/Components/EdgeDemo.qml:183

136msgid "Close"

136msgid "Close"

137msgstr "Κλείσιμο"

137msgstr "Κλείσιμο"

138

138

139−#: qml/Components/EdgeDemo.qml:171

139+#: qml/Components/EdgeDemo.qml:184

140msgid "Swipe up again to close the settings screen"

140msgid "Swipe up again to close the settings screen"

141msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"

141msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"

142

142

143−#: qml/Components/EdgeDemo.qml:201

143+#: qml/Components/EdgeDemo.qml:214

144msgid "Left edge"

144msgid "Left edge"

145msgstr "Αριστερό άκρο"

145msgstr "Αριστερό άκρο"

146

146

147−#: qml/Components/EdgeDemo.qml:202

147+#: qml/Components/EdgeDemo.qml:215

148msgid "Swipe from the left to reveal the launcher for quick access to apps"

148msgid "Swipe from the left to reveal the launcher for quick access to apps"

149msgstr ""

149msgstr ""

150"Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "

150"Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "

151"στις εφαρμογές"

151"στις εφαρμογές"

152

152

153−#: qml/Components/EdgeDemo.qml:229

153+#: qml/Components/EdgeDemo.qml:242

154msgid "Well done"

154msgid "Well done"

155msgstr "Συγχαρητήρια"

155msgstr "Συγχαρητήρια"

156

156

157−#: qml/Components/EdgeDemo.qml:230

157+#: qml/Components/EdgeDemo.qml:243

158msgid ""

158msgid ""

159"You have now mastered the edge gestures and can start using the "

159"You have now mastered the edge gestures and can start using the "

160"phone<br><br>Tap on the screen to start"

160"phone<br><br>Tap on the screen to start"

@@ -162,40 +162,44 @@ msgstr ""

162"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "

162"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "

163"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"

163"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"

164

164

165−#: qml/Components/Lockscreen.qml:223

165+#: qml/Components/Lockscreen.qml:238

166msgid "Return to Call"

166msgid "Return to Call"

167msgstr "Επιστροφή στην κλήση"

167msgstr "Επιστροφή στην κλήση"

168

168

169−#: qml/Components/Lockscreen.qml:223

169+#: qml/Components/Lockscreen.qml:238

170msgid "Emergency Call"

170msgid "Emergency Call"

171msgstr "Κλήση έκτακτης ανάγκης"

171msgstr "Κλήση έκτακτης ανάγκης"

172

172

173−#: qml/Components/Lockscreen.qml:255

173+#: qml/Components/Lockscreen.qml:270

174msgid "OK"

174msgid "OK"

175msgstr "OK"

175msgstr "OK"

176

176

177−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

177+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

178msgid "See less"

178msgid "See less"

179msgstr "Λιγότερα"

179msgstr "Λιγότερα"

180

180

181−#: qml/Dash/GenericScopeView.qml:434

181+#: qml/Dash/GenericScopeView.qml:431

182msgid "See all"

182msgid "See all"

183msgstr "Εμφάνιση όλων"

183msgstr "Εμφάνιση όλων"

184

184

185−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

185+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

186#: qml/Panel/SearchIndicator.qml:27

186#: qml/Panel/SearchIndicator.qml:27

187msgid "Search"

187msgid "Search"

188msgstr "Αναζήτηση"

188msgstr "Αναζήτηση"

189

189

190−#: qml/Dash/PageHeader.qml:268

190+#: qml/Dash/PageHeader.qml:260

191+msgid "Store"

192+msgstr "Κατάστημα"

193+

194+#: qml/Dash/PageHeader.qml:277

191msgid "Settings"

195msgid "Settings"

192msgstr "Ρυθμίσεις"

196msgstr "Ρυθμίσεις"

193

197

194−#: qml/Dash/PageHeader.qml:275

198+#: qml/Dash/PageHeader.qml:284

195msgid "Remove from Favorites"

199msgid "Remove from Favorites"

196msgstr "Αφαίρεση από τα αγαπημένα"

200msgstr "Αφαίρεση από τα αγαπημένα"

197

201

198−#: qml/Dash/PageHeader.qml:275

202+#: qml/Dash/PageHeader.qml:284

199msgid "Add to Favorites"

203msgid "Add to Favorites"

200msgstr "Προσθήκη στα αγαπημένα"

204msgstr "Προσθήκη στα αγαπημένα"

201

205

@@ -227,31 +231,23 @@ msgstr ""

227msgid "Release to refresh…"

231msgid "Release to refresh…"

228msgstr ""

232msgstr ""

229

233

230−#: qml/Dash/ScopesOverview.qml:215

234+#: qml/Dash/ScopesList.qml:63

231−msgid "Manage Scopes"

235+msgid "Manage"

232msgstr ""

236msgstr ""

233

237

234−#: qml/Dash/ScopesOverview.qml:437

238+#: qml/Dash/ScopesList.qml:107

235−msgid "Done"

236−msgstr "Ολοκληρώθηκε"

237−

238−#: qml/Dash/ScopesOverview.qml:463

239−msgid "Store"

240−msgstr "Κατάστημα"

241−

242−#: qml/Dash/ScopesOverviewTab.qml:36

243−msgid "Favorites"

239+msgid "Home"

244−msgstr "Αγαπημένα"

240+msgstr ""

245

241

246−#: qml/Dash/ScopesOverviewTab.qml:54

242+#: qml/Dash/ScopesList.qml:108

247−msgid "All"

243+msgid "Also installed"

248−msgstr "Όλα"

244+msgstr ""

249

245

250#: qml/Greeter/Greeter.qml:174

246#: qml/Greeter/Greeter.qml:174

251msgid "Unlock"

247msgid "Unlock"

252msgstr "Ξεκλείδωμα"

248msgstr "Ξεκλείδωμα"

253

249

254−#: qml/Notifications/NotificationMenuItemFactory.qml:116

250+#: qml/Notifications/NotificationMenuItemFactory.qml:128

255msgid "Show password"

251msgid "Show password"

256msgstr "Εμφάνιση κωδικού"

252msgstr "Εμφάνιση κωδικού"

257

253

@@ -299,60 +295,237 @@ msgstr "Ξεκλείδωμα SIM"

299msgid "Roaming"

295msgid "Roaming"

300msgstr "Περιαγωγή"

296msgstr "Περιαγωγή"

301

297

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

303msgid "Enter passphrase"

304msgid "Enter passphrase"

304msgstr "Εισαγωγή συνθηματικού"

305msgstr "Εισαγωγή συνθηματικού"

305

306

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

307msgid "Sorry, incorrect passphrase"

317msgid "Sorry, incorrect passphrase"

308msgstr "Συγνώμη, μη έγκυρο συνθηματικό"

318msgstr "Συγνώμη, μη έγκυρο συνθηματικό"

309

319

310−#: qml/Shell.qml:393

320+#: qml/Shell.qml:372

311msgid "Please re-enter"

321msgid "Please re-enter"

312msgstr "Παρακαλώ πληκτρολογήστε ξανά"

322msgstr "Παρακαλώ πληκτρολογήστε ξανά"

313

323

314−#: qml/Shell.qml:395

324+#: qml/Shell.qml:373

315−msgid "Enter passcode"

316−msgstr "Εισαγωγή κωδικού"

317−

318−#: qml/Shell.qml:396

319msgid "Sorry, incorrect passcode"

325msgid "Sorry, incorrect passcode"

320msgstr ""

326msgstr ""

321

327

322−#: qml/Shell.qml:399

328+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

323−#, qt-format

324−msgid "Enter %1"

325−msgstr "Εισάγετε %1"

326−

327−#: qml/Shell.qml:400

328−#, qt-format

329−msgid "Sorry, incorrect %1"

330−msgstr "Συγνώμη, μη έγκυρο %1"

331−

332−#: qml/Shell.qml:441

333msgid "Sorry, incorrect passphrase."

329msgid "Sorry, incorrect passphrase."

334msgstr ""

330msgstr ""

335

331

336−#: qml/Shell.qml:442

332+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

337msgid "Sorry, incorrect passcode."

333msgid "Sorry, incorrect passcode."

338msgstr ""

334msgstr ""

339

335

340−#: qml/Shell.qml:443

336+#: qml/Shell.qml:469

341msgid "This will be your last attempt."

337msgid "This will be your last attempt."

342msgstr ""

338msgstr ""

343

339

344−#: qml/Shell.qml:445

340+#: qml/Shell.qml:471

345msgid ""

341msgid ""

346"If passphrase is entered incorrectly, your phone will conduct a factory "

342"If passphrase is entered incorrectly, your phone will conduct a factory "

347"reset and all personal data will be deleted."

343"reset and all personal data will be deleted."

348msgstr ""

344msgstr ""

349

345

350−#: qml/Shell.qml:446

346+#: qml/Shell.qml:472

351msgid ""

347msgid ""

352"If passcode is entered incorrectly, your phone will conduct a factory reset "

348"If passcode is entered incorrectly, your phone will conduct a factory reset "

353"and all personal data will be deleted."

349"and all personal data will be deleted."

354msgstr ""

350msgstr ""

355

351

352+#: qml/Wizard/Page.qml:89

353+msgid "Back"

354+msgstr ""

355+

356+#: qml/Wizard/Pages/10-welcome.qml:27

357+msgid "Hi!"

358+msgstr ""

359+

360+#: qml/Wizard/Pages/10-welcome.qml:44

361+msgid "Welcome to your Ubuntu phone."

362+msgstr ""

363+

364+#: qml/Wizard/Pages/10-welcome.qml:52

365+msgid "Let’s get started."

366+msgstr ""

367+

368+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

369+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

370+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

371+#: qml/Wizard/Pages/passwd-set.qml:90

372+msgid "Continue"

373+msgstr ""

374+

375+#: qml/Wizard/Pages/20-sim.qml:25

376+msgid "Add a SIM card and restart your device"

377+msgstr ""

378+

379+#: qml/Wizard/Pages/20-sim.qml:55

380+msgid "Without it, you won’t be able to make calls or use text messaging."

381+msgstr ""

382+

383+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

384+msgid "Skip"

385+msgstr ""

386+

387+#: qml/Wizard/Pages/30-passwd-type.qml:39

388+msgid "Lock security"

389+msgstr ""

390+

391+#: qml/Wizard/Pages/30-passwd-type.qml:74

392+msgid "Please select how you’d like to unlock your phone."

393+msgstr ""

394+

395+#: qml/Wizard/Pages/30-passwd-type.qml:97

396+msgid "Swipe"

397+msgstr ""

398+

399+#: qml/Wizard/Pages/30-passwd-type.qml:98

400+msgid "No security"

401+msgstr ""

402+

403+#: qml/Wizard/Pages/30-passwd-type.qml:100

404+msgid "Passcode"

405+msgstr ""

406+

407+#: qml/Wizard/Pages/30-passwd-type.qml:101

408+msgid "4 digits only"

409+msgstr ""

410+

411+#: qml/Wizard/Pages/30-passwd-type.qml:103

412+msgid "Passphrase"

413+msgstr ""

414+

415+#: qml/Wizard/Pages/30-passwd-type.qml:104

416+msgid "Numbers and letters"

417+msgstr ""

418+

419+#: qml/Wizard/Pages/40-wifi.qml:28

420+msgid "Connect to Wi‑Fi"

421+msgstr ""

422+

423+#: qml/Wizard/Pages/40-wifi.qml:147

424+msgid "Available networks…"

425+msgstr ""

426+

427+#: qml/Wizard/Pages/40-wifi.qml:148

428+msgid "No available networks."

429+msgstr ""

430+

431+#: qml/Wizard/Pages/50-location.qml:27

432+msgid "Location"

433+msgstr ""

434+

435+#: qml/Wizard/Pages/50-location.qml:62

436+msgid "Let the phone detect your location:"

437+msgstr ""

438+

439+#: qml/Wizard/Pages/50-location.qml:69

440+msgid "Using GPS only (less accurate)"

441+msgstr ""

442+

443+#: qml/Wizard/Pages/50-location.qml:86

444+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

445+msgstr ""

446+

447+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

448+#: qml/Wizard/Pages/50-location.qml:103

449+msgid ""

450+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

451+"conditions</a>."

452+msgstr ""

453+

454+#: qml/Wizard/Pages/50-location.qml:112

455+msgid "Not at all"

456+msgstr ""

457+

458+#: qml/Wizard/Pages/50-location.qml:124

459+msgid "You can change your mind later in <b>System Settings</b>."

460+msgstr ""

461+

462+#: qml/Wizard/Pages/60-reporting.qml:24

463+msgid "Improving your experience"

464+msgstr ""

465+

466+#: qml/Wizard/Pages/60-reporting.qml:36

467+msgid ""

468+"Your phone is set up to automatically report errors to Canonical and its "

469+"partners, the makers of the operating system."

470+msgstr ""

471+

472+#: qml/Wizard/Pages/60-reporting.qml:43

473+msgid ""

474+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

475+"Privacy</b>"

476+msgstr ""

477+

478+#: qml/Wizard/Pages/80-finished.qml:24

479+msgid "All done"

480+msgstr ""

481+

482+#: qml/Wizard/Pages/80-finished.qml:39

483+msgid "Nice work!"

484+msgstr ""

485+

486+#: qml/Wizard/Pages/80-finished.qml:46

487+msgid "Your phone is now ready to use."

488+msgstr ""

489+

490+#: qml/Wizard/Pages/80-finished.qml:53

491+msgid "Finish"

492+msgstr ""

493+

494+#: qml/Wizard/Pages/here-terms.qml:27

495+msgid "Terms & Conditions"

496+msgstr ""

497+

498+#: qml/Wizard/Pages/passwd-confirm.qml:49

499+msgid "Confirm passphrase"

500+msgstr ""

501+

502+#: qml/Wizard/Pages/passwd-confirm.qml:50

503+msgid "Confirm passcode"

504+msgstr ""

505+

506+#: qml/Wizard/Pages/passwd-confirm.qml:53

507+#: qml/Wizard/Pages/passwd-confirm.qml:54

508+msgid "Please try again."

509+msgstr ""

510+

511+#: qml/Wizard/Pages/passwd-set.qml:61

512+msgid "Choose your passcode"

513+msgstr ""

514+

515+#: qml/Wizard/Pages/passwd-set.qml:68

516+msgid "Passphrase must be 4 characters long"

517+msgstr ""

518+

519+#: qml/Wizard/StackButton.qml:39

520+#, qt-format

521+msgid "〈 %1"

522+msgstr ""

523+

524+#: qml/Wizard/StackButton.qml:42

525+#, qt-format

526+msgid "%1 〉"

527+msgstr ""

528+

356#~ msgid "Confirm"

529#~ msgid "Confirm"

357#~ msgstr "Επιβεβαίωση"

530#~ msgstr "Επιβεβαίωση"

358

531

@@ -367,3 +540,12 @@ msgstr ""

367

540

368#~ msgid "Loading. Please Wait..."

541#~ msgid "Loading. Please Wait..."

369#~ msgstr "Γίνεται φόρτωση. Παρακαλώ περιμένετε..."

542#~ 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 ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-10-12 09:41+0000\n"

11"PO-Revision-Date: 2014-10-12 09:41+0000\n"

12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"

12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"

13"Language-Team: English (Australia) <en_AU@li.org>\n"

13"Language-Team: English (Australia) <en_AU@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Password: "

23msgstr "Password: "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Pin shortcut"

28msgstr "Pin shortcut"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Unpin shortcut"

32msgstr "Unpin shortcut"

33

33

@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] "Please wait %1 minute and then try again…"

50msgstr[0] "Please wait %1 minute and then try again…"

51msgstr[1] "Please wait %1 minutes and then try again…"

51msgstr[1] "Please wait %1 minutes and then try again…"

52

52

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

54msgid "Log out"

54msgid "Log out"

55msgstr "Log out"

55msgstr "Log out"

56

56

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

58msgid "Are you sure you want to log out?"

58msgid "Are you sure you want to log out?"

59msgstr "Are you sure you want to log out?"

59msgstr "Are you sure you want to log out?"

60

60

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:122

63msgid "No"

63msgid "No"

64msgstr "No"

64msgstr "No"

65

65

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:129

68msgid "Yes"

68msgid "Yes"

69msgstr "Yes"

69msgstr "Yes"

70

70

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

72msgid "Shut down"

72msgid "Shut down"

73msgstr "Shut down"

73msgstr "Shut down"

74

74

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

76msgid "Are you sure you want to shut down?"

76msgid "Are you sure you want to shut down?"

77msgstr "Are you sure you want to shut down?"

77msgstr "Are you sure you want to shut down?"

78

78

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

80msgid "Reboot"

80msgid "Reboot"

81msgstr "Reboot"

81msgstr "Reboot"

82

82

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

84msgid "Are you sure you want to reboot?"

84msgid "Are you sure you want to reboot?"

85msgstr "Are you sure you want to reboot?"

85msgstr "Are you sure you want to reboot?"

86

86

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

88msgid "Power"

88msgid "Power"

89msgstr "Power"

89msgstr "Power"

90

90

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

92msgid ""

92msgid ""

93"Are you sure you would like\n"

93"Are you sure you would like\n"

94"to power off?"

94"to power off?"

@@ -96,15 +96,15 @@ msgstr ""

96"Are you sure you would like\n"

96"Are you sure you would like\n"

97"to power off?"

97"to power off?"

98

98

99−#: qml/Components/Dialogs.qml:151

99+#: qml/Components/Dialogs.qml:147

100msgid "Power off"

100msgid "Power off"

101msgstr "Power off"

101msgstr "Power off"

102

102

103−#: qml/Components/Dialogs.qml:161

103+#: qml/Components/Dialogs.qml:157

104msgid "Restart"

104msgid "Restart"

105msgstr "Restart"

105msgstr "Restart"

106

106

107−#: qml/Components/Dialogs.qml:171

107+#: qml/Components/Dialogs.qml:167

108msgid "Cancel"

108msgid "Cancel"

109msgstr "Cancel"

109msgstr "Cancel"

110

110

@@ -112,43 +112,43 @@ msgstr "Cancel"

112msgid "Skip intro"

112msgid "Skip intro"

113msgstr "Skip intro"

113msgstr "Skip intro"

114

114

115−#: qml/Components/EdgeDemo.qml:112

115+#: qml/Components/EdgeDemo.qml:125

116msgid "Right edge"

116msgid "Right edge"

117msgstr "Right edge"

117msgstr "Right edge"

118

118

119−#: qml/Components/EdgeDemo.qml:113

119+#: qml/Components/EdgeDemo.qml:126

120msgid "Try swiping from the right edge to unlock the phone"

120msgid "Try swiping from the right edge to unlock the phone"

121msgstr "Try swiping from the right edge to unlock the phone"

121msgstr "Try swiping from the right edge to unlock the phone"

122

122

123−#: qml/Components/EdgeDemo.qml:144

123+#: qml/Components/EdgeDemo.qml:157

124msgid "Top edge"

124msgid "Top edge"

125msgstr "Top edge"

125msgstr "Top edge"

126

126

127−#: qml/Components/EdgeDemo.qml:145

127+#: qml/Components/EdgeDemo.qml:158

128msgid "Try swiping from the top edge to access the indicators"

128msgid "Try swiping from the top edge to access the indicators"

129msgstr "Try swiping from the top edge to access the indicators"

129msgstr "Try swiping from the top edge to access the indicators"

130

130

131−#: qml/Components/EdgeDemo.qml:170

131+#: qml/Components/EdgeDemo.qml:183

132msgid "Close"

132msgid "Close"

133msgstr "Close"

133msgstr "Close"

134

134

135−#: qml/Components/EdgeDemo.qml:171

135+#: qml/Components/EdgeDemo.qml:184

136msgid "Swipe up again to close the settings screen"

136msgid "Swipe up again to close the settings screen"

137msgstr "Swipe up again to close the settings screen"

137msgstr "Swipe up again to close the settings screen"

138

138

139−#: qml/Components/EdgeDemo.qml:201

139+#: qml/Components/EdgeDemo.qml:214

140msgid "Left edge"

140msgid "Left edge"

141msgstr "Left edge"

141msgstr "Left edge"

142

142

143−#: qml/Components/EdgeDemo.qml:202

143+#: qml/Components/EdgeDemo.qml:215

144msgid "Swipe from the left to reveal the launcher for quick access to apps"

144msgid "Swipe from the left to reveal the launcher for quick access to apps"

145msgstr "Swipe from the left to reveal the launcher for quick access to apps"

145msgstr "Swipe from the left to reveal the launcher for quick access to apps"

146

146

147−#: qml/Components/EdgeDemo.qml:229

147+#: qml/Components/EdgeDemo.qml:242

148msgid "Well done"

148msgid "Well done"

149msgstr "Well done"

149msgstr "Well done"

150

150

151−#: qml/Components/EdgeDemo.qml:230

151+#: qml/Components/EdgeDemo.qml:243

152msgid ""

152msgid ""

153"You have now mastered the edge gestures and can start using the "

153"You have now mastered the edge gestures and can start using the "

154"phone<br><br>Tap on the screen to start"

154"phone<br><br>Tap on the screen to start"

@@ -156,40 +156,44 @@ msgstr ""

156"You have now mastered the edge gestures and can start using the "

156"You have now mastered the edge gestures and can start using the "

157"phone<br><br>Tap on the screen to start"

157"phone<br><br>Tap on the screen to start"

158

158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160msgid "Return to Call"

160msgid "Return to Call"

161msgstr ""

161msgstr ""

162

162

163−#: qml/Components/Lockscreen.qml:223

163+#: qml/Components/Lockscreen.qml:238

164msgid "Emergency Call"

164msgid "Emergency Call"

165msgstr "Emergency Call"

165msgstr "Emergency Call"

166

166

167−#: qml/Components/Lockscreen.qml:255

167+#: qml/Components/Lockscreen.qml:270

168msgid "OK"

168msgid "OK"

169msgstr "OK"

169msgstr "OK"

170

170

171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

172msgid "See less"

172msgid "See less"

173msgstr "See less"

173msgstr "See less"

174

174

175−#: qml/Dash/GenericScopeView.qml:434

175+#: qml/Dash/GenericScopeView.qml:431

176msgid "See all"

176msgid "See all"

177msgstr "See all"

177msgstr "See all"

178

178

179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

180#: qml/Panel/SearchIndicator.qml:27

180#: qml/Panel/SearchIndicator.qml:27

181msgid "Search"

181msgid "Search"

182msgstr "Search"

182msgstr "Search"

183

183

184−#: qml/Dash/PageHeader.qml:268

184+#: qml/Dash/PageHeader.qml:260

185+msgid "Store"

186+msgstr "Store"

187+

188+#: qml/Dash/PageHeader.qml:277

185msgid "Settings"

189msgid "Settings"

186msgstr "Settings"

190msgstr "Settings"

187

191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189msgid "Remove from Favorites"

193msgid "Remove from Favorites"

190msgstr "Remove from Favourites"

194msgstr "Remove from Favourites"

191

195

192−#: qml/Dash/PageHeader.qml:275

196+#: qml/Dash/PageHeader.qml:284

193msgid "Add to Favorites"

197msgid "Add to Favorites"

194msgstr "Add to Favourites"

198msgstr "Add to Favourites"

195

199

@@ -221,31 +225,23 @@ msgstr "Pull to refresh…"

221msgid "Release to refresh…"

225msgid "Release to refresh…"

222msgstr "Release to refresh…"

226msgstr "Release to refresh…"

223

227

224−#: qml/Dash/ScopesOverview.qml:215

228+#: qml/Dash/ScopesList.qml:63

225−msgid "Manage Scopes"

229+msgid "Manage"

226−msgstr "Manage Scopes"

230+msgstr ""

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"

235

231

236−#: qml/Dash/ScopesOverviewTab.qml:36

232+#: qml/Dash/ScopesList.qml:107

237−msgid "Favorites"

233+msgid "Home"

238−msgstr "Favourites"

234+msgstr ""

239

235

240−#: qml/Dash/ScopesOverviewTab.qml:54

236+#: qml/Dash/ScopesList.qml:108

241−msgid "All"

237+msgid "Also installed"

242−msgstr "All"

238+msgstr ""

243

239

244#: qml/Greeter/Greeter.qml:174

240#: qml/Greeter/Greeter.qml:174

245msgid "Unlock"

241msgid "Unlock"

246msgstr "Unlock"

242msgstr "Unlock"

247

243

248−#: qml/Notifications/NotificationMenuItemFactory.qml:116

244+#: qml/Notifications/NotificationMenuItemFactory.qml:128

249msgid "Show password"

245msgid "Show password"

250msgstr "Show password"

246msgstr "Show password"

251

247

@@ -293,49 +289,49 @@ msgstr "Unlock SIM"

293msgid "Roaming"

289msgid "Roaming"

294msgstr "Roaming"

290msgstr "Roaming"

295

291

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

297msgid "Enter passphrase"

298msgid "Enter passphrase"

298msgstr "Enter passphrase"

299msgstr "Enter passphrase"

299

300

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

301msgid "Sorry, incorrect passphrase"

311msgid "Sorry, incorrect passphrase"

302msgstr "Sorry, incorrect passphrase"

312msgstr "Sorry, incorrect passphrase"

303

313

304−#: qml/Shell.qml:393

314+#: qml/Shell.qml:372

305msgid "Please re-enter"

315msgid "Please re-enter"

306msgstr "Please re-enter"

316msgstr "Please re-enter"

307

317

308−#: qml/Shell.qml:395

318+#: qml/Shell.qml:373

309−msgid "Enter passcode"

310−msgstr "Enter passcode"

311−

312−#: qml/Shell.qml:396

313msgid "Sorry, incorrect passcode"

319msgid "Sorry, incorrect passcode"

314msgstr "Sorry, incorrect passcode"

320msgstr "Sorry, incorrect passcode"

315

321

316−#: qml/Shell.qml:399

322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

317−#, qt-format

318−msgid "Enter %1"

319−msgstr "Enter %1"

320−

321−#: qml/Shell.qml:400

322−#, qt-format

323−msgid "Sorry, incorrect %1"

324−msgstr "Sorry, incorrect %1"

325−

326−#: qml/Shell.qml:441

327msgid "Sorry, incorrect passphrase."

323msgid "Sorry, incorrect passphrase."

328msgstr "Sorry, incorrect passphrase."

324msgstr "Sorry, incorrect passphrase."

329

325

330−#: qml/Shell.qml:442

326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

331msgid "Sorry, incorrect passcode."

327msgid "Sorry, incorrect passcode."

332msgstr "Sorry, incorrect passcode."

328msgstr "Sorry, incorrect passcode."

333

329

334−#: qml/Shell.qml:443

330+#: qml/Shell.qml:469

335msgid "This will be your last attempt."

331msgid "This will be your last attempt."

336msgstr "This will be your last attempt."

332msgstr "This will be your last attempt."

337

333

338−#: qml/Shell.qml:445

334+#: qml/Shell.qml:471

339msgid ""

335msgid ""

340"If passphrase is entered incorrectly, your phone will conduct a factory "

336"If passphrase is entered incorrectly, your phone will conduct a factory "

341"reset and all personal data will be deleted."

337"reset and all personal data will be deleted."

@@ -343,7 +339,7 @@ msgstr ""

343"If passphrase is entered incorrectly, your phone will conduct a factory "

339"If passphrase is entered incorrectly, your phone will conduct a factory "

344"reset and all personal data will be deleted."

340"reset and all personal data will be deleted."

345

341

346−#: qml/Shell.qml:446

342+#: qml/Shell.qml:472

347msgid ""

343msgid ""

348"If passcode is entered incorrectly, your phone will conduct a factory reset "

344"If passcode is entered incorrectly, your phone will conduct a factory reset "

349"and all personal data will be deleted."

345"and all personal data will be deleted."

@@ -351,6 +347,183 @@ msgstr ""

351"If passcode is entered incorrectly, your phone will conduct a factory reset "

347"If passcode is entered incorrectly, your phone will conduct a factory reset "

352"and all personal data will be deleted."

348"and all personal data will be deleted."

353

349

350+#: qml/Wizard/Page.qml:89

351+msgid "Back"

352+msgstr ""

353+

354+#: qml/Wizard/Pages/10-welcome.qml:27

355+msgid "Hi!"

356+msgstr ""

357+

358+#: qml/Wizard/Pages/10-welcome.qml:44

359+msgid "Welcome to your Ubuntu phone."

360+msgstr ""

361+

362+#: qml/Wizard/Pages/10-welcome.qml:52

363+msgid "Let’s get started."

364+msgstr ""

365+

366+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

367+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

368+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

369+#: qml/Wizard/Pages/passwd-set.qml:90

370+msgid "Continue"

371+msgstr ""

372+

373+#: qml/Wizard/Pages/20-sim.qml:25

374+msgid "Add a SIM card and restart your device"

375+msgstr ""

376+

377+#: qml/Wizard/Pages/20-sim.qml:55

378+msgid "Without it, you won’t be able to make calls or use text messaging."

379+msgstr ""

380+

381+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

382+msgid "Skip"

383+msgstr ""

384+

385+#: qml/Wizard/Pages/30-passwd-type.qml:39

386+msgid "Lock security"

387+msgstr ""

388+

389+#: qml/Wizard/Pages/30-passwd-type.qml:74

390+msgid "Please select how you’d like to unlock your phone."

391+msgstr ""

392+

393+#: qml/Wizard/Pages/30-passwd-type.qml:97

394+msgid "Swipe"

395+msgstr ""

396+

397+#: qml/Wizard/Pages/30-passwd-type.qml:98

398+msgid "No security"

399+msgstr ""

400+

401+#: qml/Wizard/Pages/30-passwd-type.qml:100

402+msgid "Passcode"

403+msgstr ""

404+

405+#: qml/Wizard/Pages/30-passwd-type.qml:101

406+msgid "4 digits only"

407+msgstr ""

408+

409+#: qml/Wizard/Pages/30-passwd-type.qml:103

410+msgid "Passphrase"

411+msgstr ""

412+

413+#: qml/Wizard/Pages/30-passwd-type.qml:104

414+msgid "Numbers and letters"

415+msgstr ""

416+

417+#: qml/Wizard/Pages/40-wifi.qml:28

418+msgid "Connect to Wi‑Fi"

419+msgstr ""

420+

421+#: qml/Wizard/Pages/40-wifi.qml:147

422+msgid "Available networks…"

423+msgstr ""

424+

425+#: qml/Wizard/Pages/40-wifi.qml:148

426+msgid "No available networks."

427+msgstr ""

428+

429+#: qml/Wizard/Pages/50-location.qml:27

430+msgid "Location"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/50-location.qml:62

434+msgid "Let the phone detect your location:"

435+msgstr ""

436+

437+#: qml/Wizard/Pages/50-location.qml:69

438+msgid "Using GPS only (less accurate)"

439+msgstr ""

440+

441+#: qml/Wizard/Pages/50-location.qml:86

442+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

443+msgstr ""

444+

445+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

446+#: qml/Wizard/Pages/50-location.qml:103

447+msgid ""

448+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

449+"conditions</a>."

450+msgstr ""

451+

452+#: qml/Wizard/Pages/50-location.qml:112

453+msgid "Not at all"

454+msgstr ""

455+

456+#: qml/Wizard/Pages/50-location.qml:124

457+msgid "You can change your mind later in <b>System Settings</b>."

458+msgstr ""

459+

460+#: qml/Wizard/Pages/60-reporting.qml:24

461+msgid "Improving your experience"

462+msgstr ""

463+

464+#: qml/Wizard/Pages/60-reporting.qml:36

465+msgid ""

466+"Your phone is set up to automatically report errors to Canonical and its "

467+"partners, the makers of the operating system."

468+msgstr ""

469+

470+#: qml/Wizard/Pages/60-reporting.qml:43

471+msgid ""

472+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

473+"Privacy</b>"

474+msgstr ""

475+

476+#: qml/Wizard/Pages/80-finished.qml:24

477+msgid "All done"

478+msgstr ""

479+

480+#: qml/Wizard/Pages/80-finished.qml:39

481+msgid "Nice work!"

482+msgstr ""

483+

484+#: qml/Wizard/Pages/80-finished.qml:46

485+msgid "Your phone is now ready to use."

486+msgstr ""

487+

488+#: qml/Wizard/Pages/80-finished.qml:53

489+msgid "Finish"

490+msgstr ""

491+

492+#: qml/Wizard/Pages/here-terms.qml:27

493+msgid "Terms & Conditions"

494+msgstr ""

495+

496+#: qml/Wizard/Pages/passwd-confirm.qml:49

497+msgid "Confirm passphrase"

498+msgstr ""

499+

500+#: qml/Wizard/Pages/passwd-confirm.qml:50

501+msgid "Confirm passcode"

502+msgstr ""

503+

504+#: qml/Wizard/Pages/passwd-confirm.qml:53

505+#: qml/Wizard/Pages/passwd-confirm.qml:54

506+msgid "Please try again."

507+msgstr ""

508+

509+#: qml/Wizard/Pages/passwd-set.qml:61

510+msgid "Choose your passcode"

511+msgstr ""

512+

513+#: qml/Wizard/Pages/passwd-set.qml:68

514+msgid "Passphrase must be 4 characters long"

515+msgstr ""

516+

517+#: qml/Wizard/StackButton.qml:39

518+#, qt-format

519+msgid "〈 %1"

520+msgstr ""

521+

522+#: qml/Wizard/StackButton.qml:42

523+#, qt-format

524+msgid "%1 〉"

525+msgstr ""

526+

354#~ msgid "Confirm"

527#~ msgid "Confirm"

355#~ msgstr "Confirm"

528#~ msgstr "Confirm"

356

529

@@ -365,3 +538,15 @@ msgstr ""

365

538

366#~ msgid "Speaking..."

539#~ msgid "Speaking..."

367#~ msgstr "Speaking..."

540#~ msgstr "Speaking..."

541+

542+#~ msgid "All"

543+#~ msgstr "All"

544+

545+#~ msgid "Favorites"

546+#~ msgstr "Favourites"

547+

548+#~ msgid "Done"

549+#~ msgstr "Done"

550+

551+#~ msgid "Manage Scopes"

552+#~ msgstr "Manage Scopes"

po/en_GB.po+265−80

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-11-05 18:59+0000\n"

11"PO-Revision-Date: 2014-11-05 18:59+0000\n"

12"Last-Translator: Andi Chandler <Unknown>\n"

12"Last-Translator: Andi Chandler <Unknown>\n"

13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"

13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Password: "

23msgstr "Password: "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Pin shortcut"

28msgstr "Pin shortcut"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Unpin shortcut"

32msgstr "Unpin shortcut"

33

33

@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] "Please wait %1 minute and then try again…"

50msgstr[0] "Please wait %1 minute and then try again…"

51msgstr[1] "Please wait %1 minutes and then try again…"

51msgstr[1] "Please wait %1 minutes and then try again…"

52

52

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

54msgid "Log out"

54msgid "Log out"

55msgstr "Log out"

55msgstr "Log out"

56

56

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

58msgid "Are you sure you want to log out?"

58msgid "Are you sure you want to log out?"

59msgstr "Are you sure you want to log out?"

59msgstr "Are you sure you want to log out?"

60

60

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:122

63msgid "No"

63msgid "No"

64msgstr "No"

64msgstr "No"

65

65

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:129

68msgid "Yes"

68msgid "Yes"

69msgstr "Yes"

69msgstr "Yes"

70

70

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

72msgid "Shut down"

72msgid "Shut down"

73msgstr "Shut down"

73msgstr "Shut down"

74

74

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

76msgid "Are you sure you want to shut down?"

76msgid "Are you sure you want to shut down?"

77msgstr "Are you sure you want to shut down?"

77msgstr "Are you sure you want to shut down?"

78

78

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

80msgid "Reboot"

80msgid "Reboot"

81msgstr "Reboot"

81msgstr "Reboot"

82

82

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

84msgid "Are you sure you want to reboot?"

84msgid "Are you sure you want to reboot?"

85msgstr "Are you sure you want to reboot?"

85msgstr "Are you sure you want to reboot?"

86

86

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

88msgid "Power"

88msgid "Power"

89msgstr "Power"

89msgstr "Power"

90

90

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

92msgid ""

92msgid ""

93"Are you sure you would like\n"

93"Are you sure you would like\n"

94"to power off?"

94"to power off?"

@@ -96,15 +96,15 @@ msgstr ""

96"Are you sure you would like\n"

96"Are you sure you would like\n"

97"to power off?"

97"to power off?"

98

98

99−#: qml/Components/Dialogs.qml:151

99+#: qml/Components/Dialogs.qml:147

100msgid "Power off"

100msgid "Power off"

101msgstr "Power off"

101msgstr "Power off"

102

102

103−#: qml/Components/Dialogs.qml:161

103+#: qml/Components/Dialogs.qml:157

104msgid "Restart"

104msgid "Restart"

105msgstr "Restart"

105msgstr "Restart"

106

106

107−#: qml/Components/Dialogs.qml:171

107+#: qml/Components/Dialogs.qml:167

108msgid "Cancel"

108msgid "Cancel"

109msgstr "Cancel"

109msgstr "Cancel"

110

110

@@ -112,43 +112,43 @@ msgstr "Cancel"

112msgid "Skip intro"

112msgid "Skip intro"

113msgstr "Skip intro"

113msgstr "Skip intro"

114

114

115−#: qml/Components/EdgeDemo.qml:112

115+#: qml/Components/EdgeDemo.qml:125

116msgid "Right edge"

116msgid "Right edge"

117msgstr "Right edge"

117msgstr "Right edge"

118

118

119−#: qml/Components/EdgeDemo.qml:113

119+#: qml/Components/EdgeDemo.qml:126

120msgid "Try swiping from the right edge to unlock the phone"

120msgid "Try swiping from the right edge to unlock the phone"

121msgstr "Try swiping from the right edge to unlock the phone"

121msgstr "Try swiping from the right edge to unlock the phone"

122

122

123−#: qml/Components/EdgeDemo.qml:144

123+#: qml/Components/EdgeDemo.qml:157

124msgid "Top edge"

124msgid "Top edge"

125msgstr "Top edge"

125msgstr "Top edge"

126

126

127−#: qml/Components/EdgeDemo.qml:145

127+#: qml/Components/EdgeDemo.qml:158

128msgid "Try swiping from the top edge to access the indicators"

128msgid "Try swiping from the top edge to access the indicators"

129msgstr "Try swiping from the top edge to access the indicators"

129msgstr "Try swiping from the top edge to access the indicators"

130

130

131−#: qml/Components/EdgeDemo.qml:170

131+#: qml/Components/EdgeDemo.qml:183

132msgid "Close"

132msgid "Close"

133msgstr "Close"

133msgstr "Close"

134

134

135−#: qml/Components/EdgeDemo.qml:171

135+#: qml/Components/EdgeDemo.qml:184

136msgid "Swipe up again to close the settings screen"

136msgid "Swipe up again to close the settings screen"

137msgstr "Swipe up again to close the settings screen"

137msgstr "Swipe up again to close the settings screen"

138

138

139−#: qml/Components/EdgeDemo.qml:201

139+#: qml/Components/EdgeDemo.qml:214

140msgid "Left edge"

140msgid "Left edge"

141msgstr "Left edge"

141msgstr "Left edge"

142

142

143−#: qml/Components/EdgeDemo.qml:202

143+#: qml/Components/EdgeDemo.qml:215

144msgid "Swipe from the left to reveal the launcher for quick access to apps"

144msgid "Swipe from the left to reveal the launcher for quick access to apps"

145msgstr "Swipe from the left to reveal the launcher for quick access to apps"

145msgstr "Swipe from the left to reveal the launcher for quick access to apps"

146

146

147−#: qml/Components/EdgeDemo.qml:229

147+#: qml/Components/EdgeDemo.qml:242

148msgid "Well done"

148msgid "Well done"

149msgstr "Well done"

149msgstr "Well done"

150

150

151−#: qml/Components/EdgeDemo.qml:230

151+#: qml/Components/EdgeDemo.qml:243

152msgid ""

152msgid ""

153"You have now mastered the edge gestures and can start using the "

153"You have now mastered the edge gestures and can start using the "

154"phone<br><br>Tap on the screen to start"

154"phone<br><br>Tap on the screen to start"

@@ -156,40 +156,44 @@ msgstr ""

156"You have now mastered the edge gestures and can start using the "

156"You have now mastered the edge gestures and can start using the "

157"phone<br><br>Tap on the screen to start"

157"phone<br><br>Tap on the screen to start"

158

158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160msgid "Return to Call"

160msgid "Return to Call"

161msgstr "Return to Call"

161msgstr "Return to Call"

162

162

163−#: qml/Components/Lockscreen.qml:223

163+#: qml/Components/Lockscreen.qml:238

164msgid "Emergency Call"

164msgid "Emergency Call"

165msgstr "Emergency Call"

165msgstr "Emergency Call"

166

166

167−#: qml/Components/Lockscreen.qml:255

167+#: qml/Components/Lockscreen.qml:270

168msgid "OK"

168msgid "OK"

169msgstr "OK"

169msgstr "OK"

170

170

171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

172msgid "See less"

172msgid "See less"

173msgstr "See less"

173msgstr "See less"

174

174

175−#: qml/Dash/GenericScopeView.qml:434

175+#: qml/Dash/GenericScopeView.qml:431

176msgid "See all"

176msgid "See all"

177msgstr "See all"

177msgstr "See all"

178

178

179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

180#: qml/Panel/SearchIndicator.qml:27

180#: qml/Panel/SearchIndicator.qml:27

181msgid "Search"

181msgid "Search"

182msgstr "Search"

182msgstr "Search"

183

183

184−#: qml/Dash/PageHeader.qml:268

184+#: qml/Dash/PageHeader.qml:260

185+msgid "Store"

186+msgstr "Store"

187+

188+#: qml/Dash/PageHeader.qml:277

185msgid "Settings"

189msgid "Settings"

186msgstr "Settings"

190msgstr "Settings"

187

191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189msgid "Remove from Favorites"

193msgid "Remove from Favorites"

190msgstr "Remove from Favourites"

194msgstr "Remove from Favourites"

191

195

192−#: qml/Dash/PageHeader.qml:275

196+#: qml/Dash/PageHeader.qml:284

193msgid "Add to Favorites"

197msgid "Add to Favorites"

194msgstr "Add to Favourites"

198msgstr "Add to Favourites"

195

199

@@ -221,31 +225,23 @@ msgstr "Pull to refresh…"

221msgid "Release to refresh…"

225msgid "Release to refresh…"

222msgstr "Release to refresh…"

226msgstr "Release to refresh…"

223

227

224−#: qml/Dash/ScopesOverview.qml:215

228+#: qml/Dash/ScopesList.qml:63

225−msgid "Manage Scopes"

229+msgid "Manage"

226−msgstr "Manage Scopes"

230+msgstr "Manage"

227−

228−#: qml/Dash/ScopesOverview.qml:437

229−msgid "Done"

230−msgstr "Done"

231

231

232−#: qml/Dash/ScopesOverview.qml:463

232+#: qml/Dash/ScopesList.qml:107

233−msgid "Store"

233+msgid "Home"

234−msgstr "Store"

234+msgstr "Home"

235

235

236−#: qml/Dash/ScopesOverviewTab.qml:36

236+#: qml/Dash/ScopesList.qml:108

237−msgid "Favorites"

237+msgid "Also installed"

238−msgstr "Favourites"

238+msgstr "Also installed"

239−

240−#: qml/Dash/ScopesOverviewTab.qml:54

241−msgid "All"

242−msgstr "All"

243

239

244#: qml/Greeter/Greeter.qml:174

240#: qml/Greeter/Greeter.qml:174

245msgid "Unlock"

241msgid "Unlock"

246msgstr "Unlock"

242msgstr "Unlock"

247

243

248−#: qml/Notifications/NotificationMenuItemFactory.qml:116

244+#: qml/Notifications/NotificationMenuItemFactory.qml:128

249msgid "Show password"

245msgid "Show password"

250msgstr "Show password"

246msgstr "Show password"

251

247

@@ -293,49 +289,49 @@ msgstr "Unlock SIM"

293msgid "Roaming"

289msgid "Roaming"

294msgstr "Roaming"

290msgstr "Roaming"

295

291

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

297msgid "Enter passphrase"

298msgid "Enter passphrase"

298msgstr "Enter passphrase"

299msgstr "Enter passphrase"

299

300

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

301msgid "Sorry, incorrect passphrase"

311msgid "Sorry, incorrect passphrase"

302msgstr "Sorry, incorrect passphrase"

312msgstr "Sorry, incorrect passphrase"

303

313

304−#: qml/Shell.qml:393

314+#: qml/Shell.qml:372

305msgid "Please re-enter"

315msgid "Please re-enter"

306msgstr "Please re-enter"

316msgstr "Please re-enter"

307

317

308−#: qml/Shell.qml:395

318+#: qml/Shell.qml:373

309−msgid "Enter passcode"

310−msgstr "Enter passcode"

311−

312−#: qml/Shell.qml:396

313msgid "Sorry, incorrect passcode"

319msgid "Sorry, incorrect passcode"

314msgstr "Sorry, incorrect passcode"

320msgstr "Sorry, incorrect passcode"

315

321

316−#: qml/Shell.qml:399

322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

317−#, qt-format

318−msgid "Enter %1"

319−msgstr "Enter %1"

320−

321−#: qml/Shell.qml:400

322−#, qt-format

323−msgid "Sorry, incorrect %1"

324−msgstr "Sorry, incorrect %1"

325−

326−#: qml/Shell.qml:441

327msgid "Sorry, incorrect passphrase."

323msgid "Sorry, incorrect passphrase."

328msgstr "Sorry, incorrect passphrase."

324msgstr "Sorry, incorrect passphrase."

329

325

330−#: qml/Shell.qml:442

326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

331msgid "Sorry, incorrect passcode."

327msgid "Sorry, incorrect passcode."

332msgstr "Sorry, incorrect passcode."

328msgstr "Sorry, incorrect passcode."

333

329

334−#: qml/Shell.qml:443

330+#: qml/Shell.qml:469

335msgid "This will be your last attempt."

331msgid "This will be your last attempt."

336msgstr "This will be your last attempt."

332msgstr "This will be your last attempt."

337

333

338−#: qml/Shell.qml:445

334+#: qml/Shell.qml:471

339msgid ""

335msgid ""

340"If passphrase is entered incorrectly, your phone will conduct a factory "

336"If passphrase is entered incorrectly, your phone will conduct a factory "

341"reset and all personal data will be deleted."

337"reset and all personal data will be deleted."

@@ -343,7 +339,7 @@ msgstr ""

343"If passphrase is entered incorrectly, your phone will conduct a factory "

339"If passphrase is entered incorrectly, your phone will conduct a factory "

344"reset and all personal data will be deleted."

340"reset and all personal data will be deleted."

345

341

346−#: qml/Shell.qml:446

342+#: qml/Shell.qml:472

347msgid ""

343msgid ""

348"If passcode is entered incorrectly, your phone will conduct a factory reset "

344"If passcode is entered incorrectly, your phone will conduct a factory reset "

349"and all personal data will be deleted."

345"and all personal data will be deleted."

@@ -351,6 +347,183 @@ msgstr ""

351"If passcode is entered incorrectly, your phone will conduct a factory reset "

347"If passcode is entered incorrectly, your phone will conduct a factory reset "

352"and all personal data will be deleted."

348"and all personal data will be deleted."

353

349

350+#: qml/Wizard/Page.qml:89

351+msgid "Back"

352+msgstr ""

353+

354+#: qml/Wizard/Pages/10-welcome.qml:27

355+msgid "Hi!"

356+msgstr ""

357+

358+#: qml/Wizard/Pages/10-welcome.qml:44

359+msgid "Welcome to your Ubuntu phone."

360+msgstr ""

361+

362+#: qml/Wizard/Pages/10-welcome.qml:52

363+msgid "Let’s get started."

364+msgstr ""

365+

366+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

367+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

368+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

369+#: qml/Wizard/Pages/passwd-set.qml:90

370+msgid "Continue"

371+msgstr ""

372+

373+#: qml/Wizard/Pages/20-sim.qml:25

374+msgid "Add a SIM card and restart your device"

375+msgstr ""

376+

377+#: qml/Wizard/Pages/20-sim.qml:55

378+msgid "Without it, you won’t be able to make calls or use text messaging."

379+msgstr ""

380+

381+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

382+msgid "Skip"

383+msgstr ""

384+

385+#: qml/Wizard/Pages/30-passwd-type.qml:39

386+msgid "Lock security"

387+msgstr ""

388+

389+#: qml/Wizard/Pages/30-passwd-type.qml:74

390+msgid "Please select how you’d like to unlock your phone."

391+msgstr ""

392+

393+#: qml/Wizard/Pages/30-passwd-type.qml:97

394+msgid "Swipe"

395+msgstr ""

396+

397+#: qml/Wizard/Pages/30-passwd-type.qml:98

398+msgid "No security"

399+msgstr ""

400+

401+#: qml/Wizard/Pages/30-passwd-type.qml:100

402+msgid "Passcode"

403+msgstr ""

404+

405+#: qml/Wizard/Pages/30-passwd-type.qml:101

406+msgid "4 digits only"

407+msgstr ""

408+

409+#: qml/Wizard/Pages/30-passwd-type.qml:103

410+msgid "Passphrase"

411+msgstr ""

412+

413+#: qml/Wizard/Pages/30-passwd-type.qml:104

414+msgid "Numbers and letters"

415+msgstr ""

416+

417+#: qml/Wizard/Pages/40-wifi.qml:28

418+msgid "Connect to Wi‑Fi"

419+msgstr ""

420+

421+#: qml/Wizard/Pages/40-wifi.qml:147

422+msgid "Available networks…"

423+msgstr ""

424+

425+#: qml/Wizard/Pages/40-wifi.qml:148

426+msgid "No available networks."

427+msgstr ""

428+

429+#: qml/Wizard/Pages/50-location.qml:27

430+msgid "Location"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/50-location.qml:62

434+msgid "Let the phone detect your location:"

435+msgstr ""

436+

437+#: qml/Wizard/Pages/50-location.qml:69

438+msgid "Using GPS only (less accurate)"

439+msgstr ""

440+

441+#: qml/Wizard/Pages/50-location.qml:86

442+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

443+msgstr ""

444+

445+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

446+#: qml/Wizard/Pages/50-location.qml:103

447+msgid ""

448+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

449+"conditions</a>."

450+msgstr ""

451+

452+#: qml/Wizard/Pages/50-location.qml:112

453+msgid "Not at all"

454+msgstr ""

455+

456+#: qml/Wizard/Pages/50-location.qml:124

457+msgid "You can change your mind later in <b>System Settings</b>."

458+msgstr ""

459+

460+#: qml/Wizard/Pages/60-reporting.qml:24

461+msgid "Improving your experience"

462+msgstr ""

463+

464+#: qml/Wizard/Pages/60-reporting.qml:36

465+msgid ""

466+"Your phone is set up to automatically report errors to Canonical and its "

467+"partners, the makers of the operating system."

468+msgstr ""

469+

470+#: qml/Wizard/Pages/60-reporting.qml:43

471+msgid ""

472+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

473+"Privacy</b>"

474+msgstr ""

475+

476+#: qml/Wizard/Pages/80-finished.qml:24

477+msgid "All done"

478+msgstr ""

479+

480+#: qml/Wizard/Pages/80-finished.qml:39

481+msgid "Nice work!"

482+msgstr ""

483+

484+#: qml/Wizard/Pages/80-finished.qml:46

485+msgid "Your phone is now ready to use."

486+msgstr ""

487+

488+#: qml/Wizard/Pages/80-finished.qml:53

489+msgid "Finish"

490+msgstr ""

491+

492+#: qml/Wizard/Pages/here-terms.qml:27

493+msgid "Terms & Conditions"

494+msgstr ""

495+

496+#: qml/Wizard/Pages/passwd-confirm.qml:49

497+msgid "Confirm passphrase"

498+msgstr ""

499+

500+#: qml/Wizard/Pages/passwd-confirm.qml:50

501+msgid "Confirm passcode"

502+msgstr ""

503+

504+#: qml/Wizard/Pages/passwd-confirm.qml:53

505+#: qml/Wizard/Pages/passwd-confirm.qml:54

506+msgid "Please try again."

507+msgstr ""

508+

509+#: qml/Wizard/Pages/passwd-set.qml:61

510+msgid "Choose your passcode"

511+msgstr ""

512+

513+#: qml/Wizard/Pages/passwd-set.qml:68

514+msgid "Passphrase must be 4 characters long"

515+msgstr ""

516+

517+#: qml/Wizard/StackButton.qml:39

518+#, qt-format

519+msgid "〈 %1"

520+msgstr ""

521+

522+#: qml/Wizard/StackButton.qml:42

523+#, qt-format

524+msgid "%1 〉"

525+msgstr ""

526+

354#~ msgid "Confirm"

527#~ msgid "Confirm"

355#~ msgstr "Confirm"

528#~ msgstr "Confirm"

356

529

@@ -365,3 +538,15 @@ msgstr ""

365

538

366#~ msgid "Speaking..."

539#~ msgid "Speaking..."

367#~ msgstr "Speaking..."

540#~ msgstr "Speaking..."

541+

542+#~ msgid "All"

543+#~ msgstr "All"

544+

545+#~ msgid "Favorites"

546+#~ msgstr "Favourites"

547+

548+#~ msgid "Done"

549+#~ msgstr "Done"

550+

551+#~ msgid "Manage Scopes"

552+#~ msgstr "Manage Scopes"

po/eo.po+248−75

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2013-06-26 22:35+0000\n"

11"PO-Revision-Date: 2013-06-26 22:35+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Esperanto <eo@li.org>\n"

13"Language-Team: Esperanto <eo@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr ""

23msgstr ""

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr ""

28msgstr ""

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr ""

32msgstr ""

33

33

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] ""

50msgstr[0] ""

51msgstr[1] ""

51msgstr[1] ""

52

52

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

54msgid "Log out"

54msgid "Log out"

55msgstr ""

55msgstr ""

56

56

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

58msgid "Are you sure you want to log out?"

58msgid "Are you sure you want to log out?"

59msgstr ""

59msgstr ""

60

60

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:122

63msgid "No"

63msgid "No"

64msgstr ""

64msgstr ""

65

65

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:129

68msgid "Yes"

68msgid "Yes"

69msgstr ""

69msgstr ""

70

70

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

72msgid "Shut down"

72msgid "Shut down"

73msgstr ""

73msgstr ""

74

74

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

76msgid "Are you sure you want to shut down?"

76msgid "Are you sure you want to shut down?"

77msgstr ""

77msgstr ""

78

78

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

80msgid "Reboot"

80msgid "Reboot"

81msgstr ""

81msgstr ""

82

82

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

84msgid "Are you sure you want to reboot?"

84msgid "Are you sure you want to reboot?"

85msgstr ""

85msgstr ""

86

86

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

88msgid "Power"

88msgid "Power"

89msgstr ""

89msgstr ""

90

90

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

92msgid ""

92msgid ""

93"Are you sure you would like\n"

93"Are you sure you would like\n"

94"to power off?"

94"to power off?"

95msgstr ""

95msgstr ""

96

96

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

98msgid "Power off"

98msgid "Power off"

99msgstr ""

99msgstr ""

100

100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102msgid "Restart"

102msgid "Restart"

103msgstr ""

103msgstr ""

104

104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106msgid "Cancel"

106msgid "Cancel"

107msgstr ""

107msgstr ""

108

108

@@ -110,82 +110,86 @@ msgstr ""

110msgid "Skip intro"

110msgid "Skip intro"

111msgstr ""

111msgstr ""

112

112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114msgid "Right edge"

114msgid "Right edge"

115msgstr ""

115msgstr ""

116

116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118msgid "Try swiping from the right edge to unlock the phone"

118msgid "Try swiping from the right edge to unlock the phone"

119msgstr ""

119msgstr ""

120

120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122msgid "Top edge"

122msgid "Top edge"

123msgstr ""

123msgstr ""

124

124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126msgid "Try swiping from the top edge to access the indicators"

126msgid "Try swiping from the top edge to access the indicators"

127msgstr ""

127msgstr ""

128

128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130msgid "Close"

130msgid "Close"

131msgstr ""

131msgstr ""

132

132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134msgid "Swipe up again to close the settings screen"

134msgid "Swipe up again to close the settings screen"

135msgstr ""

135msgstr ""

136

136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138msgid "Left edge"

138msgid "Left edge"

139msgstr ""

139msgstr ""

140

140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143msgstr ""

143msgstr ""

144

144

145−#: qml/Components/EdgeDemo.qml:229

145+#: qml/Components/EdgeDemo.qml:242

146msgid "Well done"

146msgid "Well done"

147msgstr ""

147msgstr ""

148

148

149−#: qml/Components/EdgeDemo.qml:230

149+#: qml/Components/EdgeDemo.qml:243

150msgid ""

150msgid ""

151"You have now mastered the edge gestures and can start using the "

151"You have now mastered the edge gestures and can start using the "

152"phone<br><br>Tap on the screen to start"

152"phone<br><br>Tap on the screen to start"

153msgstr ""

153msgstr ""

154

154

155−#: qml/Components/Lockscreen.qml:223

155+#: qml/Components/Lockscreen.qml:238

156msgid "Return to Call"

156msgid "Return to Call"

157msgstr ""

157msgstr ""

158

158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160msgid "Emergency Call"

160msgid "Emergency Call"

161msgstr ""

161msgstr ""

162

162

163−#: qml/Components/Lockscreen.qml:255

163+#: qml/Components/Lockscreen.qml:270

164msgid "OK"

164msgid "OK"

165msgstr ""

165msgstr ""

166

166

167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

168msgid "See less"

168msgid "See less"

169msgstr ""

169msgstr ""

170

170

171−#: qml/Dash/GenericScopeView.qml:434

171+#: qml/Dash/GenericScopeView.qml:431

172msgid "See all"

172msgid "See all"

173msgstr ""

173msgstr ""

174

174

175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176#: qml/Panel/SearchIndicator.qml:27

176#: qml/Panel/SearchIndicator.qml:27

177msgid "Search"

177msgid "Search"

178msgstr ""

178msgstr ""

179

179

180−#: qml/Dash/PageHeader.qml:268

180+#: qml/Dash/PageHeader.qml:260

181+msgid "Store"

182+msgstr ""

183+

184+#: qml/Dash/PageHeader.qml:277

181msgid "Settings"

185msgid "Settings"

182msgstr ""

186msgstr ""

183

187

184−#: qml/Dash/PageHeader.qml:275

188+#: qml/Dash/PageHeader.qml:284

185msgid "Remove from Favorites"

189msgid "Remove from Favorites"

186msgstr ""

190msgstr ""

187

191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189msgid "Add to Favorites"

193msgid "Add to Favorites"

190msgstr ""

194msgstr ""

191

195

@@ -217,31 +221,23 @@ msgstr ""

217msgid "Release to refresh…"

221msgid "Release to refresh…"

218msgstr ""

222msgstr ""

219

223

220−#: qml/Dash/ScopesOverview.qml:215

224+#: qml/Dash/ScopesList.qml:63

221−msgid "Manage Scopes"

225+msgid "Manage"

222−msgstr ""

223−

224−#: qml/Dash/ScopesOverview.qml:437

225−msgid "Done"

226−msgstr ""

227−

228−#: qml/Dash/ScopesOverview.qml:463

229−msgid "Store"

230msgstr ""

226msgstr ""

231

227

232−#: qml/Dash/ScopesOverviewTab.qml:36

228+#: qml/Dash/ScopesList.qml:107

233−msgid "Favorites"

229+msgid "Home"

234msgstr ""

230msgstr ""

235

231

236−#: qml/Dash/ScopesOverviewTab.qml:54

232+#: qml/Dash/ScopesList.qml:108

237−msgid "All"

233+msgid "Also installed"

238msgstr ""

234msgstr ""

239

235

240#: qml/Greeter/Greeter.qml:174

236#: qml/Greeter/Greeter.qml:174

241msgid "Unlock"

237msgid "Unlock"

242msgstr ""

238msgstr ""

243

239

244−#: qml/Notifications/NotificationMenuItemFactory.qml:116

240+#: qml/Notifications/NotificationMenuItemFactory.qml:128

245msgid "Show password"

241msgid "Show password"

246msgstr ""

242msgstr ""

247

243

@@ -289,56 +285,233 @@ msgstr ""

289msgid "Roaming"

285msgid "Roaming"

290msgstr ""

286msgstr ""

291

287

292−#: qml/Shell.qml:391

288+#: qml/Shell.qml:367

289+#, qt-format

293−msgid "Enter passphrase"

290+msgid "Enter %1"

294msgstr ""

291msgstr ""

295

292

296−#: qml/Shell.qml:392

293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

297−msgid "Sorry, incorrect passphrase"

294+msgid "Enter passphrase"

298msgstr ""

295msgstr ""

299

296

300−#: qml/Shell.qml:393

297+#: qml/Shell.qml:369

301−msgid "Please re-enter"

298+msgid "Enter passcode"

302msgstr ""

299msgstr ""

303

300

304−#: qml/Shell.qml:395

301+#: qml/Shell.qml:370

305−msgid "Enter passcode"

302+#, qt-format

303+msgid "Sorry, incorrect %1"

306msgstr ""

304msgstr ""

307

305

308−#: qml/Shell.qml:396

306+#: qml/Shell.qml:371

309−msgid "Sorry, incorrect passcode"

307+msgid "Sorry, incorrect passphrase"

310msgstr ""

308msgstr ""

311

309

312−#: qml/Shell.qml:399

310+#: qml/Shell.qml:372

313−#, qt-format

311+msgid "Please re-enter"

314−msgid "Enter %1"

315msgstr ""

312msgstr ""

316

313

317−#: qml/Shell.qml:400

314+#: qml/Shell.qml:373

318−#, qt-format

319−msgid "Sorry, incorrect %1"

315+msgid "Sorry, incorrect passcode"

320msgstr ""

316msgstr ""

321

317

322−#: qml/Shell.qml:441

318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

323msgid "Sorry, incorrect passphrase."

319msgid "Sorry, incorrect passphrase."

324msgstr ""

320msgstr ""

325

321

326−#: qml/Shell.qml:442

322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

327msgid "Sorry, incorrect passcode."

323msgid "Sorry, incorrect passcode."

328msgstr ""

324msgstr ""

329

325

330−#: qml/Shell.qml:443

326+#: qml/Shell.qml:469

331msgid "This will be your last attempt."

327msgid "This will be your last attempt."

332msgstr ""

328msgstr ""

333

329

334−#: qml/Shell.qml:445

330+#: qml/Shell.qml:471

335msgid ""

331msgid ""

336"If passphrase is entered incorrectly, your phone will conduct a factory "

332"If passphrase is entered incorrectly, your phone will conduct a factory "

337"reset and all personal data will be deleted."

333"reset and all personal data will be deleted."

338msgstr ""

334msgstr ""

339

335

340−#: qml/Shell.qml:446

336+#: qml/Shell.qml:472

341msgid ""

337msgid ""

342"If passcode is entered incorrectly, your phone will conduct a factory reset "

338"If passcode is entered incorrectly, your phone will conduct a factory reset "

343"and all personal data will be deleted."

339"and all personal data will be deleted."

344msgstr ""

340msgstr ""

341+

342+#: qml/Wizard/Page.qml:89

343+msgid "Back"

344+msgstr ""

345+

346+#: qml/Wizard/Pages/10-welcome.qml:27

347+msgid "Hi!"

348+msgstr ""

349+

350+#: qml/Wizard/Pages/10-welcome.qml:44

351+msgid "Welcome to your Ubuntu phone."

352+msgstr ""

353+

354+#: qml/Wizard/Pages/10-welcome.qml:52

355+msgid "Let’s get started."

356+msgstr ""

357+

358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

361+#: qml/Wizard/Pages/passwd-set.qml:90

362+msgid "Continue"

363+msgstr ""

364+

365+#: qml/Wizard/Pages/20-sim.qml:25

366+msgid "Add a SIM card and restart your device"

367+msgstr ""

368+

369+#: qml/Wizard/Pages/20-sim.qml:55

370+msgid "Without it, you won’t be able to make calls or use text messaging."

371+msgstr ""

372+

373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

374+msgid "Skip"

375+msgstr ""

376+

377+#: qml/Wizard/Pages/30-passwd-type.qml:39

378+msgid "Lock security"

379+msgstr ""

380+

381+#: qml/Wizard/Pages/30-passwd-type.qml:74

382+msgid "Please select how you’d like to unlock your phone."

383+msgstr ""

384+

385+#: qml/Wizard/Pages/30-passwd-type.qml:97

386+msgid "Swipe"

387+msgstr ""

388+

389+#: qml/Wizard/Pages/30-passwd-type.qml:98

390+msgid "No security"

391+msgstr ""

392+

393+#: qml/Wizard/Pages/30-passwd-type.qml:100

394+msgid "Passcode"

395+msgstr ""

396+

397+#: qml/Wizard/Pages/30-passwd-type.qml:101

398+msgid "4 digits only"

399+msgstr ""

400+

401+#: qml/Wizard/Pages/30-passwd-type.qml:103

402+msgid "Passphrase"

403+msgstr ""

404+

405+#: qml/Wizard/Pages/30-passwd-type.qml:104

406+msgid "Numbers and letters"

407+msgstr ""

408+

409+#: qml/Wizard/Pages/40-wifi.qml:28

410+msgid "Connect to Wi‑Fi"

411+msgstr ""

412+

413+#: qml/Wizard/Pages/40-wifi.qml:147

414+msgid "Available networks…"

415+msgstr ""

416+

417+#: qml/Wizard/Pages/40-wifi.qml:148

418+msgid "No available networks."

419+msgstr ""

420+

421+#: qml/Wizard/Pages/50-location.qml:27

422+msgid "Location"

423+msgstr ""

424+

425+#: qml/Wizard/Pages/50-location.qml:62

426+msgid "Let the phone detect your location:"

427+msgstr ""

428+

429+#: qml/Wizard/Pages/50-location.qml:69

430+msgid "Using GPS only (less accurate)"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/50-location.qml:86

434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

435+msgstr ""

436+

437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

438+#: qml/Wizard/Pages/50-location.qml:103

439+msgid ""

440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

441+"conditions</a>."

442+msgstr ""

443+

444+#: qml/Wizard/Pages/50-location.qml:112

445+msgid "Not at all"

446+msgstr ""

447+

448+#: qml/Wizard/Pages/50-location.qml:124

449+msgid "You can change your mind later in <b>System Settings</b>."

450+msgstr ""

451+

452+#: qml/Wizard/Pages/60-reporting.qml:24

453+msgid "Improving your experience"

454+msgstr ""

455+

456+#: qml/Wizard/Pages/60-reporting.qml:36

457+msgid ""

458+"Your phone is set up to automatically report errors to Canonical and its "

459+"partners, the makers of the operating system."

460+msgstr ""

461+

462+#: qml/Wizard/Pages/60-reporting.qml:43

463+msgid ""

464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

465+"Privacy</b>"

466+msgstr ""

467+

468+#: qml/Wizard/Pages/80-finished.qml:24

469+msgid "All done"

470+msgstr ""

471+

472+#: qml/Wizard/Pages/80-finished.qml:39

473+msgid "Nice work!"

474+msgstr ""

475+

476+#: qml/Wizard/Pages/80-finished.qml:46

477+msgid "Your phone is now ready to use."

478+msgstr ""

479+

480+#: qml/Wizard/Pages/80-finished.qml:53

481+msgid "Finish"

482+msgstr ""

483+

484+#: qml/Wizard/Pages/here-terms.qml:27

485+msgid "Terms & Conditions"

486+msgstr ""

487+

488+#: qml/Wizard/Pages/passwd-confirm.qml:49

489+msgid "Confirm passphrase"

490+msgstr ""

491+

492+#: qml/Wizard/Pages/passwd-confirm.qml:50

493+msgid "Confirm passcode"

494+msgstr ""

495+

496+#: qml/Wizard/Pages/passwd-confirm.qml:53

497+#: qml/Wizard/Pages/passwd-confirm.qml:54

498+msgid "Please try again."

499+msgstr ""

500+

501+#: qml/Wizard/Pages/passwd-set.qml:61

502+msgid "Choose your passcode"

503+msgstr ""

504+

505+#: qml/Wizard/Pages/passwd-set.qml:68

506+msgid "Passphrase must be 4 characters long"

507+msgstr ""

508+

509+#: qml/Wizard/StackButton.qml:39

510+#, qt-format

511+msgid "〈 %1"

512+msgstr ""

513+

514+#: qml/Wizard/StackButton.qml:42

515+#, qt-format

516+msgid "%1 〉"

517+msgstr ""

po/es.po+265−80

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-11-08 08:01+0000\n"

11"PO-Revision-Date: 2014-11-08 08:01+0000\n"

12"Last-Translator: Paco Molinero <paco@byasl.com>\n"

12"Last-Translator: Paco Molinero <paco@byasl.com>\n"

13"Language-Team: Spanish <es@li.org>\n"

13"Language-Team: Spanish <es@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Contraseña: "

23msgstr "Contraseña: "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Anclar"

28msgstr "Anclar"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Desanclar"

32msgstr "Desanclar"

33

33

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

54msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."

54msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."

55msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."

55msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."

56

56

57−#: qml/Components/Dialogs.qml:74

57+#: qml/Components/Dialogs.qml:70

58msgid "Log out"

58msgid "Log out"

59msgstr "Cerrar la sesión"

59msgstr "Cerrar la sesión"

60

60

61−#: qml/Components/Dialogs.qml:75

61+#: qml/Components/Dialogs.qml:71

62msgid "Are you sure you want to log out?"

62msgid "Are you sure you want to log out?"

63msgstr "̉¿Está seguro de que quiere cerrar la sesión?"

63msgstr "̉¿Está seguro de que quiere cerrar la sesión?"

64

64

65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

65+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66−#: qml/Components/Dialogs.qml:126

66+#: qml/Components/Dialogs.qml:122

67msgid "No"

67msgid "No"

68msgstr "No"

68msgstr "No"

69

69

70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

70+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71−#: qml/Components/Dialogs.qml:133

71+#: qml/Components/Dialogs.qml:129

72msgid "Yes"

72msgid "Yes"

73msgstr "Sí"

73msgstr "Sí"

74

74

75−#: qml/Components/Dialogs.qml:98

75+#: qml/Components/Dialogs.qml:94

76msgid "Shut down"

76msgid "Shut down"

77msgstr "Apagar"

77msgstr "Apagar"

78

78

79−#: qml/Components/Dialogs.qml:99

79+#: qml/Components/Dialogs.qml:95

80msgid "Are you sure you want to shut down?"

80msgid "Are you sure you want to shut down?"

81msgstr "¿Está seguro de que quiere apagar?"

81msgstr "¿Está seguro de que quiere apagar?"

82

82

83−#: qml/Components/Dialogs.qml:123

83+#: qml/Components/Dialogs.qml:119

84msgid "Reboot"

84msgid "Reboot"

85msgstr "Reiniciar"

85msgstr "Reiniciar"

86

86

87−#: qml/Components/Dialogs.qml:124

87+#: qml/Components/Dialogs.qml:120

88msgid "Are you sure you want to reboot?"

88msgid "Are you sure you want to reboot?"

89msgstr "¿Esta seguro de que quiere reiniciar?"

89msgstr "¿Esta seguro de que quiere reiniciar?"

90

90

91−#: qml/Components/Dialogs.qml:148

91+#: qml/Components/Dialogs.qml:144

92msgid "Power"

92msgid "Power"

93msgstr "Apagar"

93msgstr "Apagar"

94

94

95−#: qml/Components/Dialogs.qml:149

95+#: qml/Components/Dialogs.qml:145

96msgid ""

96msgid ""

97"Are you sure you would like\n"

97"Are you sure you would like\n"

98"to power off?"

98"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100"¿Está seguro de que quiere\n"

100"¿Está seguro de que quiere\n"

101"apagar?"

101"apagar?"

102

102

103−#: qml/Components/Dialogs.qml:151

103+#: qml/Components/Dialogs.qml:147

104msgid "Power off"

104msgid "Power off"

105msgstr "Apagar"

105msgstr "Apagar"

106

106

107−#: qml/Components/Dialogs.qml:161

107+#: qml/Components/Dialogs.qml:157

108msgid "Restart"

108msgid "Restart"

109msgstr "Reiniciar"

109msgstr "Reiniciar"

110

110

111−#: qml/Components/Dialogs.qml:171

111+#: qml/Components/Dialogs.qml:167

112msgid "Cancel"

112msgid "Cancel"

113msgstr "Cancelar"

113msgstr "Cancelar"

114

114

@@ -116,46 +116,46 @@ msgstr "Cancelar"

116msgid "Skip intro"

116msgid "Skip intro"

117msgstr "Omitir la introducción"

117msgstr "Omitir la introducción"

118

118

119−#: qml/Components/EdgeDemo.qml:112

119+#: qml/Components/EdgeDemo.qml:125

120msgid "Right edge"

120msgid "Right edge"

121msgstr "Borde derecho"

121msgstr "Borde derecho"

122

122

123−#: qml/Components/EdgeDemo.qml:113

123+#: qml/Components/EdgeDemo.qml:126

124msgid "Try swiping from the right edge to unlock the phone"

124msgid "Try swiping from the right edge to unlock the phone"

125msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"

125msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"

126

126

127−#: qml/Components/EdgeDemo.qml:144

127+#: qml/Components/EdgeDemo.qml:157

128msgid "Top edge"

128msgid "Top edge"

129msgstr "Borde superior"

129msgstr "Borde superior"

130

130

131−#: qml/Components/EdgeDemo.qml:145

131+#: qml/Components/EdgeDemo.qml:158

132msgid "Try swiping from the top edge to access the indicators"

132msgid "Try swiping from the top edge to access the indicators"

133msgstr ""

133msgstr ""

134"Deslice el dedo desde el borde superior para acceder a los indicadores"

134"Deslice el dedo desde el borde superior para acceder a los indicadores"

135

135

136−#: qml/Components/EdgeDemo.qml:170

136+#: qml/Components/EdgeDemo.qml:183

137msgid "Close"

137msgid "Close"

138msgstr "Cerrar"

138msgstr "Cerrar"

139

139

140−#: qml/Components/EdgeDemo.qml:171

140+#: qml/Components/EdgeDemo.qml:184

141msgid "Swipe up again to close the settings screen"

141msgid "Swipe up again to close the settings screen"

142msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"

142msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"

143

143

144−#: qml/Components/EdgeDemo.qml:201

144+#: qml/Components/EdgeDemo.qml:214

145msgid "Left edge"

145msgid "Left edge"

146msgstr "Borde izquierdo"

146msgstr "Borde izquierdo"

147

147

148−#: qml/Components/EdgeDemo.qml:202

148+#: qml/Components/EdgeDemo.qml:215

149msgid "Swipe from the left to reveal the launcher for quick access to apps"

149msgid "Swipe from the left to reveal the launcher for quick access to apps"

150msgstr ""

150msgstr ""

151"Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "

151"Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "

152"rápidamente a las aplicaciones"

152"rápidamente a las aplicaciones"

153

153

154−#: qml/Components/EdgeDemo.qml:229

154+#: qml/Components/EdgeDemo.qml:242

155msgid "Well done"

155msgid "Well done"

156msgstr "Bien hecho"

156msgstr "Bien hecho"

157

157

158−#: qml/Components/EdgeDemo.qml:230

158+#: qml/Components/EdgeDemo.qml:243

159msgid ""

159msgid ""

160"You have now mastered the edge gestures and can start using the "

160"You have now mastered the edge gestures and can start using the "

161"phone<br><br>Tap on the screen to start"

161"phone<br><br>Tap on the screen to start"

@@ -163,40 +163,44 @@ msgstr ""

163"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "

163"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "

164"la pantalla para comenzar"

164"la pantalla para comenzar"

165

165

166−#: qml/Components/Lockscreen.qml:223

166+#: qml/Components/Lockscreen.qml:238

167msgid "Return to Call"

167msgid "Return to Call"

168msgstr "Volver a la llamada"

168msgstr "Volver a la llamada"

169

169

170−#: qml/Components/Lockscreen.qml:223

170+#: qml/Components/Lockscreen.qml:238

171msgid "Emergency Call"

171msgid "Emergency Call"

172msgstr "Llamada de emergencia"

172msgstr "Llamada de emergencia"

173

173

174−#: qml/Components/Lockscreen.qml:255

174+#: qml/Components/Lockscreen.qml:270

175msgid "OK"

175msgid "OK"

176msgstr "Aceptar"

176msgstr "Aceptar"

177

177

178−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

178+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

179msgid "See less"

179msgid "See less"

180msgstr "Ver menos"

180msgstr "Ver menos"

181

181

182−#: qml/Dash/GenericScopeView.qml:434

182+#: qml/Dash/GenericScopeView.qml:431

183msgid "See all"

183msgid "See all"

184msgstr "Ver todo"

184msgstr "Ver todo"

185

185

186−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

186+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

187#: qml/Panel/SearchIndicator.qml:27

187#: qml/Panel/SearchIndicator.qml:27

188msgid "Search"

188msgid "Search"

189msgstr "Buscar"

189msgstr "Buscar"

190

190

191−#: qml/Dash/PageHeader.qml:268

191+#: qml/Dash/PageHeader.qml:260

192+msgid "Store"

193+msgstr "Tienda"

194+

195+#: qml/Dash/PageHeader.qml:277

192msgid "Settings"

196msgid "Settings"

193msgstr "Configuración"

197msgstr "Configuración"

194

198

195−#: qml/Dash/PageHeader.qml:275

199+#: qml/Dash/PageHeader.qml:284

196msgid "Remove from Favorites"

200msgid "Remove from Favorites"

197msgstr "Quitar de favoritos"

201msgstr "Quitar de favoritos"

198

202

199−#: qml/Dash/PageHeader.qml:275

203+#: qml/Dash/PageHeader.qml:284

200msgid "Add to Favorites"

204msgid "Add to Favorites"

201msgstr "Añadir a favoritos"

205msgstr "Añadir a favoritos"

202

206

@@ -228,31 +232,23 @@ msgstr "Deslice para actualizar…"

228msgid "Release to refresh…"

232msgid "Release to refresh…"

229msgstr "Suelte para actualizar…"

233msgstr "Suelte para actualizar…"

230

234

231−#: qml/Dash/ScopesOverview.qml:215

235+#: qml/Dash/ScopesList.qml:63

232−msgid "Manage Scopes"

236+msgid "Manage"

233−msgstr "Administrar Scopes"

237+msgstr ""

234−

235−#: qml/Dash/ScopesOverview.qml:437

236−msgid "Done"

237−msgstr "Hecho"

238−

239−#: qml/Dash/ScopesOverview.qml:463

240−msgid "Store"

241−msgstr "Tienda"

242

238

243−#: qml/Dash/ScopesOverviewTab.qml:36

239+#: qml/Dash/ScopesList.qml:107

244−msgid "Favorites"

240+msgid "Home"

245−msgstr "Favoritos"

241+msgstr ""

246

242

247−#: qml/Dash/ScopesOverviewTab.qml:54

243+#: qml/Dash/ScopesList.qml:108

248−msgid "All"

244+msgid "Also installed"

249−msgstr "Todo"

245+msgstr ""

250

246

251#: qml/Greeter/Greeter.qml:174

247#: qml/Greeter/Greeter.qml:174

252msgid "Unlock"

248msgid "Unlock"

253msgstr "Desbloquear"

249msgstr "Desbloquear"

254

250

255−#: qml/Notifications/NotificationMenuItemFactory.qml:116

251+#: qml/Notifications/NotificationMenuItemFactory.qml:128

256msgid "Show password"

252msgid "Show password"

257msgstr "Mostrar contraseña"

253msgstr "Mostrar contraseña"

258

254

@@ -300,49 +296,49 @@ msgstr "Desbloquear SIM"

300msgid "Roaming"

296msgid "Roaming"

301msgstr "Itinerancia"

297msgstr "Itinerancia"

302

298

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

304msgid "Enter passphrase"

305msgid "Enter passphrase"

305msgstr "Introduzca la contraseña"

306msgstr "Introduzca la contraseña"

306

307

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

308msgid "Sorry, incorrect passphrase"

318msgid "Sorry, incorrect passphrase"

309msgstr "La contraseña es incorrecta"

319msgstr "La contraseña es incorrecta"

310

320

311−#: qml/Shell.qml:393

321+#: qml/Shell.qml:372

312msgid "Please re-enter"

322msgid "Please re-enter"

313msgstr "Reintroduzca"

323msgstr "Reintroduzca"

314

324

315−#: qml/Shell.qml:395

325+#: qml/Shell.qml:373

316−msgid "Enter passcode"

317−msgstr "Introduzca el código"

318−

319−#: qml/Shell.qml:396

320msgid "Sorry, incorrect passcode"

326msgid "Sorry, incorrect passcode"

321msgstr "El código es incorrecto"

327msgstr "El código es incorrecto"

322

328

323−#: qml/Shell.qml:399

329+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

324−#, qt-format

325−msgid "Enter %1"

326−msgstr "Introduzca %1"

327−

328−#: qml/Shell.qml:400

329−#, qt-format

330−msgid "Sorry, incorrect %1"

331−msgstr "Incorrecto (%1)"

332−

333−#: qml/Shell.qml:441

334msgid "Sorry, incorrect passphrase."

330msgid "Sorry, incorrect passphrase."

335msgstr "La contraseña es incorrecta."

331msgstr "La contraseña es incorrecta."

336

332

337−#: qml/Shell.qml:442

333+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

338msgid "Sorry, incorrect passcode."

334msgid "Sorry, incorrect passcode."

339msgstr "Código de acceso incorrecto."

335msgstr "Código de acceso incorrecto."

340

336

341−#: qml/Shell.qml:443

337+#: qml/Shell.qml:469

342msgid "This will be your last attempt."

338msgid "This will be your last attempt."

343msgstr "Este será su último intento."

339msgstr "Este será su último intento."

344

340

345−#: qml/Shell.qml:445

341+#: qml/Shell.qml:471

346msgid ""

342msgid ""

347"If passphrase is entered incorrectly, your phone will conduct a factory "

343"If passphrase is entered incorrectly, your phone will conduct a factory "

348"reset and all personal data will be deleted."

344"reset and all personal data will be deleted."

@@ -350,7 +346,7 @@ msgstr ""

350"Si se introduce la frase incorrectamente, el teléfono volverá a la "

346"Si se introduce la frase incorrectamente, el teléfono volverá a la "

351"configuración de fábrica y se perderán todos los datos personales."

347"configuración de fábrica y se perderán todos los datos personales."

352

348

353−#: qml/Shell.qml:446

349+#: qml/Shell.qml:472

354msgid ""

350msgid ""

355"If passcode is entered incorrectly, your phone will conduct a factory reset "

351"If passcode is entered incorrectly, your phone will conduct a factory reset "

356"and all personal data will be deleted."

352"and all personal data will be deleted."

@@ -358,6 +354,183 @@ msgstr ""

358"Si se introduce el código incorrectamente, el teléfono volverá a la "

354"Si se introduce el código incorrectamente, el teléfono volverá a la "

359"configuración de fábrica y se perderán todos los datos personales."

355"configuración de fábrica y se perderán todos los datos personales."

360

356

357+#: qml/Wizard/Page.qml:89

358+msgid "Back"

359+msgstr ""

360+

361+#: qml/Wizard/Pages/10-welcome.qml:27

362+msgid "Hi!"

363+msgstr ""

364+

365+#: qml/Wizard/Pages/10-welcome.qml:44

366+msgid "Welcome to your Ubuntu phone."

367+msgstr ""

368+

369+#: qml/Wizard/Pages/10-welcome.qml:52

370+msgid "Let’s get started."

371+msgstr ""

372+

373+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

374+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

375+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

376+#: qml/Wizard/Pages/passwd-set.qml:90

377+msgid "Continue"

378+msgstr ""

379+

380+#: qml/Wizard/Pages/20-sim.qml:25

381+msgid "Add a SIM card and restart your device"

382+msgstr ""

383+

384+#: qml/Wizard/Pages/20-sim.qml:55

385+msgid "Without it, you won’t be able to make calls or use text messaging."

386+msgstr ""

387+

388+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

389+msgid "Skip"

390+msgstr ""

391+

392+#: qml/Wizard/Pages/30-passwd-type.qml:39

393+msgid "Lock security"

394+msgstr ""

395+

396+#: qml/Wizard/Pages/30-passwd-type.qml:74

397+msgid "Please select how you’d like to unlock your phone."

398+msgstr ""

399+

400+#: qml/Wizard/Pages/30-passwd-type.qml:97

401+msgid "Swipe"

402+msgstr ""

403+

404+#: qml/Wizard/Pages/30-passwd-type.qml:98

405+msgid "No security"

406+msgstr ""

407+

408+#: qml/Wizard/Pages/30-passwd-type.qml:100

409+msgid "Passcode"

410+msgstr ""

411+

412+#: qml/Wizard/Pages/30-passwd-type.qml:101

413+msgid "4 digits only"

414+msgstr ""

415+

416+#: qml/Wizard/Pages/30-passwd-type.qml:103

417+msgid "Passphrase"

418+msgstr ""

419+

420+#: qml/Wizard/Pages/30-passwd-type.qml:104

421+msgid "Numbers and letters"

422+msgstr ""

423+

424+#: qml/Wizard/Pages/40-wifi.qml:28

425+msgid "Connect to Wi‑Fi"

426+msgstr ""

427+

428+#: qml/Wizard/Pages/40-wifi.qml:147

429+msgid "Available networks…"

430+msgstr ""

431+

432+#: qml/Wizard/Pages/40-wifi.qml:148

433+msgid "No available networks."

434+msgstr ""

435+

436+#: qml/Wizard/Pages/50-location.qml:27

437+msgid "Location"

438+msgstr ""

439+

440+#: qml/Wizard/Pages/50-location.qml:62

441+msgid "Let the phone detect your location:"

442+msgstr ""

443+

444+#: qml/Wizard/Pages/50-location.qml:69

445+msgid "Using GPS only (less accurate)"

446+msgstr ""

447+

448+#: qml/Wizard/Pages/50-location.qml:86

449+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

450+msgstr ""

451+

452+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

453+#: qml/Wizard/Pages/50-location.qml:103

454+msgid ""

455+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

456+"conditions</a>."

457+msgstr ""

458+

459+#: qml/Wizard/Pages/50-location.qml:112

460+msgid "Not at all"

461+msgstr ""

462+

463+#: qml/Wizard/Pages/50-location.qml:124

464+msgid "You can change your mind later in <b>System Settings</b>."

465+msgstr ""

466+

467+#: qml/Wizard/Pages/60-reporting.qml:24

468+msgid "Improving your experience"

469+msgstr ""

470+

471+#: qml/Wizard/Pages/60-reporting.qml:36

472+msgid ""

473+"Your phone is set up to automatically report errors to Canonical and its "

474+"partners, the makers of the operating system."

475+msgstr ""

476+

477+#: qml/Wizard/Pages/60-reporting.qml:43

478+msgid ""

479+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

480+"Privacy</b>"

481+msgstr ""

482+

483+#: qml/Wizard/Pages/80-finished.qml:24

484+msgid "All done"

485+msgstr ""

486+

487+#: qml/Wizard/Pages/80-finished.qml:39

488+msgid "Nice work!"

489+msgstr ""

490+

491+#: qml/Wizard/Pages/80-finished.qml:46

492+msgid "Your phone is now ready to use."

493+msgstr ""

494+

495+#: qml/Wizard/Pages/80-finished.qml:53

496+msgid "Finish"

497+msgstr ""

498+

499+#: qml/Wizard/Pages/here-terms.qml:27

500+msgid "Terms & Conditions"

501+msgstr ""

502+

503+#: qml/Wizard/Pages/passwd-confirm.qml:49

504+msgid "Confirm passphrase"

505+msgstr ""

506+

507+#: qml/Wizard/Pages/passwd-confirm.qml:50

508+msgid "Confirm passcode"

509+msgstr ""

510+

511+#: qml/Wizard/Pages/passwd-confirm.qml:53

512+#: qml/Wizard/Pages/passwd-confirm.qml:54

513+msgid "Please try again."

514+msgstr ""

515+

516+#: qml/Wizard/Pages/passwd-set.qml:61

517+msgid "Choose your passcode"

518+msgstr ""

519+

520+#: qml/Wizard/Pages/passwd-set.qml:68

521+msgid "Passphrase must be 4 characters long"

522+msgstr ""

523+

524+#: qml/Wizard/StackButton.qml:39

525+#, qt-format

526+msgid "〈 %1"

527+msgstr ""

528+

529+#: qml/Wizard/StackButton.qml:42

530+#, qt-format

531+msgid "%1 〉"

532+msgstr ""

533+

361#~ msgid "Confirm"

534#~ msgid "Confirm"

362#~ msgstr "Confirmar"

535#~ msgstr "Confirmar"

363

536

@@ -372,3 +545,15 @@ msgstr ""

372

545

373#~ msgid "Speaking..."

546#~ msgid "Speaking..."

374#~ msgstr "Hablando…"

547#~ 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 ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-11-08 14:44+0000\n"

11"PO-Revision-Date: 2014-11-08 14:44+0000\n"

12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

13"Language-Team: Basque <eu@li.org>\n"

13"Language-Team: Basque <eu@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Pasahitza: "

23msgstr "Pasahitza: "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Ainguratu lasterbidea"

28msgstr "Ainguratu lasterbidea"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Askatu lasterbidea"

32msgstr "Askatu lasterbidea"

33

33

@@ -53,59 +53,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

53msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"

53msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"

54msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"

54msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"

55

55

56−#: qml/Components/Dialogs.qml:74

56+#: qml/Components/Dialogs.qml:70

57msgid "Log out"

57msgid "Log out"

58msgstr "Amaitu saioa"

58msgstr "Amaitu saioa"

59

59

60−#: qml/Components/Dialogs.qml:75

60+#: qml/Components/Dialogs.qml:71

61msgid "Are you sure you want to log out?"

61msgid "Are you sure you want to log out?"

62msgstr "Ziur saioa amaitu nahi duzula?"

62msgstr "Ziur saioa amaitu nahi duzula?"

63

63

64−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

64+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

65−#: qml/Components/Dialogs.qml:126

65+#: qml/Components/Dialogs.qml:122

66msgid "No"

66msgid "No"

67msgstr "Ez"

67msgstr "Ez"

68

68

69−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

69+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

70−#: qml/Components/Dialogs.qml:133

70+#: qml/Components/Dialogs.qml:129

71msgid "Yes"

71msgid "Yes"

72msgstr "Bai"

72msgstr "Bai"

73

73

74−#: qml/Components/Dialogs.qml:98

74+#: qml/Components/Dialogs.qml:94

75msgid "Shut down"

75msgid "Shut down"

76msgstr "Itzali"

76msgstr "Itzali"

77

77

78−#: qml/Components/Dialogs.qml:99

78+#: qml/Components/Dialogs.qml:95

79msgid "Are you sure you want to shut down?"

79msgid "Are you sure you want to shut down?"

80msgstr "Ziur itzali nahi duzula?"

80msgstr "Ziur itzali nahi duzula?"

81

81

82−#: qml/Components/Dialogs.qml:123

82+#: qml/Components/Dialogs.qml:119

83msgid "Reboot"

83msgid "Reboot"

84msgstr "Berrabiarazi"

84msgstr "Berrabiarazi"

85

85

86−#: qml/Components/Dialogs.qml:124

86+#: qml/Components/Dialogs.qml:120

87msgid "Are you sure you want to reboot?"

87msgid "Are you sure you want to reboot?"

88msgstr "Ziur berrabiarazi nahi duzula?"

88msgstr "Ziur berrabiarazi nahi duzula?"

89

89

90−#: qml/Components/Dialogs.qml:148

90+#: qml/Components/Dialogs.qml:144

91msgid "Power"

91msgid "Power"

92msgstr "Piztu/itzali"

92msgstr "Piztu/itzali"

93

93

94−#: qml/Components/Dialogs.qml:149

94+#: qml/Components/Dialogs.qml:145

95msgid ""

95msgid ""

96"Are you sure you would like\n"

96"Are you sure you would like\n"

97"to power off?"

97"to power off?"

98msgstr "Ziur itzali nahi duzula?"

98msgstr "Ziur itzali nahi duzula?"

99

99

100−#: qml/Components/Dialogs.qml:151

100+#: qml/Components/Dialogs.qml:147

101msgid "Power off"

101msgid "Power off"

102msgstr "Itzali"

102msgstr "Itzali"

103

103

104−#: qml/Components/Dialogs.qml:161

104+#: qml/Components/Dialogs.qml:157

105msgid "Restart"

105msgid "Restart"

106msgstr "Berrabiarazi"

106msgstr "Berrabiarazi"

107

107

108−#: qml/Components/Dialogs.qml:171

108+#: qml/Components/Dialogs.qml:167

109msgid "Cancel"

109msgid "Cancel"

110msgstr "Utzi"

110msgstr "Utzi"

111

111

@@ -113,46 +113,46 @@ msgstr "Utzi"

113msgid "Skip intro"

113msgid "Skip intro"

114msgstr "Saltatu aurkezpena"

114msgstr "Saltatu aurkezpena"

115

115

116−#: qml/Components/EdgeDemo.qml:112

116+#: qml/Components/EdgeDemo.qml:125

117msgid "Right edge"

117msgid "Right edge"

118msgstr "Eskuineko ertza"

118msgstr "Eskuineko ertza"

119

119

120−#: qml/Components/EdgeDemo.qml:113

120+#: qml/Components/EdgeDemo.qml:126

121msgid "Try swiping from the right edge to unlock the phone"

121msgid "Try swiping from the right edge to unlock the phone"

122msgstr ""

122msgstr ""

123"Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"

123"Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"

124

124

125−#: qml/Components/EdgeDemo.qml:144

125+#: qml/Components/EdgeDemo.qml:157

126msgid "Top edge"

126msgid "Top edge"

127msgstr "Goiko ertza"

127msgstr "Goiko ertza"

128

128

129−#: qml/Components/EdgeDemo.qml:145

129+#: qml/Components/EdgeDemo.qml:158

130msgid "Try swiping from the top edge to access the indicators"

130msgid "Try swiping from the top edge to access the indicators"

131msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"

131msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"

132

132

133−#: qml/Components/EdgeDemo.qml:170

133+#: qml/Components/EdgeDemo.qml:183

134msgid "Close"

134msgid "Close"

135msgstr "Itxi"

135msgstr "Itxi"

136

136

137−#: qml/Components/EdgeDemo.qml:171

137+#: qml/Components/EdgeDemo.qml:184

138msgid "Swipe up again to close the settings screen"

138msgid "Swipe up again to close the settings screen"

139msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"

139msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"

140

140

141−#: qml/Components/EdgeDemo.qml:201

141+#: qml/Components/EdgeDemo.qml:214

142msgid "Left edge"

142msgid "Left edge"

143msgstr "Ezkerreko ertza"

143msgstr "Ezkerreko ertza"

144

144

145−#: qml/Components/EdgeDemo.qml:202

145+#: qml/Components/EdgeDemo.qml:215

146msgid "Swipe from the left to reveal the launcher for quick access to apps"

146msgid "Swipe from the left to reveal the launcher for quick access to apps"

147msgstr ""

147msgstr ""

148"Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak berehala eskura "

148"Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak berehala eskura "

149"izateko"

149"izateko"

150

150

151−#: qml/Components/EdgeDemo.qml:229

151+#: qml/Components/EdgeDemo.qml:242

152msgid "Well done"

152msgid "Well done"

153msgstr "Bikain"

153msgstr "Bikain"

154

154

155−#: qml/Components/EdgeDemo.qml:230

155+#: qml/Components/EdgeDemo.qml:243

156msgid ""

156msgid ""

157"You have now mastered the edge gestures and can start using the "

157"You have now mastered the edge gestures and can start using the "

158"phone<br><br>Tap on the screen to start"

158"phone<br><br>Tap on the screen to start"

@@ -160,40 +160,44 @@ msgstr ""

160"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "

160"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "

161"zaitezke<br><br>Sakatu pantailan hasteko"

161"zaitezke<br><br>Sakatu pantailan hasteko"

162

162

163−#: qml/Components/Lockscreen.qml:223

163+#: qml/Components/Lockscreen.qml:238

164msgid "Return to Call"

164msgid "Return to Call"

165msgstr "Itzuli deira"

165msgstr "Itzuli deira"

166

166

167−#: qml/Components/Lockscreen.qml:223

167+#: qml/Components/Lockscreen.qml:238

168msgid "Emergency Call"

168msgid "Emergency Call"

169msgstr "Larrialdi-deia"

169msgstr "Larrialdi-deia"

170

170

171−#: qml/Components/Lockscreen.qml:255

171+#: qml/Components/Lockscreen.qml:270

172msgid "OK"

172msgid "OK"

173msgstr "Ados"

173msgstr "Ados"

174

174

175−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

175+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

176msgid "See less"

176msgid "See less"

177msgstr "Ikusi gutxiago"

177msgstr "Ikusi gutxiago"

178

178

179−#: qml/Dash/GenericScopeView.qml:434

179+#: qml/Dash/GenericScopeView.qml:431

180msgid "See all"

180msgid "See all"

181msgstr "Ikusi guztiak"

181msgstr "Ikusi guztiak"

182

182

183−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

183+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

184#: qml/Panel/SearchIndicator.qml:27

184#: qml/Panel/SearchIndicator.qml:27

185msgid "Search"

185msgid "Search"

186msgstr "Bilatu"

186msgstr "Bilatu"

187

187

188−#: qml/Dash/PageHeader.qml:268

188+#: qml/Dash/PageHeader.qml:260

189+msgid "Store"

190+msgstr "Denda"

191+

192+#: qml/Dash/PageHeader.qml:277

189msgid "Settings"

193msgid "Settings"

190msgstr "Ezarpenak"

194msgstr "Ezarpenak"

191

195

192−#: qml/Dash/PageHeader.qml:275

196+#: qml/Dash/PageHeader.qml:284

193msgid "Remove from Favorites"

197msgid "Remove from Favorites"

194msgstr "Kendu gogokoetatik"

198msgstr "Kendu gogokoetatik"

195

199

196−#: qml/Dash/PageHeader.qml:275

200+#: qml/Dash/PageHeader.qml:284

197msgid "Add to Favorites"

201msgid "Add to Favorites"

198msgstr "Gehitu gogokoetara"

202msgstr "Gehitu gogokoetara"

199

203

@@ -225,31 +229,23 @@ msgstr "Tiratu freskatzeko…"

225msgid "Release to refresh…"

229msgid "Release to refresh…"

226msgstr "Askatu freskatzeko…"

230msgstr "Askatu freskatzeko…"

227

231

228−#: qml/Dash/ScopesOverview.qml:215

232+#: qml/Dash/ScopesList.qml:63

229−msgid "Manage Scopes"

233+msgid "Manage"

230−msgstr "Kudeatu eremuak"

234+msgstr ""

231−

232−#: qml/Dash/ScopesOverview.qml:437

233−msgid "Done"

234−msgstr "Eginda"

235−

236−#: qml/Dash/ScopesOverview.qml:463

237−msgid "Store"

238−msgstr "Denda"

239

235

240−#: qml/Dash/ScopesOverviewTab.qml:36

236+#: qml/Dash/ScopesList.qml:107

241−msgid "Favorites"

237+msgid "Home"

242−msgstr "Gogokoak"

238+msgstr ""

243

239

244−#: qml/Dash/ScopesOverviewTab.qml:54

240+#: qml/Dash/ScopesList.qml:108

245−msgid "All"

241+msgid "Also installed"

246−msgstr "Guztiak"

242+msgstr ""

247

243

248#: qml/Greeter/Greeter.qml:174

244#: qml/Greeter/Greeter.qml:174

249msgid "Unlock"

245msgid "Unlock"

250msgstr "Desblokeatu"

246msgstr "Desblokeatu"

251

247

252−#: qml/Notifications/NotificationMenuItemFactory.qml:116

248+#: qml/Notifications/NotificationMenuItemFactory.qml:128

253msgid "Show password"

249msgid "Show password"

254msgstr "Erakutsi pasahitza"

250msgstr "Erakutsi pasahitza"

255

251

@@ -297,49 +293,49 @@ msgstr "Desblokeatu SIMa"

297msgid "Roaming"

293msgid "Roaming"

298msgstr "Ibiltaritza"

294msgstr "Ibiltaritza"

299

295

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

301msgid "Enter passphrase"

302msgid "Enter passphrase"

302msgstr "Sartu pasaesaldia"

303msgstr "Sartu pasaesaldia"

303

304

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

305msgid "Sorry, incorrect passphrase"

315msgid "Sorry, incorrect passphrase"

306msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"

316msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"

307

317

308−#: qml/Shell.qml:393

318+#: qml/Shell.qml:372

309msgid "Please re-enter"

319msgid "Please re-enter"

310msgstr "Errepikatu"

320msgstr "Errepikatu"

311

321

312−#: qml/Shell.qml:395

322+#: qml/Shell.qml:373

313−msgid "Enter passcode"

314−msgstr "Sartu pasakodea"

315−

316−#: qml/Shell.qml:396

317msgid "Sorry, incorrect passcode"

323msgid "Sorry, incorrect passcode"

318msgstr "Sentitzen dugu, pasakodea okerra da"

324msgstr "Sentitzen dugu, pasakodea okerra da"

319

325

320−#: qml/Shell.qml:399

326+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

321−#, qt-format

322−msgid "Enter %1"

323−msgstr "Sartu %1"

324−

325−#: qml/Shell.qml:400

326−#, qt-format

327−msgid "Sorry, incorrect %1"

328−msgstr "Sentitzen dugu, %1 okerra da"

329−

330−#: qml/Shell.qml:441

331msgid "Sorry, incorrect passphrase."

327msgid "Sorry, incorrect passphrase."

332msgstr "Sentitzen dugu, pasaesaldia okerra da."

328msgstr "Sentitzen dugu, pasaesaldia okerra da."

333

329

334−#: qml/Shell.qml:442

330+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

335msgid "Sorry, incorrect passcode."

331msgid "Sorry, incorrect passcode."

336msgstr "Sentitzen dugu, pasakodea okerra da."

332msgstr "Sentitzen dugu, pasakodea okerra da."

337

333

338−#: qml/Shell.qml:443

334+#: qml/Shell.qml:469

339msgid "This will be your last attempt."

335msgid "This will be your last attempt."

340msgstr "Hau duzu azken saiakera."

336msgstr "Hau duzu azken saiakera."

341

337

342−#: qml/Shell.qml:445

338+#: qml/Shell.qml:471

343msgid ""

339msgid ""

344"If passphrase is entered incorrectly, your phone will conduct a factory "

340"If passphrase is entered incorrectly, your phone will conduct a factory "

345"reset and all personal data will be deleted."

341"reset and all personal data will be deleted."

@@ -347,7 +343,7 @@ msgstr ""

347"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "

343"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "

348"berrezarri eta datu pertsonal guztiak ezabatuko dira."

344"berrezarri eta datu pertsonal guztiak ezabatuko dira."

349

345

350−#: qml/Shell.qml:446

346+#: qml/Shell.qml:472

351msgid ""

347msgid ""

352"If passcode is entered incorrectly, your phone will conduct a factory reset "

348"If passcode is entered incorrectly, your phone will conduct a factory reset "

353"and all personal data will be deleted."

349"and all personal data will be deleted."

@@ -355,6 +351,183 @@ msgstr ""

355"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "

351"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "

356"berrezarri eta datu pertsonal guztiak ezabatuko dira."

352"berrezarri eta datu pertsonal guztiak ezabatuko dira."

357

353

354+#: qml/Wizard/Page.qml:89

355+msgid "Back"

356+msgstr ""

357+

358+#: qml/Wizard/Pages/10-welcome.qml:27

359+msgid "Hi!"

360+msgstr ""

361+

362+#: qml/Wizard/Pages/10-welcome.qml:44

363+msgid "Welcome to your Ubuntu phone."

364+msgstr ""

365+

366+#: qml/Wizard/Pages/10-welcome.qml:52

367+msgid "Let’s get started."

368+msgstr ""

369+

370+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

371+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

372+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

373+#: qml/Wizard/Pages/passwd-set.qml:90

374+msgid "Continue"

375+msgstr ""

376+

377+#: qml/Wizard/Pages/20-sim.qml:25

378+msgid "Add a SIM card and restart your device"

379+msgstr ""

380+

381+#: qml/Wizard/Pages/20-sim.qml:55

382+msgid "Without it, you won’t be able to make calls or use text messaging."

383+msgstr ""

384+

385+#: 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+

358#~ msgid "Type or say a command"

531#~ msgid "Type or say a command"

359#~ msgstr "Idatzi edo esan agindu bat"

532#~ msgstr "Idatzi edo esan agindu bat"

360

533

@@ -367,5 +540,17 @@ msgstr ""

367#~ msgid "Speaking..."

540#~ msgid "Speaking..."

368#~ msgstr "Hitz egiten..."

541#~ msgstr "Hitz egiten..."

369

542

543+#~ msgid "Done"

544+#~ msgstr "Eginda"

545+

546+#~ msgid "All"

547+#~ msgstr "Guztiak"

548+

549+#~ msgid "Favorites"

550+#~ msgstr "Gogokoak"

551+

370#~ msgid "Confirm"

552#~ msgid "Confirm"

371#~ msgstr "Berretsi"

553#~ msgstr "Berretsi"

554+

555+#~ msgid "Manage Scopes"

556+#~ msgstr "Kudeatu eremuak"

po/fa.po+242−49

@@ -7,16 +7,16 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-07 12:53+0000\n"

11+"PO-Revision-Date: 2015-01-09 15:59+0000\n"

12"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"

12"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"

13"Language-Team: Persian <fa@li.org>\n"

13"Language-Team: Persian <fa@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2015-01-10 07:18+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17298)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

@@ -176,20 +176,24 @@ msgstr "کم‌تر ببینید"

176msgid "See all"

176msgid "See all"

177msgstr "دیدن همه"

177msgstr "دیدن همه"

178

178

179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268

180#: qml/Panel/SearchIndicator.qml:27

180#: qml/Panel/SearchIndicator.qml:27

181msgid "Search"

181msgid "Search"

182msgstr "جست‌وجو"

182msgstr "جست‌وجو"

183

183

184−#: qml/Dash/PageHeader.qml:268

184+#: qml/Dash/PageHeader.qml:261

185+msgid "Store"

186+msgstr "فروشگاه"

187+

188+#: qml/Dash/PageHeader.qml:278

185msgid "Settings"

189msgid "Settings"

186msgstr "تنظیمات"

190msgstr "تنظیمات"

187

191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:285

189msgid "Remove from Favorites"

193msgid "Remove from Favorites"

190msgstr "برداشتن از برگزیده‌ها"

194msgstr "برداشتن از برگزیده‌ها"

191

195

192−#: qml/Dash/PageHeader.qml:275

196+#: qml/Dash/PageHeader.qml:285

193msgid "Add to Favorites"

197msgid "Add to Favorites"

194msgstr "افزودن به برگزیده‌ها"

198msgstr "افزودن به برگزیده‌ها"

195

199

@@ -221,31 +225,23 @@ msgstr "برای تازه‌سازی بکشید…"

221msgid "Release to refresh…"

225msgid "Release to refresh…"

222msgstr "برای تازه‌سازی رها کنید…"

226msgstr "برای تازه‌سازی رها کنید…"

223

227

224−#: qml/Dash/ScopesOverview.qml:215

228+#: qml/Dash/ScopesList.qml:63

225−msgid "Manage Scopes"

229+msgid "Manage"

226−msgstr "مدیریت حوزه‌ها"

230+msgstr "مدیریت"

227−

228−#: qml/Dash/ScopesOverview.qml:437

229−msgid "Done"

230−msgstr "انجام شد"

231−

232−#: qml/Dash/ScopesOverview.qml:463

233−msgid "Store"

234−msgstr "فروشگاه"

235

231

236−#: qml/Dash/ScopesOverviewTab.qml:36

232+#: qml/Dash/ScopesList.qml:107

237−msgid "Favorites"

233+msgid "Home"

238−msgstr "برگزیده‌ها"

234+msgstr "خانه"

239

235

240−#: qml/Dash/ScopesOverviewTab.qml:54

236+#: qml/Dash/ScopesList.qml:108

241−msgid "All"

237+msgid "Also installed"

242−msgstr "همه"

238+msgstr "هم‌چنین نصب شده"

243

239

244#: qml/Greeter/Greeter.qml:174

240#: qml/Greeter/Greeter.qml:174

245msgid "Unlock"

241msgid "Unlock"

246msgstr "بازکردن قفل"

242msgstr "بازکردن قفل"

247

243

248−#: qml/Notifications/NotificationMenuItemFactory.qml:116

244+#: qml/Notifications/NotificationMenuItemFactory.qml:128

249msgid "Show password"

245msgid "Show password"

250msgstr "نمایش گذرواژه"

246msgstr "نمایش گذرواژه"

251

247

@@ -293,49 +289,49 @@ msgstr "باز کردن قفل سیم‌کارت"

293msgid "Roaming"

289msgid "Roaming"

294msgstr "رومینگ"

290msgstr "رومینگ"

295

291

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

297msgid "Enter passphrase"

298msgid "Enter passphrase"

298msgstr "عبارت‌عبور را وارد کنید"

299msgstr "عبارت‌عبور را وارد کنید"

299

300

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

301msgid "Sorry, incorrect passphrase"

311msgid "Sorry, incorrect passphrase"

302msgstr "متأسّفیم، عبارت‌عبور نادرست بود"

312msgstr "متأسّفیم، عبارت‌عبور نادرست بود"

303

313

304−#: qml/Shell.qml:393

314+#: qml/Shell.qml:396

305msgid "Please re-enter"

315msgid "Please re-enter"

306msgstr "لطفاً دوباره وارد کنید"

316msgstr "لطفاً دوباره وارد کنید"

307

317

308−#: qml/Shell.qml:395

318+#: qml/Shell.qml:399

309−msgid "Enter passcode"

310−msgstr "رمزعبور را وارد کنید"

311−

312−#: qml/Shell.qml:396

313msgid "Sorry, incorrect passcode"

319msgid "Sorry, incorrect passcode"

314msgstr "متأسّفیم، رمزعبور نادرست بود"

320msgstr "متأسّفیم، رمزعبور نادرست بود"

315

321

316−#: qml/Shell.qml:399

322+#: qml/Shell.qml:444

317−#, qt-format

318−msgid "Enter %1"

319−msgstr "%1 را وارد کنید"

320−

321−#: qml/Shell.qml:400

322−#, qt-format

323−msgid "Sorry, incorrect %1"

324−msgstr "متأسّفیم، %1 نادرست بود"

325−

326−#: qml/Shell.qml:441

327msgid "Sorry, incorrect passphrase."

323msgid "Sorry, incorrect passphrase."

328msgstr "متأسّفیم، عبارت‌عبور نادرست است."

324msgstr "متأسّفیم، عبارت‌عبور نادرست است."

329

325

330−#: qml/Shell.qml:442

326+#: qml/Shell.qml:445

331msgid "Sorry, incorrect passcode."

327msgid "Sorry, incorrect passcode."

332msgstr "متأسّفیم، رمزعبور نادرست است."

328msgstr "متأسّفیم، رمزعبور نادرست است."

333

329

334−#: qml/Shell.qml:443

330+#: qml/Shell.qml:446

335msgid "This will be your last attempt."

331msgid "This will be your last attempt."

336msgstr "این آخرین تلاش شما خواهد بود."

332msgstr "این آخرین تلاش شما خواهد بود."

337

333

338−#: qml/Shell.qml:445

334+#: qml/Shell.qml:448

339msgid ""

335msgid ""

340"If passphrase is entered incorrectly, your phone will conduct a factory "

336"If passphrase is entered incorrectly, your phone will conduct a factory "

341"reset and all personal data will be deleted."

337"reset and all personal data will be deleted."

@@ -343,7 +339,7 @@ msgstr ""

343"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

339"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

344"اطّلاعات شخصی حذف خواهند شد."

340"اطّلاعات شخصی حذف خواهند شد."

345

341

346−#: qml/Shell.qml:446

342+#: qml/Shell.qml:449

347msgid ""

343msgid ""

348"If passcode is entered incorrectly, your phone will conduct a factory reset "

344"If passcode is entered incorrectly, your phone will conduct a factory reset "

349"and all personal data will be deleted."

345"and all personal data will be deleted."

@@ -351,6 +347,191 @@ msgstr ""

351"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

347"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

352"اطّلاعات شخصی حذف خواهند شد."

348"اطّلاعات شخصی حذف خواهند شد."

353

349

350+#: qml/Wizard/Page.qml:89

351+msgid "Back"

352+msgstr "بازگشت"

353+

354+#: qml/Wizard/Pages/10-welcome.qml:27

355+msgid "Hi!"

356+msgstr "سلام!"

357+

358+#: qml/Wizard/Pages/10-welcome.qml:44

359+msgid "Welcome to your Ubuntu phone."

360+msgstr "به تلفن اوبونتوی خودتان خوش آمدید."

361+

362+#: qml/Wizard/Pages/10-welcome.qml:52

363+msgid "Let’s get started."

364+msgstr "بیایید شروع کینم."

365+

366+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

367+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

368+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

369+#: qml/Wizard/Pages/passwd-set.qml:90

370+msgid "Continue"

371+msgstr "ادامه"

372+

373+#: qml/Wizard/Pages/20-sim.qml:25

374+msgid "Add a SIM card and restart your device"

375+msgstr "سیم‌کارتی افزوده و دستگاهتان را شروع مجدّد کنید"

376+

377+#: qml/Wizard/Pages/20-sim.qml:55

378+msgid "Without it, you won’t be able to make calls or use text messaging."

379+msgstr ""

380+"بدون آن، نخواهید توانست تماس گرفته با از پیام‌رسانی متنی استفاده کنید."

381+

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+

354#~ msgid "Type or say a command"

535#~ msgid "Type or say a command"

355#~ msgstr "دستوری را بنویسید یا بگویید"

536#~ msgstr "دستوری را بنویسید یا بگویید"

356

537

@@ -365,3 +546,15 @@ msgstr ""

365

546

366#~ msgid "Speak Now..."

547#~ msgid "Speak Now..."

367#~ msgstr "اکنون صحبت کنید…"

548#~ 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 ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-05 11:49+0000\n"

11+"PO-Revision-Date: 2014-12-14 15:37+0000\n"

12"Last-Translator: Jiri Grönroos <Unknown>\n"

12"Last-Translator: Jiri Grönroos <Unknown>\n"

13"Language-Team: Finnish <fi@li.org>\n"

13"Language-Team: Finnish <fi@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-15 06:34+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Salasana: "

23msgstr "Salasana: "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Kiinnitä pikakuvake"

28msgstr "Kiinnitä pikakuvake"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Poista pikakuvakkeen kiinnitys"

32msgstr "Poista pikakuvakkeen kiinnitys"

33

33

@@ -52,45 +52,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

52msgstr[0] "Odota %1 minuutti ja yritä sitten uudelleen…"

52msgstr[0] "Odota %1 minuutti ja yritä sitten uudelleen…"

53msgstr[1] "Odota %1 minuuttia ja yritä sitten uudelleen…"

53msgstr[1] "Odota %1 minuuttia ja yritä sitten uudelleen…"

54

54

55−#: qml/Components/Dialogs.qml:74

55+#: qml/Components/Dialogs.qml:70

56msgid "Log out"

56msgid "Log out"

57msgstr "Kirjaudu ulos"

57msgstr "Kirjaudu ulos"

58

58

59−#: qml/Components/Dialogs.qml:75

59+#: qml/Components/Dialogs.qml:71

60msgid "Are you sure you want to log out?"

60msgid "Are you sure you want to log out?"

61msgstr "Haluatko varmasti kirjautua ulos?"

61msgstr "Haluatko varmasti kirjautua ulos?"

62

62

63−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

63+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

64−#: qml/Components/Dialogs.qml:126

64+#: qml/Components/Dialogs.qml:122

65msgid "No"

65msgid "No"

66msgstr "Ei"

66msgstr "Ei"

67

67

68−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

68+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

69−#: qml/Components/Dialogs.qml:133

69+#: qml/Components/Dialogs.qml:129

70msgid "Yes"

70msgid "Yes"

71msgstr "Kyllä"

71msgstr "Kyllä"

72

72

73−#: qml/Components/Dialogs.qml:98

73+#: qml/Components/Dialogs.qml:94

74msgid "Shut down"

74msgid "Shut down"

75msgstr "Sammuta"

75msgstr "Sammuta"

76

76

77−#: qml/Components/Dialogs.qml:99

77+#: qml/Components/Dialogs.qml:95

78msgid "Are you sure you want to shut down?"

78msgid "Are you sure you want to shut down?"

79msgstr "Haluatko varmasti sammuttaa laitteen?"

79msgstr "Haluatko varmasti sammuttaa laitteen?"

80

80

81−#: qml/Components/Dialogs.qml:123

81+#: qml/Components/Dialogs.qml:119

82msgid "Reboot"

82msgid "Reboot"

83msgstr "Käynnistä uudelleen"

83msgstr "Käynnistä uudelleen"

84

84

85−#: qml/Components/Dialogs.qml:124

85+#: qml/Components/Dialogs.qml:120

86msgid "Are you sure you want to reboot?"

86msgid "Are you sure you want to reboot?"

87msgstr "Haluatko varmasti käynnistää laitteen uudelleen?"

87msgstr "Haluatko varmasti käynnistää laitteen uudelleen?"

88

88

89−#: qml/Components/Dialogs.qml:148

89+#: qml/Components/Dialogs.qml:144

90msgid "Power"

90msgid "Power"

91msgstr "Virran katkaisu"

91msgstr "Virran katkaisu"

92

92

93−#: qml/Components/Dialogs.qml:149

93+#: qml/Components/Dialogs.qml:145

94msgid ""

94msgid ""

95"Are you sure you would like\n"

95"Are you sure you would like\n"

96"to power off?"

96"to power off?"

@@ -98,15 +98,15 @@ msgstr ""

98"Haluatko varmasti\n"

98"Haluatko varmasti\n"

99"sammuttaa laitteen?"

99"sammuttaa laitteen?"

100

100

101−#: qml/Components/Dialogs.qml:151

101+#: qml/Components/Dialogs.qml:147

102msgid "Power off"

102msgid "Power off"

103msgstr "Sammuta"

103msgstr "Sammuta"

104

104

105−#: qml/Components/Dialogs.qml:161

105+#: qml/Components/Dialogs.qml:157

106msgid "Restart"

106msgid "Restart"

107msgstr "Käynnistä uudelleen"

107msgstr "Käynnistä uudelleen"

108

108

109−#: qml/Components/Dialogs.qml:171

109+#: qml/Components/Dialogs.qml:167

110msgid "Cancel"

110msgid "Cancel"

111msgstr "Peru"

111msgstr "Peru"

112

112

@@ -114,43 +114,43 @@ msgstr "Peru"

114msgid "Skip intro"

114msgid "Skip intro"

115msgstr "Ohita esittely"

115msgstr "Ohita esittely"

116

116

117−#: qml/Components/EdgeDemo.qml:112

117+#: qml/Components/EdgeDemo.qml:125

118msgid "Right edge"

118msgid "Right edge"

119msgstr "Oikea reuna"

119msgstr "Oikea reuna"

120

120

121−#: qml/Components/EdgeDemo.qml:113

121+#: qml/Components/EdgeDemo.qml:126

122msgid "Try swiping from the right edge to unlock the phone"

122msgid "Try swiping from the right edge to unlock the phone"

123msgstr "Vedä oikealta avataksesi puhelimen lukituksen"

123msgstr "Vedä oikealta avataksesi puhelimen lukituksen"

124

124

125−#: qml/Components/EdgeDemo.qml:144

125+#: qml/Components/EdgeDemo.qml:157

126msgid "Top edge"

126msgid "Top edge"

127msgstr "Yläreuna"

127msgstr "Yläreuna"

128

128

129−#: qml/Components/EdgeDemo.qml:145

129+#: qml/Components/EdgeDemo.qml:158

130msgid "Try swiping from the top edge to access the indicators"

130msgid "Try swiping from the top edge to access the indicators"

131msgstr "Vedä yläreunasta käyttääksesi ilmaisimia"

131msgstr "Vedä yläreunasta käyttääksesi ilmaisimia"

132

132

133−#: qml/Components/EdgeDemo.qml:170

133+#: qml/Components/EdgeDemo.qml:183

134msgid "Close"

134msgid "Close"

135msgstr "Sulje"

135msgstr "Sulje"

136

136

137−#: qml/Components/EdgeDemo.qml:171

137+#: qml/Components/EdgeDemo.qml:184

138msgid "Swipe up again to close the settings screen"

138msgid "Swipe up again to close the settings screen"

139msgstr "Vedä uudestaan sulkeaksesi asetusnäkymän"

139msgstr "Vedä uudestaan sulkeaksesi asetusnäkymän"

140

140

141−#: qml/Components/EdgeDemo.qml:201

141+#: qml/Components/EdgeDemo.qml:214

142msgid "Left edge"

142msgid "Left edge"

143msgstr "Vasen reuna"

143msgstr "Vasen reuna"

144

144

145−#: qml/Components/EdgeDemo.qml:202

145+#: qml/Components/EdgeDemo.qml:215

146msgid "Swipe from the left to reveal the launcher for quick access to apps"

146msgid "Swipe from the left to reveal the launcher for quick access to apps"

147msgstr "Vedä vasemmalta saattaaksesi sovellusten käynnistimen esiin"

147msgstr "Vedä vasemmalta saattaaksesi sovellusten käynnistimen esiin"

148

148

149−#: qml/Components/EdgeDemo.qml:229

149+#: qml/Components/EdgeDemo.qml:242

150msgid "Well done"

150msgid "Well done"

151msgstr "Hyvin tehty"

151msgstr "Hyvin tehty"

152

152

153−#: qml/Components/EdgeDemo.qml:230

153+#: qml/Components/EdgeDemo.qml:243

154msgid ""

154msgid ""

155"You have now mastered the edge gestures and can start using the "

155"You have now mastered the edge gestures and can start using the "

156"phone<br><br>Tap on the screen to start"

156"phone<br><br>Tap on the screen to start"

@@ -158,40 +158,44 @@ msgstr ""

158"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "

158"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "

159"käytön<br><br>Napauta näyttöä aloittaaksesi"

159"käytön<br><br>Napauta näyttöä aloittaaksesi"

160

160

161−#: qml/Components/Lockscreen.qml:223

161+#: qml/Components/Lockscreen.qml:238

162msgid "Return to Call"

162msgid "Return to Call"

163msgstr "Palaa puheluun"

163msgstr "Palaa puheluun"

164

164

165−#: qml/Components/Lockscreen.qml:223

165+#: qml/Components/Lockscreen.qml:238

166msgid "Emergency Call"

166msgid "Emergency Call"

167msgstr "Hätäpuhelu"

167msgstr "Hätäpuhelu"

168

168

169−#: qml/Components/Lockscreen.qml:255

169+#: qml/Components/Lockscreen.qml:270

170msgid "OK"

170msgid "OK"

171msgstr "OK"

171msgstr "OK"

172

172

173−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

173+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

174msgid "See less"

174msgid "See less"

175msgstr "Näytä vähemmän"

175msgstr "Näytä vähemmän"

176

176

177−#: qml/Dash/GenericScopeView.qml:434

177+#: qml/Dash/GenericScopeView.qml:431

178msgid "See all"

178msgid "See all"

179msgstr "Näytä kaikki"

179msgstr "Näytä kaikki"

180

180

181−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

181+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

182#: qml/Panel/SearchIndicator.qml:27

182#: qml/Panel/SearchIndicator.qml:27

183msgid "Search"

183msgid "Search"

184msgstr "Hae"

184msgstr "Hae"

185

185

186−#: qml/Dash/PageHeader.qml:268

186+#: qml/Dash/PageHeader.qml:260

187+msgid "Store"

188+msgstr "Kauppa"

189+

190+#: qml/Dash/PageHeader.qml:277

187msgid "Settings"

191msgid "Settings"

188msgstr "Asetukset"

192msgstr "Asetukset"

189

193

190−#: qml/Dash/PageHeader.qml:275

194+#: qml/Dash/PageHeader.qml:284

191msgid "Remove from Favorites"

195msgid "Remove from Favorites"

192msgstr "Poista suosikeista"

196msgstr "Poista suosikeista"

193

197

194−#: qml/Dash/PageHeader.qml:275

198+#: qml/Dash/PageHeader.qml:284

195msgid "Add to Favorites"

199msgid "Add to Favorites"

196msgstr "Lisää suosikkeihin"

200msgstr "Lisää suosikkeihin"

197

201

@@ -223,31 +227,23 @@ msgstr "Vedä päivittääksesi…"

223msgid "Release to refresh…"

227msgid "Release to refresh…"

224msgstr "Vapauta päivittääksesi…"

228msgstr "Vapauta päivittääksesi…"

225

229

226−#: qml/Dash/ScopesOverview.qml:215

230+#: qml/Dash/ScopesList.qml:63

227−msgid "Manage Scopes"

231+msgid "Manage"

228−msgstr "Näkymien hallinta"

232+msgstr "Hallitse"

229

233

230−#: qml/Dash/ScopesOverview.qml:437

234+#: qml/Dash/ScopesList.qml:107

231−msgid "Done"

235+msgid "Home"

232−msgstr "Valmis"

236+msgstr "Koti"

233

237

234−#: qml/Dash/ScopesOverview.qml:463

238+#: qml/Dash/ScopesList.qml:108

235−msgid "Store"

239+msgid "Also installed"

236−msgstr "Kauppa"

240+msgstr "Myös asennettu"

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"

245

241

246#: qml/Greeter/Greeter.qml:174

242#: qml/Greeter/Greeter.qml:174

247msgid "Unlock"

243msgid "Unlock"

248msgstr "Avaa lukitus"

244msgstr "Avaa lukitus"

249

245

250−#: qml/Notifications/NotificationMenuItemFactory.qml:116

246+#: qml/Notifications/NotificationMenuItemFactory.qml:128

251msgid "Show password"

247msgid "Show password"

252msgstr "Näytä salasana"

248msgstr "Näytä salasana"

253

249

@@ -295,49 +291,49 @@ msgstr "Avaa SIM-kortin lukitus"

295msgid "Roaming"

291msgid "Roaming"

296msgstr "Verkkovierailu"

292msgstr "Verkkovierailu"

297

293

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

299msgid "Enter passphrase"

300msgid "Enter passphrase"

300msgstr "Anna tunnuslause"

301msgstr "Anna tunnuslause"

301

302

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

303msgid "Sorry, incorrect passphrase"

313msgid "Sorry, incorrect passphrase"

304msgstr "Virheellinen tunnuslause"

314msgstr "Virheellinen tunnuslause"

305

315

306−#: qml/Shell.qml:393

316+#: qml/Shell.qml:372

307msgid "Please re-enter"

317msgid "Please re-enter"

308msgstr "Anna uudelleen"

318msgstr "Anna uudelleen"

309

319

310−#: qml/Shell.qml:395

320+#: qml/Shell.qml:373

311−msgid "Enter passcode"

312−msgstr "Anna suojakoodi"

313−

314−#: qml/Shell.qml:396

315msgid "Sorry, incorrect passcode"

321msgid "Sorry, incorrect passcode"

316msgstr "Väärä suojakoodi"

322msgstr "Väärä suojakoodi"

317

323

318−#: qml/Shell.qml:399

324+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

319−#, qt-format

320−msgid "Enter %1"

321−msgstr "Anna %1"

322−

323−#: qml/Shell.qml:400

324−#, qt-format

325−msgid "Sorry, incorrect %1"

326−msgstr "Väärä %1"

327−

328−#: qml/Shell.qml:441

329msgid "Sorry, incorrect passphrase."

325msgid "Sorry, incorrect passphrase."

330msgstr "Virheellinen tunnuslause."

326msgstr "Virheellinen tunnuslause."

331

327

332−#: qml/Shell.qml:442

328+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

333msgid "Sorry, incorrect passcode."

329msgid "Sorry, incorrect passcode."

334msgstr "Virheellinen suojakoodi."

330msgstr "Virheellinen suojakoodi."

335

331

336−#: qml/Shell.qml:443

332+#: qml/Shell.qml:469

337msgid "This will be your last attempt."

333msgid "This will be your last attempt."

338msgstr "Tämä on viimeinen yritys."

334msgstr "Tämä on viimeinen yritys."

339

335

340−#: qml/Shell.qml:445

336+#: qml/Shell.qml:471

341msgid ""

337msgid ""

342"If passphrase is entered incorrectly, your phone will conduct a factory "

338"If passphrase is entered incorrectly, your phone will conduct a factory "

343"reset and all personal data will be deleted."

339"reset and all personal data will be deleted."

@@ -345,7 +341,7 @@ msgstr ""

345"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "

341"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "

346"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

342"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

347

343

348−#: qml/Shell.qml:446

344+#: qml/Shell.qml:472

349msgid ""

345msgid ""

350"If passcode is entered incorrectly, your phone will conduct a factory reset "

346"If passcode is entered incorrectly, your phone will conduct a factory reset "

351"and all personal data will be deleted."

347"and all personal data will be deleted."

@@ -353,6 +349,190 @@ msgstr ""

353"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "

349"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "

354"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

350"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

355

351

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+

356#~ msgid "Confirm"

536#~ msgid "Confirm"

357#~ msgstr "Hyväksy"

537#~ msgstr "Hyväksy"

358

538

@@ -367,3 +547,15 @@ msgstr ""

367

547

368#~ msgid "Loading. Please Wait..."

548#~ msgid "Loading. Please Wait..."

369#~ msgstr "Ladataan, pieni hetki..."

549#~ msgstr "Ladataan, pieni hetki..."

550+

551+#~ msgid "All"

552+#~ msgstr "Kaikki"

553+

554+#~ msgid "Favorites"

555+#~ msgstr "Suosikit"

556+

557+#~ msgid "Done"

558+#~ msgstr "Valmis"

559+

560+#~ msgid "Manage Scopes"

561+#~ msgstr "Näkymien hallinta"

po/fo.po+248−75

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-01-14 20:08+0000\n"

11"PO-Revision-Date: 2014-01-14 20:08+0000\n"

12"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"

12"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"

13"Language-Team: Faroese <fo@li.org>\n"

13"Language-Team: Faroese <fo@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr ""

23msgstr ""

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr ""

28msgstr ""

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr ""

32msgstr ""

33

33

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] ""

50msgstr[0] ""

51msgstr[1] ""

51msgstr[1] ""

52

52

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

54msgid "Log out"

54msgid "Log out"

55msgstr ""

55msgstr ""

56

56

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

58msgid "Are you sure you want to log out?"

58msgid "Are you sure you want to log out?"

59msgstr ""

59msgstr ""

60

60

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:122

63msgid "No"

63msgid "No"

64msgstr ""

64msgstr ""

65

65

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:129

68msgid "Yes"

68msgid "Yes"

69msgstr ""

69msgstr ""

70

70

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

72msgid "Shut down"

72msgid "Shut down"

73msgstr ""

73msgstr ""

74

74

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

76msgid "Are you sure you want to shut down?"

76msgid "Are you sure you want to shut down?"

77msgstr ""

77msgstr ""

78

78

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

80msgid "Reboot"

80msgid "Reboot"

81msgstr ""

81msgstr ""

82

82

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

84msgid "Are you sure you want to reboot?"

84msgid "Are you sure you want to reboot?"

85msgstr ""

85msgstr ""

86

86

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

88msgid "Power"

88msgid "Power"

89msgstr ""

89msgstr ""

90

90

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

92msgid ""

92msgid ""

93"Are you sure you would like\n"

93"Are you sure you would like\n"

94"to power off?"

94"to power off?"

95msgstr ""

95msgstr ""

96

96

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

98msgid "Power off"

98msgid "Power off"

99msgstr ""

99msgstr ""

100

100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102msgid "Restart"

102msgid "Restart"

103msgstr ""

103msgstr ""

104

104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106msgid "Cancel"

106msgid "Cancel"

107msgstr ""

107msgstr ""

108

108

@@ -110,82 +110,86 @@ msgstr ""

110msgid "Skip intro"

110msgid "Skip intro"

111msgstr ""

111msgstr ""

112

112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114msgid "Right edge"

114msgid "Right edge"

115msgstr "Høgra kant"

115msgstr "Høgra kant"

116

116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118msgid "Try swiping from the right edge to unlock the phone"

118msgid "Try swiping from the right edge to unlock the phone"

119msgstr ""

119msgstr ""

120

120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122msgid "Top edge"

122msgid "Top edge"

123msgstr "Topp kantur"

123msgstr "Topp kantur"

124

124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126msgid "Try swiping from the top edge to access the indicators"

126msgid "Try swiping from the top edge to access the indicators"

127msgstr ""

127msgstr ""

128

128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130msgid "Close"

130msgid "Close"

131msgstr ""

131msgstr ""

132

132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134msgid "Swipe up again to close the settings screen"

134msgid "Swipe up again to close the settings screen"

135msgstr ""

135msgstr ""

136

136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138msgid "Left edge"

138msgid "Left edge"

139msgstr ""

139msgstr ""

140

140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143msgstr ""

143msgstr ""

144

144

145−#: qml/Components/EdgeDemo.qml:229

145+#: qml/Components/EdgeDemo.qml:242

146msgid "Well done"

146msgid "Well done"

147msgstr ""

147msgstr ""

148

148

149−#: qml/Components/EdgeDemo.qml:230

149+#: qml/Components/EdgeDemo.qml:243

150msgid ""

150msgid ""

151"You have now mastered the edge gestures and can start using the "

151"You have now mastered the edge gestures and can start using the "

152"phone<br><br>Tap on the screen to start"

152"phone<br><br>Tap on the screen to start"

153msgstr ""

153msgstr ""

154

154

155−#: qml/Components/Lockscreen.qml:223

155+#: qml/Components/Lockscreen.qml:238

156msgid "Return to Call"

156msgid "Return to Call"

157msgstr ""

157msgstr ""

158

158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160msgid "Emergency Call"

160msgid "Emergency Call"

161msgstr ""

161msgstr ""

162

162

163−#: qml/Components/Lockscreen.qml:255

163+#: qml/Components/Lockscreen.qml:270

164msgid "OK"

164msgid "OK"

165msgstr ""

165msgstr ""

166

166

167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

168msgid "See less"

168msgid "See less"

169msgstr ""

169msgstr ""

170

170

171−#: qml/Dash/GenericScopeView.qml:434

171+#: qml/Dash/GenericScopeView.qml:431

172msgid "See all"

172msgid "See all"

173msgstr ""

173msgstr ""

174

174

175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176#: qml/Panel/SearchIndicator.qml:27

176#: qml/Panel/SearchIndicator.qml:27

177msgid "Search"

177msgid "Search"

178msgstr "Leita"

178msgstr "Leita"

179

179

180−#: qml/Dash/PageHeader.qml:268

180+#: qml/Dash/PageHeader.qml:260

181+msgid "Store"

182+msgstr ""

183+

184+#: qml/Dash/PageHeader.qml:277

181msgid "Settings"

185msgid "Settings"

182msgstr ""

186msgstr ""

183

187

184−#: qml/Dash/PageHeader.qml:275

188+#: qml/Dash/PageHeader.qml:284

185msgid "Remove from Favorites"

189msgid "Remove from Favorites"

186msgstr ""

190msgstr ""

187

191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189msgid "Add to Favorites"

193msgid "Add to Favorites"

190msgstr ""

194msgstr ""

191

195

@@ -217,31 +221,23 @@ msgstr ""

217msgid "Release to refresh…"

221msgid "Release to refresh…"

218msgstr ""

222msgstr ""

219

223

220−#: qml/Dash/ScopesOverview.qml:215

224+#: qml/Dash/ScopesList.qml:63

221−msgid "Manage Scopes"

225+msgid "Manage"

222−msgstr ""

223−

224−#: qml/Dash/ScopesOverview.qml:437

225−msgid "Done"

226−msgstr ""

227−

228−#: qml/Dash/ScopesOverview.qml:463

229−msgid "Store"

230msgstr ""

226msgstr ""

231

227

232−#: qml/Dash/ScopesOverviewTab.qml:36

228+#: qml/Dash/ScopesList.qml:107

233−msgid "Favorites"

229+msgid "Home"

234msgstr ""

230msgstr ""

235

231

236−#: qml/Dash/ScopesOverviewTab.qml:54

232+#: qml/Dash/ScopesList.qml:108

237−msgid "All"

233+msgid "Also installed"

238msgstr ""

234msgstr ""

239

235

240#: qml/Greeter/Greeter.qml:174

236#: qml/Greeter/Greeter.qml:174

241msgid "Unlock"

237msgid "Unlock"

242msgstr ""

238msgstr ""

243

239

244−#: qml/Notifications/NotificationMenuItemFactory.qml:116

240+#: qml/Notifications/NotificationMenuItemFactory.qml:128

245msgid "Show password"

241msgid "Show password"

246msgstr ""

242msgstr ""

247

243

@@ -289,60 +285,237 @@ msgstr ""

289msgid "Roaming"

285msgid "Roaming"

290msgstr ""

286msgstr ""

291

287

292−#: qml/Shell.qml:391

288+#: qml/Shell.qml:367

289+#, qt-format

293−msgid "Enter passphrase"

290+msgid "Enter %1"

294msgstr ""

291msgstr ""

295

292

296−#: qml/Shell.qml:392

293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

297−msgid "Sorry, incorrect passphrase"

294+msgid "Enter passphrase"

298msgstr ""

295msgstr ""

299

296

300−#: qml/Shell.qml:393

297+#: qml/Shell.qml:369

301−msgid "Please re-enter"

298+msgid "Enter passcode"

302msgstr ""

299msgstr ""

303

300

304−#: qml/Shell.qml:395

301+#: qml/Shell.qml:370

305−msgid "Enter passcode"

302+#, qt-format

303+msgid "Sorry, incorrect %1"

306msgstr ""

304msgstr ""

307

305

308−#: qml/Shell.qml:396

306+#: qml/Shell.qml:371

309−msgid "Sorry, incorrect passcode"

307+msgid "Sorry, incorrect passphrase"

310msgstr ""

308msgstr ""

311

309

312−#: qml/Shell.qml:399

310+#: qml/Shell.qml:372

313−#, qt-format

311+msgid "Please re-enter"

314−msgid "Enter %1"

315msgstr ""

312msgstr ""

316

313

317−#: qml/Shell.qml:400

314+#: qml/Shell.qml:373

318−#, qt-format

319−msgid "Sorry, incorrect %1"

315+msgid "Sorry, incorrect passcode"

320msgstr ""

316msgstr ""

321

317

322−#: qml/Shell.qml:441

318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

323msgid "Sorry, incorrect passphrase."

319msgid "Sorry, incorrect passphrase."

324msgstr ""

320msgstr ""

325

321

326−#: qml/Shell.qml:442

322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

327msgid "Sorry, incorrect passcode."

323msgid "Sorry, incorrect passcode."

328msgstr ""

324msgstr ""

329

325

330−#: qml/Shell.qml:443

326+#: qml/Shell.qml:469

331msgid "This will be your last attempt."

327msgid "This will be your last attempt."

332msgstr ""

328msgstr ""

333

329

334−#: qml/Shell.qml:445

330+#: qml/Shell.qml:471

335msgid ""

331msgid ""

336"If passphrase is entered incorrectly, your phone will conduct a factory "

332"If passphrase is entered incorrectly, your phone will conduct a factory "

337"reset and all personal data will be deleted."

333"reset and all personal data will be deleted."

338msgstr ""

334msgstr ""

339

335

340−#: qml/Shell.qml:446

336+#: qml/Shell.qml:472

341msgid ""

337msgid ""

342"If passcode is entered incorrectly, your phone will conduct a factory reset "

338"If passcode is entered incorrectly, your phone will conduct a factory reset "

343"and all personal data will be deleted."

339"and all personal data will be deleted."

344msgstr ""

340msgstr ""

345

341

342+#: qml/Wizard/Page.qml:89

343+msgid "Back"

344+msgstr ""

345+

346+#: qml/Wizard/Pages/10-welcome.qml:27

347+msgid "Hi!"

348+msgstr ""

349+

350+#: qml/Wizard/Pages/10-welcome.qml:44

351+msgid "Welcome to your Ubuntu phone."

352+msgstr ""

353+

354+#: qml/Wizard/Pages/10-welcome.qml:52

355+msgid "Let’s get started."

356+msgstr ""

357+

358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

361+#: qml/Wizard/Pages/passwd-set.qml:90

362+msgid "Continue"

363+msgstr ""

364+

365+#: qml/Wizard/Pages/20-sim.qml:25

366+msgid "Add a SIM card and restart your device"

367+msgstr ""

368+

369+#: qml/Wizard/Pages/20-sim.qml:55

370+msgid "Without it, you won’t be able to make calls or use text messaging."

371+msgstr ""

372+

373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

374+msgid "Skip"

375+msgstr ""

376+

377+#: qml/Wizard/Pages/30-passwd-type.qml:39

378+msgid "Lock security"

379+msgstr ""

380+

381+#: qml/Wizard/Pages/30-passwd-type.qml:74

382+msgid "Please select how you’d like to unlock your phone."

383+msgstr ""

384+

385+#: qml/Wizard/Pages/30-passwd-type.qml:97

386+msgid "Swipe"

387+msgstr ""

388+

389+#: qml/Wizard/Pages/30-passwd-type.qml:98

390+msgid "No security"

391+msgstr ""

392+

393+#: qml/Wizard/Pages/30-passwd-type.qml:100

394+msgid "Passcode"

395+msgstr ""

396+

397+#: qml/Wizard/Pages/30-passwd-type.qml:101

398+msgid "4 digits only"

399+msgstr ""

400+

401+#: qml/Wizard/Pages/30-passwd-type.qml:103

402+msgid "Passphrase"

403+msgstr ""

404+

405+#: qml/Wizard/Pages/30-passwd-type.qml:104

406+msgid "Numbers and letters"

407+msgstr ""

408+

409+#: qml/Wizard/Pages/40-wifi.qml:28

410+msgid "Connect to Wi‑Fi"

411+msgstr ""

412+

413+#: qml/Wizard/Pages/40-wifi.qml:147

414+msgid "Available networks…"

415+msgstr ""

416+

417+#: qml/Wizard/Pages/40-wifi.qml:148

418+msgid "No available networks."

419+msgstr ""

420+

421+#: qml/Wizard/Pages/50-location.qml:27

422+msgid "Location"

423+msgstr ""

424+

425+#: qml/Wizard/Pages/50-location.qml:62

426+msgid "Let the phone detect your location:"

427+msgstr ""

428+

429+#: qml/Wizard/Pages/50-location.qml:69

430+msgid "Using GPS only (less accurate)"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/50-location.qml:86

434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

435+msgstr ""

436+

437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

438+#: qml/Wizard/Pages/50-location.qml:103

439+msgid ""

440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

441+"conditions</a>."

442+msgstr ""

443+

444+#: qml/Wizard/Pages/50-location.qml:112

445+msgid "Not at all"

446+msgstr ""

447+

448+#: qml/Wizard/Pages/50-location.qml:124

449+msgid "You can change your mind later in <b>System Settings</b>."

450+msgstr ""

451+

452+#: qml/Wizard/Pages/60-reporting.qml:24

453+msgid "Improving your experience"

454+msgstr ""

455+

456+#: qml/Wizard/Pages/60-reporting.qml:36

457+msgid ""

458+"Your phone is set up to automatically report errors to Canonical and its "

459+"partners, the makers of the operating system."

460+msgstr ""

461+

462+#: qml/Wizard/Pages/60-reporting.qml:43

463+msgid ""

464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

465+"Privacy</b>"

466+msgstr ""

467+

468+#: qml/Wizard/Pages/80-finished.qml:24

469+msgid "All done"

470+msgstr ""

471+

472+#: qml/Wizard/Pages/80-finished.qml:39

473+msgid "Nice work!"

474+msgstr ""

475+

476+#: qml/Wizard/Pages/80-finished.qml:46

477+msgid "Your phone is now ready to use."

478+msgstr ""

479+

480+#: qml/Wizard/Pages/80-finished.qml:53

481+msgid "Finish"

482+msgstr ""

483+

484+#: qml/Wizard/Pages/here-terms.qml:27

485+msgid "Terms & Conditions"

486+msgstr ""

487+

488+#: qml/Wizard/Pages/passwd-confirm.qml:49

489+msgid "Confirm passphrase"

490+msgstr ""

491+

492+#: qml/Wizard/Pages/passwd-confirm.qml:50

493+msgid "Confirm passcode"

494+msgstr ""

495+

496+#: qml/Wizard/Pages/passwd-confirm.qml:53

497+#: qml/Wizard/Pages/passwd-confirm.qml:54

498+msgid "Please try again."

499+msgstr ""

500+

501+#: qml/Wizard/Pages/passwd-set.qml:61

502+msgid "Choose your passcode"

503+msgstr ""

504+

505+#: qml/Wizard/Pages/passwd-set.qml:68

506+msgid "Passphrase must be 4 characters long"

507+msgstr ""

508+

509+#: qml/Wizard/StackButton.qml:39

510+#, qt-format

511+msgid "〈 %1"

512+msgstr ""

513+

514+#: qml/Wizard/StackButton.qml:42

515+#, qt-format

516+msgid "%1 〉"

517+msgstr ""

518+

346#~ msgid "Confirm"

519#~ msgid "Confirm"

347#~ msgstr "Vátta"

520#~ msgstr "Vátta"

348

521

po/fr.po+267−82

@@ -7,27 +7,27 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-05 17:30+0000\n"

11+"PO-Revision-Date: 2014-12-10 22:01+0000\n"

12−"Last-Translator: Sébastien Maes <nautilussebastien@gmail.com>\n"

12+"Last-Translator: Jean Marc <Unknown>\n"

13"Language-Team: French <fr@li.org>\n"

13"Language-Team: French <fr@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Mot de passe : "

23msgstr "Mot de passe : "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Épingler le raccourci"

28msgstr "Épingler le raccourci"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Détacher le raccourci"

32msgstr "Détacher le raccourci"

33

33

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

54msgstr[0] "Veuillez patienter %1 minute et réessayer..."

54msgstr[0] "Veuillez patienter %1 minute et réessayer..."

55msgstr[1] "Veuillez patienter %1 minutes et réessayer..."

55msgstr[1] "Veuillez patienter %1 minutes et réessayer..."

56

56

57−#: qml/Components/Dialogs.qml:74

57+#: qml/Components/Dialogs.qml:70

58msgid "Log out"

58msgid "Log out"

59msgstr "Se déconnecter"

59msgstr "Se déconnecter"

60

60

61−#: qml/Components/Dialogs.qml:75

61+#: qml/Components/Dialogs.qml:71

62msgid "Are you sure you want to log out?"

62msgid "Are you sure you want to log out?"

63msgstr "Êtes-vous sûr de vouloir vous déconnecter ?"

63msgstr "Êtes-vous sûr de vouloir vous déconnecter ?"

64

64

65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

65+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

66−#: qml/Components/Dialogs.qml:126

66+#: qml/Components/Dialogs.qml:122

67msgid "No"

67msgid "No"

68msgstr "Non"

68msgstr "Non"

69

69

70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

70+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

71−#: qml/Components/Dialogs.qml:133

71+#: qml/Components/Dialogs.qml:129

72msgid "Yes"

72msgid "Yes"

73msgstr "Oui"

73msgstr "Oui"

74

74

75−#: qml/Components/Dialogs.qml:98

75+#: qml/Components/Dialogs.qml:94

76msgid "Shut down"

76msgid "Shut down"

77msgstr "Éteindre"

77msgstr "Éteindre"

78

78

79−#: qml/Components/Dialogs.qml:99

79+#: qml/Components/Dialogs.qml:95

80msgid "Are you sure you want to shut down?"

80msgid "Are you sure you want to shut down?"

81msgstr "Êtes-vous sûr de vouloir éteindre ?"

81msgstr "Êtes-vous sûr de vouloir éteindre ?"

82

82

83−#: qml/Components/Dialogs.qml:123

83+#: qml/Components/Dialogs.qml:119

84msgid "Reboot"

84msgid "Reboot"

85msgstr "Redémarrer"

85msgstr "Redémarrer"

86

86

87−#: qml/Components/Dialogs.qml:124

87+#: qml/Components/Dialogs.qml:120

88msgid "Are you sure you want to reboot?"

88msgid "Are you sure you want to reboot?"

89msgstr "Êtes-vous sûr de vouloir redémarrer ?"

89msgstr "Êtes-vous sûr de vouloir redémarrer ?"

90

90

91−#: qml/Components/Dialogs.qml:148

91+#: qml/Components/Dialogs.qml:144

92msgid "Power"

92msgid "Power"

93msgstr "Alimentation"

93msgstr "Alimentation"

94

94

95−#: qml/Components/Dialogs.qml:149

95+#: qml/Components/Dialogs.qml:145

96msgid ""

96msgid ""

97"Are you sure you would like\n"

97"Are you sure you would like\n"

98"to power off?"

98"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100"Êtes-vous sûr de vouloir\n"

100"Êtes-vous sûr de vouloir\n"

101"couper l'alimentation ?"

101"couper l'alimentation ?"

102

102

103−#: qml/Components/Dialogs.qml:151

103+#: qml/Components/Dialogs.qml:147

104msgid "Power off"

104msgid "Power off"

105msgstr "Éteindre"

105msgstr "Éteindre"

106

106

107−#: qml/Components/Dialogs.qml:161

107+#: qml/Components/Dialogs.qml:157

108msgid "Restart"

108msgid "Restart"

109msgstr "Redémarrer"

109msgstr "Redémarrer"

110

110

111−#: qml/Components/Dialogs.qml:171

111+#: qml/Components/Dialogs.qml:167

112msgid "Cancel"

112msgid "Cancel"

113msgstr "Annuler"

113msgstr "Annuler"

114

114

@@ -116,50 +116,50 @@ msgstr "Annuler"

116msgid "Skip intro"

116msgid "Skip intro"

117msgstr "Passer l'intro"

117msgstr "Passer l'intro"

118

118

119−#: qml/Components/EdgeDemo.qml:112

119+#: qml/Components/EdgeDemo.qml:125

120msgid "Right edge"

120msgid "Right edge"

121msgstr "Bord droit"

121msgstr "Bord droit"

122

122

123−#: qml/Components/EdgeDemo.qml:113

123+#: qml/Components/EdgeDemo.qml:126

124msgid "Try swiping from the right edge to unlock the phone"

124msgid "Try swiping from the right edge to unlock the phone"

125msgstr ""

125msgstr ""

126"Faites glisser votre doigt à partir du bord droit pour déverrouiller."

126"Faites glisser votre doigt à partir du bord droit pour déverrouiller."

127

127

128−#: qml/Components/EdgeDemo.qml:144

128+#: qml/Components/EdgeDemo.qml:157

129msgid "Top edge"

129msgid "Top edge"

130msgstr "Bord supérieur"

130msgstr "Bord supérieur"

131

131

132−#: qml/Components/EdgeDemo.qml:145

132+#: qml/Components/EdgeDemo.qml:158

133msgid "Try swiping from the top edge to access the indicators"

133msgid "Try swiping from the top edge to access the indicators"

134msgstr ""

134msgstr ""

135"Faites glisser votre doigt à partir du bord supérieur pour accéder aux "

135"Faites glisser votre doigt à partir du bord supérieur pour accéder aux "

136"indicateurs."

136"indicateurs."

137

137

138−#: qml/Components/EdgeDemo.qml:170

138+#: qml/Components/EdgeDemo.qml:183

139msgid "Close"

139msgid "Close"

140msgstr "Fermer"

140msgstr "Fermer"

141

141

142−#: qml/Components/EdgeDemo.qml:171

142+#: qml/Components/EdgeDemo.qml:184

143msgid "Swipe up again to close the settings screen"

143msgid "Swipe up again to close the settings screen"

144msgstr ""

144msgstr ""

145"Faites glisser à nouveau votre doigt vers le bord supérieur pour fermer "

145"Faites glisser à nouveau votre doigt vers le bord supérieur pour fermer "

146"l'écran des paramètres"

146"l'écran des paramètres"

147

147

148−#: qml/Components/EdgeDemo.qml:201

148+#: qml/Components/EdgeDemo.qml:214

149msgid "Left edge"

149msgid "Left edge"

150msgstr "Bord gauche"

150msgstr "Bord gauche"

151

151

152−#: qml/Components/EdgeDemo.qml:202

152+#: qml/Components/EdgeDemo.qml:215

153msgid "Swipe from the left to reveal the launcher for quick access to apps"

153msgid "Swipe from the left to reveal the launcher for quick access to apps"

154msgstr ""

154msgstr ""

155"Faites glisser votre doigt à partir du bord gauche pour afficher le lanceur "

155"Faites glisser votre doigt à partir du bord gauche pour afficher le lanceur "

156"d'applications."

156"d'applications."

157

157

158−#: qml/Components/EdgeDemo.qml:229

158+#: qml/Components/EdgeDemo.qml:242

159msgid "Well done"

159msgid "Well done"

160msgstr "Félicitations"

160msgstr "Félicitations"

161

161

162−#: qml/Components/EdgeDemo.qml:230

162+#: qml/Components/EdgeDemo.qml:243

163msgid ""

163msgid ""

164"You have now mastered the edge gestures and can start using the "

164"You have now mastered the edge gestures and can start using the "

165"phone<br><br>Tap on the screen to start"

165"phone<br><br>Tap on the screen to start"

@@ -167,40 +167,44 @@ msgstr ""

167"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "

167"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "

168"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"

168"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"

169

169

170−#: qml/Components/Lockscreen.qml:223

170+#: qml/Components/Lockscreen.qml:238

171msgid "Return to Call"

171msgid "Return to Call"

172msgstr "Retourner à l'appel"

172msgstr "Retourner à l'appel"

173

173

174−#: qml/Components/Lockscreen.qml:223

174+#: qml/Components/Lockscreen.qml:238

175msgid "Emergency Call"

175msgid "Emergency Call"

176msgstr "Appel d'urgence"

176msgstr "Appel d'urgence"

177

177

178−#: qml/Components/Lockscreen.qml:255

178+#: qml/Components/Lockscreen.qml:270

179msgid "OK"

179msgid "OK"

180msgstr "OK"

180msgstr "OK"

181

181

182−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

182+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

183msgid "See less"

183msgid "See less"

184msgstr "Voir moins"

184msgstr "Voir moins"

185

185

186−#: qml/Dash/GenericScopeView.qml:434

186+#: qml/Dash/GenericScopeView.qml:431

187msgid "See all"

187msgid "See all"

188msgstr "Tout voir"

188msgstr "Tout voir"

189

189

190−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

190+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

191#: qml/Panel/SearchIndicator.qml:27

191#: qml/Panel/SearchIndicator.qml:27

192msgid "Search"

192msgid "Search"

193msgstr "Rechercher"

193msgstr "Rechercher"

194

194

195−#: qml/Dash/PageHeader.qml:268

195+#: qml/Dash/PageHeader.qml:260

196+msgid "Store"

197+msgstr "Logithèque"

198+

199+#: qml/Dash/PageHeader.qml:277

196msgid "Settings"

200msgid "Settings"

197msgstr "Paramètres"

201msgstr "Paramètres"

198

202

199−#: qml/Dash/PageHeader.qml:275

203+#: qml/Dash/PageHeader.qml:284

200msgid "Remove from Favorites"

204msgid "Remove from Favorites"

201msgstr "Retirer des favoris"

205msgstr "Retirer des favoris"

202

206

203−#: qml/Dash/PageHeader.qml:275

207+#: qml/Dash/PageHeader.qml:284

204msgid "Add to Favorites"

208msgid "Add to Favorites"

205msgstr "Ajouter aux favoris"

209msgstr "Ajouter aux favoris"

206

210

@@ -232,31 +236,23 @@ msgstr "Tirer pour actualiser..."

232msgid "Release to refresh…"

236msgid "Release to refresh…"

233msgstr "Relâcher pour actualiser..."

237msgstr "Relâcher pour actualiser..."

234

238

235−#: qml/Dash/ScopesOverview.qml:215

239+#: qml/Dash/ScopesList.qml:63

236−msgid "Manage Scopes"

240+msgid "Manage"

237−msgstr "Gérer les moteurs de recherche"

241+msgstr ""

238−

239−#: qml/Dash/ScopesOverview.qml:437

240−msgid "Done"

241−msgstr "Terminé"

242−

243−#: qml/Dash/ScopesOverview.qml:463

244−msgid "Store"

245−msgstr "Logithèque"

246

242

247−#: qml/Dash/ScopesOverviewTab.qml:36

243+#: qml/Dash/ScopesList.qml:107

248−msgid "Favorites"

244+msgid "Home"

249−msgstr "Favorites"

245+msgstr ""

250

246

251−#: qml/Dash/ScopesOverviewTab.qml:54

247+#: qml/Dash/ScopesList.qml:108

252−msgid "All"

248+msgid "Also installed"

253−msgstr "Toutes"

249+msgstr "Également installées"

254

250

255#: qml/Greeter/Greeter.qml:174

251#: qml/Greeter/Greeter.qml:174

256msgid "Unlock"

252msgid "Unlock"

257msgstr "Déverrouiller"

253msgstr "Déverrouiller"

258

254

259−#: qml/Notifications/NotificationMenuItemFactory.qml:116

255+#: qml/Notifications/NotificationMenuItemFactory.qml:128

260msgid "Show password"

256msgid "Show password"

261msgstr "Afficher le mot de passe"

257msgstr "Afficher le mot de passe"

262

258

@@ -304,49 +300,49 @@ msgstr "Déverrouiller la carte SIM"

304msgid "Roaming"

300msgid "Roaming"

305msgstr "Roaming"

301msgstr "Roaming"

306

302

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

308msgid "Enter passphrase"

309msgid "Enter passphrase"

309msgstr "Saisissez la phrase de passe"

310msgstr "Saisissez la phrase de passe"

310

311

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

312msgid "Sorry, incorrect passphrase"

322msgid "Sorry, incorrect passphrase"

313msgstr "Désolé, phrase secrète incorrecte"

323msgstr "Désolé, phrase secrète incorrecte"

314

324

315−#: qml/Shell.qml:393

325+#: qml/Shell.qml:372

316msgid "Please re-enter"

326msgid "Please re-enter"

317msgstr "Veuillez ressaisir"

327msgstr "Veuillez ressaisir"

318

328

319−#: qml/Shell.qml:395

329+#: qml/Shell.qml:373

320−msgid "Enter passcode"

321−msgstr "Saisissez le mot de passe"

322−

323−#: qml/Shell.qml:396

324msgid "Sorry, incorrect passcode"

330msgid "Sorry, incorrect passcode"

325msgstr "Désolé, code incorrect"

331msgstr "Désolé, code incorrect"

326

332

327−#: qml/Shell.qml:399

333+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

328−#, qt-format

329−msgid "Enter %1"

330−msgstr "Saisissez %1"

331−

332−#: qml/Shell.qml:400

333−#, qt-format

334−msgid "Sorry, incorrect %1"

335−msgstr "Désolé, %1 incorrect"

336−

337−#: qml/Shell.qml:441

338msgid "Sorry, incorrect passphrase."

334msgid "Sorry, incorrect passphrase."

339msgstr "Désolé, phrase secrète incorrecte."

335msgstr "Désolé, phrase secrète incorrecte."

340

336

341−#: qml/Shell.qml:442

337+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

342msgid "Sorry, incorrect passcode."

338msgid "Sorry, incorrect passcode."

343msgstr "Désolé, code incorrect."

339msgstr "Désolé, code incorrect."

344

340

345−#: qml/Shell.qml:443

341+#: qml/Shell.qml:469

346msgid "This will be your last attempt."

342msgid "This will be your last attempt."

347msgstr "Ceci sera votre dernière tentative."

343msgstr "Ceci sera votre dernière tentative."

348

344

349−#: qml/Shell.qml:445

345+#: qml/Shell.qml:471

350msgid ""

346msgid ""

351"If passphrase is entered incorrectly, your phone will conduct a factory "

347"If passphrase is entered incorrectly, your phone will conduct a factory "

352"reset and all personal data will be deleted."

348"reset and all personal data will be deleted."

@@ -355,7 +351,7 @@ msgstr ""

355"effectuera une réinitialisation aux paramètres d'usine et toutes les données "

351"effectuera une réinitialisation aux paramètres d'usine et toutes les données "

356"personnelles seront supprimées."

352"personnelles seront supprimées."

357

353

358−#: qml/Shell.qml:446

354+#: qml/Shell.qml:472

359msgid ""

355msgid ""

360"If passcode is entered incorrectly, your phone will conduct a factory reset "

356"If passcode is entered incorrectly, your phone will conduct a factory reset "

361"and all personal data will be deleted."

357"and all personal data will be deleted."

@@ -364,6 +360,183 @@ msgstr ""

364"réinitialisation aux paramètres d'usine et toutes les données personnelles "

360"réinitialisation aux paramètres d'usine et toutes les données personnelles "

365"seront supprimées."

361"seront supprimées."

366

362

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+

367#~ msgid "Speaking..."

540#~ msgid "Speaking..."

368#~ msgstr "En cours d'écoute..."

541#~ msgstr "En cours d'écoute..."

369

542

@@ -378,3 +551,15 @@ msgstr ""

378

551

379#~ msgid "Speak Now..."

552#~ msgid "Speak Now..."

380#~ msgstr "Parlez maintenant…"

553#~ msgstr "Parlez maintenant…"

554+

555+#~ msgid "All"

556+#~ msgstr "Toutes"

557+

558+#~ msgid "Done"

559+#~ msgstr "Terminé"

560+

561+#~ msgid "Favorites"

562+#~ msgstr "Favorites"

563+

564+#~ msgid "Manage Scopes"

565+#~ msgstr "Gérer les moteurs de recherche"

po/gd.po+265−80

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-11-09 08:18+0000\n"

11"PO-Revision-Date: 2014-11-09 08:18+0000\n"

12"Last-Translator: GunChleoc <Unknown>\n"

12"Last-Translator: GunChleoc <Unknown>\n"

13"Language-Team: Fòram na Gàidhlig\n"

13"Language-Team: Fòram na Gàidhlig\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "

17"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "

18"(n > 2 && n < 20) ? 2 : 3;\n"

18"(n > 2 && n < 20) ? 2 : 3;\n"

19−"X-Launchpad-Export-Date: 2014-11-10 06:09+0000\n"

19+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

20−"X-Generator: Launchpad (build 17231)\n"

20+"X-Generator: Launchpad (build 17286)\n"

21"Language: gd\n"

21"Language: gd\n"

22

22

23#: plugins/LightDM/Greeter.cpp:130

23#: plugins/LightDM/Greeter.cpp:130

@@ -25,11 +25,11 @@ msgid "Password: "

25msgstr "Facal-faire: "

25msgstr "Facal-faire: "

26

26

27#: plugins/Unity/Launcher/launcheritem.cpp:45

27#: plugins/Unity/Launcher/launcheritem.cpp:45

28−#: plugins/Unity/Launcher/launcheritem.cpp:91

28+#: plugins/Unity/Launcher/launcheritem.cpp:100

29msgid "Pin shortcut"

29msgid "Pin shortcut"

30msgstr "Prìnich ath-ghoirid"

30msgstr "Prìnich ath-ghoirid"

31

31

32−#: plugins/Unity/Launcher/launcheritem.cpp:91

32+#: plugins/Unity/Launcher/launcheritem.cpp:100

33msgid "Unpin shortcut"

33msgid "Unpin shortcut"

34msgstr "Neo-phrìnich an ath-ghoirid"

34msgstr "Neo-phrìnich an ath-ghoirid"

35

35

@@ -58,45 +58,45 @@ msgstr[1] "Fuirich ort %1 dhiog 's feuch ris a-rithist an uairsin…"

58msgstr[2] "Fuirich ort %1 diogan 's feuch ris a-rithist an uairsin…"

58msgstr[2] "Fuirich ort %1 diogan 's feuch ris a-rithist an uairsin…"

59msgstr[3] "Fuirich ort %1 diog 's feuch ris a-rithist an uairsin…"

59msgstr[3] "Fuirich ort %1 diog 's feuch ris a-rithist an uairsin…"

60

60

61−#: qml/Components/Dialogs.qml:74

61+#: qml/Components/Dialogs.qml:70

62msgid "Log out"

62msgid "Log out"

63msgstr "Clàraich a-mach"

63msgstr "Clàraich a-mach"

64

64

65−#: qml/Components/Dialogs.qml:75

65+#: qml/Components/Dialogs.qml:71

66msgid "Are you sure you want to log out?"

66msgid "Are you sure you want to log out?"

67msgstr "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?"

67msgstr "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?"

68

68

69−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

69+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

70−#: qml/Components/Dialogs.qml:126

70+#: qml/Components/Dialogs.qml:122

71msgid "No"

71msgid "No"

72msgstr "Chan eil"

72msgstr "Chan eil"

73

73

74−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

74+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

75−#: qml/Components/Dialogs.qml:133

75+#: qml/Components/Dialogs.qml:129

76msgid "Yes"

76msgid "Yes"

77msgstr "Tha"

77msgstr "Tha"

78

78

79−#: qml/Components/Dialogs.qml:98

79+#: qml/Components/Dialogs.qml:94

80msgid "Shut down"

80msgid "Shut down"

81msgstr "Dùin sìos"

81msgstr "Dùin sìos"

82

82

83−#: qml/Components/Dialogs.qml:99

83+#: qml/Components/Dialogs.qml:95

84msgid "Are you sure you want to shut down?"

84msgid "Are you sure you want to shut down?"

85msgstr "A bheil thu cinnteach gu bheil thu airson a dhùnadh sìos?"

85msgstr "A bheil thu cinnteach gu bheil thu airson a dhùnadh sìos?"

86

86

87−#: qml/Components/Dialogs.qml:123

87+#: qml/Components/Dialogs.qml:119

88msgid "Reboot"

88msgid "Reboot"

89msgstr "Ath-thòisich an siostam"

89msgstr "Ath-thòisich an siostam"

90

90

91−#: qml/Components/Dialogs.qml:124

91+#: qml/Components/Dialogs.qml:120

92msgid "Are you sure you want to reboot?"

92msgid "Are you sure you want to reboot?"

93msgstr "A bheil thu cinnteach gu bheil thu airson tòiseachadh às ùr?"

93msgstr "A bheil thu cinnteach gu bheil thu airson tòiseachadh às ùr?"

94

94

95−#: qml/Components/Dialogs.qml:148

95+#: qml/Components/Dialogs.qml:144

96msgid "Power"

96msgid "Power"

97msgstr "Cumhachd"

97msgstr "Cumhachd"

98

98

99−#: qml/Components/Dialogs.qml:149

99+#: qml/Components/Dialogs.qml:145

100msgid ""

100msgid ""

101"Are you sure you would like\n"

101"Are you sure you would like\n"

102"to power off?"

102"to power off?"

@@ -104,15 +104,15 @@ msgstr ""

104"A bheil thu cinnteach gu bheil thu\n"

104"A bheil thu cinnteach gu bheil thu\n"

105"airson a' chumhachd a chur dheth?"

105"airson a' chumhachd a chur dheth?"

106

106

107−#: qml/Components/Dialogs.qml:151

107+#: qml/Components/Dialogs.qml:147

108msgid "Power off"

108msgid "Power off"

109msgstr "Cuir a' chumhachd dheth"

109msgstr "Cuir a' chumhachd dheth"

110

110

111−#: qml/Components/Dialogs.qml:161

111+#: qml/Components/Dialogs.qml:157

112msgid "Restart"

112msgid "Restart"

113msgstr "Ath-thòisich"

113msgstr "Ath-thòisich"

114

114

115−#: qml/Components/Dialogs.qml:171

115+#: qml/Components/Dialogs.qml:167

116msgid "Cancel"

116msgid "Cancel"

117msgstr "Sguir dheth"

117msgstr "Sguir dheth"

118

118

@@ -120,49 +120,49 @@ msgstr "Sguir dheth"

120msgid "Skip intro"

120msgid "Skip intro"

121msgstr "Gearr leum thairis air an ro-ràdh"

121msgstr "Gearr leum thairis air an ro-ràdh"

122

122

123−#: qml/Components/EdgeDemo.qml:112

123+#: qml/Components/EdgeDemo.qml:125

124msgid "Right edge"

124msgid "Right edge"

125msgstr "An oir dheas"

125msgstr "An oir dheas"

126

126

127−#: qml/Components/EdgeDemo.qml:113

127+#: qml/Components/EdgeDemo.qml:126

128msgid "Try swiping from the right edge to unlock the phone"

128msgid "Try swiping from the right edge to unlock the phone"

129msgstr ""

129msgstr ""

130"Feuch is dèan grad-shlaighdeadh a-steach on oir dheas gus a' ghlas a thoirt "

130"Feuch is dèan grad-shlaighdeadh a-steach on oir dheas gus a' ghlas a thoirt "

131"far an fhòn"

131"far an fhòn"

132

132

133−#: qml/Components/EdgeDemo.qml:144

133+#: qml/Components/EdgeDemo.qml:157

134msgid "Top edge"

134msgid "Top edge"

135msgstr "An oir aig a' bharr"

135msgstr "An oir aig a' bharr"

136

136

137−#: qml/Components/EdgeDemo.qml:145

137+#: qml/Components/EdgeDemo.qml:158

138msgid "Try swiping from the top edge to access the indicators"

138msgid "Try swiping from the top edge to access the indicators"

139msgstr ""

139msgstr ""

140"Feuch is dèan grad-shlaighdeadh a-steach on oir aig a' bharr gus greim "

140"Feuch is dèan grad-shlaighdeadh a-steach on oir aig a' bharr gus greim "

141"fhaighinn air na taisbeanairean"

141"fhaighinn air na taisbeanairean"

142

142

143−#: qml/Components/EdgeDemo.qml:170

143+#: qml/Components/EdgeDemo.qml:183

144msgid "Close"

144msgid "Close"

145msgstr "Dùin"

145msgstr "Dùin"

146

146

147−#: qml/Components/EdgeDemo.qml:171

147+#: qml/Components/EdgeDemo.qml:184

148msgid "Swipe up again to close the settings screen"

148msgid "Swipe up again to close the settings screen"

149msgstr "Dèan grad-shlaighdeadh a-nìos gus sgrìn nan roghainnean a dhùnadh"

149msgstr "Dèan grad-shlaighdeadh a-nìos gus sgrìn nan roghainnean a dhùnadh"

150

150

151−#: qml/Components/EdgeDemo.qml:201

151+#: qml/Components/EdgeDemo.qml:214

152msgid "Left edge"

152msgid "Left edge"

153msgstr "An oir chlì"

153msgstr "An oir chlì"

154

154

155−#: qml/Components/EdgeDemo.qml:202

155+#: qml/Components/EdgeDemo.qml:215

156msgid "Swipe from the left to reveal the launcher for quick access to apps"

156msgid "Swipe from the left to reveal the launcher for quick access to apps"

157msgstr ""

157msgstr ""

158"Dèan grad-shlaighdeadh on oir chlì air an lòinseir a bheir dhut cothrom "

158"Dèan grad-shlaighdeadh on oir chlì air an lòinseir a bheir dhut cothrom "

159"luath air na h-aplacaidean"

159"luath air na h-aplacaidean"

160

160

161−#: qml/Components/EdgeDemo.qml:229

161+#: qml/Components/EdgeDemo.qml:242

162msgid "Well done"

162msgid "Well done"

163msgstr "Gasta!"

163msgstr "Gasta!"

164

164

165−#: qml/Components/EdgeDemo.qml:230

165+#: qml/Components/EdgeDemo.qml:243

166msgid ""

166msgid ""

167"You have now mastered the edge gestures and can start using the "

167"You have now mastered the edge gestures and can start using the "

168"phone<br><br>Tap on the screen to start"

168"phone<br><br>Tap on the screen to start"

@@ -170,40 +170,44 @@ msgstr ""

170"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "

170"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "

171"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"

171"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"

172

172

173−#: qml/Components/Lockscreen.qml:223

173+#: qml/Components/Lockscreen.qml:238

174msgid "Return to Call"

174msgid "Return to Call"

175msgstr "Till dhan ghairm"

175msgstr "Till dhan ghairm"

176

176

177−#: qml/Components/Lockscreen.qml:223

177+#: qml/Components/Lockscreen.qml:238

178msgid "Emergency Call"

178msgid "Emergency Call"

179msgstr "Gairm èiginn"

179msgstr "Gairm èiginn"

180

180

181−#: qml/Components/Lockscreen.qml:255

181+#: qml/Components/Lockscreen.qml:270

182msgid "OK"

182msgid "OK"

183msgstr "Ceart ma-thà"

183msgstr "Ceart ma-thà"

184

184

185−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

185+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

186msgid "See less"

186msgid "See less"

187msgstr "Seall nas lugha"

187msgstr "Seall nas lugha"

188

188

189−#: qml/Dash/GenericScopeView.qml:434

189+#: qml/Dash/GenericScopeView.qml:431

190msgid "See all"

190msgid "See all"

191msgstr "Seall na h-uile"

191msgstr "Seall na h-uile"

192

192

193−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

193+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

194#: qml/Panel/SearchIndicator.qml:27

194#: qml/Panel/SearchIndicator.qml:27

195msgid "Search"

195msgid "Search"

196msgstr "Lorg"

196msgstr "Lorg"

197

197

198−#: qml/Dash/PageHeader.qml:268

198+#: qml/Dash/PageHeader.qml:260

199+msgid "Store"

200+msgstr "Am bùth"

201+

202+#: qml/Dash/PageHeader.qml:277

199msgid "Settings"

203msgid "Settings"

200msgstr "Roghainnean"

204msgstr "Roghainnean"

201

205

202−#: qml/Dash/PageHeader.qml:275

206+#: qml/Dash/PageHeader.qml:284

203msgid "Remove from Favorites"

207msgid "Remove from Favorites"

204msgstr "Thoir air falbh o na h-annsachdan"

208msgstr "Thoir air falbh o na h-annsachdan"

205

209

206−#: qml/Dash/PageHeader.qml:275

210+#: qml/Dash/PageHeader.qml:284

207msgid "Add to Favorites"

211msgid "Add to Favorites"

208msgstr "Cuir ris na h-annsachdan"

212msgstr "Cuir ris na h-annsachdan"

209

213

@@ -235,31 +239,23 @@ msgstr "Tarraing airson ath-nuadhachadh…"

235msgid "Release to refresh…"

239msgid "Release to refresh…"

236msgstr "Leig às airson ath-nuadhachadh…"

240msgstr "Leig às airson ath-nuadhachadh…"

237

241

238−#: qml/Dash/ScopesOverview.qml:215

242+#: qml/Dash/ScopesList.qml:63

239−msgid "Manage Scopes"

243+msgid "Manage"

240−msgstr "Stiùirich na sgòpaichean"

244+msgstr ""

241−

242−#: qml/Dash/ScopesOverview.qml:437

243−msgid "Done"

244−msgstr "Deiseil"

245−

246−#: qml/Dash/ScopesOverview.qml:463

247−msgid "Store"

248−msgstr "Am bùth"

249

245

250−#: qml/Dash/ScopesOverviewTab.qml:36

246+#: qml/Dash/ScopesList.qml:107

251−msgid "Favorites"

247+msgid "Home"

252−msgstr "Annsachdan"

248+msgstr ""

253

249

254−#: qml/Dash/ScopesOverviewTab.qml:54

250+#: qml/Dash/ScopesList.qml:108

255−msgid "All"

251+msgid "Also installed"

256−msgstr "Na h-uile"

252+msgstr ""

257

253

258#: qml/Greeter/Greeter.qml:174

254#: qml/Greeter/Greeter.qml:174

259msgid "Unlock"

255msgid "Unlock"

260msgstr "Thoir a' ghlas dheth"

256msgstr "Thoir a' ghlas dheth"

261

257

262−#: qml/Notifications/NotificationMenuItemFactory.qml:116

258+#: qml/Notifications/NotificationMenuItemFactory.qml:128

263msgid "Show password"

259msgid "Show password"

264msgstr "Seall am facal-faire"

260msgstr "Seall am facal-faire"

265

261

@@ -307,49 +303,49 @@ msgstr "Thoir a' ghlas far an SIM"

307msgid "Roaming"

303msgid "Roaming"

308msgstr "Air fàrsan"

304msgstr "Air fàrsan"

309

305

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

311msgid "Enter passphrase"

312msgid "Enter passphrase"

312msgstr "Cuir abairt-fhaire a-steach"

313msgstr "Cuir abairt-fhaire a-steach"

313

314

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

315msgid "Sorry, incorrect passphrase"

325msgid "Sorry, incorrect passphrase"

316msgstr "Duilich ach tha an abairt-fhaire cearr"

326msgstr "Duilich ach tha an abairt-fhaire cearr"

317

327

318−#: qml/Shell.qml:393

328+#: qml/Shell.qml:372

319msgid "Please re-enter"

329msgid "Please re-enter"

320msgstr "Cuir a-steach e a-rithist"

330msgstr "Cuir a-steach e a-rithist"

321

331

322−#: qml/Shell.qml:395

332+#: qml/Shell.qml:373

323−msgid "Enter passcode"

324−msgstr "Cuir còd-faire a-steach"

325−

326−#: qml/Shell.qml:396

327msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

328msgstr "Duilich ach tha an còd-faire cearr"

334msgstr "Duilich ach tha an còd-faire cearr"

329

335

330−#: qml/Shell.qml:399

336+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

331−#, qt-format

332−msgid "Enter %1"

333−msgstr "Cuir a-steach %1"

334−

335−#: qml/Shell.qml:400

336−#, qt-format

337−msgid "Sorry, incorrect %1"

338−msgstr "Duilich ach tha a' %1 cearr"

339−

340−#: qml/Shell.qml:441

341msgid "Sorry, incorrect passphrase."

337msgid "Sorry, incorrect passphrase."

342msgstr "Duilich ach tha an abairt-fhaire cearr."

338msgstr "Duilich ach tha an abairt-fhaire cearr."

343

339

344−#: qml/Shell.qml:442

340+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

345msgid "Sorry, incorrect passcode."

341msgid "Sorry, incorrect passcode."

346msgstr "Duilich ach tha an còd-faire cearr."

342msgstr "Duilich ach tha an còd-faire cearr."

347

343

348−#: qml/Shell.qml:443

344+#: qml/Shell.qml:469

349msgid "This will be your last attempt."

345msgid "This will be your last attempt."

350msgstr "Seo an oidhirp mu dheireadh agad."

346msgstr "Seo an oidhirp mu dheireadh agad."

351

347

352−#: qml/Shell.qml:445

348+#: qml/Shell.qml:471

353msgid ""

349msgid ""

354"If passphrase is entered incorrectly, your phone will conduct a factory "

350"If passphrase is entered incorrectly, your phone will conduct a factory "

355"reset and all personal data will be deleted."

351"reset and all personal data will be deleted."

@@ -358,7 +354,7 @@ msgstr ""

358"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "

354"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "

359"pearsanta a sguabadh às."

355"pearsanta a sguabadh às."

360

356

361−#: qml/Shell.qml:446

357+#: qml/Shell.qml:472

362msgid ""

358msgid ""

363"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"If passcode is entered incorrectly, your phone will conduct a factory reset "

364"and all personal data will be deleted."

360"and all personal data will be deleted."

@@ -367,6 +363,183 @@ msgstr ""

367"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "

363"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "

368"a sguabadh às."

364"a sguabadh às."

369

365

366+#: qml/Wizard/Page.qml:89

367+msgid "Back"

368+msgstr ""

369+

370+#: qml/Wizard/Pages/10-welcome.qml:27

371+msgid "Hi!"

372+msgstr ""

373+

374+#: qml/Wizard/Pages/10-welcome.qml:44

375+msgid "Welcome to your Ubuntu phone."

376+msgstr ""

377+

378+#: qml/Wizard/Pages/10-welcome.qml:52

379+msgid "Let’s get started."

380+msgstr ""

381+

382+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

383+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

384+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

385+#: qml/Wizard/Pages/passwd-set.qml:90

386+msgid "Continue"

387+msgstr ""

388+

389+#: qml/Wizard/Pages/20-sim.qml:25

390+msgid "Add a SIM card and restart your device"

391+msgstr ""

392+

393+#: qml/Wizard/Pages/20-sim.qml:55

394+msgid "Without it, you won’t be able to make calls or use text messaging."

395+msgstr ""

396+

397+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

398+msgid "Skip"

399+msgstr ""

400+

401+#: qml/Wizard/Pages/30-passwd-type.qml:39

402+msgid "Lock security"

403+msgstr ""

404+

405+#: qml/Wizard/Pages/30-passwd-type.qml:74

406+msgid "Please select how you’d like to unlock your phone."

407+msgstr ""

408+

409+#: qml/Wizard/Pages/30-passwd-type.qml:97

410+msgid "Swipe"

411+msgstr ""

412+

413+#: qml/Wizard/Pages/30-passwd-type.qml:98

414+msgid "No security"

415+msgstr ""

416+

417+#: qml/Wizard/Pages/30-passwd-type.qml:100

418+msgid "Passcode"

419+msgstr ""

420+

421+#: qml/Wizard/Pages/30-passwd-type.qml:101

422+msgid "4 digits only"

423+msgstr ""

424+

425+#: qml/Wizard/Pages/30-passwd-type.qml:103

426+msgid "Passphrase"

427+msgstr ""

428+

429+#: qml/Wizard/Pages/30-passwd-type.qml:104

430+msgid "Numbers and letters"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/40-wifi.qml:28

434+msgid "Connect to Wi‑Fi"

435+msgstr ""

436+

437+#: qml/Wizard/Pages/40-wifi.qml:147

438+msgid "Available networks…"

439+msgstr ""

440+

441+#: qml/Wizard/Pages/40-wifi.qml:148

442+msgid "No available networks."

443+msgstr ""

444+

445+#: qml/Wizard/Pages/50-location.qml:27

446+msgid "Location"

447+msgstr ""

448+

449+#: qml/Wizard/Pages/50-location.qml:62

450+msgid "Let the phone detect your location:"

451+msgstr ""

452+

453+#: qml/Wizard/Pages/50-location.qml:69

454+msgid "Using GPS only (less accurate)"

455+msgstr ""

456+

457+#: qml/Wizard/Pages/50-location.qml:86

458+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

459+msgstr ""

460+

461+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

462+#: qml/Wizard/Pages/50-location.qml:103

463+msgid ""

464+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

465+"conditions</a>."

466+msgstr ""

467+

468+#: qml/Wizard/Pages/50-location.qml:112

469+msgid "Not at all"

470+msgstr ""

471+

472+#: qml/Wizard/Pages/50-location.qml:124

473+msgid "You can change your mind later in <b>System Settings</b>."

474+msgstr ""

475+

476+#: qml/Wizard/Pages/60-reporting.qml:24

477+msgid "Improving your experience"

478+msgstr ""

479+

480+#: qml/Wizard/Pages/60-reporting.qml:36

481+msgid ""

482+"Your phone is set up to automatically report errors to Canonical and its "

483+"partners, the makers of the operating system."

484+msgstr ""

485+

486+#: qml/Wizard/Pages/60-reporting.qml:43

487+msgid ""

488+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

489+"Privacy</b>"

490+msgstr ""

491+

492+#: qml/Wizard/Pages/80-finished.qml:24

493+msgid "All done"

494+msgstr ""

495+

496+#: qml/Wizard/Pages/80-finished.qml:39

497+msgid "Nice work!"

498+msgstr ""

499+

500+#: qml/Wizard/Pages/80-finished.qml:46

501+msgid "Your phone is now ready to use."

502+msgstr ""

503+

504+#: qml/Wizard/Pages/80-finished.qml:53

505+msgid "Finish"

506+msgstr ""

507+

508+#: qml/Wizard/Pages/here-terms.qml:27

509+msgid "Terms & Conditions"

510+msgstr ""

511+

512+#: qml/Wizard/Pages/passwd-confirm.qml:49

513+msgid "Confirm passphrase"

514+msgstr ""

515+

516+#: qml/Wizard/Pages/passwd-confirm.qml:50

517+msgid "Confirm passcode"

518+msgstr ""

519+

520+#: qml/Wizard/Pages/passwd-confirm.qml:53

521+#: qml/Wizard/Pages/passwd-confirm.qml:54

522+msgid "Please try again."

523+msgstr ""

524+

525+#: qml/Wizard/Pages/passwd-set.qml:61

526+msgid "Choose your passcode"

527+msgstr ""

528+

529+#: qml/Wizard/Pages/passwd-set.qml:68

530+msgid "Passphrase must be 4 characters long"

531+msgstr ""

532+

533+#: qml/Wizard/StackButton.qml:39

534+#, qt-format

535+msgid "〈 %1"

536+msgstr ""

537+

538+#: qml/Wizard/StackButton.qml:42

539+#, qt-format

540+msgid "%1 〉"

541+msgstr ""

542+

370#~ msgid "Confirm"

543#~ msgid "Confirm"

371#~ msgstr "Dearbhaich"

544#~ msgstr "Dearbhaich"

372

545

@@ -381,3 +554,15 @@ msgstr ""

381

554

382#~ msgid "Speak Now..."

555#~ msgid "Speak Now..."

383#~ msgstr "Can rud a-nis..."

556#~ msgstr "Can rud a-nis..."

557+

558+#~ msgid "All"

559+#~ msgstr "Na h-uile"

560+

561+#~ msgid "Favorites"

562+#~ msgstr "Annsachdan"

563+

564+#~ msgid "Done"

565+#~ msgstr "Deiseil"

566+

567+#~ msgid "Manage Scopes"

568+#~ msgstr "Stiùirich na sgòpaichean"

po/gl.po+273−81

@@ -7,27 +7,27 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-06 13:30+0000\n"

11+"PO-Revision-Date: 2014-12-13 10:46+0000\n"

12"Last-Translator: Marcos Lans <Unknown>\n"

12"Last-Translator: Marcos Lans <Unknown>\n"

13"Language-Team: Galician <gl@li.org>\n"

13"Language-Team: Galician <gl@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-14 06:14+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Contrasinal : "

23msgstr "Contrasinal : "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Fixar o atallo"

28msgstr "Fixar o atallo"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Eliminar o atallo"

32msgstr "Eliminar o atallo"

33

33

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] "Agarde %1 minuto e ténteo de novo…"

50msgstr[0] "Agarde %1 minuto e ténteo de novo…"

51msgstr[1] "Agarde %1 minutos e ténteo de novo…"

51msgstr[1] "Agarde %1 minutos e ténteo de novo…"

52

52

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

54msgid "Log out"

54msgid "Log out"

55msgstr "Saír da sesión"

55msgstr "Saír da sesión"

56

56

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

58msgid "Are you sure you want to log out?"

58msgid "Are you sure you want to log out?"

59msgstr "Está seguro de querer pechar a sesión?"

59msgstr "Está seguro de querer pechar a sesión?"

60

60

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:122

63msgid "No"

63msgid "No"

64msgstr "Non"

64msgstr "Non"

65

65

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:129

68msgid "Yes"

68msgid "Yes"

69msgstr "Si"

69msgstr "Si"

70

70

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

72msgid "Shut down"

72msgid "Shut down"

73msgstr "Apagar"

73msgstr "Apagar"

74

74

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

76msgid "Are you sure you want to shut down?"

76msgid "Are you sure you want to shut down?"

77msgstr "Está seguro de querer apagar?"

77msgstr "Está seguro de querer apagar?"

78

78

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

80msgid "Reboot"

80msgid "Reboot"

81msgstr "Reiniciar"

81msgstr "Reiniciar"

82

82

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

84msgid "Are you sure you want to reboot?"

84msgid "Are you sure you want to reboot?"

85msgstr "Está seguro de querer reiniciar?"

85msgstr "Está seguro de querer reiniciar?"

86

86

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

88msgid "Power"

88msgid "Power"

89msgstr "Enerxía"

89msgstr "Enerxía"

90

90

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

92msgid ""

92msgid ""

93"Are you sure you would like\n"

93"Are you sure you would like\n"

94"to power off?"

94"to power off?"

95msgstr "Está seguro de querer apagar?"

95msgstr "Está seguro de querer apagar?"

96

96

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

98msgid "Power off"

98msgid "Power off"

99msgstr "Apagar"

99msgstr "Apagar"

100

100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102msgid "Restart"

102msgid "Restart"

103msgstr "Reiniciar"

103msgstr "Reiniciar"

104

104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106msgid "Cancel"

106msgid "Cancel"

107msgstr "Cancelar"

107msgstr "Cancelar"

108

108

@@ -110,45 +110,45 @@ msgstr "Cancelar"

110msgid "Skip intro"

110msgid "Skip intro"

111msgstr "Saltar introdución"

111msgstr "Saltar introdución"

112

112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114msgid "Right edge"

114msgid "Right edge"

115msgstr "Bordo dereito"

115msgstr "Bordo dereito"

116

116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118msgid "Try swiping from the right edge to unlock the phone"

118msgid "Try swiping from the right edge to unlock the phone"

119msgstr "Esvare o dedo desde o bordo dereito para desbloquear o teléfono"

119msgstr "Esvare o dedo desde o bordo dereito para desbloquear o teléfono"

120

120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122msgid "Top edge"

122msgid "Top edge"

123msgstr "Bordo superior"

123msgstr "Bordo superior"

124

124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126msgid "Try swiping from the top edge to access the indicators"

126msgid "Try swiping from the top edge to access the indicators"

127msgstr "Esvare o dedo desde o bordo superior para acceder aos indicadores."

127msgstr "Esvare o dedo desde o bordo superior para acceder aos indicadores."

128

128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130msgid "Close"

130msgid "Close"

131msgstr "Pechar"

131msgstr "Pechar"

132

132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134msgid "Swipe up again to close the settings screen"

134msgid "Swipe up again to close the settings screen"

135msgstr "Esvare o dedo de novo cara a arriba para pechar os axustes"

135msgstr "Esvare o dedo de novo cara a arriba para pechar os axustes"

136

136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138msgid "Left edge"

138msgid "Left edge"

139msgstr "Bordo esquerdo"

139msgstr "Bordo esquerdo"

140

140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143msgstr ""

143msgstr ""

144"Esvare o dedo desde a esquerda para mostrar o iniciador rápido dos "

144"Esvare o dedo desde a esquerda para mostrar o iniciador rápido dos "

145"aplicativos"

145"aplicativos"

146

146

147−#: qml/Components/EdgeDemo.qml:229

147+#: qml/Components/EdgeDemo.qml:242

148msgid "Well done"

148msgid "Well done"

149msgstr "Ben feito!"

149msgstr "Ben feito!"

150

150

151−#: qml/Components/EdgeDemo.qml:230

151+#: qml/Components/EdgeDemo.qml:243

152msgid ""

152msgid ""

153"You have now mastered the edge gestures and can start using the "

153"You have now mastered the edge gestures and can start using the "

154"phone<br><br>Tap on the screen to start"

154"phone<br><br>Tap on the screen to start"

@@ -156,40 +156,44 @@ msgstr ""

156"Agora xa domina os xestos dos bordos e pode comezar a usar o "

156"Agora xa domina os xestos dos bordos e pode comezar a usar o "

157"teléfono<br><br>Toque na pantalla para comezar"

157"teléfono<br><br>Toque na pantalla para comezar"

158

158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160msgid "Return to Call"

160msgid "Return to Call"

161msgstr "Volver á chamada"

161msgstr "Volver á chamada"

162

162

163−#: qml/Components/Lockscreen.qml:223

163+#: qml/Components/Lockscreen.qml:238

164msgid "Emergency Call"

164msgid "Emergency Call"

165msgstr "Chamada de emerxencia"

165msgstr "Chamada de emerxencia"

166

166

167−#: qml/Components/Lockscreen.qml:255

167+#: qml/Components/Lockscreen.qml:270

168msgid "OK"

168msgid "OK"

169msgstr "Aceptar"

169msgstr "Aceptar"

170

170

171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

172msgid "See less"

172msgid "See less"

173msgstr "Ver menos"

173msgstr "Ver menos"

174

174

175−#: qml/Dash/GenericScopeView.qml:434

175+#: qml/Dash/GenericScopeView.qml:431

176msgid "See all"

176msgid "See all"

177msgstr "Ver todo"

177msgstr "Ver todo"

178

178

179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

180#: qml/Panel/SearchIndicator.qml:27

180#: qml/Panel/SearchIndicator.qml:27

181msgid "Search"

181msgid "Search"

182msgstr "Buscar"

182msgstr "Buscar"

183

183

184−#: qml/Dash/PageHeader.qml:268

184+#: qml/Dash/PageHeader.qml:260

185+msgid "Store"

186+msgstr "Tenda"

187+

188+#: qml/Dash/PageHeader.qml:277

185msgid "Settings"

189msgid "Settings"

186msgstr "Axustes"

190msgstr "Axustes"

187

191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189msgid "Remove from Favorites"

193msgid "Remove from Favorites"

190msgstr "Eliminar dos favoritos"

194msgstr "Eliminar dos favoritos"

191

195

192−#: qml/Dash/PageHeader.qml:275

196+#: qml/Dash/PageHeader.qml:284

193msgid "Add to Favorites"

197msgid "Add to Favorites"

194msgstr "Engadir aos favoritos"

198msgstr "Engadir aos favoritos"

195

199

@@ -221,31 +225,23 @@ msgstr "Tirar para actualizar..."

221msgid "Release to refresh…"

225msgid "Release to refresh…"

222msgstr "Soltar para actualizar"

226msgstr "Soltar para actualizar"

223

227

224−#: qml/Dash/ScopesOverview.qml:215

228+#: qml/Dash/ScopesList.qml:63

225−msgid "Manage Scopes"

229+msgid "Manage"

226−msgstr "Xestionar os Ámbitos"

230+msgstr "Xestionar"

227

231

228−#: qml/Dash/ScopesOverview.qml:437

232+#: qml/Dash/ScopesList.qml:107

229−msgid "Done"

233+msgid "Home"

230−msgstr "Feito"

234+msgstr "Inicio"

231−

232−#: qml/Dash/ScopesOverview.qml:463

233−msgid "Store"

234−msgstr "Tenda"

235

235

236−#: qml/Dash/ScopesOverviewTab.qml:36

236+#: qml/Dash/ScopesList.qml:108

237−msgid "Favorites"

237+msgid "Also installed"

238−msgstr "Favoritos"

238+msgstr "Tamén instalado"

239−

240−#: qml/Dash/ScopesOverviewTab.qml:54

241−msgid "All"

242−msgstr "Todos"

243

239

244#: qml/Greeter/Greeter.qml:174

240#: qml/Greeter/Greeter.qml:174

245msgid "Unlock"

241msgid "Unlock"

246msgstr "Desbloquear"

242msgstr "Desbloquear"

247

243

248−#: qml/Notifications/NotificationMenuItemFactory.qml:116

244+#: qml/Notifications/NotificationMenuItemFactory.qml:128

249msgid "Show password"

245msgid "Show password"

250msgstr "Mostrar contrasinal"

246msgstr "Mostrar contrasinal"

251

247

@@ -293,49 +289,49 @@ msgstr "Desbloquear a SIM"

293msgid "Roaming"

289msgid "Roaming"

294msgstr "Itinerancia"

290msgstr "Itinerancia"

295

291

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

297msgid "Enter passphrase"

298msgid "Enter passphrase"

298msgstr "Introduza a frase secreta"

299msgstr "Introduza a frase secreta"

299

300

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

301msgid "Sorry, incorrect passphrase"

311msgid "Sorry, incorrect passphrase"

302msgstr "Sentímolo a frase é incorrecta"

312msgstr "Sentímolo a frase é incorrecta"

303

313

304−#: qml/Shell.qml:393

314+#: qml/Shell.qml:372

305msgid "Please re-enter"

315msgid "Please re-enter"

306msgstr "Introducir de novo"

316msgstr "Introducir de novo"

307

317

308−#: qml/Shell.qml:395

318+#: qml/Shell.qml:373

309−msgid "Enter passcode"

310−msgstr "Introduza a clave"

311−

312−#: qml/Shell.qml:396

313msgid "Sorry, incorrect passcode"

319msgid "Sorry, incorrect passcode"

314msgstr "Sentímolo, a clave é incorrecta"

320msgstr "Sentímolo, a clave é incorrecta"

315

321

316−#: qml/Shell.qml:399

322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

317−#, qt-format

318−msgid "Enter %1"

319−msgstr "Introducir %1"

320−

321−#: qml/Shell.qml:400

322−#, qt-format

323−msgid "Sorry, incorrect %1"

324−msgstr "Sentímolo, %1 non coincide"

325−

326−#: qml/Shell.qml:441

327msgid "Sorry, incorrect passphrase."

323msgid "Sorry, incorrect passphrase."

328msgstr "Sentímolo a frase é incorrecta."

324msgstr "Sentímolo a frase é incorrecta."

329

325

330−#: qml/Shell.qml:442

326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

331msgid "Sorry, incorrect passcode."

327msgid "Sorry, incorrect passcode."

332msgstr "Sentímolo, a clave é incorrecta."

328msgstr "Sentímolo, a clave é incorrecta."

333

329

334−#: qml/Shell.qml:443

330+#: qml/Shell.qml:469

335msgid "This will be your last attempt."

331msgid "This will be your last attempt."

336msgstr "Este será o seu último intento."

332msgstr "Este será o seu último intento."

337

333

338−#: qml/Shell.qml:445

334+#: qml/Shell.qml:471

339msgid ""

335msgid ""

340"If passphrase is entered incorrectly, your phone will conduct a factory "

336"If passphrase is entered incorrectly, your phone will conduct a factory "

341"reset and all personal data will be deleted."

337"reset and all personal data will be deleted."

@@ -343,7 +339,7 @@ msgstr ""

343"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "

339"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "

344"valores de fábrica e perderá todos os datos persoais."

340"valores de fábrica e perderá todos os datos persoais."

345

341

346−#: qml/Shell.qml:446

342+#: qml/Shell.qml:472

347msgid ""

343msgid ""

348"If passcode is entered incorrectly, your phone will conduct a factory reset "

344"If passcode is entered incorrectly, your phone will conduct a factory reset "

349"and all personal data will be deleted."

345"and all personal data will be deleted."

@@ -351,6 +347,190 @@ msgstr ""

351"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "

347"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "

352"fábrica e perderá todos os datos persoais."

348"fábrica e perderá todos os datos persoais."

353

349

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+

354#~ msgid "Confirm"

534#~ msgid "Confirm"

355#~ msgstr "Confirmar"

535#~ msgstr "Confirmar"

356

536

@@ -365,3 +545,15 @@ msgstr ""

365

545

366#~ msgid "Loading. Please Wait..."

546#~ msgid "Loading. Please Wait..."

367#~ msgstr "Cargando, agarde…"

547#~ msgstr "Cargando, agarde…"

548+

549+#~ msgid "All"

550+#~ msgstr "Todos"

551+

552+#~ msgid "Favorites"

553+#~ msgstr "Favoritos"

554+

555+#~ msgid "Done"

556+#~ msgstr "Feito"

557+

558+#~ msgid "Manage Scopes"

559+#~ msgstr "Xestionar os Ámbitos"

po/he.po+260−78

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-08-23 14:19+0000\n"

11"PO-Revision-Date: 2014-08-23 14:19+0000\n"

12"Last-Translator: Yaron <sh.yaron@gmail.com>\n"

12"Last-Translator: Yaron <sh.yaron@gmail.com>\n"

13"Language-Team: Hebrew <he@li.org>\n"

13"Language-Team: Hebrew <he@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "ססמה: "

23msgstr "ססמה: "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "הצמדת קיצור דרך"

28msgstr "הצמדת קיצור דרך"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "הפרדת קיצור הדרך"

32msgstr "הפרדת קיצור הדרך"

33

33

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] ""

50msgstr[0] ""

51msgstr[1] ""

51msgstr[1] ""

52

52

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

54msgid "Log out"

54msgid "Log out"

55msgstr ""

55msgstr ""

56

56

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

58msgid "Are you sure you want to log out?"

58msgid "Are you sure you want to log out?"

59msgstr ""

59msgstr ""

60

60

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:122

63msgid "No"

63msgid "No"

64msgstr ""

64msgstr ""

65

65

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:129

68msgid "Yes"

68msgid "Yes"

69msgstr ""

69msgstr ""

70

70

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

72msgid "Shut down"

72msgid "Shut down"

73msgstr ""

73msgstr ""

74

74

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

76msgid "Are you sure you want to shut down?"

76msgid "Are you sure you want to shut down?"

77msgstr ""

77msgstr ""

78

78

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

80msgid "Reboot"

80msgid "Reboot"

81msgstr ""

81msgstr ""

82

82

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

84msgid "Are you sure you want to reboot?"

84msgid "Are you sure you want to reboot?"

85msgstr ""

85msgstr ""

86

86

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

88msgid "Power"

88msgid "Power"

89msgstr ""

89msgstr ""

90

90

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

92msgid ""

92msgid ""

93"Are you sure you would like\n"

93"Are you sure you would like\n"

94"to power off?"

94"to power off?"

95msgstr ""

95msgstr ""

96

96

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

98msgid "Power off"

98msgid "Power off"

99msgstr "כיבוי"

99msgstr "כיבוי"

100

100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102msgid "Restart"

102msgid "Restart"

103msgstr ""

103msgstr ""

104

104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106msgid "Cancel"

106msgid "Cancel"

107msgstr "ביטול"

107msgstr "ביטול"

108

108

@@ -110,43 +110,43 @@ msgstr "ביטול"

110msgid "Skip intro"

110msgid "Skip intro"

111msgstr "לדלג על הפתיחה"

111msgstr "לדלג על הפתיחה"

112

112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114msgid "Right edge"

114msgid "Right edge"

115msgstr "שול ימני"

115msgstr "שול ימני"

116

116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118msgid "Try swiping from the right edge to unlock the phone"

118msgid "Try swiping from the right edge to unlock the phone"

119msgstr "נא לנסות למשוך מהשול הימני כדי לשחרר את נעילת הטלפון"

119msgstr "נא לנסות למשוך מהשול הימני כדי לשחרר את נעילת הטלפון"

120

120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122msgid "Top edge"

122msgid "Top edge"

123msgstr "השול העליון"

123msgstr "השול העליון"

124

124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126msgid "Try swiping from the top edge to access the indicators"

126msgid "Try swiping from the top edge to access the indicators"

127msgstr "נא לנסות למשוך מהשול העליון כדי לגשת למחוונים"

127msgstr "נא לנסות למשוך מהשול העליון כדי לגשת למחוונים"

128

128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130msgid "Close"

130msgid "Close"

131msgstr "סגירה"

131msgstr "סגירה"

132

132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134msgid "Swipe up again to close the settings screen"

134msgid "Swipe up again to close the settings screen"

135msgstr "ניתן למשוך שוב כדי לסגור את מסך ההגדרות"

135msgstr "ניתן למשוך שוב כדי לסגור את מסך ההגדרות"

136

136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138msgid "Left edge"

138msgid "Left edge"

139msgstr "שול שמאלי"

139msgstr "שול שמאלי"

140

140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143msgstr "יש למשוך משמאל כדי לחשוף את המשגר לצורך גישה מהירה ליישומים"

143msgstr "יש למשוך משמאל כדי לחשוף את המשגר לצורך גישה מהירה ליישומים"

144

144

145−#: qml/Components/EdgeDemo.qml:229

145+#: qml/Components/EdgeDemo.qml:242

146msgid "Well done"

146msgid "Well done"

147msgstr "כל הכבוד"

147msgstr "כל הכבוד"

148

148

149−#: qml/Components/EdgeDemo.qml:230

149+#: qml/Components/EdgeDemo.qml:243

150msgid ""

150msgid ""

151"You have now mastered the edge gestures and can start using the "

151"You have now mastered the edge gestures and can start using the "

152"phone<br><br>Tap on the screen to start"

152"phone<br><br>Tap on the screen to start"

@@ -154,40 +154,44 @@ msgstr ""

154"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "

154"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "

155"לגעת במסך כדי להתחיל"

155"לגעת במסך כדי להתחיל"

156

156

157−#: qml/Components/Lockscreen.qml:223

157+#: qml/Components/Lockscreen.qml:238

158msgid "Return to Call"

158msgid "Return to Call"

159msgstr ""

159msgstr ""

160

160

161−#: qml/Components/Lockscreen.qml:223

161+#: qml/Components/Lockscreen.qml:238

162msgid "Emergency Call"

162msgid "Emergency Call"

163msgstr "שיחת חירום"

163msgstr "שיחת חירום"

164

164

165−#: qml/Components/Lockscreen.qml:255

165+#: qml/Components/Lockscreen.qml:270

166msgid "OK"

166msgid "OK"

167msgstr "אישור"

167msgstr "אישור"

168

168

169−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

169+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

170msgid "See less"

170msgid "See less"

171msgstr "לראות פחות"

171msgstr "לראות פחות"

172

172

173−#: qml/Dash/GenericScopeView.qml:434

173+#: qml/Dash/GenericScopeView.qml:431

174msgid "See all"

174msgid "See all"

175msgstr "להציג הכול"

175msgstr "להציג הכול"

176

176

177−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

177+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

178#: qml/Panel/SearchIndicator.qml:27

178#: qml/Panel/SearchIndicator.qml:27

179msgid "Search"

179msgid "Search"

180msgstr "חיפוש"

180msgstr "חיפוש"

181

181

182−#: qml/Dash/PageHeader.qml:268

182+#: qml/Dash/PageHeader.qml:260

183+msgid "Store"

184+msgstr "אחסון"

185+

186+#: qml/Dash/PageHeader.qml:277

183msgid "Settings"

187msgid "Settings"

184msgstr ""

188msgstr ""

185

189

186−#: qml/Dash/PageHeader.qml:275

190+#: qml/Dash/PageHeader.qml:284

187msgid "Remove from Favorites"

191msgid "Remove from Favorites"

188msgstr ""

192msgstr ""

189

193

190−#: qml/Dash/PageHeader.qml:275

194+#: qml/Dash/PageHeader.qml:284

191msgid "Add to Favorites"

195msgid "Add to Favorites"

192msgstr ""

196msgstr ""

193

197

@@ -219,31 +223,23 @@ msgstr ""

219msgid "Release to refresh…"

223msgid "Release to refresh…"

220msgstr ""

224msgstr ""

221

225

222−#: qml/Dash/ScopesOverview.qml:215

226+#: qml/Dash/ScopesList.qml:63

223−msgid "Manage Scopes"

227+msgid "Manage"

224msgstr ""

228msgstr ""

225

229

226−#: qml/Dash/ScopesOverview.qml:437

230+#: qml/Dash/ScopesList.qml:107

227−msgid "Done"

228−msgstr "סיימתי"

229−

230−#: qml/Dash/ScopesOverview.qml:463

231−msgid "Store"

232−msgstr "אחסון"

233−

234−#: qml/Dash/ScopesOverviewTab.qml:36

235−msgid "Favorites"

231+msgid "Home"

236−msgstr "מועדפים"

232+msgstr ""

237

233

238−#: qml/Dash/ScopesOverviewTab.qml:54

234+#: qml/Dash/ScopesList.qml:108

239−msgid "All"

235+msgid "Also installed"

240−msgstr "הכול"

236+msgstr ""

241

237

242#: qml/Greeter/Greeter.qml:174

238#: qml/Greeter/Greeter.qml:174

243msgid "Unlock"

239msgid "Unlock"

244msgstr ""

240msgstr ""

245

241

246−#: qml/Notifications/NotificationMenuItemFactory.qml:116

242+#: qml/Notifications/NotificationMenuItemFactory.qml:128

247msgid "Show password"

243msgid "Show password"

248msgstr "הצגת הססמה"

244msgstr "הצגת הססמה"

249

245

@@ -291,60 +287,237 @@ msgstr ""

291msgid "Roaming"

287msgid "Roaming"

292msgstr "נדידה"

288msgstr "נדידה"

293

289

294−#: qml/Shell.qml:391

290+#: qml/Shell.qml:367

291+#, qt-format

295−msgid "Enter passphrase"

292+msgid "Enter %1"

296msgstr ""

293msgstr ""

297

294

298−#: qml/Shell.qml:392

295+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

299−msgid "Sorry, incorrect passphrase"

296+msgid "Enter passphrase"

300−msgstr "מילת הצופן שגויה, עמך הסליחה."

301−

302−#: qml/Shell.qml:393

303−msgid "Please re-enter"

304msgstr ""

297msgstr ""

305

298

306−#: qml/Shell.qml:395

299+#: qml/Shell.qml:369

307msgid "Enter passcode"

300msgid "Enter passcode"

308msgstr ""

301msgstr ""

309

302

310−#: qml/Shell.qml:396

303+#: qml/Shell.qml:370

304+#, qt-format

311−msgid "Sorry, incorrect passcode"

305+msgid "Sorry, incorrect %1"

312msgstr ""

306msgstr ""

313

307

314−#: qml/Shell.qml:399

308+#: qml/Shell.qml:371

315−#, qt-format

309+msgid "Sorry, incorrect passphrase"

316−msgid "Enter %1"

310+msgstr "מילת הצופן שגויה, עמך הסליחה."

311+

312+#: qml/Shell.qml:372

313+msgid "Please re-enter"

317msgstr ""

314msgstr ""

318

315

319−#: qml/Shell.qml:400

316+#: qml/Shell.qml:373

320−#, qt-format

321−msgid "Sorry, incorrect %1"

317+msgid "Sorry, incorrect passcode"

322msgstr ""

318msgstr ""

323

319

324−#: qml/Shell.qml:441

320+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

325msgid "Sorry, incorrect passphrase."

321msgid "Sorry, incorrect passphrase."

326msgstr "מילת הצופן שגויה, עמך הסליחה."

322msgstr "מילת הצופן שגויה, עמך הסליחה."

327

323

328−#: qml/Shell.qml:442

324+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

329msgid "Sorry, incorrect passcode."

325msgid "Sorry, incorrect passcode."

330msgstr "הצופן שגוי, עם הסליחה."

326msgstr "הצופן שגוי, עם הסליחה."

331

327

332−#: qml/Shell.qml:443

328+#: qml/Shell.qml:469

333msgid "This will be your last attempt."

329msgid "This will be your last attempt."

334msgstr "זה יהיה הניסיון האחרון שלך."

330msgstr "זה יהיה הניסיון האחרון שלך."

335

331

336−#: qml/Shell.qml:445

332+#: qml/Shell.qml:471

337msgid ""

333msgid ""

338"If passphrase is entered incorrectly, your phone will conduct a factory "

334"If passphrase is entered incorrectly, your phone will conduct a factory "

339"reset and all personal data will be deleted."

335"reset and all personal data will be deleted."

340msgstr ""

336msgstr ""

341

337

342−#: qml/Shell.qml:446

338+#: qml/Shell.qml:472

343msgid ""

339msgid ""

344"If passcode is entered incorrectly, your phone will conduct a factory reset "

340"If passcode is entered incorrectly, your phone will conduct a factory reset "

345"and all personal data will be deleted."

341"and all personal data will be deleted."

346msgstr ""

342msgstr ""

347

343

344+#: qml/Wizard/Page.qml:89

345+msgid "Back"

346+msgstr ""

347+

348+#: qml/Wizard/Pages/10-welcome.qml:27

349+msgid "Hi!"

350+msgstr ""

351+

352+#: qml/Wizard/Pages/10-welcome.qml:44

353+msgid "Welcome to your Ubuntu phone."

354+msgstr ""

355+

356+#: qml/Wizard/Pages/10-welcome.qml:52

357+msgid "Let’s get started."

358+msgstr ""

359+

360+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

361+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

362+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

363+#: qml/Wizard/Pages/passwd-set.qml:90

364+msgid "Continue"

365+msgstr ""

366+

367+#: qml/Wizard/Pages/20-sim.qml:25

368+msgid "Add a SIM card and restart your device"

369+msgstr ""

370+

371+#: qml/Wizard/Pages/20-sim.qml:55

372+msgid "Without it, you won’t be able to make calls or use text messaging."

373+msgstr ""

374+

375+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

376+msgid "Skip"

377+msgstr ""

378+

379+#: qml/Wizard/Pages/30-passwd-type.qml:39

380+msgid "Lock security"

381+msgstr ""

382+

383+#: qml/Wizard/Pages/30-passwd-type.qml:74

384+msgid "Please select how you’d like to unlock your phone."

385+msgstr ""

386+

387+#: qml/Wizard/Pages/30-passwd-type.qml:97

388+msgid "Swipe"

389+msgstr ""

390+

391+#: qml/Wizard/Pages/30-passwd-type.qml:98

392+msgid "No security"

393+msgstr ""

394+

395+#: qml/Wizard/Pages/30-passwd-type.qml:100

396+msgid "Passcode"

397+msgstr ""

398+

399+#: qml/Wizard/Pages/30-passwd-type.qml:101

400+msgid "4 digits only"

401+msgstr ""

402+

403+#: qml/Wizard/Pages/30-passwd-type.qml:103

404+msgid "Passphrase"

405+msgstr ""

406+

407+#: qml/Wizard/Pages/30-passwd-type.qml:104

408+msgid "Numbers and letters"

409+msgstr ""

410+

411+#: qml/Wizard/Pages/40-wifi.qml:28

412+msgid "Connect to Wi‑Fi"

413+msgstr ""

414+

415+#: qml/Wizard/Pages/40-wifi.qml:147

416+msgid "Available networks…"

417+msgstr ""

418+

419+#: qml/Wizard/Pages/40-wifi.qml:148

420+msgid "No available networks."

421+msgstr ""

422+

423+#: qml/Wizard/Pages/50-location.qml:27

424+msgid "Location"

425+msgstr ""

426+

427+#: qml/Wizard/Pages/50-location.qml:62

428+msgid "Let the phone detect your location:"

429+msgstr ""

430+

431+#: qml/Wizard/Pages/50-location.qml:69

432+msgid "Using GPS only (less accurate)"

433+msgstr ""

434+

435+#: qml/Wizard/Pages/50-location.qml:86

436+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

437+msgstr ""

438+

439+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

440+#: qml/Wizard/Pages/50-location.qml:103

441+msgid ""

442+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

443+"conditions</a>."

444+msgstr ""

445+

446+#: qml/Wizard/Pages/50-location.qml:112

447+msgid "Not at all"

448+msgstr ""

449+

450+#: qml/Wizard/Pages/50-location.qml:124

451+msgid "You can change your mind later in <b>System Settings</b>."

452+msgstr ""

453+

454+#: qml/Wizard/Pages/60-reporting.qml:24

455+msgid "Improving your experience"

456+msgstr ""

457+

458+#: qml/Wizard/Pages/60-reporting.qml:36

459+msgid ""

460+"Your phone is set up to automatically report errors to Canonical and its "

461+"partners, the makers of the operating system."

462+msgstr ""

463+

464+#: qml/Wizard/Pages/60-reporting.qml:43

465+msgid ""

466+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

467+"Privacy</b>"

468+msgstr ""

469+

470+#: qml/Wizard/Pages/80-finished.qml:24

471+msgid "All done"

472+msgstr ""

473+

474+#: qml/Wizard/Pages/80-finished.qml:39

475+msgid "Nice work!"

476+msgstr ""

477+

478+#: qml/Wizard/Pages/80-finished.qml:46

479+msgid "Your phone is now ready to use."

480+msgstr ""

481+

482+#: qml/Wizard/Pages/80-finished.qml:53

483+msgid "Finish"

484+msgstr ""

485+

486+#: qml/Wizard/Pages/here-terms.qml:27

487+msgid "Terms & Conditions"

488+msgstr ""

489+

490+#: qml/Wizard/Pages/passwd-confirm.qml:49

491+msgid "Confirm passphrase"

492+msgstr ""

493+

494+#: qml/Wizard/Pages/passwd-confirm.qml:50

495+msgid "Confirm passcode"

496+msgstr ""

497+

498+#: qml/Wizard/Pages/passwd-confirm.qml:53

499+#: qml/Wizard/Pages/passwd-confirm.qml:54

500+msgid "Please try again."

501+msgstr ""

502+

503+#: qml/Wizard/Pages/passwd-set.qml:61

504+msgid "Choose your passcode"

505+msgstr ""

506+

507+#: qml/Wizard/Pages/passwd-set.qml:68

508+msgid "Passphrase must be 4 characters long"

509+msgstr ""

510+

511+#: qml/Wizard/StackButton.qml:39

512+#, qt-format

513+msgid "〈 %1"

514+msgstr ""

515+

516+#: qml/Wizard/StackButton.qml:42

517+#, qt-format

518+msgid "%1 〉"

519+msgstr ""

520+

348#~ msgid "Confirm"

521#~ msgid "Confirm"

349#~ msgstr "אישור"

522#~ msgstr "אישור"

350

523

@@ -359,3 +532,12 @@ msgstr ""

359

532

360#~ msgid "Speaking..."

533#~ msgid "Speaking..."

361#~ msgstr "הדיבור מושמע…"

534#~ 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 ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity8\n"

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-01-15 01:49+0000\n"

11"PO-Revision-Date: 2014-01-15 01:49+0000\n"

12"Last-Translator: Siddhanathan S. <Unknown>\n"

12"Last-Translator: Siddhanathan S. <Unknown>\n"

13"Language-Team: Hindi <hi@li.org>\n"

13"Language-Team: Hindi <hi@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr ""

23msgstr ""

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr ""

28msgstr ""

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr ""

32msgstr ""

33

33

@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] ""

50msgstr[0] ""

51msgstr[1] ""

51msgstr[1] ""

52

52

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

54msgid "Log out"

54msgid "Log out"

55msgstr ""

55msgstr ""

56

56

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

58msgid "Are you sure you want to log out?"

58msgid "Are you sure you want to log out?"

59msgstr ""

59msgstr ""

60

60

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:122

63msgid "No"

63msgid "No"

64msgstr ""

64msgstr ""

65

65

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:129

68msgid "Yes"

68msgid "Yes"

69msgstr ""

69msgstr ""

70

70

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

72msgid "Shut down"

72msgid "Shut down"

73msgstr ""

73msgstr ""

74

74

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

76msgid "Are you sure you want to shut down?"

76msgid "Are you sure you want to shut down?"

77msgstr ""

77msgstr ""

78

78

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

80msgid "Reboot"

80msgid "Reboot"

81msgstr ""

81msgstr ""

82

82

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

84msgid "Are you sure you want to reboot?"

84msgid "Are you sure you want to reboot?"

85msgstr ""

85msgstr ""

86

86

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

88msgid "Power"

88msgid "Power"

89msgstr ""

89msgstr ""

90

90

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

92msgid ""

92msgid ""

93"Are you sure you would like\n"

93"Are you sure you would like\n"

94"to power off?"

94"to power off?"

95msgstr ""

95msgstr ""

96

96

97−#: qml/Components/Dialogs.qml:151

97+#: qml/Components/Dialogs.qml:147

98msgid "Power off"

98msgid "Power off"

99msgstr ""

99msgstr ""

100

100

101−#: qml/Components/Dialogs.qml:161

101+#: qml/Components/Dialogs.qml:157

102msgid "Restart"

102msgid "Restart"

103msgstr ""

103msgstr ""

104

104

105−#: qml/Components/Dialogs.qml:171

105+#: qml/Components/Dialogs.qml:167

106msgid "Cancel"

106msgid "Cancel"

107msgstr ""

107msgstr ""

108

108

@@ -110,82 +110,86 @@ msgstr ""

110msgid "Skip intro"

110msgid "Skip intro"

111msgstr "परिचय छोड़"

111msgstr "परिचय छोड़"

112

112

113−#: qml/Components/EdgeDemo.qml:112

113+#: qml/Components/EdgeDemo.qml:125

114msgid "Right edge"

114msgid "Right edge"

115msgstr "दायाँ किनारा"

115msgstr "दायाँ किनारा"

116

116

117−#: qml/Components/EdgeDemo.qml:113

117+#: qml/Components/EdgeDemo.qml:126

118msgid "Try swiping from the right edge to unlock the phone"

118msgid "Try swiping from the right edge to unlock the phone"

119msgstr ""

119msgstr ""

120

120

121−#: qml/Components/EdgeDemo.qml:144

121+#: qml/Components/EdgeDemo.qml:157

122msgid "Top edge"

122msgid "Top edge"

123msgstr "ऊपर किनारे"

123msgstr "ऊपर किनारे"

124

124

125−#: qml/Components/EdgeDemo.qml:145

125+#: qml/Components/EdgeDemo.qml:158

126msgid "Try swiping from the top edge to access the indicators"

126msgid "Try swiping from the top edge to access the indicators"

127msgstr ""

127msgstr ""

128

128

129−#: qml/Components/EdgeDemo.qml:170

129+#: qml/Components/EdgeDemo.qml:183

130msgid "Close"

130msgid "Close"

131msgstr "बंद करें"

131msgstr "बंद करें"

132

132

133−#: qml/Components/EdgeDemo.qml:171

133+#: qml/Components/EdgeDemo.qml:184

134msgid "Swipe up again to close the settings screen"

134msgid "Swipe up again to close the settings screen"

135msgstr ""

135msgstr ""

136

136

137−#: qml/Components/EdgeDemo.qml:201

137+#: qml/Components/EdgeDemo.qml:214

138msgid "Left edge"

138msgid "Left edge"

139msgstr "बायाँ किनारा"

139msgstr "बायाँ किनारा"

140

140

141−#: qml/Components/EdgeDemo.qml:202

141+#: qml/Components/EdgeDemo.qml:215

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

143msgstr ""

143msgstr ""

144

144

145−#: qml/Components/EdgeDemo.qml:229

145+#: qml/Components/EdgeDemo.qml:242

146msgid "Well done"

146msgid "Well done"

147msgstr "शाबाश"

147msgstr "शाबाश"

148

148

149−#: qml/Components/EdgeDemo.qml:230

149+#: qml/Components/EdgeDemo.qml:243

150msgid ""

150msgid ""

151"You have now mastered the edge gestures and can start using the "

151"You have now mastered the edge gestures and can start using the "

152"phone<br><br>Tap on the screen to start"

152"phone<br><br>Tap on the screen to start"

153msgstr ""

153msgstr ""

154

154

155−#: qml/Components/Lockscreen.qml:223

155+#: qml/Components/Lockscreen.qml:238

156msgid "Return to Call"

156msgid "Return to Call"

157msgstr ""

157msgstr ""

158

158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160msgid "Emergency Call"

160msgid "Emergency Call"

161msgstr "आपातकालीन कॉल"

161msgstr "आपातकालीन कॉल"

162

162

163−#: qml/Components/Lockscreen.qml:255

163+#: qml/Components/Lockscreen.qml:270

164msgid "OK"

164msgid "OK"

165msgstr ""

165msgstr ""

166

166

167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

168msgid "See less"

168msgid "See less"

169msgstr ""

169msgstr ""

170

170

171−#: qml/Dash/GenericScopeView.qml:434

171+#: qml/Dash/GenericScopeView.qml:431

172msgid "See all"

172msgid "See all"

173msgstr ""

173msgstr ""

174

174

175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176#: qml/Panel/SearchIndicator.qml:27

176#: qml/Panel/SearchIndicator.qml:27

177msgid "Search"

177msgid "Search"

178msgstr "खोजें"

178msgstr "खोजें"

179

179

180−#: qml/Dash/PageHeader.qml:268

180+#: qml/Dash/PageHeader.qml:260

181+msgid "Store"

182+msgstr ""

183+

184+#: qml/Dash/PageHeader.qml:277

181msgid "Settings"

185msgid "Settings"

182msgstr ""

186msgstr ""

183

187

184−#: qml/Dash/PageHeader.qml:275

188+#: qml/Dash/PageHeader.qml:284

185msgid "Remove from Favorites"

189msgid "Remove from Favorites"

186msgstr ""

190msgstr ""

187

191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189msgid "Add to Favorites"

193msgid "Add to Favorites"

190msgstr ""

194msgstr ""

191

195

@@ -217,31 +221,23 @@ msgstr ""

217msgid "Release to refresh…"

221msgid "Release to refresh…"

218msgstr ""

222msgstr ""

219

223

220−#: qml/Dash/ScopesOverview.qml:215

224+#: qml/Dash/ScopesList.qml:63

221−msgid "Manage Scopes"

225+msgid "Manage"

222−msgstr ""

223−

224−#: qml/Dash/ScopesOverview.qml:437

225−msgid "Done"

226−msgstr ""

227−

228−#: qml/Dash/ScopesOverview.qml:463

229−msgid "Store"

230msgstr ""

226msgstr ""

231

227

232−#: qml/Dash/ScopesOverviewTab.qml:36

228+#: qml/Dash/ScopesList.qml:107

233−msgid "Favorites"

229+msgid "Home"

234msgstr ""

230msgstr ""

235

231

236−#: qml/Dash/ScopesOverviewTab.qml:54

232+#: qml/Dash/ScopesList.qml:108

237−msgid "All"

233+msgid "Also installed"

238msgstr ""

234msgstr ""

239

235

240#: qml/Greeter/Greeter.qml:174

236#: qml/Greeter/Greeter.qml:174

241msgid "Unlock"

237msgid "Unlock"

242msgstr ""

238msgstr ""

243

239

244−#: qml/Notifications/NotificationMenuItemFactory.qml:116

240+#: qml/Notifications/NotificationMenuItemFactory.qml:128

245msgid "Show password"

241msgid "Show password"

246msgstr ""

242msgstr ""

247

243

@@ -289,60 +285,237 @@ msgstr ""

289msgid "Roaming"

285msgid "Roaming"

290msgstr ""

286msgstr ""

291

287

292−#: qml/Shell.qml:391

288+#: qml/Shell.qml:367

289+#, qt-format

293−msgid "Enter passphrase"

290+msgid "Enter %1"

294msgstr ""

291msgstr ""

295

292

296−#: qml/Shell.qml:392

293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

297−msgid "Sorry, incorrect passphrase"

294+msgid "Enter passphrase"

298msgstr ""

295msgstr ""

299

296

300−#: qml/Shell.qml:393

297+#: qml/Shell.qml:369

301−msgid "Please re-enter"

298+msgid "Enter passcode"

302msgstr ""

299msgstr ""

303

300

304−#: qml/Shell.qml:395

301+#: qml/Shell.qml:370

305−msgid "Enter passcode"

302+#, qt-format

303+msgid "Sorry, incorrect %1"

306msgstr ""

304msgstr ""

307

305

308−#: qml/Shell.qml:396

306+#: qml/Shell.qml:371

309−msgid "Sorry, incorrect passcode"

307+msgid "Sorry, incorrect passphrase"

310msgstr ""

308msgstr ""

311

309

312−#: qml/Shell.qml:399

310+#: qml/Shell.qml:372

313−#, qt-format

311+msgid "Please re-enter"

314−msgid "Enter %1"

315msgstr ""

312msgstr ""

316

313

317−#: qml/Shell.qml:400

314+#: qml/Shell.qml:373

318−#, qt-format

319−msgid "Sorry, incorrect %1"

315+msgid "Sorry, incorrect passcode"

320msgstr ""

316msgstr ""

321

317

322−#: qml/Shell.qml:441

318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

323msgid "Sorry, incorrect passphrase."

319msgid "Sorry, incorrect passphrase."

324msgstr ""

320msgstr ""

325

321

326−#: qml/Shell.qml:442

322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

327msgid "Sorry, incorrect passcode."

323msgid "Sorry, incorrect passcode."

328msgstr ""

324msgstr ""

329

325

330−#: qml/Shell.qml:443

326+#: qml/Shell.qml:469

331msgid "This will be your last attempt."

327msgid "This will be your last attempt."

332msgstr ""

328msgstr ""

333

329

334−#: qml/Shell.qml:445

330+#: qml/Shell.qml:471

335msgid ""

331msgid ""

336"If passphrase is entered incorrectly, your phone will conduct a factory "

332"If passphrase is entered incorrectly, your phone will conduct a factory "

337"reset and all personal data will be deleted."

333"reset and all personal data will be deleted."

338msgstr ""

334msgstr ""

339

335

340−#: qml/Shell.qml:446

336+#: qml/Shell.qml:472

341msgid ""

337msgid ""

342"If passcode is entered incorrectly, your phone will conduct a factory reset "

338"If passcode is entered incorrectly, your phone will conduct a factory reset "

343"and all personal data will be deleted."

339"and all personal data will be deleted."

344msgstr ""

340msgstr ""

345

341

342+#: qml/Wizard/Page.qml:89

343+msgid "Back"

344+msgstr ""

345+

346+#: qml/Wizard/Pages/10-welcome.qml:27

347+msgid "Hi!"

348+msgstr ""

349+

350+#: qml/Wizard/Pages/10-welcome.qml:44

351+msgid "Welcome to your Ubuntu phone."

352+msgstr ""

353+

354+#: qml/Wizard/Pages/10-welcome.qml:52

355+msgid "Let’s get started."

356+msgstr ""

357+

358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

361+#: qml/Wizard/Pages/passwd-set.qml:90

362+msgid "Continue"

363+msgstr ""

364+

365+#: qml/Wizard/Pages/20-sim.qml:25

366+msgid "Add a SIM card and restart your device"

367+msgstr ""

368+

369+#: qml/Wizard/Pages/20-sim.qml:55

370+msgid "Without it, you won’t be able to make calls or use text messaging."

371+msgstr ""

372+

373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

374+msgid "Skip"

375+msgstr ""

376+

377+#: qml/Wizard/Pages/30-passwd-type.qml:39

378+msgid "Lock security"

379+msgstr ""

380+

381+#: qml/Wizard/Pages/30-passwd-type.qml:74

382+msgid "Please select how you’d like to unlock your phone."

383+msgstr ""

384+

385+#: qml/Wizard/Pages/30-passwd-type.qml:97

386+msgid "Swipe"

387+msgstr ""

388+

389+#: qml/Wizard/Pages/30-passwd-type.qml:98

390+msgid "No security"

391+msgstr ""

392+

393+#: qml/Wizard/Pages/30-passwd-type.qml:100

394+msgid "Passcode"

395+msgstr ""

396+

397+#: qml/Wizard/Pages/30-passwd-type.qml:101

398+msgid "4 digits only"

399+msgstr ""

400+

401+#: qml/Wizard/Pages/30-passwd-type.qml:103

402+msgid "Passphrase"

403+msgstr ""

404+

405+#: qml/Wizard/Pages/30-passwd-type.qml:104

406+msgid "Numbers and letters"

407+msgstr ""

408+

409+#: qml/Wizard/Pages/40-wifi.qml:28

410+msgid "Connect to Wi‑Fi"

411+msgstr ""

412+

413+#: qml/Wizard/Pages/40-wifi.qml:147

414+msgid "Available networks…"

415+msgstr ""

416+

417+#: qml/Wizard/Pages/40-wifi.qml:148

418+msgid "No available networks."

419+msgstr ""

420+

421+#: qml/Wizard/Pages/50-location.qml:27

422+msgid "Location"

423+msgstr ""

424+

425+#: qml/Wizard/Pages/50-location.qml:62

426+msgid "Let the phone detect your location:"

427+msgstr ""

428+

429+#: qml/Wizard/Pages/50-location.qml:69

430+msgid "Using GPS only (less accurate)"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/50-location.qml:86

434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

435+msgstr ""

436+

437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

438+#: qml/Wizard/Pages/50-location.qml:103

439+msgid ""

440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

441+"conditions</a>."

442+msgstr ""

443+

444+#: qml/Wizard/Pages/50-location.qml:112

445+msgid "Not at all"

446+msgstr ""

447+

448+#: qml/Wizard/Pages/50-location.qml:124

449+msgid "You can change your mind later in <b>System Settings</b>."

450+msgstr ""

451+

452+#: qml/Wizard/Pages/60-reporting.qml:24

453+msgid "Improving your experience"

454+msgstr ""

455+

456+#: qml/Wizard/Pages/60-reporting.qml:36

457+msgid ""

458+"Your phone is set up to automatically report errors to Canonical and its "

459+"partners, the makers of the operating system."

460+msgstr ""

461+

462+#: qml/Wizard/Pages/60-reporting.qml:43

463+msgid ""

464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

465+"Privacy</b>"

466+msgstr ""

467+

468+#: qml/Wizard/Pages/80-finished.qml:24

469+msgid "All done"

470+msgstr ""

471+

472+#: qml/Wizard/Pages/80-finished.qml:39

473+msgid "Nice work!"

474+msgstr ""

475+

476+#: qml/Wizard/Pages/80-finished.qml:46

477+msgid "Your phone is now ready to use."

478+msgstr ""

479+

480+#: qml/Wizard/Pages/80-finished.qml:53

481+msgid "Finish"

482+msgstr ""

483+

484+#: qml/Wizard/Pages/here-terms.qml:27

485+msgid "Terms & Conditions"

486+msgstr ""

487+

488+#: qml/Wizard/Pages/passwd-confirm.qml:49

489+msgid "Confirm passphrase"

490+msgstr ""

491+

492+#: qml/Wizard/Pages/passwd-confirm.qml:50

493+msgid "Confirm passcode"

494+msgstr ""

495+

496+#: qml/Wizard/Pages/passwd-confirm.qml:53

497+#: qml/Wizard/Pages/passwd-confirm.qml:54

498+msgid "Please try again."

499+msgstr ""

500+

501+#: qml/Wizard/Pages/passwd-set.qml:61

502+msgid "Choose your passcode"

503+msgstr ""

504+

505+#: qml/Wizard/Pages/passwd-set.qml:68

506+msgid "Passphrase must be 4 characters long"

507+msgstr ""

508+

509+#: qml/Wizard/StackButton.qml:39

510+#, qt-format

511+msgid "〈 %1"

512+msgstr ""

513+

514+#: qml/Wizard/StackButton.qml:42

515+#, qt-format

516+msgid "%1 〉"

517+msgstr ""

518+

346#~ msgid "Speaking..."

519#~ msgid "Speaking..."

347#~ msgstr "अब बोल रहे हैं"

520#~ msgstr "अब बोल रहे हैं"

348

521

po/hr.po+248−75

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2013-06-27 04:14+0000\n"

11"PO-Revision-Date: 2013-06-27 04:14+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Croatian <hr@li.org>\n"

13"Language-Team: Croatian <hr@li.org>\n"

@@ -16,19 +16,19 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

19+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

20−"X-Generator: Launchpad (build 17231)\n"

20+"X-Generator: Launchpad (build 17286)\n"

21

21

22#: plugins/LightDM/Greeter.cpp:130

22#: plugins/LightDM/Greeter.cpp:130

23msgid "Password: "

23msgid "Password: "

24msgstr ""

24msgstr ""

25

25

26#: plugins/Unity/Launcher/launcheritem.cpp:45

26#: plugins/Unity/Launcher/launcheritem.cpp:45

27−#: plugins/Unity/Launcher/launcheritem.cpp:91

27+#: plugins/Unity/Launcher/launcheritem.cpp:100

28msgid "Pin shortcut"

28msgid "Pin shortcut"

29msgstr ""

29msgstr ""

30

30

31−#: plugins/Unity/Launcher/launcheritem.cpp:91

31+#: plugins/Unity/Launcher/launcheritem.cpp:100

32msgid "Unpin shortcut"

32msgid "Unpin shortcut"

33msgstr ""

33msgstr ""

34

34

@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"

51msgstr[0] ""

51msgstr[0] ""

52msgstr[1] ""

52msgstr[1] ""

53

53

54−#: qml/Components/Dialogs.qml:74

54+#: qml/Components/Dialogs.qml:70

55msgid "Log out"

55msgid "Log out"

56msgstr ""

56msgstr ""

57

57

58−#: qml/Components/Dialogs.qml:75

58+#: qml/Components/Dialogs.qml:71

59msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

60msgstr ""

60msgstr ""

61

61

62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

63−#: qml/Components/Dialogs.qml:126

63+#: qml/Components/Dialogs.qml:122

64msgid "No"

64msgid "No"

65msgstr ""

65msgstr ""

66

66

67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

68−#: qml/Components/Dialogs.qml:133

68+#: qml/Components/Dialogs.qml:129

69msgid "Yes"

69msgid "Yes"

70msgstr ""

70msgstr ""

71

71

72−#: qml/Components/Dialogs.qml:98

72+#: qml/Components/Dialogs.qml:94

73msgid "Shut down"

73msgid "Shut down"

74msgstr ""

74msgstr ""

75

75

76−#: qml/Components/Dialogs.qml:99

76+#: qml/Components/Dialogs.qml:95

77msgid "Are you sure you want to shut down?"

77msgid "Are you sure you want to shut down?"

78msgstr ""

78msgstr ""

79

79

80−#: qml/Components/Dialogs.qml:123

80+#: qml/Components/Dialogs.qml:119

81msgid "Reboot"

81msgid "Reboot"

82msgstr ""

82msgstr ""

83

83

84−#: qml/Components/Dialogs.qml:124

84+#: qml/Components/Dialogs.qml:120

85msgid "Are you sure you want to reboot?"

85msgid "Are you sure you want to reboot?"

86msgstr ""

86msgstr ""

87

87

88−#: qml/Components/Dialogs.qml:148

88+#: qml/Components/Dialogs.qml:144

89msgid "Power"

89msgid "Power"

90msgstr ""

90msgstr ""

91

91

92−#: qml/Components/Dialogs.qml:149

92+#: qml/Components/Dialogs.qml:145

93msgid ""

93msgid ""

94"Are you sure you would like\n"

94"Are you sure you would like\n"

95"to power off?"

95"to power off?"

96msgstr ""

96msgstr ""

97

97

98−#: qml/Components/Dialogs.qml:151

98+#: qml/Components/Dialogs.qml:147

99msgid "Power off"

99msgid "Power off"

100msgstr ""

100msgstr ""

101

101

102−#: qml/Components/Dialogs.qml:161

102+#: qml/Components/Dialogs.qml:157

103msgid "Restart"

103msgid "Restart"

104msgstr ""

104msgstr ""

105

105

106−#: qml/Components/Dialogs.qml:171

106+#: qml/Components/Dialogs.qml:167

107msgid "Cancel"

107msgid "Cancel"

108msgstr ""

108msgstr ""

109

109

@@ -111,82 +111,86 @@ msgstr ""

111msgid "Skip intro"

111msgid "Skip intro"

112msgstr ""

112msgstr ""

113

113

114−#: qml/Components/EdgeDemo.qml:112

114+#: qml/Components/EdgeDemo.qml:125

115msgid "Right edge"

115msgid "Right edge"

116msgstr ""

116msgstr ""

117

117

118−#: qml/Components/EdgeDemo.qml:113

118+#: qml/Components/EdgeDemo.qml:126

119msgid "Try swiping from the right edge to unlock the phone"

119msgid "Try swiping from the right edge to unlock the phone"

120msgstr ""

120msgstr ""

121

121

122−#: qml/Components/EdgeDemo.qml:144

122+#: qml/Components/EdgeDemo.qml:157

123msgid "Top edge"

123msgid "Top edge"

124msgstr ""

124msgstr ""

125

125

126−#: qml/Components/EdgeDemo.qml:145

126+#: qml/Components/EdgeDemo.qml:158

127msgid "Try swiping from the top edge to access the indicators"

127msgid "Try swiping from the top edge to access the indicators"

128msgstr ""

128msgstr ""

129

129

130−#: qml/Components/EdgeDemo.qml:170

130+#: qml/Components/EdgeDemo.qml:183

131msgid "Close"

131msgid "Close"

132msgstr ""

132msgstr ""

133

133

134−#: qml/Components/EdgeDemo.qml:171

134+#: qml/Components/EdgeDemo.qml:184

135msgid "Swipe up again to close the settings screen"

135msgid "Swipe up again to close the settings screen"

136msgstr ""

136msgstr ""

137

137

138−#: qml/Components/EdgeDemo.qml:201

138+#: qml/Components/EdgeDemo.qml:214

139msgid "Left edge"

139msgid "Left edge"

140msgstr ""

140msgstr ""

141

141

142−#: qml/Components/EdgeDemo.qml:202

142+#: qml/Components/EdgeDemo.qml:215

143msgid "Swipe from the left to reveal the launcher for quick access to apps"

143msgid "Swipe from the left to reveal the launcher for quick access to apps"

144msgstr ""

144msgstr ""

145

145

146−#: qml/Components/EdgeDemo.qml:229

146+#: qml/Components/EdgeDemo.qml:242

147msgid "Well done"

147msgid "Well done"

148msgstr ""

148msgstr ""

149

149

150−#: qml/Components/EdgeDemo.qml:230

150+#: qml/Components/EdgeDemo.qml:243

151msgid ""

151msgid ""

152"You have now mastered the edge gestures and can start using the "

152"You have now mastered the edge gestures and can start using the "

153"phone<br><br>Tap on the screen to start"

153"phone<br><br>Tap on the screen to start"

154msgstr ""

154msgstr ""

155

155

156−#: qml/Components/Lockscreen.qml:223

156+#: qml/Components/Lockscreen.qml:238

157msgid "Return to Call"

157msgid "Return to Call"

158msgstr ""

158msgstr ""

159

159

160−#: qml/Components/Lockscreen.qml:223

160+#: qml/Components/Lockscreen.qml:238

161msgid "Emergency Call"

161msgid "Emergency Call"

162msgstr ""

162msgstr ""

163

163

164−#: qml/Components/Lockscreen.qml:255

164+#: qml/Components/Lockscreen.qml:270

165msgid "OK"

165msgid "OK"

166msgstr ""

166msgstr ""

167

167

168−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

168+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

169msgid "See less"

169msgid "See less"

170msgstr ""

170msgstr ""

171

171

172−#: qml/Dash/GenericScopeView.qml:434

172+#: qml/Dash/GenericScopeView.qml:431

173msgid "See all"

173msgid "See all"

174msgstr ""

174msgstr ""

175

175

176−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

176+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

177#: qml/Panel/SearchIndicator.qml:27

177#: qml/Panel/SearchIndicator.qml:27

178msgid "Search"

178msgid "Search"

179msgstr "Pretraživanje"

179msgstr "Pretraživanje"

180

180

181−#: qml/Dash/PageHeader.qml:268

181+#: qml/Dash/PageHeader.qml:260

182+msgid "Store"

183+msgstr ""

184+

185+#: qml/Dash/PageHeader.qml:277

182msgid "Settings"

186msgid "Settings"

183msgstr ""

187msgstr ""

184

188

185−#: qml/Dash/PageHeader.qml:275

189+#: qml/Dash/PageHeader.qml:284

186msgid "Remove from Favorites"

190msgid "Remove from Favorites"

187msgstr ""

191msgstr ""

188

192

189−#: qml/Dash/PageHeader.qml:275

193+#: qml/Dash/PageHeader.qml:284

190msgid "Add to Favorites"

194msgid "Add to Favorites"

191msgstr ""

195msgstr ""

192

196

@@ -218,31 +222,23 @@ msgstr ""

218msgid "Release to refresh…"

222msgid "Release to refresh…"

219msgstr ""

223msgstr ""

220

224

221−#: qml/Dash/ScopesOverview.qml:215

225+#: qml/Dash/ScopesList.qml:63

222−msgid "Manage Scopes"

226+msgid "Manage"

223−msgstr ""

224−

225−#: qml/Dash/ScopesOverview.qml:437

226−msgid "Done"

227−msgstr ""

228−

229−#: qml/Dash/ScopesOverview.qml:463

230−msgid "Store"

231msgstr ""

227msgstr ""

232

228

233−#: qml/Dash/ScopesOverviewTab.qml:36

229+#: qml/Dash/ScopesList.qml:107

234−msgid "Favorites"

230+msgid "Home"

235msgstr ""

231msgstr ""

236

232

237−#: qml/Dash/ScopesOverviewTab.qml:54

233+#: qml/Dash/ScopesList.qml:108

238−msgid "All"

234+msgid "Also installed"

239msgstr ""

235msgstr ""

240

236

241#: qml/Greeter/Greeter.qml:174

237#: qml/Greeter/Greeter.qml:174

242msgid "Unlock"

238msgid "Unlock"

243msgstr ""

239msgstr ""

244

240

245−#: qml/Notifications/NotificationMenuItemFactory.qml:116

241+#: qml/Notifications/NotificationMenuItemFactory.qml:128

246msgid "Show password"

242msgid "Show password"

247msgstr ""

243msgstr ""

248

244

@@ -290,60 +286,237 @@ msgstr ""

290msgid "Roaming"

286msgid "Roaming"

291msgstr ""

287msgstr ""

292

288

293−#: qml/Shell.qml:391

289+#: qml/Shell.qml:367

290+#, qt-format

294−msgid "Enter passphrase"

291+msgid "Enter %1"

295msgstr ""

292msgstr ""

296

293

297−#: qml/Shell.qml:392

294+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

298−msgid "Sorry, incorrect passphrase"

295+msgid "Enter passphrase"

299msgstr ""

296msgstr ""

300

297

301−#: qml/Shell.qml:393

298+#: qml/Shell.qml:369

302−msgid "Please re-enter"

299+msgid "Enter passcode"

303msgstr ""

300msgstr ""

304

301

305−#: qml/Shell.qml:395

302+#: qml/Shell.qml:370

306−msgid "Enter passcode"

303+#, qt-format

304+msgid "Sorry, incorrect %1"

307msgstr ""

305msgstr ""

308

306

309−#: qml/Shell.qml:396

307+#: qml/Shell.qml:371

310−msgid "Sorry, incorrect passcode"

308+msgid "Sorry, incorrect passphrase"

311msgstr ""

309msgstr ""

312

310

313−#: qml/Shell.qml:399

311+#: qml/Shell.qml:372

314−#, qt-format

312+msgid "Please re-enter"

315−msgid "Enter %1"

316msgstr ""

313msgstr ""

317

314

318−#: qml/Shell.qml:400

315+#: qml/Shell.qml:373

319−#, qt-format

320−msgid "Sorry, incorrect %1"

316+msgid "Sorry, incorrect passcode"

321msgstr ""

317msgstr ""

322

318

323−#: qml/Shell.qml:441

319+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

324msgid "Sorry, incorrect passphrase."

320msgid "Sorry, incorrect passphrase."

325msgstr ""

321msgstr ""

326

322

327−#: qml/Shell.qml:442

323+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

328msgid "Sorry, incorrect passcode."

324msgid "Sorry, incorrect passcode."

329msgstr ""

325msgstr ""

330

326

331−#: qml/Shell.qml:443

327+#: qml/Shell.qml:469

332msgid "This will be your last attempt."

328msgid "This will be your last attempt."

333msgstr ""

329msgstr ""

334

330

335−#: qml/Shell.qml:445

331+#: qml/Shell.qml:471

336msgid ""

332msgid ""

337"If passphrase is entered incorrectly, your phone will conduct a factory "

333"If passphrase is entered incorrectly, your phone will conduct a factory "

338"reset and all personal data will be deleted."

334"reset and all personal data will be deleted."

339msgstr ""

335msgstr ""

340

336

341−#: qml/Shell.qml:446

337+#: qml/Shell.qml:472

342msgid ""

338msgid ""

343"If passcode is entered incorrectly, your phone will conduct a factory reset "

339"If passcode is entered incorrectly, your phone will conduct a factory reset "

344"and all personal data will be deleted."

340"and all personal data will be deleted."

345msgstr ""

341msgstr ""

346

342

343+#: qml/Wizard/Page.qml:89

344+msgid "Back"

345+msgstr ""

346+

347+#: qml/Wizard/Pages/10-welcome.qml:27

348+msgid "Hi!"

349+msgstr ""

350+

351+#: qml/Wizard/Pages/10-welcome.qml:44

352+msgid "Welcome to your Ubuntu phone."

353+msgstr ""

354+

355+#: qml/Wizard/Pages/10-welcome.qml:52

356+msgid "Let’s get started."

357+msgstr ""

358+

359+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

360+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

361+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

362+#: qml/Wizard/Pages/passwd-set.qml:90

363+msgid "Continue"

364+msgstr ""

365+

366+#: qml/Wizard/Pages/20-sim.qml:25

367+msgid "Add a SIM card and restart your device"

368+msgstr ""

369+

370+#: qml/Wizard/Pages/20-sim.qml:55

371+msgid "Without it, you won’t be able to make calls or use text messaging."

372+msgstr ""

373+

374+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

375+msgid "Skip"

376+msgstr ""

377+

378+#: qml/Wizard/Pages/30-passwd-type.qml:39

379+msgid "Lock security"

380+msgstr ""

381+

382+#: qml/Wizard/Pages/30-passwd-type.qml:74

383+msgid "Please select how you’d like to unlock your phone."

384+msgstr ""

385+

386+#: qml/Wizard/Pages/30-passwd-type.qml:97

387+msgid "Swipe"

388+msgstr ""

389+

390+#: qml/Wizard/Pages/30-passwd-type.qml:98

391+msgid "No security"

392+msgstr ""

393+

394+#: qml/Wizard/Pages/30-passwd-type.qml:100

395+msgid "Passcode"

396+msgstr ""

397+

398+#: qml/Wizard/Pages/30-passwd-type.qml:101

399+msgid "4 digits only"

400+msgstr ""

401+

402+#: qml/Wizard/Pages/30-passwd-type.qml:103

403+msgid "Passphrase"

404+msgstr ""

405+

406+#: qml/Wizard/Pages/30-passwd-type.qml:104

407+msgid "Numbers and letters"

408+msgstr ""

409+

410+#: qml/Wizard/Pages/40-wifi.qml:28

411+msgid "Connect to Wi‑Fi"

412+msgstr ""

413+

414+#: qml/Wizard/Pages/40-wifi.qml:147

415+msgid "Available networks…"

416+msgstr ""

417+

418+#: qml/Wizard/Pages/40-wifi.qml:148

419+msgid "No available networks."

420+msgstr ""

421+

422+#: qml/Wizard/Pages/50-location.qml:27

423+msgid "Location"

424+msgstr ""

425+

426+#: qml/Wizard/Pages/50-location.qml:62

427+msgid "Let the phone detect your location:"

428+msgstr ""

429+

430+#: qml/Wizard/Pages/50-location.qml:69

431+msgid "Using GPS only (less accurate)"

432+msgstr ""

433+

434+#: qml/Wizard/Pages/50-location.qml:86

435+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

436+msgstr ""

437+

438+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

439+#: qml/Wizard/Pages/50-location.qml:103

440+msgid ""

441+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

442+"conditions</a>."

443+msgstr ""

444+

445+#: qml/Wizard/Pages/50-location.qml:112

446+msgid "Not at all"

447+msgstr ""

448+

449+#: qml/Wizard/Pages/50-location.qml:124

450+msgid "You can change your mind later in <b>System Settings</b>."

451+msgstr ""

452+

453+#: qml/Wizard/Pages/60-reporting.qml:24

454+msgid "Improving your experience"

455+msgstr ""

456+

457+#: qml/Wizard/Pages/60-reporting.qml:36

458+msgid ""

459+"Your phone is set up to automatically report errors to Canonical and its "

460+"partners, the makers of the operating system."

461+msgstr ""

462+

463+#: qml/Wizard/Pages/60-reporting.qml:43

464+msgid ""

465+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

466+"Privacy</b>"

467+msgstr ""

468+

469+#: qml/Wizard/Pages/80-finished.qml:24

470+msgid "All done"

471+msgstr ""

472+

473+#: qml/Wizard/Pages/80-finished.qml:39

474+msgid "Nice work!"

475+msgstr ""

476+

477+#: qml/Wizard/Pages/80-finished.qml:46

478+msgid "Your phone is now ready to use."

479+msgstr ""

480+

481+#: qml/Wizard/Pages/80-finished.qml:53

482+msgid "Finish"

483+msgstr ""

484+

485+#: qml/Wizard/Pages/here-terms.qml:27

486+msgid "Terms & Conditions"

487+msgstr ""

488+

489+#: qml/Wizard/Pages/passwd-confirm.qml:49

490+msgid "Confirm passphrase"

491+msgstr ""

492+

493+#: qml/Wizard/Pages/passwd-confirm.qml:50

494+msgid "Confirm passcode"

495+msgstr ""

496+

497+#: qml/Wizard/Pages/passwd-confirm.qml:53

498+#: qml/Wizard/Pages/passwd-confirm.qml:54

499+msgid "Please try again."

500+msgstr ""

501+

502+#: qml/Wizard/Pages/passwd-set.qml:61

503+msgid "Choose your passcode"

504+msgstr ""

505+

506+#: qml/Wizard/Pages/passwd-set.qml:68

507+msgid "Passphrase must be 4 characters long"

508+msgstr ""

509+

510+#: qml/Wizard/StackButton.qml:39

511+#, qt-format

512+msgid "〈 %1"

513+msgstr ""

514+

515+#: qml/Wizard/StackButton.qml:42

516+#, qt-format

517+msgid "%1 〉"

518+msgstr ""

519+

347#~ msgid "Confirm"

520#~ msgid "Confirm"

348#~ msgstr "Potvrdi"

521#~ msgstr "Potvrdi"

349

522

po/hu.po+247−54

@@ -7,16 +7,16 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-05 15:45+0000\n"

11+"PO-Revision-Date: 2014-12-21 15:13+0000\n"

12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

13"Language-Team: Hungarian <hu@li.org>\n"

13"Language-Team: Hungarian <hu@li.org>\n"

14"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-22 07:05+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

@@ -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

47#, qt-format

47#, qt-format

48msgid "Please wait %1 minute and then try again…"

48msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

50−msgstr[0] "Kérjük várjon %1 percet és próbálja újra…"

50+msgstr[0] "Várjon %1 percet és próbálja újra…"

51−msgstr[1] "Kérjük várjon %1 percet és próbálja újra…"

51+msgstr[1] "Várjon %1 percet és próbálja újra…"

52

52

53#: qml/Components/Dialogs.qml:74

53#: qml/Components/Dialogs.qml:74

54msgid "Log out"

54msgid "Log out"

@@ -178,20 +178,24 @@ msgstr "Kevesebb"

178msgid "See all"

178msgid "See all"

179msgstr "Összes megtekintése"

179msgstr "Összes megtekintése"

180

180

181−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

181+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268

182#: qml/Panel/SearchIndicator.qml:27

182#: qml/Panel/SearchIndicator.qml:27

183msgid "Search"

183msgid "Search"

184msgstr "Keresés"

184msgstr "Keresés"

185

185

186−#: qml/Dash/PageHeader.qml:268

186+#: qml/Dash/PageHeader.qml:261

187+msgid "Store"

188+msgstr "Áruház"

189+

190+#: qml/Dash/PageHeader.qml:278

187msgid "Settings"

191msgid "Settings"

188msgstr "Beállítások"

192msgstr "Beállítások"

189

193

190−#: qml/Dash/PageHeader.qml:275

194+#: qml/Dash/PageHeader.qml:285

191msgid "Remove from Favorites"

195msgid "Remove from Favorites"

192msgstr "Eltávolítás a kedvencek közül"

196msgstr "Eltávolítás a kedvencek közül"

193

197

194−#: qml/Dash/PageHeader.qml:275

198+#: qml/Dash/PageHeader.qml:285

195msgid "Add to Favorites"

199msgid "Add to Favorites"

196msgstr "Hozzáadás a kedvencekhez"

200msgstr "Hozzáadás a kedvencekhez"

197

201

@@ -223,31 +227,23 @@ msgstr "Húzza a frissítéshez…"

223msgid "Release to refresh…"

227msgid "Release to refresh…"

224msgstr "Engedje el a frissítéshez…"

228msgstr "Engedje el a frissítéshez…"

225

229

226−#: qml/Dash/ScopesOverview.qml:215

230+#: qml/Dash/ScopesList.qml:63

227−msgid "Manage Scopes"

231+msgid "Manage"

228−msgstr "Lencsék kezelése"

232+msgstr "Kezelés"

229

233

230−#: qml/Dash/ScopesOverview.qml:437

234+#: qml/Dash/ScopesList.qml:107

231−msgid "Done"

235+msgid "Home"

232−msgstr "Kész"

236+msgstr "Kezdőlapon"

233−

234−#: qml/Dash/ScopesOverview.qml:463

235−msgid "Store"

236−msgstr "Áruház"

237

237

238−#: qml/Dash/ScopesOverviewTab.qml:36

238+#: qml/Dash/ScopesList.qml:108

239−msgid "Favorites"

239+msgid "Also installed"

240−msgstr "Kedvencek"

240+msgstr "Szintén telepítve"

241−

242−#: qml/Dash/ScopesOverviewTab.qml:54

243−msgid "All"

244−msgstr "Összes"

245

241

246#: qml/Greeter/Greeter.qml:174

242#: qml/Greeter/Greeter.qml:174

247msgid "Unlock"

243msgid "Unlock"

248msgstr "Feloldás"

244msgstr "Feloldás"

249

245

250−#: qml/Notifications/NotificationMenuItemFactory.qml:116

246+#: qml/Notifications/NotificationMenuItemFactory.qml:128

251msgid "Show password"

247msgid "Show password"

252msgstr "Jelszó megjelenítése"

248msgstr "Jelszó megjelenítése"

253

249

@@ -295,49 +291,49 @@ msgstr "SIM feloldása"

295msgid "Roaming"

291msgid "Roaming"

296msgstr "Barangolás"

292msgstr "Barangolás"

297

293

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

299msgid "Enter passphrase"

300msgid "Enter passphrase"

300msgstr "Jelmondat megadása"

301msgstr "Jelmondat megadása"

301

302

302−#: qml/Shell.qml:392

303+#: qml/Shell.qml:398

303−msgid "Sorry, incorrect passphrase"

304+msgid "Enter passcode"

304−msgstr "Sajnáljuk, helytelen jelmondat"

305+msgstr "Jelkód megadása"

305

306

306−#: qml/Shell.qml:393

307+#: qml/Shell.qml:403

307−msgid "Please re-enter"

308+#, qt-format

308−msgstr "Kérjük próbálja újra"

309+msgid "Sorry, incorrect %1"

310+msgstr "Sajnálom, helytelen %1"

309

311

310#: qml/Shell.qml:395

312#: qml/Shell.qml:395

311−msgid "Enter passcode"

313+msgid "Sorry, incorrect passphrase"

312−msgstr "Jelkód megadása"

314+msgstr "Sajnálom, helytelen jelmondat"

313

315

314#: qml/Shell.qml:396

316#: qml/Shell.qml:396

315−msgid "Sorry, incorrect passcode"

317+msgid "Please re-enter"

316−msgstr "Sajnáljuk, helytelen jelkód"

318+msgstr "Próbálja újra"

317

319

318#: qml/Shell.qml:399

320#: 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"

321+msgid "Sorry, incorrect passcode"

326−msgstr "Sajnáljuk, helytelen %1"

322+msgstr "Sajnálom, helytelen jelkód"

327

323

328−#: qml/Shell.qml:441

324+#: qml/Shell.qml:444

329msgid "Sorry, incorrect passphrase."

325msgid "Sorry, incorrect passphrase."

330−msgstr "Sajnáljuk, helytelen jelmondat."

326+msgstr "Sajnálom, helytelen jelmondat."

331

327

332−#: qml/Shell.qml:442

328+#: qml/Shell.qml:445

333msgid "Sorry, incorrect passcode."

329msgid "Sorry, incorrect passcode."

334−msgstr "Sajnáljuk, helytelen jelkód."

330+msgstr "Sajnálom, helytelen jelkód."

335

331

336−#: qml/Shell.qml:443

332+#: qml/Shell.qml:446

337msgid "This will be your last attempt."

333msgid "This will be your last attempt."

338msgstr "Ez az utolsó próbálkozási lehetősége."

334msgstr "Ez az utolsó próbálkozási lehetősége."

339

335

340−#: qml/Shell.qml:445

336+#: qml/Shell.qml:448

341msgid ""

337msgid ""

342"If passphrase is entered incorrectly, your phone will conduct a factory "

338"If passphrase is entered incorrectly, your phone will conduct a factory "

343"reset and all personal data will be deleted."

339"reset and all personal data will be deleted."

@@ -345,7 +341,7 @@ msgstr ""

345"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "

341"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "

346"beállításokat és törli minden személyes adatát."

342"beállításokat és törli minden személyes adatát."

347

343

348−#: qml/Shell.qml:446

344+#: qml/Shell.qml:449

349msgid ""

345msgid ""

350"If passcode is entered incorrectly, your phone will conduct a factory reset "

346"If passcode is entered incorrectly, your phone will conduct a factory reset "

351"and all personal data will be deleted."

347"and all personal data will be deleted."

@@ -353,6 +349,191 @@ msgstr ""

353"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "

349"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "

354"beállításokat és törli minden személyes adatát."

350"beállításokat és törli minden személyes adatát."

355

351

352+#: qml/Wizard/Page.qml:89

353+msgid "Back"

354+msgstr "Vissza"

355+

356+#: qml/Wizard/Pages/10-welcome.qml:27

357+msgid "Hi!"

358+msgstr "Üdv!"

359+

360+#: qml/Wizard/Pages/10-welcome.qml:44

361+msgid "Welcome to your Ubuntu phone."

362+msgstr "Üdvözöljük az Ubuntu telefonos változatában."

363+

364+#: qml/Wizard/Pages/10-welcome.qml:52

365+msgid "Let’s get started."

366+msgstr "Kezdjünk is bele."

367+

368+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

369+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

370+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

371+#: qml/Wizard/Pages/passwd-set.qml:90

372+msgid "Continue"

373+msgstr "Folytatás"

374+

375+#: qml/Wizard/Pages/20-sim.qml:25

376+msgid "Add a SIM card and restart your device"

377+msgstr "Helyezzen be egy SIM kártyát és indítsa újra az eszközét"

378+

379+#: qml/Wizard/Pages/20-sim.qml:55

380+msgid "Without it, you won’t be able to make calls or use text messaging."

381+msgstr ""

382+"Anélkül nem indíthat vagy fogadhat hívásokat és nem küldhet vagy fogadhat "

383+"üzeneteket."

384+

385+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

386+msgid "Skip"

387+msgstr "Kihagyás"

388+

389+#: qml/Wizard/Pages/30-passwd-type.qml:39

390+msgid "Lock security"

391+msgstr "Képernyőzárolás"

392+

393+#: qml/Wizard/Pages/30-passwd-type.qml:74

394+msgid "Please select how you’d like to unlock your phone."

395+msgstr "Válassza ki, hogy milyen módon kívánja feloldani a telefonját."

396+

397+#: qml/Wizard/Pages/30-passwd-type.qml:97

398+msgid "Swipe"

399+msgstr "Csúsztatás"

400+

401+#: qml/Wizard/Pages/30-passwd-type.qml:98

402+msgid "No security"

403+msgstr "Nem biztonságos"

404+

405+#: qml/Wizard/Pages/30-passwd-type.qml:100

406+msgid "Passcode"

407+msgstr "Jelkód"

408+

409+#: qml/Wizard/Pages/30-passwd-type.qml:101

410+msgid "4 digits only"

411+msgstr "4 számjegy"

412+

413+#: qml/Wizard/Pages/30-passwd-type.qml:103

414+msgid "Passphrase"

415+msgstr "Jelmondat"

416+

417+#: qml/Wizard/Pages/30-passwd-type.qml:104

418+msgid "Numbers and letters"

419+msgstr "Betűk és számok"

420+

421+#: qml/Wizard/Pages/40-wifi.qml:28

422+msgid "Connect to Wi‑Fi"

423+msgstr "Csatlakozás Wi-Fi hálózathoz"

424+

425+#: qml/Wizard/Pages/40-wifi.qml:147

426+msgid "Available networks…"

427+msgstr "Elérhető hálózatok…"

428+

429+#: qml/Wizard/Pages/40-wifi.qml:148

430+msgid "No available networks."

431+msgstr "Nincsenek elérhető hálózatok."

432+

433+#: qml/Wizard/Pages/50-location.qml:27

434+msgid "Location"

435+msgstr "Tartózkodási hely"

436+

437+#: qml/Wizard/Pages/50-location.qml:62

438+msgid "Let the phone detect your location:"

439+msgstr "A telefon megpróbálja megállapítani az Ön tartózkodási helyét:"

440+

441+#: qml/Wizard/Pages/50-location.qml:69

442+msgid "Using GPS only (less accurate)"

443+msgstr "Csak GPS használata (kevésbé pontos)"

444+

445+#: qml/Wizard/Pages/50-location.qml:86

446+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

447+msgstr "GPS és névtelen Wi-Fi és mobilhálózati adatok (ajánlott)"

448+

449+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

450+#: qml/Wizard/Pages/50-location.qml:103

451+msgid ""

452+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

453+"conditions</a>."

454+msgstr ""

455+"A lehetőség kiválasztásával elfogadja a Nokia HERE <a href='#'>felhasználási "

456+"feltételeit</a>."

457+

458+#: qml/Wizard/Pages/50-location.qml:112

459+msgid "Not at all"

460+msgstr ""

461+

462+#: qml/Wizard/Pages/50-location.qml:124

463+msgid "You can change your mind later in <b>System Settings</b>."

464+msgstr "Ezt később a <b>Rendszerbeállítások</b> alatt módosíthatja."

465+

466+#: qml/Wizard/Pages/60-reporting.qml:24

467+msgid "Improving your experience"

468+msgstr "Javítson az élményen"

469+

470+#: qml/Wizard/Pages/60-reporting.qml:36

471+msgid ""

472+"Your phone is set up to automatically report errors to Canonical and its "

473+"partners, the makers of the operating system."

474+msgstr ""

475+"A telefonja automatikus hibajelentéseket küld az operációs rendszert készítő "

476+"Canonical, és annak partnerei felé."

477+

478+#: qml/Wizard/Pages/60-reporting.qml:43

479+msgid ""

480+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

481+"Privacy</b>"

482+msgstr ""

483+"Ezt kikapcsolhatja a <b>Rendszerbeállítások</b> alatt található <b>Biztonság "

484+"és adatvédelem</b> alatt"

485+

486+#: qml/Wizard/Pages/80-finished.qml:24

487+msgid "All done"

488+msgstr "Készen van"

489+

490+#: qml/Wizard/Pages/80-finished.qml:39

491+msgid "Nice work!"

492+msgstr "Szép munka!"

493+

494+#: qml/Wizard/Pages/80-finished.qml:46

495+msgid "Your phone is now ready to use."

496+msgstr "A telefonja készen áll a használatra."

497+

498+#: qml/Wizard/Pages/80-finished.qml:53

499+msgid "Finish"

500+msgstr "Befejezés"

501+

502+#: qml/Wizard/Pages/here-terms.qml:27

503+msgid "Terms & Conditions"

504+msgstr "Felhasználási feltételek"

505+

506+#: qml/Wizard/Pages/passwd-confirm.qml:49

507+msgid "Confirm passphrase"

508+msgstr "Jelmondat megerősítése"

509+

510+#: qml/Wizard/Pages/passwd-confirm.qml:50

511+msgid "Confirm passcode"

512+msgstr "Jelkód megerősítése"

513+

514+#: qml/Wizard/Pages/passwd-confirm.qml:53

515+#: qml/Wizard/Pages/passwd-confirm.qml:54

516+msgid "Please try again."

517+msgstr "Próbálja újra."

518+

519+#: qml/Wizard/Pages/passwd-set.qml:61

520+msgid "Choose your passcode"

521+msgstr "Jelkód kiválasztása"

522+

523+#: qml/Wizard/Pages/passwd-set.qml:68

524+msgid "Passphrase must be 4 characters long"

525+msgstr "A jelmondat legalább 4 karakter hosszú legyen"

526+

527+#: qml/Wizard/StackButton.qml:39

528+#, qt-format

529+msgid "〈 %1"

530+msgstr "〈 %1"

531+

532+#: qml/Wizard/StackButton.qml:42

533+#, qt-format

534+msgid "%1 〉"

535+msgstr "%1 〉"

536+

356#~ msgid "Confirm"

537#~ msgid "Confirm"

357#~ msgstr "Megerősítés"

538#~ msgstr "Megerősítés"

358

539

@@ -367,3 +548,15 @@ msgstr ""

367

548

368#~ msgid "Speak Now..."

549#~ msgid "Speak Now..."

369#~ msgstr "Most beszéljen…"

550#~ msgstr "Most beszéljen…"

551+

552+#~ msgid "All"

553+#~ msgstr "Összes"

554+

555+#~ msgid "Favorites"

556+#~ msgstr "Kedvencek"

557+

558+#~ msgid "Done"

559+#~ msgstr "Kész"

560+

561+#~ msgid "Manage Scopes"

562+#~ msgstr "Lencsék kezelése"

po/hy.po+261−79

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2014-10-28 06:34+0000\n"

11"PO-Revision-Date: 2014-10-28 06:34+0000\n"

12"Last-Translator: Vahan Harutyunyan <Unknown>\n"

12"Last-Translator: Vahan Harutyunyan <Unknown>\n"

13"Language-Team: Armenian <hy@li.org>\n"

13"Language-Team: Armenian <hy@li.org>\n"

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23msgstr "Գաղտնաբառ: "

23msgstr "Գաղտնաբառ: "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28msgstr "Փակցնել պիտակը"

28msgstr "Փակցնել պիտակը"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32msgstr "Հեռացնել պիտակը"

32msgstr "Հեռացնել պիտակը"

33

33

@@ -53,60 +53,60 @@ msgstr[0] ""

53"Խնդրում ենք սպասել %1 րոպե և փորձել կրկին...\r\n"

53"Խնդրում ենք սպասել %1 րոպե և փորձել կրկին...\r\n"

54"Խնդրում ենք սպասել %1 րոպե և փորձել կրկին..."

54"Խնդրում ենք սպասել %1 րոպե և փորձել կրկին..."

55

55

56−#: qml/Components/Dialogs.qml:74

56+#: qml/Components/Dialogs.qml:70

57msgid "Log out"

57msgid "Log out"

58msgstr "Ելք"

58msgstr "Ելք"

59

59

60−#: qml/Components/Dialogs.qml:75

60+#: qml/Components/Dialogs.qml:71

61msgid "Are you sure you want to log out?"

61msgid "Are you sure you want to log out?"

62msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք դուրս գալ համակարգից"

62msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք դուրս գալ համակարգից"

63

63

64−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

64+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

65−#: qml/Components/Dialogs.qml:126

65+#: qml/Components/Dialogs.qml:122

66msgid "No"

66msgid "No"

67msgstr "Ոչ"

67msgstr "Ոչ"

68

68

69−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

69+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

70−#: qml/Components/Dialogs.qml:133

70+#: qml/Components/Dialogs.qml:129

71msgid "Yes"

71msgid "Yes"

72msgstr "Այո"

72msgstr "Այո"

73

73

74−#: qml/Components/Dialogs.qml:98

74+#: qml/Components/Dialogs.qml:94

75msgid "Shut down"

75msgid "Shut down"

76msgstr "Անջատել"

76msgstr "Անջատել"

77

77

78−#: qml/Components/Dialogs.qml:99

78+#: qml/Components/Dialogs.qml:95

79msgid "Are you sure you want to shut down?"

79msgid "Are you sure you want to shut down?"

80msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք անջատել համակարգիչը"

80msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք անջատել համակարգիչը"

81

81

82−#: qml/Components/Dialogs.qml:123

82+#: qml/Components/Dialogs.qml:119

83msgid "Reboot"

83msgid "Reboot"

84msgstr "Վերաբեռնել"

84msgstr "Վերաբեռնել"

85

85

86−#: qml/Components/Dialogs.qml:124

86+#: qml/Components/Dialogs.qml:120

87msgid "Are you sure you want to reboot?"

87msgid "Are you sure you want to reboot?"

88msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք վերաբեռնել համակարգիչը"

88msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք վերաբեռնել համակարգիչը"

89

89

90−#: qml/Components/Dialogs.qml:148

90+#: qml/Components/Dialogs.qml:144

91msgid "Power"

91msgid "Power"

92msgstr "Էլեկտրասնուցում"

92msgstr "Էլեկտրասնուցում"

93

93

94−#: qml/Components/Dialogs.qml:149

94+#: qml/Components/Dialogs.qml:145

95msgid ""

95msgid ""

96"Are you sure you would like\n"

96"Are you sure you would like\n"

97"to power off?"

97"to power off?"

98msgstr ""

98msgstr ""

99"Դուք համոզվա՞ծ եք, որ ցանկանում եք անջատել համակարգիչը սնուցման աղբյուրից"

99"Դուք համոզվա՞ծ եք, որ ցանկանում եք անջատել համակարգիչը սնուցման աղբյուրից"

100

100

101−#: qml/Components/Dialogs.qml:151

101+#: qml/Components/Dialogs.qml:147

102msgid "Power off"

102msgid "Power off"

103msgstr "Անջատել սնուցման աղբյուրից"

103msgstr "Անջատել սնուցման աղբյուրից"

104

104

105−#: qml/Components/Dialogs.qml:161

105+#: qml/Components/Dialogs.qml:157

106msgid "Restart"

106msgid "Restart"

107msgstr "Վերագործարկել"

107msgstr "Վերագործարկել"

108

108

109−#: qml/Components/Dialogs.qml:171

109+#: qml/Components/Dialogs.qml:167

110msgid "Cancel"

110msgid "Cancel"

111msgstr "Չեղյալ համարել"

111msgstr "Չեղյալ համարել"

112

112

@@ -114,82 +114,86 @@ msgstr "Չեղյալ համարել"

114msgid "Skip intro"

114msgid "Skip intro"

115msgstr "Բաց թողնել ներածությունը"

115msgstr "Բաց թողնել ներածությունը"

116

116

117−#: qml/Components/EdgeDemo.qml:112

117+#: qml/Components/EdgeDemo.qml:125

118msgid "Right edge"

118msgid "Right edge"

119msgstr "Աջ եզրը"

119msgstr "Աջ եզրը"

120

120

121−#: qml/Components/EdgeDemo.qml:113

121+#: qml/Components/EdgeDemo.qml:126

122msgid "Try swiping from the right edge to unlock the phone"

122msgid "Try swiping from the right edge to unlock the phone"

123msgstr ""

123msgstr ""

124

124

125−#: qml/Components/EdgeDemo.qml:144

125+#: qml/Components/EdgeDemo.qml:157

126msgid "Top edge"

126msgid "Top edge"

127msgstr "Վերին եզրը"

127msgstr "Վերին եզրը"

128

128

129−#: qml/Components/EdgeDemo.qml:145

129+#: qml/Components/EdgeDemo.qml:158

130msgid "Try swiping from the top edge to access the indicators"

130msgid "Try swiping from the top edge to access the indicators"

131msgstr ""

131msgstr ""

132

132

133−#: qml/Components/EdgeDemo.qml:170

133+#: qml/Components/EdgeDemo.qml:183

134msgid "Close"

134msgid "Close"

135msgstr "Փակել"

135msgstr "Փակել"

136

136

137−#: qml/Components/EdgeDemo.qml:171

137+#: qml/Components/EdgeDemo.qml:184

138msgid "Swipe up again to close the settings screen"

138msgid "Swipe up again to close the settings screen"

139msgstr ""

139msgstr ""

140

140

141−#: qml/Components/EdgeDemo.qml:201

141+#: qml/Components/EdgeDemo.qml:214

142msgid "Left edge"

142msgid "Left edge"

143msgstr "Ձախ եզրը"

143msgstr "Ձախ եզրը"

144

144

145−#: qml/Components/EdgeDemo.qml:202

145+#: qml/Components/EdgeDemo.qml:215

146msgid "Swipe from the left to reveal the launcher for quick access to apps"

146msgid "Swipe from the left to reveal the launcher for quick access to apps"

147msgstr ""

147msgstr ""

148

148

149−#: qml/Components/EdgeDemo.qml:229

149+#: qml/Components/EdgeDemo.qml:242

150msgid "Well done"

150msgid "Well done"

151msgstr "Լավ է"

151msgstr "Լավ է"

152

152

153−#: qml/Components/EdgeDemo.qml:230

153+#: qml/Components/EdgeDemo.qml:243

154msgid ""

154msgid ""

155"You have now mastered the edge gestures and can start using the "

155"You have now mastered the edge gestures and can start using the "

156"phone<br><br>Tap on the screen to start"

156"phone<br><br>Tap on the screen to start"

157msgstr ""

157msgstr ""

158

158

159−#: qml/Components/Lockscreen.qml:223

159+#: qml/Components/Lockscreen.qml:238

160msgid "Return to Call"

160msgid "Return to Call"

161msgstr ""

161msgstr ""

162

162

163−#: qml/Components/Lockscreen.qml:223

163+#: qml/Components/Lockscreen.qml:238

164msgid "Emergency Call"

164msgid "Emergency Call"

165msgstr ""

165msgstr ""

166

166

167−#: qml/Components/Lockscreen.qml:255

167+#: qml/Components/Lockscreen.qml:270

168msgid "OK"

168msgid "OK"

169msgstr ""

169msgstr ""

170

170

171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

172msgid "See less"

172msgid "See less"

173msgstr ""

173msgstr ""

174

174

175−#: qml/Dash/GenericScopeView.qml:434

175+#: qml/Dash/GenericScopeView.qml:431

176msgid "See all"

176msgid "See all"

177msgstr "Տեսնել բոլորը"

177msgstr "Տեսնել բոլորը"

178

178

179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

180#: qml/Panel/SearchIndicator.qml:27

180#: qml/Panel/SearchIndicator.qml:27

181msgid "Search"

181msgid "Search"

182msgstr "Որոնում"

182msgstr "Որոնում"

183

183

184−#: qml/Dash/PageHeader.qml:268

184+#: qml/Dash/PageHeader.qml:260

185+msgid "Store"

186+msgstr "Խանութ"

187+

188+#: qml/Dash/PageHeader.qml:277

185msgid "Settings"

189msgid "Settings"

186msgstr "Կարգավորումներ"

190msgstr "Կարգավորումներ"

187

191

188−#: qml/Dash/PageHeader.qml:275

192+#: qml/Dash/PageHeader.qml:284

189msgid "Remove from Favorites"

193msgid "Remove from Favorites"

190msgstr "Հեռացնել ընտրյալների ցուցակից"

194msgstr "Հեռացնել ընտրյալների ցուցակից"

191

195

192−#: qml/Dash/PageHeader.qml:275

196+#: qml/Dash/PageHeader.qml:284

193msgid "Add to Favorites"

197msgid "Add to Favorites"

194msgstr "Ավելացնել ընտրյալների ցուցակում"

198msgstr "Ավելացնել ընտրյալների ցուցակում"

195

199

@@ -221,31 +225,23 @@ msgstr ""

221msgid "Release to refresh…"

225msgid "Release to refresh…"

222msgstr ""

226msgstr ""

223

227

224−#: qml/Dash/ScopesOverview.qml:215

228+#: qml/Dash/ScopesList.qml:63

225−msgid "Manage Scopes"

229+msgid "Manage"

226msgstr ""

230msgstr ""

227

231

228−#: qml/Dash/ScopesOverview.qml:437

232+#: qml/Dash/ScopesList.qml:107

229−msgid "Done"

230−msgstr "Կատարված է"

231−

232−#: qml/Dash/ScopesOverview.qml:463

233−msgid "Store"

234−msgstr "Խանութ"

235−

236−#: qml/Dash/ScopesOverviewTab.qml:36

237−msgid "Favorites"

233+msgid "Home"

238−msgstr "Նախընտրելի"

234+msgstr ""

239

235

240−#: qml/Dash/ScopesOverviewTab.qml:54

236+#: qml/Dash/ScopesList.qml:108

241−msgid "All"

237+msgid "Also installed"

242−msgstr "Բոլորը"

238+msgstr ""

243

239

244#: qml/Greeter/Greeter.qml:174

240#: qml/Greeter/Greeter.qml:174

245msgid "Unlock"

241msgid "Unlock"

246msgstr "Ապաբլոկավորել"

242msgstr "Ապաբլոկավորել"

247

243

248−#: qml/Notifications/NotificationMenuItemFactory.qml:116

244+#: qml/Notifications/NotificationMenuItemFactory.qml:128

249msgid "Show password"

245msgid "Show password"

250msgstr "Ցույց տալ գաղտնաբառը"

246msgstr "Ցույց տալ գաղտնաբառը"

251

247

@@ -293,60 +289,237 @@ msgstr "Ապաբլոկավորել SIM-ը"

293msgid "Roaming"

289msgid "Roaming"

294msgstr "Ռոումինգ"

290msgstr "Ռոումինգ"

295

291

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

297msgid "Enter passphrase"

298msgid "Enter passphrase"

298msgstr "Մուտքագրե՛ք անցաբառը"

299msgstr "Մուտքագրե՛ք անցաբառը"

299

300

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

301msgid "Sorry, incorrect passphrase"

311msgid "Sorry, incorrect passphrase"

302msgstr "Ներեցեք, սխալ անցաբառ է"

312msgstr "Ներեցեք, սխալ անցաբառ է"

303

313

304−#: qml/Shell.qml:393

314+#: qml/Shell.qml:372

305msgid "Please re-enter"

315msgid "Please re-enter"

306msgstr "Խնդրում ենք նորից մուտքագրել"

316msgstr "Խնդրում ենք նորից մուտքագրել"

307

317

308−#: qml/Shell.qml:395

318+#: qml/Shell.qml:373

309−msgid "Enter passcode"

310−msgstr "Մոտքագրեք ծածկագիրը"

311−

312−#: qml/Shell.qml:396

313msgid "Sorry, incorrect passcode"

319msgid "Sorry, incorrect passcode"

314msgstr "Ներեցեք, սխալ ծածկագիր է"

320msgstr "Ներեցեք, սխալ ծածկագիր է"

315

321

316−#: qml/Shell.qml:399

322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

317−#, qt-format

318−msgid "Enter %1"

319−msgstr "Մուտքագրեք %1"

320−

321−#: qml/Shell.qml:400

322−#, qt-format

323−msgid "Sorry, incorrect %1"

324−msgstr "Ներեցեք, սխալ %1"

325−

326−#: qml/Shell.qml:441

327msgid "Sorry, incorrect passphrase."

323msgid "Sorry, incorrect passphrase."

328msgstr "Ներեցեք, սխալ անցաբառ է"

324msgstr "Ներեցեք, սխալ անցաբառ է"

329

325

330−#: qml/Shell.qml:442

326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

331msgid "Sorry, incorrect passcode."

327msgid "Sorry, incorrect passcode."

332msgstr "Ներեցեք, սխալ ծածկագիր է:"

328msgstr "Ներեցեք, սխալ ծածկագիր է:"

333

329

334−#: qml/Shell.qml:443

330+#: qml/Shell.qml:469

335msgid "This will be your last attempt."

331msgid "This will be your last attempt."

336msgstr "Սա կլինի ձեր վերջին փորձը"

332msgstr "Սա կլինի ձեր վերջին փորձը"

337

333

338−#: qml/Shell.qml:445

334+#: qml/Shell.qml:471

339msgid ""

335msgid ""

340"If passphrase is entered incorrectly, your phone will conduct a factory "

336"If passphrase is entered incorrectly, your phone will conduct a factory "

341"reset and all personal data will be deleted."

337"reset and all personal data will be deleted."

342msgstr ""

338msgstr ""

343

339

344−#: qml/Shell.qml:446

340+#: qml/Shell.qml:472

345msgid ""

341msgid ""

346"If passcode is entered incorrectly, your phone will conduct a factory reset "

342"If passcode is entered incorrectly, your phone will conduct a factory reset "

347"and all personal data will be deleted."

343"and all personal data will be deleted."

348msgstr ""

344msgstr ""

349

345

346+#: qml/Wizard/Page.qml:89

347+msgid "Back"

348+msgstr ""

349+

350+#: qml/Wizard/Pages/10-welcome.qml:27

351+msgid "Hi!"

352+msgstr ""

353+

354+#: qml/Wizard/Pages/10-welcome.qml:44

355+msgid "Welcome to your Ubuntu phone."

356+msgstr ""

357+

358+#: qml/Wizard/Pages/10-welcome.qml:52

359+msgid "Let’s get started."

360+msgstr ""

361+

362+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

363+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

364+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

365+#: qml/Wizard/Pages/passwd-set.qml:90

366+msgid "Continue"

367+msgstr ""

368+

369+#: qml/Wizard/Pages/20-sim.qml:25

370+msgid "Add a SIM card and restart your device"

371+msgstr ""

372+

373+#: qml/Wizard/Pages/20-sim.qml:55

374+msgid "Without it, you won’t be able to make calls or use text messaging."

375+msgstr ""

376+

377+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

378+msgid "Skip"

379+msgstr ""

380+

381+#: qml/Wizard/Pages/30-passwd-type.qml:39

382+msgid "Lock security"

383+msgstr ""

384+

385+#: qml/Wizard/Pages/30-passwd-type.qml:74

386+msgid "Please select how you’d like to unlock your phone."

387+msgstr ""

388+

389+#: qml/Wizard/Pages/30-passwd-type.qml:97

390+msgid "Swipe"

391+msgstr ""

392+

393+#: qml/Wizard/Pages/30-passwd-type.qml:98

394+msgid "No security"

395+msgstr ""

396+

397+#: qml/Wizard/Pages/30-passwd-type.qml:100

398+msgid "Passcode"

399+msgstr ""

400+

401+#: qml/Wizard/Pages/30-passwd-type.qml:101

402+msgid "4 digits only"

403+msgstr ""

404+

405+#: qml/Wizard/Pages/30-passwd-type.qml:103

406+msgid "Passphrase"

407+msgstr ""

408+

409+#: qml/Wizard/Pages/30-passwd-type.qml:104

410+msgid "Numbers and letters"

411+msgstr ""

412+

413+#: qml/Wizard/Pages/40-wifi.qml:28

414+msgid "Connect to Wi‑Fi"

415+msgstr ""

416+

417+#: qml/Wizard/Pages/40-wifi.qml:147

418+msgid "Available networks…"

419+msgstr ""

420+

421+#: qml/Wizard/Pages/40-wifi.qml:148

422+msgid "No available networks."

423+msgstr ""

424+

425+#: qml/Wizard/Pages/50-location.qml:27

426+msgid "Location"

427+msgstr ""

428+

429+#: qml/Wizard/Pages/50-location.qml:62

430+msgid "Let the phone detect your location:"

431+msgstr ""

432+

433+#: qml/Wizard/Pages/50-location.qml:69

434+msgid "Using GPS only (less accurate)"

435+msgstr ""

436+

437+#: qml/Wizard/Pages/50-location.qml:86

438+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

439+msgstr ""

440+

441+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

442+#: qml/Wizard/Pages/50-location.qml:103

443+msgid ""

444+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

445+"conditions</a>."

446+msgstr ""

447+

448+#: qml/Wizard/Pages/50-location.qml:112

449+msgid "Not at all"

450+msgstr ""

451+

452+#: qml/Wizard/Pages/50-location.qml:124

453+msgid "You can change your mind later in <b>System Settings</b>."

454+msgstr ""

455+

456+#: qml/Wizard/Pages/60-reporting.qml:24

457+msgid "Improving your experience"

458+msgstr ""

459+

460+#: qml/Wizard/Pages/60-reporting.qml:36

461+msgid ""

462+"Your phone is set up to automatically report errors to Canonical and its "

463+"partners, the makers of the operating system."

464+msgstr ""

465+

466+#: qml/Wizard/Pages/60-reporting.qml:43

467+msgid ""

468+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

469+"Privacy</b>"

470+msgstr ""

471+

472+#: qml/Wizard/Pages/80-finished.qml:24

473+msgid "All done"

474+msgstr ""

475+

476+#: qml/Wizard/Pages/80-finished.qml:39

477+msgid "Nice work!"

478+msgstr ""

479+

480+#: qml/Wizard/Pages/80-finished.qml:46

481+msgid "Your phone is now ready to use."

482+msgstr ""

483+

484+#: qml/Wizard/Pages/80-finished.qml:53

485+msgid "Finish"

486+msgstr ""

487+

488+#: qml/Wizard/Pages/here-terms.qml:27

489+msgid "Terms & Conditions"

490+msgstr ""

491+

492+#: qml/Wizard/Pages/passwd-confirm.qml:49

493+msgid "Confirm passphrase"

494+msgstr ""

495+

496+#: qml/Wizard/Pages/passwd-confirm.qml:50

497+msgid "Confirm passcode"

498+msgstr ""

499+

500+#: qml/Wizard/Pages/passwd-confirm.qml:53

501+#: qml/Wizard/Pages/passwd-confirm.qml:54

502+msgid "Please try again."

503+msgstr ""

504+

505+#: qml/Wizard/Pages/passwd-set.qml:61

506+msgid "Choose your passcode"

507+msgstr ""

508+

509+#: qml/Wizard/Pages/passwd-set.qml:68

510+msgid "Passphrase must be 4 characters long"

511+msgstr ""

512+

513+#: qml/Wizard/StackButton.qml:39

514+#, qt-format

515+msgid "〈 %1"

516+msgstr ""

517+

518+#: qml/Wizard/StackButton.qml:42

519+#, qt-format

520+msgid "%1 〉"

521+msgstr ""

522+

350#~ msgid "Confirm"

523#~ msgid "Confirm"

351#~ msgstr "Հաստատել"

524#~ msgstr "Հաստատել"

352

525

@@ -356,8 +529,17 @@ msgstr ""

356#~ msgid "Speaking..."

529#~ msgid "Speaking..."

357#~ msgstr "Խոսում եմ..."

530#~ msgstr "Խոսում եմ..."

358

531

532+#~ msgid "Favorites"

533+#~ msgstr "Նախընտրելի"

534+

535+#~ msgid "Done"

536+#~ msgstr "Կատարված է"

537+

359#~ msgid "Loading. Please Wait..."

538#~ msgid "Loading. Please Wait..."

360#~ msgstr "Բեռնվում է: Խնդրում ենք սպասել..."

539#~ msgstr "Բեռնվում է: Խնդրում ենք սպասել..."

361

540

362#~ msgid "Speak Now..."

541#~ msgid "Speak Now..."

363#~ msgstr "Հիմա խոսեք..."

542#~ msgstr "Հիմա խոսեք..."

543+

544+#~ msgid "All"

545+#~ msgstr "Բոլորը"

po/id.po+347−138

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

7msgstr ""

8"Project-Id-Version: unity\n"

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"

10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11"PO-Revision-Date: 2013-06-26 22:35+0000\n"

11"PO-Revision-Date: 2013-06-26 22:35+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Indonesian <id@li.org>\n"

13"Language-Team: Indonesian <id@li.org>\n"

@@ -15,330 +15,539 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"

18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19−"X-Generator: Launchpad (build 17231)\n"

19+"X-Generator: Launchpad (build 17286)\n"

20

20

21#: plugins/LightDM/Greeter.cpp:130

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

22msgid "Password: "

23−msgstr ""

23+msgstr "Sandi: "

24

24

25#: plugins/Unity/Launcher/launcheritem.cpp:45

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

27msgid "Pin shortcut"

28−msgstr ""

28+msgstr "Paku pintasan"

29

29

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

31msgid "Unpin shortcut"

32−msgstr ""

32+msgstr "Lepas pintasan"

33

33

34#: qml/Components/DelayedLockscreen.qml:47

34#: qml/Components/DelayedLockscreen.qml:47

35msgid "Device Locked"

35msgid "Device Locked"

36−msgstr ""

36+msgstr "Perangkat Terkunci"

37

37

38#: qml/Components/DelayedLockscreen.qml:62

38#: qml/Components/DelayedLockscreen.qml:62

39msgid "You have been locked out due to too many failed passphrase attempts."

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

40msgstr ""

41+"Anda telah terkunci karena terlalu banyak percobaan frasa sandi yang gagal."

41

42

42#: qml/Components/DelayedLockscreen.qml:63

43#: qml/Components/DelayedLockscreen.qml:63

43msgid "You have been locked out due to too many failed passcode attempts."

44msgid "You have been locked out due to too many failed passcode attempts."

44msgstr ""

45msgstr ""

46+"Anda telah terkunci karena terlalu banyak percobaan kode sandi yang gagal."

45

47

46#: qml/Components/DelayedLockscreen.qml:72

48#: qml/Components/DelayedLockscreen.qml:72

47#, qt-format

49#, qt-format

48msgid "Please wait %1 minute and then try again…"

50msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

51msgid_plural "Please wait %1 minutes and then try again…"

50−msgstr[0] ""

52+msgstr[0] "Harap tunggu %1 menit lalu coba lagi..."

51−msgstr[1] ""

52

53

53−#: qml/Components/Dialogs.qml:74

54+#: qml/Components/Dialogs.qml:70

54msgid "Log out"

55msgid "Log out"

55−msgstr ""

56+msgstr "Log keluar"

56

57

57−#: qml/Components/Dialogs.qml:75

58+#: qml/Components/Dialogs.qml:71

58msgid "Are you sure you want to log out?"

59msgid "Are you sure you want to log out?"

59−msgstr ""

60+msgstr "Anda yakin ingin log keluar?"

60

61

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:126

63+#: qml/Components/Dialogs.qml:122

63msgid "No"

64msgid "No"

64−msgstr ""

65+msgstr "Tidak"

65

66

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:133

68+#: qml/Components/Dialogs.qml:129

68msgid "Yes"

69msgid "Yes"

69−msgstr ""

70+msgstr "Ya"

70

71

71−#: qml/Components/Dialogs.qml:98

72+#: qml/Components/Dialogs.qml:94

72msgid "Shut down"

73msgid "Shut down"

73−msgstr ""

74+msgstr "Matikan"

74

75

75−#: qml/Components/Dialogs.qml:99

76+#: qml/Components/Dialogs.qml:95

76msgid "Are you sure you want to shut down?"

77msgid "Are you sure you want to shut down?"

77−msgstr ""

78+msgstr "Anda yakin ingin mematikan?"

78

79

79−#: qml/Components/Dialogs.qml:123

80+#: qml/Components/Dialogs.qml:119

80msgid "Reboot"

81msgid "Reboot"

81−msgstr ""

82+msgstr "Boot ulang"

82

83

83−#: qml/Components/Dialogs.qml:124

84+#: qml/Components/Dialogs.qml:120

84msgid "Are you sure you want to reboot?"

85msgid "Are you sure you want to reboot?"

85−msgstr ""

86+msgstr "Anda yakin ingin boot ulang?"

86

87

87−#: qml/Components/Dialogs.qml:148

88+#: qml/Components/Dialogs.qml:144

88msgid "Power"

89msgid "Power"

89−msgstr ""

90+msgstr "Daya"

90

91

91−#: qml/Components/Dialogs.qml:149

92+#: qml/Components/Dialogs.qml:145

92msgid ""

93msgid ""

93"Are you sure you would like\n"

94"Are you sure you would like\n"

94"to power off?"

95"to power off?"

95msgstr ""

96msgstr ""

97+"Anda yakin ingin\n"

98+"mematikan daya?"

96

99

97−#: qml/Components/Dialogs.qml:151

100+#: qml/Components/Dialogs.qml:147

98msgid "Power off"

101msgid "Power off"

99−msgstr ""

102+msgstr "Matikan"

100

103

101−#: qml/Components/Dialogs.qml:161

104+#: qml/Components/Dialogs.qml:157

102msgid "Restart"

105msgid "Restart"

103−msgstr ""

106+msgstr "Nyalakan ulang"

104

107

105−#: qml/Components/Dialogs.qml:171

108+#: qml/Components/Dialogs.qml:167

106msgid "Cancel"

109msgid "Cancel"

107−msgstr ""

110+msgstr "Batal"

108

111

109#: qml/Components/EdgeDemoOverlay.qml:151

112#: qml/Components/EdgeDemoOverlay.qml:151

110msgid "Skip intro"

113msgid "Skip intro"

111−msgstr ""

114+msgstr "Lewati pengenalan"

112

115

113−#: qml/Components/EdgeDemo.qml:112

116+#: qml/Components/EdgeDemo.qml:125

114msgid "Right edge"

117msgid "Right edge"

115−msgstr ""

118+msgstr "Tepi kanan"

116

119

117−#: qml/Components/EdgeDemo.qml:113

120+#: qml/Components/EdgeDemo.qml:126

118msgid "Try swiping from the right edge to unlock the phone"

121msgid "Try swiping from the right edge to unlock the phone"

119−msgstr ""

122+msgstr "Coba usap dari tepi kanan untuk membuka kunci telepon"

120

123

121−#: qml/Components/EdgeDemo.qml:144

124+#: qml/Components/EdgeDemo.qml:157

122msgid "Top edge"

125msgid "Top edge"

123−msgstr ""

126+msgstr "Tepi atas"

124

127

125−#: qml/Components/EdgeDemo.qml:145

128+#: qml/Components/EdgeDemo.qml:158

126msgid "Try swiping from the top edge to access the indicators"

129msgid "Try swiping from the top edge to access the indicators"

127−msgstr ""

130+msgstr "Coba usap dari tepi atas untuk mengakses indikator"

128

131

129−#: qml/Components/EdgeDemo.qml:170

132+#: qml/Components/EdgeDemo.qml:183

130msgid "Close"

133msgid "Close"

131−msgstr ""

134+msgstr "Tutup"

132

135

133−#: qml/Components/EdgeDemo.qml:171

136+#: qml/Components/EdgeDemo.qml:184

134msgid "Swipe up again to close the settings screen"

137msgid "Swipe up again to close the settings screen"

135−msgstr ""

138+msgstr "Usap ke atas lagi untuk menutup layar pengaturan"

136

139

137−#: qml/Components/EdgeDemo.qml:201

140+#: qml/Components/EdgeDemo.qml:214

138msgid "Left edge"

141msgid "Left edge"

139−msgstr ""

142+msgstr "Tepi kiri"

140

143

141−#: qml/Components/EdgeDemo.qml:202

144+#: qml/Components/EdgeDemo.qml:215

142msgid "Swipe from the left to reveal the launcher for quick access to apps"

145msgid "Swipe from the left to reveal the launcher for quick access to apps"

143−msgstr ""

146+msgstr "Usap dari tepi kiri menampilkan peluncur untuk akses cepat aplikasi"

144

147

145−#: qml/Components/EdgeDemo.qml:229

148+#: qml/Components/EdgeDemo.qml:242

146msgid "Well done"

149msgid "Well done"

147−msgstr ""

150+msgstr "Bagus sekali"

148

151

149−#: qml/Components/EdgeDemo.qml:230

152+#: qml/Components/EdgeDemo.qml:243

150msgid ""

153msgid ""

151"You have now mastered the edge gestures and can start using the "

154"You have now mastered the edge gestures and can start using the "

152"phone<br><br>Tap on the screen to start"

155"phone<br><br>Tap on the screen to start"

153msgstr ""

156msgstr ""

157+"Anda kini telah menguasai gestur tepi dan dapat mulai memakai "

158+"telepon<br><br>Ketuk pada layar untuk mulai"

154

159

155−#: qml/Components/Lockscreen.qml:223

160+#: qml/Components/Lockscreen.qml:238

156msgid "Return to Call"

161msgid "Return to Call"

157−msgstr ""

162+msgstr "Kembali ke Panggilan"

158

163

159−#: qml/Components/Lockscreen.qml:223

164+#: qml/Components/Lockscreen.qml:238

160msgid "Emergency Call"

165msgid "Emergency Call"

161−msgstr ""

166+msgstr "Panggilan Darurat"

162

167

163−#: qml/Components/Lockscreen.qml:255

168+#: qml/Components/Lockscreen.qml:270

164msgid "OK"

169msgid "OK"

165−msgstr ""

170+msgstr "OK"

166

171

167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

172+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

168msgid "See less"

173msgid "See less"

169−msgstr ""

174+msgstr "Lihat lebih sedikit"

170

175

171−#: qml/Dash/GenericScopeView.qml:434

176+#: qml/Dash/GenericScopeView.qml:431

172msgid "See all"

177msgid "See all"

173−msgstr ""

178+msgstr "Lihat semua"

174

179

175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

180+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

176#: qml/Panel/SearchIndicator.qml:27

181#: qml/Panel/SearchIndicator.qml:27

177msgid "Search"

182msgid "Search"

178−msgstr ""

183+msgstr "Cari"

184+

185+#: qml/Dash/PageHeader.qml:260

186+msgid "Store"

187+msgstr "Simpan"

179

188

180−#: qml/Dash/PageHeader.qml:268

189+#: qml/Dash/PageHeader.qml:277

181msgid "Settings"

190msgid "Settings"

182−msgstr ""

191+msgstr "Pengaturan"

183

192

184−#: qml/Dash/PageHeader.qml:275

193+#: qml/Dash/PageHeader.qml:284

185msgid "Remove from Favorites"

194msgid "Remove from Favorites"

186−msgstr ""

195+msgstr "Hapus dari Favorit"

187

196

188−#: qml/Dash/PageHeader.qml:275

197+#: qml/Dash/PageHeader.qml:284

189msgid "Add to Favorites"

198msgid "Add to Favorites"

190−msgstr ""

199+msgstr "Tambah ke Favorit"

191

200

192#: qml/Dash/Previews/PreviewActionCombo.qml:35

201#: qml/Dash/Previews/PreviewActionCombo.qml:35

193msgid "More..."

202msgid "More..."

194−msgstr ""

203+msgstr "Lebih..."

195

204

196#: qml/Dash/Previews/PreviewActionCombo.qml:35

205#: qml/Dash/Previews/PreviewActionCombo.qml:35

197msgid "Less..."

206msgid "Less..."

198−msgstr ""

207+msgstr "Kurang..."

199

208

200#: qml/Dash/Previews/PreviewRatingInput.qml:81

209#: qml/Dash/Previews/PreviewRatingInput.qml:81

201msgid "Rate this"

210msgid "Rate this"

202−msgstr ""

211+msgstr "Beri peringkat"

203

212

204#: qml/Dash/Previews/PreviewRatingInput.qml:126

213#: qml/Dash/Previews/PreviewRatingInput.qml:126

205msgid "Add a review"

214msgid "Add a review"

206−msgstr ""

215+msgstr "Berikan ulasan"

207

216

208#: qml/Dash/Previews/PreviewRatingInput.qml:166

217#: qml/Dash/Previews/PreviewRatingInput.qml:166

209msgid "Send"

218msgid "Send"

210−msgstr ""

219+msgstr "Kirim"

211

220

212#: qml/Dash/PullToRefreshScopeStyle.qml:55

221#: qml/Dash/PullToRefreshScopeStyle.qml:55

213msgid "Pull to refresh…"

222msgid "Pull to refresh…"

214−msgstr ""

223+msgstr "Tarik untuk menyegarkan..."

215

224

216#: qml/Dash/PullToRefreshScopeStyle.qml:60

225#: qml/Dash/PullToRefreshScopeStyle.qml:60

217msgid "Release to refresh…"

226msgid "Release to refresh…"

218−msgstr ""

227+msgstr "Lepas untuk menyegarkan..."

219

228

220−#: qml/Dash/ScopesOverview.qml:215

229+#: qml/Dash/ScopesList.qml:63

221−msgid "Manage Scopes"

230+msgid "Manage"

222msgstr ""

231msgstr ""

223

232

224−#: qml/Dash/ScopesOverview.qml:437

233+#: qml/Dash/ScopesList.qml:107

225−msgid "Done"

234+msgid "Home"

226msgstr ""

235msgstr ""

227

236

228−#: qml/Dash/ScopesOverview.qml:463

237+#: qml/Dash/ScopesList.qml:108

229−msgid "Store"

238+msgid "Also installed"

230−msgstr ""

231−

232−#: qml/Dash/ScopesOverviewTab.qml:36

233−msgid "Favorites"

234−msgstr ""

235−

236−#: qml/Dash/ScopesOverviewTab.qml:54

237−msgid "All"

238msgstr ""

239msgstr ""

239

240

240#: qml/Greeter/Greeter.qml:174

241#: qml/Greeter/Greeter.qml:174

241msgid "Unlock"

242msgid "Unlock"

242−msgstr ""

243+msgstr "Buka kunci"

243

244

244−#: qml/Notifications/NotificationMenuItemFactory.qml:116

245+#: qml/Notifications/NotificationMenuItemFactory.qml:128

245msgid "Show password"

246msgid "Show password"

246−msgstr ""

247+msgstr "Tampilkan sandi"

247

248

248#: qml/Panel/ActiveCallHint.qml:79

249#: qml/Panel/ActiveCallHint.qml:79

249msgid "Tap to return to call..."

250msgid "Tap to return to call..."

250−msgstr ""

251+msgstr "Ketuk untuk kembali ke panggilan..."

251

252

252#: qml/Panel/ActiveCallHint.qml:92

253#: qml/Panel/ActiveCallHint.qml:92

253msgid "Conference"

254msgid "Conference"

254−msgstr ""

255+msgstr "Konferensi"

255

256

256#: qml/Panel/Indicators/MenuItemFactory.qml:643

257#: qml/Panel/Indicators/MenuItemFactory.qml:643

257msgid "Nothing is playing"

258msgid "Nothing is playing"

258−msgstr ""

259+msgstr "Tak ada yang sedang diputar"

259

260

260#: qml/Panel/Indicators/MenuItemFactory.qml:791

261#: qml/Panel/Indicators/MenuItemFactory.qml:791

261msgid "In queue…"

262msgid "In queue…"

262−msgstr ""

263+msgstr "Dalam antrian..."

263

264

264#: qml/Panel/Indicators/MenuItemFactory.qml:795

265#: qml/Panel/Indicators/MenuItemFactory.qml:795

265msgid "Downloading"

266msgid "Downloading"

266−msgstr ""

267+msgstr "Sedang mengunduh"

267

268

268#: qml/Panel/Indicators/MenuItemFactory.qml:797

269#: qml/Panel/Indicators/MenuItemFactory.qml:797

269msgid "Paused, tap to resume"

270msgid "Paused, tap to resume"

270−msgstr ""

271+msgstr "Jeda, ketuk untuk melanjutkan"

271

272

272#: qml/Panel/Indicators/MenuItemFactory.qml:799

273#: qml/Panel/Indicators/MenuItemFactory.qml:799

273msgid "Canceled"

274msgid "Canceled"

274−msgstr ""

275+msgstr "Dibatalkan"

275

276

276#: qml/Panel/Indicators/MenuItemFactory.qml:801

277#: qml/Panel/Indicators/MenuItemFactory.qml:801

277msgid "Finished"

278msgid "Finished"

278−msgstr ""

279+msgstr "Selesai"

279

280

280#: qml/Panel/Indicators/MenuItemFactory.qml:803

281#: qml/Panel/Indicators/MenuItemFactory.qml:803

281msgid "Failed, tap to retry"

282msgid "Failed, tap to retry"

282−msgstr ""

283+msgstr "Gagal, ketuk untuk mencoba ulang"

283

284

284#: qml/Panel/Indicators/ModemInfoItem.qml:105

285#: qml/Panel/Indicators/ModemInfoItem.qml:105

285msgid "Unlock SIM"

286msgid "Unlock SIM"

286−msgstr ""

287+msgstr "Buka Kunci SIM"

287

288

288#: qml/Panel/Indicators/RoamingIndication.qml:27

289#: qml/Panel/Indicators/RoamingIndication.qml:27

289msgid "Roaming"

290msgid "Roaming"

290−msgstr ""

291+msgstr "Roaming"

291

292

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

293msgid "Enter passphrase"

299msgid "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"

295

310

296−#: qml/Shell.qml:392

311+#: qml/Shell.qml:371

297msgid "Sorry, incorrect passphrase"

312msgid "Sorry, incorrect passphrase"

298−msgstr ""

313+msgstr "Maaf, frasa sandi salah"

299

314

300−#: qml/Shell.qml:393

315+#: qml/Shell.qml:372

301msgid "Please re-enter"

316msgid "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."

302msgstr ""

339msgstr ""

340+"Bila frasa sandi salah dimasukkan, telepon Anda akan melakukan reset pabrik "

341+"dan semua data pribadi akan dihapus."

303

342

304−#: qml/Shell.qml:395

343+#: qml/Shell.qml:472

305−msgid "Enter passcode"

344+msgid ""

345+"If passcode is entered incorrectly, your phone will conduct a factory reset "

346+"and all personal data will be deleted."

306msgstr ""

347msgstr ""

348+"Bila kode sandi salah dimasukkan, telepon Anda akan melakukan reset pabrik "

349+"dan semua data pribadi akan dihapus."

307

350

308−#: qml/Shell.qml:396

351+#: qml/Wizard/Page.qml:89

309−msgid "Sorry, incorrect passcode"

352+msgid "Back"

310msgstr ""

353msgstr ""

311

354

312−#: qml/Shell.qml:399

355+#: qml/Wizard/Pages/10-welcome.qml:27

313−#, qt-format

314−msgid "Enter %1"

356+msgid "Hi!"

315msgstr ""

357msgstr ""

316

358

317−#: qml/Shell.qml:400

359+#: qml/Wizard/Pages/10-welcome.qml:44

318−#, qt-format

360+msgid "Welcome to your Ubuntu phone."

319−msgid "Sorry, incorrect %1"

320msgstr ""

361msgstr ""

321

362

322−#: qml/Shell.qml:441

363+#: qml/Wizard/Pages/10-welcome.qml:52

323−msgid "Sorry, incorrect passphrase."

364+msgid "Let’s get started."

324msgstr ""

365msgstr ""

325

366

326−#: qml/Shell.qml:442

367+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

327−msgid "Sorry, incorrect passcode."

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"

328msgstr ""

372msgstr ""

329

373

330−#: qml/Shell.qml:443

374+#: qml/Wizard/Pages/20-sim.qml:25

331−msgid "This will be your last attempt."

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"

332msgstr ""

408msgstr ""

333

409

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

335msgid ""

448msgid ""

336−"If passphrase is entered incorrectly, your phone will conduct a factory "

449+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

337−"reset and all personal data will be deleted."

450+"conditions</a>."

451+msgstr ""

452+

453+#: qml/Wizard/Pages/50-location.qml:112

454+msgid "Not at all"

338msgstr ""

455msgstr ""

339

456

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

341msgid ""

466msgid ""

342−"If passcode is entered incorrectly, your phone will conduct a factory reset "

467+"Your phone is set up to automatically report errors to Canonical and its "

343−"and all personal data will be deleted."

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 〉"

344msgstr ""

526msgstr ""

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.