on xenial help sign in
rebased
0a267ebNick Dedekind
@@ -44,6 +44,7 @@ install_dependencies() {
44 gsettings-ubuntu-schemas \
44 gsettings-ubuntu-schemas \
45 pay-service \
45 pay-service \
46 qmenumodel-qml \
46 qmenumodel-qml \
47+ qml-module-qtquick-layouts \
47 qml-module-qtquick-xmllistmodel \
48 qml-module-qtquick-xmllistmodel \
48 qtdeclarative5-gsettings1.0 \
49 qtdeclarative5-gsettings1.0 \
49 qtdeclarative5-ubuntu-ui-toolkit-plugin \
50 qtdeclarative5-ubuntu-ui-toolkit-plugin \
cmake/modules/QmlTest.cmake+2−2
@@ -103,7 +103,7 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
103 endif()
103 endif()
104
104
105 set(qmltest_command
105 set(qmltest_command
106− env ${qmltest_ENVIRONMENT}
106+ env ${qmltest_ENVIRONMENT} UNITY_TESTING=1
107 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
107 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
108 ${qmltestrunner_imports}
108 ${qmltestrunner_imports}
109 ${ITERATIONS_STRING}
109 ${ITERATIONS_STRING}
@@ -117,7 +117,7 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
117 set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
117 set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
118 endif()
118 endif()
119 set(qmltest_xvfb_command
119 set(qmltest_xvfb_command
120− env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}
120+ env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH} UNITY_TESTING=1
121 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
121 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
122 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
122 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
123 ${qmltestrunner_imports}
123 ${qmltestrunner_imports}
cmake/modules/autopilot.cmake+2−2
@@ -2,7 +2,7 @@ add_custom_target(autopilot)
2
2
3function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
3function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
4 add_custom_target(autopilot-${TEST_NAME}
4 add_custom_target(autopilot-${TEST_NAME}
5− COMMAND LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python3 -m autopilot.run run ${TEST_SUITE}
5+ COMMAND UNITY_TESTING=1 LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python3 -m autopilot.run run ${TEST_SUITE}
6 WORKING_DIRECTORY ${WORKING_DIR}
6 WORKING_DIRECTORY ${WORKING_DIR}
7 DEPENDS fake_install
7 DEPENDS fake_install
8 )
8 )
@@ -14,7 +14,7 @@ function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
14 add_dependencies(autopilot autopilot-${TEST_NAME})
14 add_dependencies(autopilot autopilot-${TEST_NAME})
15
15
16 add_custom_target(autopilot2-${TEST_NAME}
16 add_custom_target(autopilot2-${TEST_NAME}
17− COMMAND LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}
17+ COMMAND UNITY_TESTING=1 LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}
18 WORKING_DIRECTORY ${WORKING_DIR}
18 WORKING_DIRECTORY ${WORKING_DIR}
19 DEPENDS fake_install
19 DEPENDS fake_install
20 )
20 )
debian/changelog+88
@@ -1,3 +1,91 @@
1+unity8 (8.00+14.10.20140817-0ubuntu1) utopic; urgency=low
2+
3+ [ CI bot ]
4+ * Resync trunk
5+
6+ [ Michał Sawicz ]
7+ * Fix dash overview test and prevent crash in mock ApplicationInfo's
8+ d'tor. tryCompareFunction didn't work because .item threw.
9+
10+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Sun, 17 Aug 2014 00:37:35 +0000
11+
12+unity8 (8.00+14.10.20140815.1-0ubuntu1) utopic; urgency=low
13+
14+ [ Michael Terry ]
15+ * Bring dialer to front on incoming call even when device is locked
16+ (LP: #1354532)
17+
18+ [ CI bot ]
19+ * Resync trunk
20+
21+ [ Michał Sawicz ]
22+ * Use palette's baseText for text colour in dash.
23+ * Update qmltypes definitions
24+ * Move PageHeader out of qml/Components into qml/Dash
25+ * Reshuffle and update dependencies
26+ * Fix cardtool test and make card creator output debugging info on
27+ errors.
28+ * Support previews for scopes in overview and hook up preview
29+ processing to activity indicator.
30+ * Fix notifications indicator title
31+ * Fix horizontal list activation and add test for it.
32+
33+ [ Ying-Chun Liu ]
34+ * Add button colors and i18n for power off dialog. (LP: #1354506)
35+
36+ [ Mirco Müller ]
37+ * Force plain-text rendering for summary- and body-text. (LP:
38+ #1335787)
39+
40+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 15 Aug 2014 17:38:07 +0000
41+
42+unity8 (8.00+14.10.20140814.1-0ubuntu1) utopic; urgency=low
43+
44+ [ Michael Terry ]
45+ * Add --lightdm= argument to ./run.sh that lets developers choose
46+ which lightdm backend to use. Stop letting a user that is
47+ immediately denied via PAM into the shell by fixing some assumptions
48+ that a user which was not prompted was successfully authenticated.
49+ This is not a common situation, you'd have to manually change your
50+ PAM config. Fix a small console warning .
51+ * Make wrong-password handling much nicer by showing a pretty spinner
52+ while we wait for PAM, by improving the prompt text to match
53+ designs, by forcing the user to wait five seconds after every five
54+ failed attemps, and by supporting (but not yet enabling) an opt-in
55+ "factory-reset your phone after X failed attemps" feature.
56+
57+ [ Michael Zanetti ]
58+ * bring back network caching in dash (LP: #1355729)
59+
60+ [ Michał Sawicz ]
61+ * Add --lightdm= argument to ./run.sh that lets developers choose
62+ which lightdm backend to use. Stop letting a user that is
63+ immediately denied via PAM into the shell by fixing some assumptions
64+ that a user which was not prompted was successfully authenticated.
65+ This is not a common situation, you'd have to manually change your
66+ PAM config. Fix a small console warning .
67+ * Fix anchor in PreviewListView.qml.
68+ * Make wrong-password handling much nicer by showing a pretty spinner
69+ while we wait for PAM, by improving the prompt text to match
70+ designs, by forcing the user to wait five seconds after every five
71+ failed attemps, and by supporting (but not yet enabling) an opt-in
72+ "factory-reset your phone after X failed attemps" feature.
73+ * Add new horizontal list category layout. (LP: #1352226)
74+ * Fix qml tests - loader around PageHeader, more retries for selecting
75+ a scope and undefined attributes in mock overview scope.
76+
77+ [ Leo Arias ]
78+ * Added autopilot helpers and tests for the launcher and dash icon.
79+ * Added an autopilot helper to click a scope item.
80+ * Added an autopilot test for focusing an app clicking the icon on the
81+ launcher.
82+
83+ [ Mirco Müller ]
84+ * Allow ENTER/RETURN in a TextField to accept a snap-decision
85+ notification. (LP: #1305885)
86+
87+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 14 Aug 2014 01:29:55 +0000
88+
1unity8 (8.00+14.10.20140811-0ubuntu1) utopic; urgency=low
89unity8 (8.00+14.10.20140811-0ubuntu1) utopic; urgency=low
2
90
3 [ Andrea Cimitan ]
91 [ Andrea Cimitan ]
debian/control+6−3
@@ -32,6 +32,7 @@ Build-Depends: cmake,
32 python3-all:any,
32 python3-all:any,
33 python3-setuptools,
33 python3-setuptools,
34 python:any (>= 2.7),
34 python:any (>= 2.7),
35+ qml-module-qtquick-layouts,
35 qml-module-qtquick-xmllistmodel,
36 qml-module-qtquick-xmllistmodel,
36 qml-module-qtquick2,
37 qml-module-qtquick2,
37 qml-module-qttest,
38 qml-module-qttest,
@@ -84,7 +85,6 @@ Depends: gsettings-desktop-schemas,
84 qml-module-qtquick-xmllistmodel,
85 qml-module-qtquick-xmllistmodel,
85 qtdeclarative5-gsettings1.0,
86 qtdeclarative5-gsettings1.0,
86 qtdeclarative5-qtmir-plugin (>= 0.4.1),
87 qtdeclarative5-qtmir-plugin (>= 0.4.1),
87− qtdeclarative5-ubuntu-settings-components (>= 0.4),
88 qtdeclarative5-ubuntu-telephony0.1,
88 qtdeclarative5-ubuntu-telephony0.1,
89 unity-launcher-impl-3,
89 unity-launcher-impl-3,
90 unity8-common (= ${source:Version}),
90 unity8-common (= ${source:Version}),
@@ -105,7 +105,9 @@ Description: Unity 8 shell
105
105
106Package: unity8-common
106Package: unity8-common
107Architecture: all
107Architecture: all
108+Depends: qml-module-qtquick-layouts,
109+ qtdeclarative5-ubuntu-settings-components (>= 0.4),
108−Depends: qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
110+ qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
109 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
111 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
110 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
112 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
111 ubuntu-thumbnailer-impl-0,
113 ubuntu-thumbnailer-impl-0,
@@ -165,7 +167,8 @@ Package: unity8-private
165Architecture: any
167Architecture: any
166Multi-Arch: same
168Multi-Arch: same
167Pre-Depends: ${misc:Pre-Depends},
169Pre-Depends: ${misc:Pre-Depends},
170+Depends: accountsservice-ubuntu-schemas,
168−Depends: gsettings-ubuntu-schemas,
171+ gsettings-ubuntu-schemas,
169 libhardware2,
172 libhardware2,
170 libunity-core-6.0-9,
173 libunity-core-6.0-9,
171 pay-service,
174 pay-service,
debian/unity8-private.install−2
@@ -10,5 +10,3 @@ usr/lib/*/unity8/qml/Unity
10usr/lib/*/unity8/qml/Utils
10usr/lib/*/unity8/qml/Utils
11usr/share/accountsservice/interfaces
11usr/share/accountsservice/interfaces
12usr/share/dbus-1/interfaces
12usr/share/dbus-1/interfaces
13−usr/share/polkit-1
14−var/lib/polkit-1
plugins/AccountsService/50-com.canonical.unity.AccountsService.pkladeleted−6
@@ -1,6 +0,0 @@
1−[Allow LightDM to set Unity AccountsService fields]
2−Identity=unix-user:lightdm
3−Action=com.canonical.unity.AccountsService.ModifyAnyUser
4−ResultActive=yes
5−ResultInactive=yes
6−ResultAny=yes
plugins/AccountsService/AccountsService.cpp+27−1
@@ -27,7 +27,8 @@ AccountsService::AccountsService(QObject* parent)
27 m_user(qgetenv("USER")),
27 m_user(qgetenv("USER")),
28 m_demoEdges(false),
28 m_demoEdges(false),
29 m_statsWelcomeScreen(false),
29 m_statsWelcomeScreen(false),
30− m_passwordDisplayHint(Keyboard)
30+ m_passwordDisplayHint(Keyboard),
31+ m_failedLogins(0)
31{
32{
32 connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),
33 connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),
33 this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
34 this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
@@ -49,6 +50,7 @@ void AccountsService::setUser(const QString &user)
49 updateBackgroundFile();
50 updateBackgroundFile();
50 updateStatsWelcomeScreen();
51 updateStatsWelcomeScreen();
51 updatePasswordDisplayHint();
52 updatePasswordDisplayHint();
53+ updateFailedLogins();
52}
54}
53
55
54bool AccountsService::demoEdges() const
56bool AccountsService::demoEdges() const
@@ -113,6 +115,26 @@ void AccountsService::updatePasswordDisplayHint()
113 }
115 }
114}
116}
115
117
118+void AccountsService::updateFailedLogins()
119+{
120+ uint failedLogins = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService.Private", "FailedLogins").toUInt();
121+ if (m_failedLogins != failedLogins) {
122+ m_failedLogins = failedLogins;
123+ Q_EMIT failedLoginsChanged();
124+ }
125+}
126+
127+uint AccountsService::failedLogins() const
128+{
129+ return m_failedLogins;
130+}
131+
132+void AccountsService::setFailedLogins(uint failedLogins)
133+{
134+ m_failedLogins = failedLogins;
135+ m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService.Private", "FailedLogins", failedLogins);
136+}
137+
116void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
138void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
117{
139{
118 if (m_user != user) {
140 if (m_user != user) {
@@ -123,6 +145,10 @@ void AccountsService::propertiesChanged(const QString &user, const QString &inte
123 if (changed.contains("demo-edges")) {
145 if (changed.contains("demo-edges")) {
124 updateDemoEdges();
146 updateDemoEdges();
125 }
147 }
148+ } else if (interface == "com.canonical.unity.AccountsService.Private") {
149+ if (changed.contains("FailedLogins")) {
150+ updateFailedLogins();
151+ }
126 } else if (interface == "com.ubuntu.touch.AccountsService.SecurityPrivacy") {
152 } else if (interface == "com.ubuntu.touch.AccountsService.SecurityPrivacy") {
127 if (changed.contains("StatsWelcomeScreen")) {
153 if (changed.contains("StatsWelcomeScreen")) {
128 updateStatsWelcomeScreen();
154 updateStatsWelcomeScreen();
plugins/AccountsService/AccountsService.h+9
@@ -45,6 +45,10 @@ class AccountsService: public QObject
45 Q_PROPERTY (PasswordDisplayHint passwordDisplayHint
45 Q_PROPERTY (PasswordDisplayHint passwordDisplayHint
46 READ passwordDisplayHint
46 READ passwordDisplayHint
47 NOTIFY passwordDisplayHintChanged)
47 NOTIFY passwordDisplayHintChanged)
48+ Q_PROPERTY (uint failedLogins
49+ READ failedLogins
50+ WRITE setFailedLogins
51+ NOTIFY failedLoginsChanged)
48
52
49public:
53public:
50 enum PasswordDisplayHint {
54 enum PasswordDisplayHint {
@@ -61,6 +65,8 @@ public:
61 QString backgroundFile() const;
65 QString backgroundFile() const;
62 bool statsWelcomeScreen() const;
66 bool statsWelcomeScreen() const;
63 PasswordDisplayHint passwordDisplayHint() const;
67 PasswordDisplayHint passwordDisplayHint() const;
68+ uint failedLogins() const;
69+ void setFailedLogins(uint failedLogins);
64
70
65Q_SIGNALS:
71Q_SIGNALS:
66 void userChanged();
72 void userChanged();
@@ -68,6 +74,7 @@ Q_SIGNALS:
68 void backgroundFileChanged();
74 void backgroundFileChanged();
69 void statsWelcomeScreenChanged();
75 void statsWelcomeScreenChanged();
70 void passwordDisplayHintChanged();
76 void passwordDisplayHintChanged();
77+ void failedLoginsChanged();
71
78
72private Q_SLOTS:
79private Q_SLOTS:
73 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
80 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
@@ -78,6 +85,7 @@ private:
78 void updateBackgroundFile();
85 void updateBackgroundFile();
79 void updateStatsWelcomeScreen();
86 void updateStatsWelcomeScreen();
80 void updatePasswordDisplayHint();
87 void updatePasswordDisplayHint();
88+ void updateFailedLogins();
81
89
82 AccountsServiceDBusAdaptor *m_service;
90 AccountsServiceDBusAdaptor *m_service;
83 QString m_user;
91 QString m_user;
@@ -85,6 +93,7 @@ private:
85 QString m_backgroundFile;
93 QString m_backgroundFile;
86 bool m_statsWelcomeScreen;
94 bool m_statsWelcomeScreen;
87 PasswordDisplayHint m_passwordDisplayHint;
95 PasswordDisplayHint m_passwordDisplayHint;
96+ uint m_failedLogins;
88};
97};
89
98
90#endif
99#endif
plugins/AccountsService/AccountsService.qmltypes+8
@@ -14,9 +14,17 @@ Module {
14 isCreatable: false
14 isCreatable: false
15 isSingleton: true
15 isSingleton: true
16 exportMetaObjectRevisions: [0]
16 exportMetaObjectRevisions: [0]
17+ Enum {
18+ name: "PasswordDisplayHint"
19+ values: {
20+ "Keyboard": 0,
21+ "Numeric": 1
22+ }
23+ }
17 Property { name: "user"; type: "string" }
24 Property { name: "user"; type: "string" }
18 Property { name: "demoEdges"; type: "bool" }
25 Property { name: "demoEdges"; type: "bool" }
19 Property { name: "backgroundFile"; type: "string"; isReadonly: true }
26 Property { name: "backgroundFile"; type: "string"; isReadonly: true }
20 Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }
27 Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }
28+ Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
21 }
29 }
22}
30}
plugins/AccountsService/CMakeLists.txt−10
@@ -10,8 +10,6 @@ qt5_use_modules(AccountsService-qml DBus Qml)
10
10
11add_unity8_plugin(AccountsService 0.1 AccountsService TARGETS AccountsService-qml)
11add_unity8_plugin(AccountsService 0.1 AccountsService TARGETS AccountsService-qml)
12
12
13−set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
14−set(POLKIT_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1")
15set(DBUS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces")
13set(DBUS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces")
16set(ACCOUNTS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/accountsservice/interfaces")
14set(ACCOUNTS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/accountsservice/interfaces")
17
15
@@ -24,11 +22,3 @@ install(CODE "
24execute_process(COMMAND mkdir -p \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
22execute_process(COMMAND mkdir -p \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
25execute_process(COMMAND ln -sf ../../dbus-1/interfaces/com.canonical.unity.AccountsService.xml \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
23execute_process(COMMAND ln -sf ../../dbus-1/interfaces/com.canonical.unity.AccountsService.xml \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
26 ")
24 ")
27−
28−install(FILES com.canonical.unity.AccountsService.policy
29− DESTINATION "${POLKIT_DATA_DIR}/actions"
30− )
31−
32−install(FILES 50-com.canonical.unity.AccountsService.pkla
33− DESTINATION "${POLKIT_LIB_DIR}/localauthority/10-vendor.d"
34− )
plugins/AccountsService/com.canonical.unity.AccountsService.policydeleted−24
@@ -1,24 +0,0 @@
1−<?xml version="1.0" encoding="UTF-8"?>
2−
3−<policyconfig>
4− <action id="com.canonical.unity.AccountsService.ModifyOwnUser">
5− <description>Set properties of own user</description>
6− <message>Authentication is required to set one's own unity properties.</message>
7− <defaults>
8− <allow_any>yes</allow_any>
9− <allow_inactive>yes</allow_inactive>
10− <allow_active>yes</allow_active>
11− </defaults>
12− </action>
13−
14− <action id="com.canonical.unity.AccountsService.ModifyAnyUser">
15− <description>Set properties of any user</description>
16− <message>Authentication is required to set another user's unity
17−properties.</message>
18− <defaults>
19− <allow_any>no</allow_any>
20− <allow_inactive>no</allow_inactive>
21− <allow_active>no</allow_active>
22− </defaults>
23− </action>
24−</policyconfig>
plugins/AccountsService/com.canonical.unity.AccountsService.xml+28−5
@@ -3,22 +3,45 @@
3
3
4 <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
4 <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
5
5
6− <annotation name="org.freedesktop.Accounts.Authentication.ChangeOwn"
7− value="com.canonical.unity.AccountsService.ModifyOwnUser"/>
8−
9 <annotation name="org.freedesktop.Accounts.Authentication.ReadAny"
6 <annotation name="org.freedesktop.Accounts.Authentication.ReadAny"
10− value="com.canonical.unity.AccountsService.ModifyAnyUser"/>
7+ value="com.ubuntu.AccountsService.GreeterReadAny"/>
11
8
12 <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
9 <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
13− value="com.canonical.unity.AccountsService.ModifyAnyUser"/>
10+ value="com.ubuntu.AccountsService.GreeterChangeAny"/>
14
11
12+ <!-- Should have been named DemoEdges, sorry folks. -mterry -->
15 <property name="demo-edges" type="b" access="readwrite">
13 <property name="demo-edges" type="b" access="readwrite">
16 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
14 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
17 </property>
15 </property>
18
16
17+ <!-- Should have been named LauncherItems, sorry folks. -mterry -->
19 <property name="launcher-items" type="aa{sv}" access="readwrite">
18 <property name="launcher-items" type="aa{sv}" access="readwrite">
20 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
19 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
21 </property>
20 </property>
22
21
23 </interface>
22 </interface>
23+
24+ <!-- This interface is for bits of data that the greeter wants to track
25+ per-user in a persistent way, but that users shouldn't be able to edit
26+ in an ideal world.
27+
28+ This interface is identical in permissions to the above one for now,
29+ but once we stop running the greeter in user-space, we should
30+ disallow org.freedesktop.Accounts.Authentication.ChangeOwn from the
31+ Private inteface. -->
32+ <interface name="com.canonical.unity.AccountsService.Private">
33+
34+ <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
35+
36+ <annotation name="org.freedesktop.Accounts.Authentication.ReadAny"
37+ value="com.ubuntu.AccountsService.GreeterReadAny"/>
38+
39+ <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
40+ value="com.ubuntu.AccountsService.GreeterChangeAny"/>
41+
42+ <property name="FailedLogins" type="u" access="readwrite">
43+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>
44+ </property>
45+
46+ </interface>
24</node>
47</node>
plugins/Dash/CardCreator.js+19−5
@@ -439,20 +439,20 @@ function cardString(template, components) {
439 mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);
439 mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);
440 }
440 }
441
441
442− var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey")';
442+ var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText)';
443
443
444 var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
444 var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
445 var titleSubtitleCode = '';
445 var titleSubtitleCode = '';
446 if (hasTitle) {
446 if (hasTitle) {
447 var titleColor;
447 var titleColor;
448 if (headerAsOverlay) {
448 if (headerAsOverlay) {
449− titleColor = 'overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey")';
449+ titleColor = 'overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText)';
450 } else if (hasSummary) {
450 } else if (hasSummary) {
451 titleColor = 'summary.color';
451 titleColor = 'summary.color';
452 } else if (hasBackground) {
452 } else if (hasBackground) {
453 titleColor = summaryColorWithBackground;
453 titleColor = summaryColorWithBackground;
454 } else {
454 } else {
455− titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : "grey"';
455+ titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
456 }
456 }
457
457
458 var titleAnchors;
458 var titleAnchors;
@@ -604,7 +604,7 @@ function cardString(template, components) {
604 if (hasBackground) {
604 if (hasBackground) {
605 summaryColor = summaryColorWithBackground;
605 summaryColor = summaryColorWithBackground;
606 } else {
606 } else {
607− summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : "grey"';
607+ summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
608 }
608 }
609
609
610 var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
610 var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
@@ -639,7 +639,10 @@ function cardString(template, components) {
639 implicitHeight += 'titleLabel.y + titleLabel.height + units.gu(1);\n';
639 implicitHeight += 'titleLabel.y + titleLabel.height + units.gu(1);\n';
640 } else if (hasArt) {
640 } else if (hasArt) {
641 implicitHeight += 'artShapeHolder.height;\n';
641 implicitHeight += 'artShapeHolder.height;\n';
642+ } else {
643+ implicitHeight = '';
642 }
644 }
645+
643 // Close the AbstractButton
646 // Close the AbstractButton
644 code += implicitHeight + '}\n';
647 code += implicitHeight + '}\n';
645
648
@@ -653,5 +656,16 @@ function createCardComponent(parent, template, components) {
653 var card = cardString(template, components);
656 var card = cardString(template, components);
654 var code = imports + 'Component {\n' + card + '}\n';
657 var code = imports + 'Component {\n' + card + '}\n';
655
658
659+ try {
656− return Qt.createQmlObject(code, parent, "createCardComponent");
660+ return Qt.createQmlObject(code, parent, "createCardComponent");
661+ } catch (e) {
662+ console.error("ERROR: Invalid component created.");
663+ console.error("Template:");
664+ console.error(JSON.stringify(template));
665+ console.error("Components:");
666+ console.error(JSON.stringify(components));
667+ console.error("Code:");
668+ console.error(code);
669+ throw e;
670+ }
657}
671}
plugins/Dash/Dash.qmltypes+1
@@ -39,6 +39,7 @@ Module {
39 Property { name: "sectionProperty"; type: "string" }
39 Property { name: "sectionProperty"; type: "string" }
40 Property { name: "forceNoClip"; type: "bool" }
40 Property { name: "forceNoClip"; type: "bool" }
41 Property { name: "stickyHeaderHeight"; type: "int"; isReadonly: true }
41 Property { name: "stickyHeaderHeight"; type: "int"; isReadonly: true }
42+ Property { name: "headerItemShownHeight"; type: "double"; isReadonly: true }
42 Signal { name: "headerChanged" }
43 Signal { name: "headerChanged" }
43 Method { name: "positionAtBeginning" }
44 Method { name: "positionAtBeginning" }
44 Method { name: "showHeader" }
45 Method { name: "showHeader" }
plugins/Dash/ScopeStyle.qml+1−1
@@ -87,7 +87,7 @@ QtObject {
87 property var d: QtObject {
87 property var d: QtObject {
88 // FIXME: should be taken from the theme
88 // FIXME: should be taken from the theme
89 readonly property color defaultLight: "white"
89 readonly property color defaultLight: "white"
90− readonly property color defaultDark: "grey"
90+ readonly property color defaultDark: Theme.palette.normal.baseText
91 readonly property real defaultLightLuminance: luminance(defaultLight)
91 readonly property real defaultLightLuminance: luminance(defaultLight)
92 readonly property real defaultDarkLuminance: luminance(defaultDark)
92 readonly property real defaultDarkLuminance: luminance(defaultDark)
93
93
plugins/LightDM/Greeter.cpp+4−1
@@ -17,6 +17,7 @@
17 */
17 */
18
18
19#include "Greeter.h"
19#include "Greeter.h"
20+#include <libintl.h>
20#include <QLightDM/Greeter>
21#include <QLightDM/Greeter>
21
22
22class GreeterPrivate
23class GreeterPrivate
@@ -125,13 +126,15 @@ void Greeter::showPromptFilter(const QString &text, QLightDM::Greeter::PromptTyp
125 Q_D(Greeter);
126 Q_D(Greeter);
126 d->wasPrompted = true;
127 d->wasPrompted = true;
127
128
129+ bool isDefaultPrompt = (text == dgettext("Linux-PAM", "Password: "));
130+
128 // Strip prompt of any colons at the end
131 // Strip prompt of any colons at the end
129 QString trimmedText = text.trimmed();
132 QString trimmedText = text.trimmed();
130 if (trimmedText.endsWith(":") || trimmedText.endsWith(":")) {
133 if (trimmedText.endsWith(":") || trimmedText.endsWith(":")) {
131 trimmedText.chop(1);
134 trimmedText.chop(1);
132 }
135 }
133
136
134− Q_EMIT showPrompt(trimmedText, type == QLightDM::Greeter::PromptTypeSecret);
137+ Q_EMIT showPrompt(trimmedText, type == QLightDM::Greeter::PromptTypeSecret, isDefaultPrompt);
135}
138}
136
139
137void Greeter::showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type)
140void Greeter::showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type)
plugins/LightDM/Greeter.h+1−1
@@ -55,7 +55,7 @@ public Q_SLOTS:
55
55
56Q_SIGNALS:
56Q_SIGNALS:
57 void showMessage(const QString &text, bool isError);
57 void showMessage(const QString &text, bool isError);
58− void showPrompt(const QString &text, bool isSecret);
58+ void showPrompt(const QString &text, bool isSecret, bool isDefaultPrompt);
59 void authenticationComplete();
59 void authenticationComplete();
60 void authenticationUserChanged(const QString &user);
60 void authenticationUserChanged(const QString &user);
61 void isActiveChanged();
61 void isActiveChanged();
plugins/LightDM/LightDM.qmltypes+7
@@ -14,6 +14,7 @@ Module {
14 isCreatable: false
14 isCreatable: false
15 isSingleton: true
15 isSingleton: true
16 exportMetaObjectRevisions: [0]
16 exportMetaObjectRevisions: [0]
17+ Property { name: "active"; type: "bool" }
17 Property { name: "authenticated"; type: "bool"; isReadonly: true }
18 Property { name: "authenticated"; type: "bool"; isReadonly: true }
18 Property { name: "authenticationUser"; type: "string"; isReadonly: true }
19 Property { name: "authenticationUser"; type: "string"; isReadonly: true }
19 Property { name: "promptless"; type: "bool"; isReadonly: true }
20 Property { name: "promptless"; type: "bool"; isReadonly: true }
@@ -32,6 +33,8 @@ Module {
32 name: "authenticationUserChanged"
33 name: "authenticationUserChanged"
33 Parameter { name: "user"; type: "string" }
34 Parameter { name: "user"; type: "string" }
34 }
35 }
36+ Signal { name: "isActiveChanged" }
37+ Signal { name: "showGreeter" }
35 Signal {
38 Signal {
36 name: "requestAuthenticationUser"
39 name: "requestAuthenticationUser"
37 Parameter { name: "user"; type: "string" }
40 Parameter { name: "user"; type: "string" }
@@ -51,6 +54,10 @@ Module {
51 Parameter { name: "session"; type: "string" }
54 Parameter { name: "session"; type: "string" }
52 }
55 }
53 Method { name: "startSessionSync"; type: "bool" }
56 Method { name: "startSessionSync"; type: "bool" }
57+ Method {
58+ name: "setIsActive"
59+ Parameter { name: "isActive"; type: "bool" }
60+ }
54 }
61 }
55 Component {
62 Component {
56 name: "QAbstractProxyModel"
63 name: "QAbstractProxyModel"
plugins/Ubuntu/CMakeLists.txt+1
@@ -1,3 +1,4 @@
1add_subdirectory(Gestures)
1add_subdirectory(Gestures)
2add_subdirectory(DownloadDaemonListener)
2add_subdirectory(DownloadDaemonListener)
3add_subdirectory(Payments)
3add_subdirectory(Payments)
4+add_subdirectory(SystemImage)
plugins/Ubuntu/SystemImage/CMakeLists.txtnew file+10
@@ -0,0 +1,10 @@
1+set(SYSTEMIMAGE_SOURCES
2+ plugin.cpp
3+ SystemImage.cpp
4+)
5+
6+add_library(SystemImage MODULE ${SYSTEMIMAGE_SOURCES})
7+
8+qt5_use_modules(SystemImage Qml DBus Core)
9+
10+add_unity8_plugin(Ubuntu.SystemImage 0.1 Ubuntu/SystemImage TARGETS SystemImage)
plugins/Ubuntu/SystemImage/SystemImage.cppnew file+34
@@ -0,0 +1,34 @@
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 "SystemImage.h"
18+#include <QDBusConnection>
19+#include <QDBusInterface>
20+
21+SystemImage::SystemImage(QObject *parent)
22+ : QObject(parent),
23+ m_interface(new QDBusInterface("com.canonical.SystemImage",
24+ "/Service",
25+ "com.canonical.SystemImage",
26+ QDBusConnection::systemBus(),
27+ this))
28+{
29+}
30+
31+void SystemImage::factoryReset()
32+{
33+ m_interface->call("FactoryReset");
34+}
plugins/Ubuntu/SystemImage/SystemImage.hnew file+38
@@ -0,0 +1,38 @@
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 SYSTEMIMAGE_H
18+#define SYSTEMIMAGE_H
19+
20+#include <QObject>
21+
22+class QDBusInterface;
23+
24+class SystemImage : public QObject
25+{
26+ Q_OBJECT
27+ Q_DISABLE_COPY(SystemImage)
28+
29+public:
30+ explicit SystemImage(QObject *parent = 0);
31+
32+ Q_INVOKABLE void factoryReset();
33+
34+private:
35+ QDBusInterface *m_interface;
36+};
37+
38+#endif // SYSTEMIMAGE_H
plugins/Ubuntu/SystemImage/SystemImage.qmltypesnew file+17
@@ -0,0 +1,17 @@
1+import QtQuick.tooling 1.1
2+
3+// This file describes the plugin-supplied types contained in the library.
4+// It is used for QML tooling purposes only.
5+//
6+// This file was auto-generated by:
7+// 'qmlplugindump -notrelocatable Ubuntu.SystemImage 0.1 plugins'
8+
9+Module {
10+ Component {
11+ name: "SystemImage"
12+ prototype: "QObject"
13+ exports: ["Ubuntu.SystemImage/SystemImage 0.1"]
14+ exportMetaObjectRevisions: [0]
15+ Method { name: "factoryReset" }
16+ }
17+}
plugins/Ubuntu/SystemImage/plugin.cppnew file+34
@@ -0,0 +1,34 @@
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 "plugin.h"
18+#include "SystemImage.h"
19+
20+#include <QtQml>
21+
22+static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
23+{
24+ Q_UNUSED(engine)
25+ Q_UNUSED(scriptEngine)
26+ return new SystemImage();
27+}
28+
29+void BackendPlugin::registerTypes(const char *uri)
30+{
31+ Q_ASSERT(uri == QLatin1String("Ubuntu.SystemImage"));
32+
33+ qmlRegisterSingletonType<SystemImage>(uri, 0, 1, "SystemImage", service_provider);
34+}
plugins/Ubuntu/SystemImage/plugin.hnew file+31
@@ -0,0 +1,31 @@
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 SYSTEMIMAGE_PLUGIN_H
18+#define SYSTEMIMAGE_PLUGIN_H
19+
20+#include <QQmlExtensionPlugin>
21+
22+class BackendPlugin : public QQmlExtensionPlugin
23+{
24+ Q_OBJECT
25+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
26+
27+public:
28+ void registerTypes(const char *uri);
29+};
30+
31+#endif // SYSTEMIMAGE_PLUGIN_H
plugins/Ubuntu/SystemImage/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module Ubuntu.SystemImage
2+plugin SystemImage
3+typeinfo SystemImage.qmltypes
plugins/Unity/DashCommunicator/DashCommunicator.qmltypesnew file+34
@@ -0,0 +1,34 @@
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 Unity.DashCommunicator 0.1 plugins'
8+
9+Module {
10+ Component {
11+ name: "DashCommunicator"
12+ prototype: "QObject"
13+ exports: ["Unity.DashCommunicator/DashCommunicator 0.1"]
14+ exportMetaObjectRevisions: [0]
15+ Method {
16+ name: "setCurrentScope"
17+ Parameter { name: "scopeId"; type: "string" }
18+ Parameter { name: "animate"; type: "bool" }
19+ Parameter { name: "reset"; type: "bool" }
20+ }
21+ }
22+ Component {
23+ name: "DashCommunicatorService"
24+ prototype: "QObject"
25+ exports: ["Unity.DashCommunicator/DashCommunicatorService 0.1"]
26+ exportMetaObjectRevisions: [0]
27+ Signal {
28+ name: "setCurrentScopeRequested"
29+ Parameter { name: "scopeId"; type: "string" }
30+ Parameter { name: "animate"; type: "bool" }
31+ Parameter { name: "reset"; type: "bool" }
32+ }
33+ }
34+}
plugins/Unity/Session/Session.qmltypes+12
@@ -18,8 +18,20 @@ Module {
18 name: "logoutRequested"
18 name: "logoutRequested"
19 Parameter { name: "have_inhibitors"; type: "bool" }
19 Parameter { name: "have_inhibitors"; type: "bool" }
20 }
20 }
21+ Signal {
22+ name: "rebootRequested"
23+ Parameter { name: "have_inhibitors"; type: "bool" }
24+ }
25+ Signal {
26+ name: "shutdownRequested"
27+ Parameter { name: "have_inhibitors"; type: "bool" }
28+ }
21 Signal { name: "logoutReady" }
29 Signal { name: "logoutReady" }
22 Method { name: "Logout" }
30 Method { name: "Logout" }
31+ Method { name: "Reboot" }
32+ Method { name: "Shutdown" }
23 Method { name: "RequestLogout" }
33 Method { name: "RequestLogout" }
34+ Method { name: "RequestReboot" }
35+ Method { name: "RequestShutdown" }
24 }
36 }
25}
37}
plugins/Utils/Utils.qmltypes+7
@@ -140,4 +140,11 @@ Module {
140 Property { name: "actionsHint"; type: "QByteArray" }
140 Property { name: "actionsHint"; type: "QByteArray" }
141 Property { name: "menuObjectPathHint"; type: "QByteArray" }
141 Property { name: "menuObjectPathHint"; type: "QByteArray" }
142 }
142 }
143+ Component {
144+ name: "WindowKeysFilter"
145+ defaultProperty: "data"
146+ prototype: "QQuickItem"
147+ exports: ["Utils/WindowKeysFilter 0.1"]
148+ exportMetaObjectRevisions: [0]
149+ }
143}
150}
po/am.po+78−25
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-11 23:40+0000\n"
11+"PO-Revision-Date: 2014-08-16 20:11+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−"X-Launchpad-Export-Date: 2014-08-12 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "የ መግቢያ ቃል: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,11 +32,11 @@ msgstr "አቋራጭ መለያያ"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "በእርግጥ ሐይሉን ማጥፋት ይፈልጋሉ"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "ማጥፊያ"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr "በርካታ የተሳሳቱ ሙከራዎች"
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr "እባክዎን ይቆዩ"
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr "የ ድንገተኛ ጥሪ"
105msgstr "የ ድንገተኛ ጥሪ"
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr "እሺ"
109msgstr "እሺ"
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr "ሰላም %1"
114msgstr "ሰላም %1"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr "ሰላም"
118msgstr "ሰላም"
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr "መሰረዣ"
122msgstr "መሰረዣ"
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr "ጨርሷል"
126msgstr "ጨርሷል"
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr "አነስተኛ መመልከቻ"
130msgstr "አነስተኛ መመልከቻ"
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr "ሁሉንም መመልከቻ"
134msgstr "ሁሉንም መመልከቻ"
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "መፈለጊያ"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr "ተጨማሪ..."
142msgstr "ተጨማሪ..."
@@ -141,15 +157,15 @@ msgstr "ግምገማ መጨመሪያ"
141msgid "Send"
157msgid "Send"
142msgstr "መላኪያ"
158msgstr "መላኪያ"
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr "ጨርሷል"
166msgstr "ጨርሷል"
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr "ማስቀመጫ"
170msgstr "ማስቀመጫ"
155
171
@@ -195,7 +211,7 @@ msgstr ""
195
211
196#: qml/Panel/ActiveCallHint.qml:77
212#: qml/Panel/ActiveCallHint.qml:77
197msgid "Tap to return to call..."
213msgid "Tap to return to call..."
198−msgstr ""
214+msgstr "ወደ ጥሪው ለመመለስ መታ ያድርጉ..."
199
215
200#: qml/Panel/ActiveCallHint.qml:90
216#: qml/Panel/ActiveCallHint.qml:90
201msgid "Conference"
217msgid "Conference"
@@ -211,7 +227,7 @@ msgstr "በማውረድ ላይ"
211
227
212#: qml/Panel/Indicators/MenuItemFactory.qml:657
228#: qml/Panel/Indicators/MenuItemFactory.qml:657
213msgid "Paused, tap to resume"
229msgid "Paused, tap to resume"
214−msgstr ""
230+msgstr "ማስቆሚያ: ለመቀጠል መታ ያድርጉ"
215
231
216#: qml/Panel/Indicators/MenuItemFactory.qml:659
232#: qml/Panel/Indicators/MenuItemFactory.qml:659
217msgid "Canceled"
233msgid "Canceled"
@@ -223,7 +239,7 @@ msgstr "ጨርሷል"
223
239
224#: qml/Panel/Indicators/MenuItemFactory.qml:663
240#: qml/Panel/Indicators/MenuItemFactory.qml:663
225msgid "Failed, tap to retry"
241msgid "Failed, tap to retry"
226−msgstr ""
242+msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"
227
243
228#: qml/Panel/Indicators/ModemInfoItem.qml:105
244#: qml/Panel/Indicators/ModemInfoItem.qml:105
229msgid "Unlock SIM"
245msgid "Unlock SIM"
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
237−msgid "Search"
257+msgid "passcode"
238−msgstr "መፈለጊያ"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
263+msgstr "ያስገቡ የ እርስዎን %1"
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
267+msgid "Incorrect %1"
268+msgstr "የተሳሳተ %1"
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
243−msgstr "እባክዎን ያስገቡ %1"
272+msgstr "እባክዎን እንደ ገና-ያስገቡ"
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
296+msgstr ""
po/ar.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\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"
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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -91,39 +95,51 @@ msgstr ""
91"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
95"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
92"الشاشة للبدء"
96"الشاشة للبدء"
93
97
94−#: qml/Components/Lockscreen.qml:220
98+#: qml/Components/Lockscreen.qml:161
99+msgid "Too many incorrect attempts"
100+msgstr ""
101+
102+#: qml/Components/Lockscreen.qml:163
103+msgid "Please wait"
104+msgstr ""
105+
106+#: qml/Components/Lockscreen.qml:245
95msgid "Emergency Call"
107msgid "Emergency Call"
96msgstr "مكالمة طوارئ"
108msgstr "مكالمة طوارئ"
97
109
98−#: qml/Components/Lockscreen.qml:243
110+#: qml/Components/Lockscreen.qml:268
99msgid "OK"
111msgid "OK"
100msgstr ""
112msgstr ""
101
113
102−#: qml/Components/PassphraseLockscreen.qml:62
114+#: qml/Components/PassphraseLockscreen.qml:61
103#, qt-format
115#, qt-format
104msgid "Hello %1"
116msgid "Hello %1"
105msgstr "مرحبا %1"
117msgstr "مرحبا %1"
106
118
107−#: qml/Components/PassphraseLockscreen.qml:62
119+#: qml/Components/PassphraseLockscreen.qml:61
108msgid "Hello"
120msgid "Hello"
109msgstr "مرحبًا"
121msgstr "مرحبًا"
110
122
111−#: qml/Components/PinLockscreen.qml:198
123+#: qml/Components/PinLockscreen.qml:197
112msgid "CANCEL"
124msgid "CANCEL"
113msgstr ""
125msgstr ""
114
126
115−#: qml/Components/PinLockscreen.qml:216
127+#: qml/Components/PinLockscreen.qml:215
116msgid "DONE"
128msgid "DONE"
117msgstr ""
129msgstr ""
118
130
119−#: qml/Dash/GenericScopeView.qml:358
131+#: qml/Dash/GenericScopeView.qml:360
120msgid "See less"
132msgid "See less"
121msgstr "شاهد أقل"
133msgstr "شاهد أقل"
122
134
123−#: qml/Dash/GenericScopeView.qml:358
135+#: qml/Dash/GenericScopeView.qml:360
124msgid "See all"
136msgid "See all"
125msgstr ""
137msgstr ""
126
138
139+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
140+msgid "Search"
141+msgstr "ابحث"
142+
127#: qml/Dash/Previews/PreviewActionCombo.qml:34
143#: qml/Dash/Previews/PreviewActionCombo.qml:34
128msgid "More..."
144msgid "More..."
129msgstr "المزيد..."
145msgstr "المزيد..."
@@ -144,15 +160,15 @@ msgstr "أضف تعليق"
144msgid "Send"
160msgid "Send"
145msgstr "أرسل"
161msgstr "أرسل"
146
162
147−#: qml/Dash/ScopesOverview.qml:200
163+#: qml/Dash/ScopesOverview.qml:201
148msgid "Manage Dash"
164msgid "Manage Dash"
149msgstr ""
165msgstr ""
150
166
151−#: qml/Dash/ScopesOverview.qml:405
167+#: qml/Dash/ScopesOverview.qml:408
152msgid "Done"
168msgid "Done"
153msgstr ""
169msgstr ""
154
170
155−#: qml/Dash/ScopesOverview.qml:431
171+#: qml/Dash/ScopesOverview.qml:434
156msgid "Store"
172msgid "Store"
157msgstr ""
173msgstr ""
158
174
@@ -236,11 +252,48 @@ msgstr ""
236msgid "Roaming"
252msgid "Roaming"
237msgstr ""
253msgstr ""
238
254
239−#: qml/Panel/SearchIndicator.qml:27
255+#: qml/Shell.qml:267
256+msgid "passphrase"
257+msgstr ""
258+
259+#: qml/Shell.qml:267
240−msgid "Search"
260+msgid "passcode"
241−msgstr "ابحث"
261+msgstr ""
262+
263+#: qml/Shell.qml:269
264+#, qt-format
265+msgid "Enter your %1"
266+msgstr ""
242
267
243−#: qml/Shell.qml:256
268+#: qml/Shell.qml:270
244#, qt-format
269#, qt-format
270+msgid "Incorrect %1"
271+msgstr ""
272+
273+#: qml/Shell.qml:272
245−msgid "Please enter %1"
274+msgid "Please re-enter"
246−msgstr "من فضلك أدخِل %1"
275+msgstr ""
276+
277+#: qml/Shell.qml:306
278+msgid "Sorry, incorrect passphrase."
279+msgstr ""
280+
281+#: qml/Shell.qml:307
282+msgid "Sorry, incorrect passcode."
283+msgstr ""
284+
285+#: qml/Shell.qml:308
286+msgid "This will be your last attempt."
287+msgstr ""
288+
289+#: qml/Shell.qml:310
290+msgid ""
291+"If passphrase is entered incorrectly, your phone will conduct a factory "
292+"reset and all personal data will be deleted."
293+msgstr ""
294+
295+#: qml/Shell.qml:311
296+msgid ""
297+"If passcode is entered incorrectly, your phone will conduct a factory reset "
298+"and all personal data will be deleted."
299+msgstr ""
po/ast.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-07-25 16:51+0000\n"
11"PO-Revision-Date: 2014-07-25 16:51+0000\n"
12"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
12"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
13"Language-Team: Asturian <ast@li.org>\n"
13"Language-Team: Asturian <ast@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -92,39 +96,51 @@ msgstr ""
92"Agora yá domines los xestos de los berbesos y pues entamar a usar el "
96"Agora yá domines los xestos de los berbesos y pues entamar a usar el "
93"teléfonu<br><br>Toca la pantalla pa comenzar"
97"teléfonu<br><br>Toca la pantalla pa comenzar"
94
98
95−#: qml/Components/Lockscreen.qml:220
99+#: qml/Components/Lockscreen.qml:161
100+msgid "Too many incorrect attempts"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:163
104+msgid "Please wait"
105+msgstr ""
106+
107+#: qml/Components/Lockscreen.qml:245
96msgid "Emergency Call"
108msgid "Emergency Call"
97msgstr "Llamada d'emerxencia"
109msgstr "Llamada d'emerxencia"
98
110
99−#: qml/Components/Lockscreen.qml:243
111+#: qml/Components/Lockscreen.qml:268
100msgid "OK"
112msgid "OK"
101msgstr "Aceutar"
113msgstr "Aceutar"
102
114
103−#: qml/Components/PassphraseLockscreen.qml:62
115+#: qml/Components/PassphraseLockscreen.qml:61
104#, qt-format
116#, qt-format
105msgid "Hello %1"
117msgid "Hello %1"
106msgstr "Hola %1"
118msgstr "Hola %1"
107
119
108−#: qml/Components/PassphraseLockscreen.qml:62
120+#: qml/Components/PassphraseLockscreen.qml:61
109msgid "Hello"
121msgid "Hello"
110msgstr "Hola"
122msgstr "Hola"
111
123
112−#: qml/Components/PinLockscreen.qml:198
124+#: qml/Components/PinLockscreen.qml:197
113msgid "CANCEL"
125msgid "CANCEL"
114msgstr "ENCABOXAR"
126msgstr "ENCABOXAR"
115
127
116−#: qml/Components/PinLockscreen.qml:216
128+#: qml/Components/PinLockscreen.qml:215
117msgid "DONE"
129msgid "DONE"
118msgstr "FECHO"
130msgstr "FECHO"
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See less"
133msgid "See less"
122msgstr "Ver menos"
134msgstr "Ver menos"
123
135
124−#: qml/Dash/GenericScopeView.qml:358
136+#: qml/Dash/GenericScopeView.qml:360
125msgid "See all"
137msgid "See all"
126msgstr "Ver too"
138msgstr "Ver too"
127
139
140+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
141+msgid "Search"
142+msgstr "Guetar"
143+
128#: qml/Dash/Previews/PreviewActionCombo.qml:34
144#: qml/Dash/Previews/PreviewActionCombo.qml:34
129msgid "More..."
145msgid "More..."
130msgstr "Más…"
146msgstr "Más…"
@@ -145,15 +161,15 @@ msgstr "Amestar una reseña"
145msgid "Send"
161msgid "Send"
146msgstr "Unviar"
162msgstr "Unviar"
147
163
148−#: qml/Dash/ScopesOverview.qml:200
164+#: qml/Dash/ScopesOverview.qml:201
149msgid "Manage Dash"
165msgid "Manage Dash"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:405
168+#: qml/Dash/ScopesOverview.qml:408
153msgid "Done"
169msgid "Done"
154msgstr ""
170msgstr ""
155
171
156−#: qml/Dash/ScopesOverview.qml:431
172+#: qml/Dash/ScopesOverview.qml:434
157msgid "Store"
173msgid "Store"
158msgstr ""
174msgstr ""
159
175
@@ -237,11 +253,48 @@ msgstr ""
237msgid "Roaming"
253msgid "Roaming"
238msgstr ""
254msgstr ""
239
255
240−#: qml/Panel/SearchIndicator.qml:27
256+#: qml/Shell.qml:267
257+msgid "passphrase"
258+msgstr ""
259+
260+#: qml/Shell.qml:267
241−msgid "Search"
261+msgid "passcode"
242−msgstr "Guetar"
262+msgstr ""
263+
264+#: qml/Shell.qml:269
265+#, qt-format
266+msgid "Enter your %1"
267+msgstr ""
243
268
244−#: qml/Shell.qml:256
269+#: qml/Shell.qml:270
245#, qt-format
270#, qt-format
271+msgid "Incorrect %1"
272+msgstr ""
273+
274+#: qml/Shell.qml:272
246−msgid "Please enter %1"
275+msgid "Please re-enter"
276+msgstr ""
277+
278+#: qml/Shell.qml:306
279+msgid "Sorry, incorrect passphrase."
247−msgstr "Introduz %1"
280+msgstr ""
281+
282+#: qml/Shell.qml:307
283+msgid "Sorry, incorrect passcode."
284+msgstr ""
285+
286+#: qml/Shell.qml:308
287+msgid "This will be your last attempt."
288+msgstr ""
289+
290+#: qml/Shell.qml:310
291+msgid ""
292+"If passphrase is entered incorrectly, your phone will conduct a factory "
293+"reset and all personal data will be deleted."
294+msgstr ""
295+
296+#: qml/Shell.qml:311
297+msgid ""
298+"If passcode is entered incorrectly, your phone will conduct a factory reset "
299+"and all personal data will be deleted."
300+msgstr ""
po/az.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-01-15 09:50+0000\n"
11"PO-Revision-Date: 2014-01-15 09:50+0000\n"
12"Last-Translator: Turan Mahmudov <turan.mahmudov@gmail.com>\n"
12"Last-Translator: Turan Mahmudov <turan.mahmudov@gmail.com>\n"
13"Language-Team: Azerbaijani <az@li.org>\n"
13"Language-Team: Azerbaijani <az@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -89,39 +93,51 @@ msgid ""
89"phone<br><br>Tap on the screen to start"
93"phone<br><br>Tap on the screen to start"
90msgstr ""
94msgstr ""
91
95
92−#: qml/Components/Lockscreen.qml:220
96+#: qml/Components/Lockscreen.qml:161
97+msgid "Too many incorrect attempts"
98+msgstr ""
99+
100+#: qml/Components/Lockscreen.qml:163
101+msgid "Please wait"
102+msgstr ""
103+
104+#: qml/Components/Lockscreen.qml:245
93msgid "Emergency Call"
105msgid "Emergency Call"
94msgstr "Zərurət zəngi"
106msgstr "Zərurət zəngi"
95
107
96−#: qml/Components/Lockscreen.qml:243
108+#: qml/Components/Lockscreen.qml:268
97msgid "OK"
109msgid "OK"
98msgstr ""
110msgstr ""
99
111
100−#: qml/Components/PassphraseLockscreen.qml:62
112+#: qml/Components/PassphraseLockscreen.qml:61
101#, qt-format
113#, qt-format
102msgid "Hello %1"
114msgid "Hello %1"
103msgstr "Xoş gördük %1"
115msgstr "Xoş gördük %1"
104
116
105−#: qml/Components/PassphraseLockscreen.qml:62
117+#: qml/Components/PassphraseLockscreen.qml:61
106msgid "Hello"
118msgid "Hello"
107msgstr "Xoş gördük"
119msgstr "Xoş gördük"
108
120
109−#: qml/Components/PinLockscreen.qml:198
121+#: qml/Components/PinLockscreen.qml:197
110msgid "CANCEL"
122msgid "CANCEL"
111msgstr ""
123msgstr ""
112
124
113−#: qml/Components/PinLockscreen.qml:216
125+#: qml/Components/PinLockscreen.qml:215
114msgid "DONE"
126msgid "DONE"
115msgstr ""
127msgstr ""
116
128
117−#: qml/Dash/GenericScopeView.qml:358
129+#: qml/Dash/GenericScopeView.qml:360
118msgid "See less"
130msgid "See less"
119msgstr ""
131msgstr ""
120
132
121−#: qml/Dash/GenericScopeView.qml:358
133+#: qml/Dash/GenericScopeView.qml:360
122msgid "See all"
134msgid "See all"
123msgstr ""
135msgstr ""
124
136
137+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
138+msgid "Search"
139+msgstr "Axtar"
140+
125#: qml/Dash/Previews/PreviewActionCombo.qml:34
141#: qml/Dash/Previews/PreviewActionCombo.qml:34
126msgid "More..."
142msgid "More..."
127msgstr ""
143msgstr ""
@@ -142,15 +158,15 @@ msgstr "Rəy yaz"
142msgid "Send"
158msgid "Send"
143msgstr "Göndər"
159msgstr "Göndər"
144
160
145−#: qml/Dash/ScopesOverview.qml:200
161+#: qml/Dash/ScopesOverview.qml:201
146msgid "Manage Dash"
162msgid "Manage Dash"
147msgstr ""
163msgstr ""
148
164
149−#: qml/Dash/ScopesOverview.qml:405
165+#: qml/Dash/ScopesOverview.qml:408
150msgid "Done"
166msgid "Done"
151msgstr ""
167msgstr ""
152
168
153−#: qml/Dash/ScopesOverview.qml:431
169+#: qml/Dash/ScopesOverview.qml:434
154msgid "Store"
170msgid "Store"
155msgstr ""
171msgstr ""
156
172
@@ -234,11 +250,48 @@ msgstr ""
234msgid "Roaming"
250msgid "Roaming"
235msgstr ""
251msgstr ""
236
252
237−#: qml/Panel/SearchIndicator.qml:27
253+#: qml/Shell.qml:267
254+msgid "passphrase"
255+msgstr ""
256+
257+#: qml/Shell.qml:267
238−msgid "Search"
258+msgid "passcode"
239−msgstr "Axtar"
259+msgstr ""
260+
261+#: qml/Shell.qml:269
262+#, qt-format
263+msgid "Enter your %1"
264+msgstr ""
240
265
241−#: qml/Shell.qml:256
266+#: qml/Shell.qml:270
242#, qt-format
267#, qt-format
268+msgid "Incorrect %1"
269+msgstr ""
270+
271+#: qml/Shell.qml:272
243−msgid "Please enter %1"
272+msgid "Please re-enter"
244−msgstr "Xahiş edirik daxil edin: %1"
273+msgstr ""
274+
275+#: qml/Shell.qml:306
276+msgid "Sorry, incorrect passphrase."
277+msgstr ""
278+
279+#: qml/Shell.qml:307
280+msgid "Sorry, incorrect passcode."
281+msgstr ""
282+
283+#: qml/Shell.qml:308
284+msgid "This will be your last attempt."
285+msgstr ""
286+
287+#: qml/Shell.qml:310
288+msgid ""
289+"If passphrase is entered incorrectly, your phone will conduct a factory "
290+"reset and all personal data will be deleted."
291+msgstr ""
292+
293+#: qml/Shell.qml:311
294+msgid ""
295+"If passcode is entered incorrectly, your phone will conduct a factory reset "
296+"and all personal data will be deleted."
297+msgstr ""
po/bg.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\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"
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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -95,39 +99,51 @@ msgid ""
95"phone<br><br>Tap on the screen to start"
99"phone<br><br>Tap on the screen to start"
96msgstr ""
100msgstr ""
97
101
98−#: qml/Components/Lockscreen.qml:220
102+#: qml/Components/Lockscreen.qml:161
103+msgid "Too many incorrect attempts"
104+msgstr ""
105+
106+#: qml/Components/Lockscreen.qml:163
107+msgid "Please wait"
108+msgstr ""
109+
110+#: qml/Components/Lockscreen.qml:245
99msgid "Emergency Call"
111msgid "Emergency Call"
100msgstr "Спешно повикване"
112msgstr "Спешно повикване"
101
113
102−#: qml/Components/Lockscreen.qml:243
114+#: qml/Components/Lockscreen.qml:268
103msgid "OK"
115msgid "OK"
104msgstr ""
116msgstr ""
105
117
106−#: qml/Components/PassphraseLockscreen.qml:62
118+#: qml/Components/PassphraseLockscreen.qml:61
107#, qt-format
119#, qt-format
108msgid "Hello %1"
120msgid "Hello %1"
109msgstr "Здравей, %1"
121msgstr "Здравей, %1"
110
122
111−#: qml/Components/PassphraseLockscreen.qml:62
123+#: qml/Components/PassphraseLockscreen.qml:61
112msgid "Hello"
124msgid "Hello"
113msgstr "Здравей"
125msgstr "Здравей"
114
126
115−#: qml/Components/PinLockscreen.qml:198
127+#: qml/Components/PinLockscreen.qml:197
116msgid "CANCEL"
128msgid "CANCEL"
117msgstr ""
129msgstr ""
118
130
119−#: qml/Components/PinLockscreen.qml:216
131+#: qml/Components/PinLockscreen.qml:215
120msgid "DONE"
132msgid "DONE"
121msgstr ""
133msgstr ""
122
134
123−#: qml/Dash/GenericScopeView.qml:358
135+#: qml/Dash/GenericScopeView.qml:360
124msgid "See less"
136msgid "See less"
125msgstr ""
137msgstr ""
126
138
127−#: qml/Dash/GenericScopeView.qml:358
139+#: qml/Dash/GenericScopeView.qml:360
128msgid "See all"
140msgid "See all"
129msgstr ""
141msgstr ""
130
142
143+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
144+msgid "Search"
145+msgstr "Търсене"
146+
131#: qml/Dash/Previews/PreviewActionCombo.qml:34
147#: qml/Dash/Previews/PreviewActionCombo.qml:34
132msgid "More..."
148msgid "More..."
133msgstr ""
149msgstr ""
@@ -148,15 +164,15 @@ msgstr "Добави отзив"
148msgid "Send"
164msgid "Send"
149msgstr "Изпрати"
165msgstr "Изпрати"
150
166
151−#: qml/Dash/ScopesOverview.qml:200
167+#: qml/Dash/ScopesOverview.qml:201
152msgid "Manage Dash"
168msgid "Manage Dash"
153msgstr ""
169msgstr ""
154
170
155−#: qml/Dash/ScopesOverview.qml:405
171+#: qml/Dash/ScopesOverview.qml:408
156msgid "Done"
172msgid "Done"
157msgstr ""
173msgstr ""
158
174
159−#: qml/Dash/ScopesOverview.qml:431
175+#: qml/Dash/ScopesOverview.qml:434
160msgid "Store"
176msgid "Store"
161msgstr ""
177msgstr ""
162
178
@@ -240,11 +256,48 @@ msgstr ""
240msgid "Roaming"
256msgid "Roaming"
241msgstr ""
257msgstr ""
242
258
243−#: qml/Panel/SearchIndicator.qml:27
259+#: qml/Shell.qml:267
260+msgid "passphrase"
261+msgstr ""
262+
263+#: qml/Shell.qml:267
244−msgid "Search"
264+msgid "passcode"
245−msgstr "Търсене"
265+msgstr ""
266+
267+#: qml/Shell.qml:269
268+#, qt-format
269+msgid "Enter your %1"
270+msgstr ""
246
271
247−#: qml/Shell.qml:256
272+#: qml/Shell.qml:270
248#, qt-format
273#, qt-format
274+msgid "Incorrect %1"
275+msgstr ""
276+
277+#: qml/Shell.qml:272
249−msgid "Please enter %1"
278+msgid "Please re-enter"
250−msgstr "Моля, въведете %1"
279+msgstr ""
280+
281+#: qml/Shell.qml:306
282+msgid "Sorry, incorrect passphrase."
283+msgstr ""
284+
285+#: qml/Shell.qml:307
286+msgid "Sorry, incorrect passcode."
287+msgstr ""
288+
289+#: qml/Shell.qml:308
290+msgid "This will be your last attempt."
291+msgstr ""
292+
293+#: qml/Shell.qml:310
294+msgid ""
295+"If passphrase is entered incorrectly, your phone will conduct a factory "
296+"reset and all personal data will be deleted."
297+msgstr ""
298+
299+#: qml/Shell.qml:311
300+msgid ""
301+"If passcode is entered incorrectly, your phone will conduct a factory reset "
302+"and all personal data will be deleted."
303+msgstr ""
po/br.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-07-28 06:44+0000\n"
11"PO-Revision-Date: 2014-07-28 06:44+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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -95,39 +99,51 @@ msgstr ""
95"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
99"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
96"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
100"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
97
101
98−#: qml/Components/Lockscreen.qml:220
102+#: qml/Components/Lockscreen.qml:161
103+msgid "Too many incorrect attempts"
104+msgstr ""
105+
106+#: qml/Components/Lockscreen.qml:163
107+msgid "Please wait"
108+msgstr ""
109+
110+#: qml/Components/Lockscreen.qml:245
99msgid "Emergency Call"
111msgid "Emergency Call"
100msgstr "Pellgomzadenn vallus"
112msgstr "Pellgomzadenn vallus"
101
113
102−#: qml/Components/Lockscreen.qml:243
114+#: qml/Components/Lockscreen.qml:268
103msgid "OK"
115msgid "OK"
104msgstr "Mat eo"
116msgstr "Mat eo"
105
117
106−#: qml/Components/PassphraseLockscreen.qml:62
118+#: qml/Components/PassphraseLockscreen.qml:61
107#, qt-format
119#, qt-format
108msgid "Hello %1"
120msgid "Hello %1"
109msgstr "Demat %1"
121msgstr "Demat %1"
110
122
111−#: qml/Components/PassphraseLockscreen.qml:62
123+#: qml/Components/PassphraseLockscreen.qml:61
112msgid "Hello"
124msgid "Hello"
113msgstr "Demat"
125msgstr "Demat"
114
126
115−#: qml/Components/PinLockscreen.qml:198
127+#: qml/Components/PinLockscreen.qml:197
116msgid "CANCEL"
128msgid "CANCEL"
117msgstr "NULLAÑ"
129msgstr "NULLAÑ"
118
130
119−#: qml/Components/PinLockscreen.qml:216
131+#: qml/Components/PinLockscreen.qml:215
120msgid "DONE"
132msgid "DONE"
121msgstr "ECHU"
133msgstr "ECHU"
122
134
123−#: qml/Dash/GenericScopeView.qml:358
135+#: qml/Dash/GenericScopeView.qml:360
124msgid "See less"
136msgid "See less"
125msgstr "Gwelet nebeutoc'h"
137msgstr "Gwelet nebeutoc'h"
126
138
127−#: qml/Dash/GenericScopeView.qml:358
139+#: qml/Dash/GenericScopeView.qml:360
128msgid "See all"
140msgid "See all"
129msgstr "Gwelet pep tra"
141msgstr "Gwelet pep tra"
130
142
143+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
144+msgid "Search"
145+msgstr "Klask"
146+
131#: qml/Dash/Previews/PreviewActionCombo.qml:34
147#: qml/Dash/Previews/PreviewActionCombo.qml:34
132msgid "More..."
148msgid "More..."
133msgstr "Muioc'h..."
149msgstr "Muioc'h..."
@@ -148,15 +164,15 @@ msgstr "Ouzhpennañ un ali"
148msgid "Send"
164msgid "Send"
149msgstr "Kas"
165msgstr "Kas"
150
166
151−#: qml/Dash/ScopesOverview.qml:200
167+#: qml/Dash/ScopesOverview.qml:201
152msgid "Manage Dash"
168msgid "Manage Dash"
153msgstr ""
169msgstr ""
154
170
155−#: qml/Dash/ScopesOverview.qml:405
171+#: qml/Dash/ScopesOverview.qml:408
156msgid "Done"
172msgid "Done"
157msgstr ""
173msgstr ""
158
174
159−#: qml/Dash/ScopesOverview.qml:431
175+#: qml/Dash/ScopesOverview.qml:434
160msgid "Store"
176msgid "Store"
161msgstr ""
177msgstr ""
162
178
@@ -240,11 +256,48 @@ msgstr ""
240msgid "Roaming"
256msgid "Roaming"
241msgstr ""
257msgstr ""
242
258
243−#: qml/Panel/SearchIndicator.qml:27
259+#: qml/Shell.qml:267
260+msgid "passphrase"
261+msgstr ""
262+
263+#: qml/Shell.qml:267
244−msgid "Search"
264+msgid "passcode"
245−msgstr "Klask"
265+msgstr ""
266+
267+#: qml/Shell.qml:269
268+#, qt-format
269+msgid "Enter your %1"
270+msgstr ""
246
271
247−#: qml/Shell.qml:256
272+#: qml/Shell.qml:270
248#, qt-format
273#, qt-format
274+msgid "Incorrect %1"
275+msgstr ""
276+
277+#: qml/Shell.qml:272
249−msgid "Please enter %1"
278+msgid "Please re-enter"
279+msgstr ""
280+
281+#: qml/Shell.qml:306
282+msgid "Sorry, incorrect passphrase."
283+msgstr ""
284+
285+#: qml/Shell.qml:307
286+msgid "Sorry, incorrect passcode."
287+msgstr ""
288+
289+#: qml/Shell.qml:308
290+msgid "This will be your last attempt."
291+msgstr ""
292+
293+#: qml/Shell.qml:310
294+msgid ""
295+"If passphrase is entered incorrectly, your phone will conduct a factory "
296+"reset and all personal data will be deleted."
250−msgstr "Ebarzhit %1, mar plij"
297+msgstr ""
298+
299+#: qml/Shell.qml:311
300+msgid ""
301+"If passcode is entered incorrectly, your phone will conduct a factory reset "
302+"and all personal data will be deleted."
303+msgstr ""
po/bs.po+70−17
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\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"
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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr ""
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
238msgstr ""
263msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
242−msgid "Please enter %1"
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/ca.po+89−31
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-25 10:21+0000\n"
11+"PO-Revision-Date: 2014-08-17 03:42+0000\n"
12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
13"Language-Team: Catalan <ca@li.org>\n"
13"Language-Team: Catalan <ca@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Contrasenya: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "Desenganxa la drecera"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "Segur que voleu apagar el dispositiu?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Apaga'l"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Reinicia'l"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Cancel·la"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -96,39 +100,51 @@ msgstr ""
96"Ja heu après com utilitzar els gestos de les vores per fer servir el "
100"Ja heu après com utilitzar els gestos de les vores per fer servir el "
97"telèfon<br><br>Feu un toc a la pantalla per començar"
101"telèfon<br><br>Feu un toc a la pantalla per començar"
98
102
99−#: qml/Components/Lockscreen.qml:220
103+#: qml/Components/Lockscreen.qml:161
104+msgid "Too many incorrect attempts"
105+msgstr "Massa intents incorrectes"
106+
107+#: qml/Components/Lockscreen.qml:163
108+msgid "Please wait"
109+msgstr "Espereu"
110+
111+#: qml/Components/Lockscreen.qml:245
100msgid "Emergency Call"
112msgid "Emergency Call"
101msgstr "Trucada d'emergència"
113msgstr "Trucada d'emergència"
102
114
103−#: qml/Components/Lockscreen.qml:243
115+#: qml/Components/Lockscreen.qml:268
104msgid "OK"
116msgid "OK"
105msgstr "D'acord"
117msgstr "D'acord"
106
118
107−#: qml/Components/PassphraseLockscreen.qml:62
119+#: qml/Components/PassphraseLockscreen.qml:61
108#, qt-format
120#, qt-format
109msgid "Hello %1"
121msgid "Hello %1"
110msgstr "Hola %1"
122msgstr "Hola %1"
111
123
112−#: qml/Components/PassphraseLockscreen.qml:62
124+#: qml/Components/PassphraseLockscreen.qml:61
113msgid "Hello"
125msgid "Hello"
114msgstr "Hola"
126msgstr "Hola"
115
127
116−#: qml/Components/PinLockscreen.qml:198
128+#: qml/Components/PinLockscreen.qml:197
117msgid "CANCEL"
129msgid "CANCEL"
118msgstr "Cancel·la"
130msgstr "Cancel·la"
119
131
120−#: qml/Components/PinLockscreen.qml:216
132+#: qml/Components/PinLockscreen.qml:215
121msgid "DONE"
133msgid "DONE"
122msgstr "Fet"
134msgstr "Fet"
123
135
124−#: qml/Dash/GenericScopeView.qml:358
136+#: qml/Dash/GenericScopeView.qml:360
125msgid "See less"
137msgid "See less"
126msgstr "Mostra'n menys"
138msgstr "Mostra'n menys"
127
139
128−#: qml/Dash/GenericScopeView.qml:358
140+#: qml/Dash/GenericScopeView.qml:360
129msgid "See all"
141msgid "See all"
130msgstr "Mostra-ho tot"
142msgstr "Mostra-ho tot"
131
143
144+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
145+msgid "Search"
146+msgstr "Cerca"
147+
132#: qml/Dash/Previews/PreviewActionCombo.qml:34
148#: qml/Dash/Previews/PreviewActionCombo.qml:34
133msgid "More..."
149msgid "More..."
134msgstr "Més..."
150msgstr "Més..."
@@ -149,25 +165,25 @@ msgstr "Afegiu una ressenya"
149msgid "Send"
165msgid "Send"
150msgstr "Envia"
166msgstr "Envia"
151
167
152−#: qml/Dash/ScopesOverview.qml:200
168+#: qml/Dash/ScopesOverview.qml:201
153msgid "Manage Dash"
169msgid "Manage Dash"
154−msgstr ""
170+msgstr "Gestiona el tauler"
155
171
156−#: qml/Dash/ScopesOverview.qml:405
172+#: qml/Dash/ScopesOverview.qml:408
157msgid "Done"
173msgid "Done"
158−msgstr ""
174+msgstr "Fet"
159
175
160−#: qml/Dash/ScopesOverview.qml:431
176+#: qml/Dash/ScopesOverview.qml:434
161msgid "Store"
177msgid "Store"
162−msgstr ""
178+msgstr "Botiga"
163
179
164#: qml/Dash/ScopesOverviewTab.qml:36
180#: qml/Dash/ScopesOverviewTab.qml:36
165msgid "Favorites"
181msgid "Favorites"
166−msgstr ""
182+msgstr "Preferides"
167
183
168#: qml/Dash/ScopesOverviewTab.qml:54
184#: qml/Dash/ScopesOverviewTab.qml:54
169msgid "All"
185msgid "All"
170−msgstr ""
186+msgstr "Totes"
171
187
172#: qml/Greeter/Greeter.qml:157
188#: qml/Greeter/Greeter.qml:157
173msgid "Swipe to unlock"
189msgid "Swipe to unlock"
@@ -235,17 +251,59 @@ msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
235
251
236#: qml/Panel/Indicators/ModemInfoItem.qml:105
252#: qml/Panel/Indicators/ModemInfoItem.qml:105
237msgid "Unlock SIM"
253msgid "Unlock SIM"
238−msgstr ""
254+msgstr "Desbloca la SIM"
239
255
240#: qml/Panel/Indicators/RoamingIndication.qml:27
256#: qml/Panel/Indicators/RoamingIndication.qml:27
241msgid "Roaming"
257msgid "Roaming"
242−msgstr ""
258+msgstr "Itinerància"
243
259
244−#: qml/Panel/SearchIndicator.qml:27
260+#: qml/Shell.qml:267
261+msgid "passphrase"
262+msgstr "contrasenya"
263+
264+#: qml/Shell.qml:267
245−msgid "Search"
265+msgid "passcode"
246−msgstr "Cerca"
266+msgstr "clau"
247
267
248−#: qml/Shell.qml:256
268+#: qml/Shell.qml:269
249#, qt-format
269#, qt-format
270+msgid "Enter your %1"
271+msgstr "Introduïu la %1"
272+
273+#: qml/Shell.qml:270
274+#, qt-format
275+msgid "Incorrect %1"
276+msgstr "La %1 és incorrecta"
277+
278+#: qml/Shell.qml:272
250−msgid "Please enter %1"
279+msgid "Please re-enter"
251−msgstr "Introduïu %1"
280+msgstr "Torneu-la a introduir"
281+
282+#: qml/Shell.qml:306
283+msgid "Sorry, incorrect passphrase."
284+msgstr "La contrasenya és incorrecta"
285+
286+#: qml/Shell.qml:307
287+msgid "Sorry, incorrect passcode."
288+msgstr "La clau és incorrecta"
289+
290+#: qml/Shell.qml:308
291+msgid "This will be your last attempt."
292+msgstr "Aquest serà el darrer intent."
293+
294+#: qml/Shell.qml:310
295+msgid ""
296+"If passphrase is entered incorrectly, your phone will conduct a factory "
297+"reset and all personal data will be deleted."
298+msgstr ""
299+"Si la contrasenya s'introdueix de manera incorrecta, el telèfon es "
300+"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
301+"personals."
302+
303+#: qml/Shell.qml:311
304+msgid ""
305+"If passcode is entered incorrectly, your phone will conduct a factory reset "
306+"and all personal data will be deleted."
307+msgstr ""
308+"Si la clau s'introdueix de manera incorrecta, el telèfon es reinicialitzarà "
309+"a l'estat de fàbrica i se suprimiran totes les dades personals."
po/ckb.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\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"
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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:29+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr "هێڵی فریاگوزاری"
105msgstr "هێڵی فریاگوزاری"
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr "سڵاو %1"
114msgstr "سڵاو %1"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr "سڵاو"
118msgstr "سڵاو"
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "گەڕان"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr "پێداچوونەوە زۆر بکە"
141msgid "Send"
157msgid "Send"
142msgstr "ناردن"
158msgstr "ناردن"
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
237−msgid "Search"
257+msgid "passcode"
238−msgstr "گەڕان"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
243−msgstr "تکایە %1 بنووسە"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
296+msgstr ""
po/cs.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\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"
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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr "Tísňové volání"
105msgstr "Tísňové volání"
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr "Ahoj %1"
114msgstr "Ahoj %1"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr "Ahoj"
118msgstr "Ahoj"
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "Hledat"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr "Přidat recenzi"
141msgid "Send"
157msgid "Send"
142msgstr "Odeslat"
158msgstr "Odeslat"
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
237−msgid "Search"
257+msgid "passcode"
238−msgstr "Hledat"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
243−msgstr "Zadejte prosím %1"
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
296+msgstr ""
po/da.po+72−19
@@ -8,16 +8,20 @@ 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-08-08 11:17+0200\n"
11+"POT-Creation-Date: 2014-08-13 14:09-0400\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"
15"MIME-Version: 1.0\n"
15"MIME-Version: 1.0\n"
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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
19"X-Generator: Launchpad (build 17156)\n"
19"X-Generator: Launchpad (build 17156)\n"
20
20
21+#: plugins/LightDM/Greeter.cpp:129
22+msgid "Password: "
23+msgstr ""
24+
21#: plugins/Unity/Launcher/launcheritem.cpp:43
25#: plugins/Unity/Launcher/launcheritem.cpp:43
22#: plugins/Unity/Launcher/launcheritem.cpp:73
26#: plugins/Unity/Launcher/launcheritem.cpp:73
23msgid "Pin shortcut"
27msgid "Pin shortcut"
@@ -91,39 +95,51 @@ msgstr ""
91"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
95"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
92"på skærmen for at starte"
96"på skærmen for at starte"
93
97
94−#: qml/Components/Lockscreen.qml:220
98+#: qml/Components/Lockscreen.qml:161
99+msgid "Too many incorrect attempts"
100+msgstr ""
101+
102+#: qml/Components/Lockscreen.qml:163
103+msgid "Please wait"
104+msgstr ""
105+
106+#: qml/Components/Lockscreen.qml:245
95msgid "Emergency Call"
107msgid "Emergency Call"
96msgstr "Nødopkald"
108msgstr "Nødopkald"
97
109
98−#: qml/Components/Lockscreen.qml:243
110+#: qml/Components/Lockscreen.qml:268
99msgid "OK"
111msgid "OK"
100msgstr "O.k."
112msgstr "O.k."
101
113
102−#: qml/Components/PassphraseLockscreen.qml:62
114+#: qml/Components/PassphraseLockscreen.qml:61
103#, qt-format
115#, qt-format
104msgid "Hello %1"
116msgid "Hello %1"
105msgstr "Hej %1"
117msgstr "Hej %1"
106
118
107−#: qml/Components/PassphraseLockscreen.qml:62
119+#: qml/Components/PassphraseLockscreen.qml:61
108msgid "Hello"
120msgid "Hello"
109msgstr "Hej"
121msgstr "Hej"
110
122
111−#: qml/Components/PinLockscreen.qml:198
123+#: qml/Components/PinLockscreen.qml:197
112msgid "CANCEL"
124msgid "CANCEL"
113msgstr "ANNULLÉR"
125msgstr "ANNULLÉR"
114
126
115−#: qml/Components/PinLockscreen.qml:216
127+#: qml/Components/PinLockscreen.qml:215
116msgid "DONE"
128msgid "DONE"
117msgstr "FÆRDIG"
129msgstr "FÆRDIG"
118
130
119−#: qml/Dash/GenericScopeView.qml:358
131+#: qml/Dash/GenericScopeView.qml:360
120msgid "See less"
132msgid "See less"
121msgstr "Vis mindre"
133msgstr "Vis mindre"
122
134
123−#: qml/Dash/GenericScopeView.qml:358
135+#: qml/Dash/GenericScopeView.qml:360
124msgid "See all"
136msgid "See all"
125msgstr "Se alle"
137msgstr "Se alle"
126
138
139+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
140+msgid "Search"
141+msgstr "Søg"
142+
127#: qml/Dash/Previews/PreviewActionCombo.qml:34
143#: qml/Dash/Previews/PreviewActionCombo.qml:34
128msgid "More..."
144msgid "More..."
129msgstr "Mere..."
145msgstr "Mere..."
@@ -144,15 +160,15 @@ msgstr "Tilføj en forhåndsvisning"
144msgid "Send"
160msgid "Send"
145msgstr "Send"
161msgstr "Send"
146
162
147−#: qml/Dash/ScopesOverview.qml:200
163+#: qml/Dash/ScopesOverview.qml:201
148msgid "Manage Dash"
164msgid "Manage Dash"
149msgstr ""
165msgstr ""
150
166
151−#: qml/Dash/ScopesOverview.qml:405
167+#: qml/Dash/ScopesOverview.qml:408
152msgid "Done"
168msgid "Done"
153msgstr ""
169msgstr ""
154
170
155−#: qml/Dash/ScopesOverview.qml:431
171+#: qml/Dash/ScopesOverview.qml:434
156msgid "Store"
172msgid "Store"
157msgstr ""
173msgstr ""
158
174
@@ -236,11 +252,48 @@ msgstr ""
236msgid "Roaming"
252msgid "Roaming"
237msgstr ""
253msgstr ""
238
254
239−#: qml/Panel/SearchIndicator.qml:27
255+#: qml/Shell.qml:267
256+msgid "passphrase"
257+msgstr ""
258+
259+#: qml/Shell.qml:267
240−msgid "Search"
260+msgid "passcode"
241−msgstr "Søg"
261+msgstr ""
262+
263+#: qml/Shell.qml:269
264+#, qt-format
265+msgid "Enter your %1"
266+msgstr ""
242
267
243−#: qml/Shell.qml:256
268+#: qml/Shell.qml:270
244#, qt-format
269#, qt-format
270+msgid "Incorrect %1"
271+msgstr ""
272+
273+#: qml/Shell.qml:272
245−msgid "Please enter %1"
274+msgid "Please re-enter"
275+msgstr ""
276+
277+#: qml/Shell.qml:306
278+msgid "Sorry, incorrect passphrase."
246−msgstr "Indtast venligst %1"
279+msgstr ""
280+
281+#: qml/Shell.qml:307
282+msgid "Sorry, incorrect passcode."
283+msgstr ""
284+
285+#: qml/Shell.qml:308
286+msgid "This will be your last attempt."
287+msgstr ""
288+
289+#: qml/Shell.qml:310
290+msgid ""
291+"If passphrase is entered incorrectly, your phone will conduct a factory "
292+"reset and all personal data will be deleted."
293+msgstr ""
294+
295+#: qml/Shell.qml:311
296+msgid ""
297+"If passcode is entered incorrectly, your phone will conduct a factory reset "
298+"and all personal data will be deleted."
299+msgstr ""
po/de.po+82−29
@@ -7,24 +7,28 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-08 08:58+0000\n"
11+"PO-Revision-Date: 2014-08-17 21:46+0000\n"
12−"Last-Translator: Martin Pitt <martin.pitt@ubuntu.com>\n"
12+"Last-Translator: Phillip Sz <Unknown>\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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Passwort: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
23−msgstr ""
27+msgstr "Verknüpfung anheften"
24
28
25#: plugins/Unity/Launcher/launcheritem.cpp:73
29#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Unpin shortcut"
30msgid "Unpin shortcut"
27−msgstr ""
31+msgstr "Verknüpfung entfernen"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
@@ -32,15 +36,15 @@ msgstr ""
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Ausschalten"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Neustart"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Abbrechen"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -93,39 +97,51 @@ msgstr ""
93"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
97"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
94"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
98"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
95
99
96−#: qml/Components/Lockscreen.qml:220
100+#: qml/Components/Lockscreen.qml:161
101+msgid "Too many incorrect attempts"
102+msgstr ""
103+
104+#: qml/Components/Lockscreen.qml:163
105+msgid "Please wait"
106+msgstr "Bitte warten"
107+
108+#: qml/Components/Lockscreen.qml:245
97msgid "Emergency Call"
109msgid "Emergency Call"
98msgstr "Notruf"
110msgstr "Notruf"
99
111
100−#: qml/Components/Lockscreen.qml:243
112+#: qml/Components/Lockscreen.qml:268
101msgid "OK"
113msgid "OK"
102msgstr "OK"
114msgstr "OK"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105#, qt-format
117#, qt-format
106msgid "Hello %1"
118msgid "Hello %1"
107msgstr "Hallo %1"
119msgstr "Hallo %1"
108
120
109−#: qml/Components/PassphraseLockscreen.qml:62
121+#: qml/Components/PassphraseLockscreen.qml:61
110msgid "Hello"
122msgid "Hello"
111msgstr "Hallo"
123msgstr "Hallo"
112
124
113−#: qml/Components/PinLockscreen.qml:198
125+#: qml/Components/PinLockscreen.qml:197
114msgid "CANCEL"
126msgid "CANCEL"
115msgstr "ABBRECHEN"
127msgstr "ABBRECHEN"
116
128
117−#: qml/Components/PinLockscreen.qml:216
129+#: qml/Components/PinLockscreen.qml:215
118msgid "DONE"
130msgid "DONE"
119msgstr "ERLEDIGT"
131msgstr "ERLEDIGT"
120
132
121−#: qml/Dash/GenericScopeView.qml:358
133+#: qml/Dash/GenericScopeView.qml:360
122msgid "See less"
134msgid "See less"
123msgstr "Weniger ansehen"
135msgstr "Weniger ansehen"
124
136
125−#: qml/Dash/GenericScopeView.qml:358
137+#: qml/Dash/GenericScopeView.qml:360
126msgid "See all"
138msgid "See all"
127msgstr "Alle anzeigen"
139msgstr "Alle anzeigen"
128
140
141+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
142+msgid "Search"
143+msgstr "Suchen"
144+
129#: qml/Dash/Previews/PreviewActionCombo.qml:34
145#: qml/Dash/Previews/PreviewActionCombo.qml:34
130msgid "More..."
146msgid "More..."
131msgstr "Mehr …"
147msgstr "Mehr …"
@@ -146,25 +162,25 @@ msgstr "Bewertung hinzufügen"
146msgid "Send"
162msgid "Send"
147msgstr "Senden"
163msgstr "Senden"
148
164
149−#: qml/Dash/ScopesOverview.qml:200
165+#: qml/Dash/ScopesOverview.qml:201
150msgid "Manage Dash"
166msgid "Manage Dash"
151msgstr ""
167msgstr ""
152
168
153−#: qml/Dash/ScopesOverview.qml:405
169+#: qml/Dash/ScopesOverview.qml:408
154msgid "Done"
170msgid "Done"
155−msgstr ""
171+msgstr "Erledigt"
156
172
157−#: qml/Dash/ScopesOverview.qml:431
173+#: qml/Dash/ScopesOverview.qml:434
158msgid "Store"
174msgid "Store"
159msgstr ""
175msgstr ""
160
176
161#: qml/Dash/ScopesOverviewTab.qml:36
177#: qml/Dash/ScopesOverviewTab.qml:36
162msgid "Favorites"
178msgid "Favorites"
163−msgstr ""
179+msgstr "Favoriten"
164
180
165#: qml/Dash/ScopesOverviewTab.qml:54
181#: qml/Dash/ScopesOverviewTab.qml:54
166msgid "All"
182msgid "All"
167−msgstr ""
183+msgstr "Alle"
168
184
169#: qml/Greeter/Greeter.qml:157
185#: qml/Greeter/Greeter.qml:157
170msgid "Swipe to unlock"
186msgid "Swipe to unlock"
@@ -236,13 +252,50 @@ msgstr ""
236
252
237#: qml/Panel/Indicators/RoamingIndication.qml:27
253#: qml/Panel/Indicators/RoamingIndication.qml:27
238msgid "Roaming"
254msgid "Roaming"
255+msgstr "Roaming"
256+
257+#: qml/Shell.qml:267
258+msgid "passphrase"
259+msgstr "Passwort"
260+
261+#: qml/Shell.qml:267
262+msgid "passcode"
239msgstr ""
263msgstr ""
240
264
241−#: qml/Panel/SearchIndicator.qml:27
265+#: qml/Shell.qml:269
242−msgid "Search"
266+#, qt-format
267+msgid "Enter your %1"
243−msgstr "Suchen"
268+msgstr ""
244
269
245−#: qml/Shell.qml:256
270+#: qml/Shell.qml:270
246#, qt-format
271#, qt-format
272+msgid "Incorrect %1"
273+msgstr ""
274+
275+#: qml/Shell.qml:272
247−msgid "Please enter %1"
276+msgid "Please re-enter"
277+msgstr ""
278+
279+#: qml/Shell.qml:306
280+msgid "Sorry, incorrect passphrase."
248−msgstr "Bitte geben Sie %1 ein"
281+msgstr ""
282+
283+#: qml/Shell.qml:307
284+msgid "Sorry, incorrect passcode."
285+msgstr ""
286+
287+#: qml/Shell.qml:308
288+msgid "This will be your last attempt."
289+msgstr ""
290+
291+#: qml/Shell.qml:310
292+msgid ""
293+"If passphrase is entered incorrectly, your phone will conduct a factory "
294+"reset and all personal data will be deleted."
295+msgstr ""
296+
297+#: qml/Shell.qml:311
298+msgid ""
299+"If passcode is entered incorrectly, your phone will conduct a factory reset "
300+"and all personal data will be deleted."
301+msgstr ""
po/el.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-08-08 13:03+0000\n"
11"PO-Revision-Date: 2014-08-08 13:03+0000\n"
12"Last-Translator: Simos Xenitellis <Unknown>\n"
12"Last-Translator: Simos Xenitellis <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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -92,39 +96,51 @@ msgstr ""
92"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
96"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
93"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
97"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
94
98
95−#: qml/Components/Lockscreen.qml:220
99+#: qml/Components/Lockscreen.qml:161
100+msgid "Too many incorrect attempts"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:163
104+msgid "Please wait"
105+msgstr ""
106+
107+#: qml/Components/Lockscreen.qml:245
96msgid "Emergency Call"
108msgid "Emergency Call"
97msgstr "Κλήση έκτακτης ανάγκης"
109msgstr "Κλήση έκτακτης ανάγκης"
98
110
99−#: qml/Components/Lockscreen.qml:243
111+#: qml/Components/Lockscreen.qml:268
100msgid "OK"
112msgid "OK"
101msgstr "OK"
113msgstr "OK"
102
114
103−#: qml/Components/PassphraseLockscreen.qml:62
115+#: qml/Components/PassphraseLockscreen.qml:61
104#, qt-format
116#, qt-format
105msgid "Hello %1"
117msgid "Hello %1"
106msgstr "Γεια σας %1"
118msgstr "Γεια σας %1"
107
119
108−#: qml/Components/PassphraseLockscreen.qml:62
120+#: qml/Components/PassphraseLockscreen.qml:61
109msgid "Hello"
121msgid "Hello"
110msgstr "Γεια σας"
122msgstr "Γεια σας"
111
123
112−#: qml/Components/PinLockscreen.qml:198
124+#: qml/Components/PinLockscreen.qml:197
113msgid "CANCEL"
125msgid "CANCEL"
114msgstr "ΑΚΥΡΩΣΗ"
126msgstr "ΑΚΥΡΩΣΗ"
115
127
116−#: qml/Components/PinLockscreen.qml:216
128+#: qml/Components/PinLockscreen.qml:215
117msgid "DONE"
129msgid "DONE"
118msgstr "ΟΛΟΚΛΗΡΩΣΗ"
130msgstr "ΟΛΟΚΛΗΡΩΣΗ"
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See less"
133msgid "See less"
122msgstr "Λιγότερα"
134msgstr "Λιγότερα"
123
135
124−#: qml/Dash/GenericScopeView.qml:358
136+#: qml/Dash/GenericScopeView.qml:360
125msgid "See all"
137msgid "See all"
126msgstr "Εμφάνιση όλων"
138msgstr "Εμφάνιση όλων"
127
139
140+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
141+msgid "Search"
142+msgstr "Αναζήτηση"
143+
128#: qml/Dash/Previews/PreviewActionCombo.qml:34
144#: qml/Dash/Previews/PreviewActionCombo.qml:34
129msgid "More..."
145msgid "More..."
130msgstr "Περισσότερα..."
146msgstr "Περισσότερα..."
@@ -145,15 +161,15 @@ msgstr "Προσθέστε την αξιολόγησή σας"
145msgid "Send"
161msgid "Send"
146msgstr "Αποστολή"
162msgstr "Αποστολή"
147
163
148−#: qml/Dash/ScopesOverview.qml:200
164+#: qml/Dash/ScopesOverview.qml:201
149msgid "Manage Dash"
165msgid "Manage Dash"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:405
168+#: qml/Dash/ScopesOverview.qml:408
153msgid "Done"
169msgid "Done"
154msgstr ""
170msgstr ""
155
171
156−#: qml/Dash/ScopesOverview.qml:431
172+#: qml/Dash/ScopesOverview.qml:434
157msgid "Store"
173msgid "Store"
158msgstr ""
174msgstr ""
159
175
@@ -237,11 +253,48 @@ msgstr ""
237msgid "Roaming"
253msgid "Roaming"
238msgstr ""
254msgstr ""
239
255
240−#: qml/Panel/SearchIndicator.qml:27
256+#: qml/Shell.qml:267
257+msgid "passphrase"
258+msgstr ""
259+
260+#: qml/Shell.qml:267
241−msgid "Search"
261+msgid "passcode"
242−msgstr "Αναζήτηση"
262+msgstr ""
263+
264+#: qml/Shell.qml:269
265+#, qt-format
266+msgid "Enter your %1"
267+msgstr ""
243
268
244−#: qml/Shell.qml:256
269+#: qml/Shell.qml:270
245#, qt-format
270#, qt-format
271+msgid "Incorrect %1"
272+msgstr ""
273+
274+#: qml/Shell.qml:272
246−msgid "Please enter %1"
275+msgid "Please re-enter"
247−msgstr "Πληκτρολογήστε %1"
276+msgstr ""
277+
278+#: qml/Shell.qml:306
279+msgid "Sorry, incorrect passphrase."
280+msgstr ""
281+
282+#: qml/Shell.qml:307
283+msgid "Sorry, incorrect passcode."
284+msgstr ""
285+
286+#: qml/Shell.qml:308
287+msgid "This will be your last attempt."
288+msgstr ""
289+
290+#: qml/Shell.qml:310
291+msgid ""
292+"If passphrase is entered incorrectly, your phone will conduct a factory "
293+"reset and all personal data will be deleted."
294+msgstr ""
295+
296+#: qml/Shell.qml:311
297+msgid ""
298+"If passcode is entered incorrectly, your phone will conduct a factory reset "
299+"and all personal data will be deleted."
300+msgstr ""
po/en_AU.po+88−31
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-27 12:14+0000\n"
11+"PO-Revision-Date: 2014-08-17 09:06+0000\n"
12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
13"Language-Team: English (Australia) <en_AU@li.org>\n"
13"Language-Team: English (Australia) <en_AU@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Password: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "Unpin shortcut"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "Are you sure you would like to turn power off?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Power off"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Restart"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Cancel"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -90,39 +94,51 @@ msgstr ""
90"You have now mastered the edge gestures and can start using the "
94"You have now mastered the edge gestures and can start using the "
91"phone<br><br>Tap on the screen to start"
95"phone<br><br>Tap on the screen to start"
92
96
93−#: qml/Components/Lockscreen.qml:220
97+#: qml/Components/Lockscreen.qml:161
98+msgid "Too many incorrect attempts"
99+msgstr "Too many incorrect attempts"
100+
101+#: qml/Components/Lockscreen.qml:163
102+msgid "Please wait"
103+msgstr "Please wait"
104+
105+#: qml/Components/Lockscreen.qml:245
94msgid "Emergency Call"
106msgid "Emergency Call"
95msgstr "Emergency Call"
107msgstr "Emergency Call"
96
108
97−#: qml/Components/Lockscreen.qml:243
109+#: qml/Components/Lockscreen.qml:268
98msgid "OK"
110msgid "OK"
99msgstr "OK"
111msgstr "OK"
100
112
101−#: qml/Components/PassphraseLockscreen.qml:62
113+#: qml/Components/PassphraseLockscreen.qml:61
102#, qt-format
114#, qt-format
103msgid "Hello %1"
115msgid "Hello %1"
104msgstr "Hello %1"
116msgstr "Hello %1"
105
117
106−#: qml/Components/PassphraseLockscreen.qml:62
118+#: qml/Components/PassphraseLockscreen.qml:61
107msgid "Hello"
119msgid "Hello"
108msgstr "Hello"
120msgstr "Hello"
109
121
110−#: qml/Components/PinLockscreen.qml:198
122+#: qml/Components/PinLockscreen.qml:197
111msgid "CANCEL"
123msgid "CANCEL"
112msgstr "CANCEL"
124msgstr "CANCEL"
113
125
114−#: qml/Components/PinLockscreen.qml:216
126+#: qml/Components/PinLockscreen.qml:215
115msgid "DONE"
127msgid "DONE"
116msgstr "DONE"
128msgstr "DONE"
117
129
118−#: qml/Dash/GenericScopeView.qml:358
130+#: qml/Dash/GenericScopeView.qml:360
119msgid "See less"
131msgid "See less"
120msgstr "See less"
132msgstr "See less"
121
133
122−#: qml/Dash/GenericScopeView.qml:358
134+#: qml/Dash/GenericScopeView.qml:360
123msgid "See all"
135msgid "See all"
124msgstr "See all"
136msgstr "See all"
125
137
138+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
139+msgid "Search"
140+msgstr "Search"
141+
126#: qml/Dash/Previews/PreviewActionCombo.qml:34
142#: qml/Dash/Previews/PreviewActionCombo.qml:34
127msgid "More..."
143msgid "More..."
128msgstr "More..."
144msgstr "More..."
@@ -143,25 +159,25 @@ msgstr "Add a review"
143msgid "Send"
159msgid "Send"
144msgstr "Send"
160msgstr "Send"
145
161
146−#: qml/Dash/ScopesOverview.qml:200
162+#: qml/Dash/ScopesOverview.qml:201
147msgid "Manage Dash"
163msgid "Manage Dash"
148−msgstr ""
164+msgstr "Manage Dash"
149
165
150−#: qml/Dash/ScopesOverview.qml:405
166+#: qml/Dash/ScopesOverview.qml:408
151msgid "Done"
167msgid "Done"
152−msgstr ""
168+msgstr "Done"
153
169
154−#: qml/Dash/ScopesOverview.qml:431
170+#: qml/Dash/ScopesOverview.qml:434
155msgid "Store"
171msgid "Store"
156−msgstr ""
172+msgstr "Store"
157
173
158#: qml/Dash/ScopesOverviewTab.qml:36
174#: qml/Dash/ScopesOverviewTab.qml:36
159msgid "Favorites"
175msgid "Favorites"
160−msgstr ""
176+msgstr "Favourites"
161
177
162#: qml/Dash/ScopesOverviewTab.qml:54
178#: qml/Dash/ScopesOverviewTab.qml:54
163msgid "All"
179msgid "All"
164−msgstr ""
180+msgstr "All"
165
181
166#: qml/Greeter/Greeter.qml:157
182#: qml/Greeter/Greeter.qml:157
167msgid "Swipe to unlock"
183msgid "Swipe to unlock"
@@ -229,17 +245,58 @@ msgstr "Failed, tap to retry"
229
245
230#: qml/Panel/Indicators/ModemInfoItem.qml:105
246#: qml/Panel/Indicators/ModemInfoItem.qml:105
231msgid "Unlock SIM"
247msgid "Unlock SIM"
232−msgstr ""
248+msgstr "Unlock SIM"
233
249
234#: qml/Panel/Indicators/RoamingIndication.qml:27
250#: qml/Panel/Indicators/RoamingIndication.qml:27
235msgid "Roaming"
251msgid "Roaming"
236−msgstr ""
252+msgstr "Roaming"
237
253
238−#: qml/Panel/SearchIndicator.qml:27
254+#: qml/Shell.qml:267
255+msgid "passphrase"
256+msgstr "passphrase"
257+
258+#: qml/Shell.qml:267
239−msgid "Search"
259+msgid "passcode"
240−msgstr "Search"
260+msgstr "passcode"
241
261
242−#: qml/Shell.qml:256
262+#: qml/Shell.qml:269
243#, qt-format
263#, qt-format
244−msgid "Please enter %1"
264+msgid "Enter your %1"
265+msgstr "Enter your %1"
266+
267+#: qml/Shell.qml:270
268+#, qt-format
269+msgid "Incorrect %1"
270+msgstr "Incorrect %1"
271+
272+#: qml/Shell.qml:272
273+msgid "Please re-enter"
245−msgstr "Please enter %1"
274+msgstr "Please re-enter"
275+
276+#: qml/Shell.qml:306
277+msgid "Sorry, incorrect passphrase."
278+msgstr "Sorry, incorrect passphrase."
279+
280+#: qml/Shell.qml:307
281+msgid "Sorry, incorrect passcode."
282+msgstr "Sorry, incorrect passcode."
283+
284+#: qml/Shell.qml:308
285+msgid "This will be your last attempt."
286+msgstr "This will be your last attempt."
287+
288+#: qml/Shell.qml:310
289+msgid ""
290+"If passphrase is entered incorrectly, your phone will conduct a factory "
291+"reset and all personal data will be deleted."
292+msgstr ""
293+"If passphrase is entered incorrectly, your phone will conduct a factory "
294+"reset and all personal data will be deleted."
295+
296+#: qml/Shell.qml:311
297+msgid ""
298+"If passcode is entered incorrectly, your phone will conduct a factory reset "
299+"and all personal data will be deleted."
300+msgstr ""
301+"If passcode is entered incorrectly, your phone will conduct a factory reset "
302+"and all personal data will be deleted."
po/en_GB.po+88−31
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-27 14:09+0000\n"
11+"PO-Revision-Date: 2014-08-15 10:01+0000\n"
12"Last-Translator: Alan Pope ㋛ <alan@ubuntu.com>\n"
12"Last-Translator: Alan Pope ㋛ <alan@ubuntu.com>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Password: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "Unpin shortcut"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "Are you sure you would like to turn power off?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Power off"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Restart"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Cancel"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -90,39 +94,51 @@ msgstr ""
90"You have now mastered the edge gestures and can start using the "
94"You have now mastered the edge gestures and can start using the "
91"phone<br><br>Tap on the screen to start"
95"phone<br><br>Tap on the screen to start"
92
96
93−#: qml/Components/Lockscreen.qml:220
97+#: qml/Components/Lockscreen.qml:161
98+msgid "Too many incorrect attempts"
99+msgstr "Too many incorrect attempts"
100+
101+#: qml/Components/Lockscreen.qml:163
102+msgid "Please wait"
103+msgstr "Please wait"
104+
105+#: qml/Components/Lockscreen.qml:245
94msgid "Emergency Call"
106msgid "Emergency Call"
95msgstr "Emergency Call"
107msgstr "Emergency Call"
96
108
97−#: qml/Components/Lockscreen.qml:243
109+#: qml/Components/Lockscreen.qml:268
98msgid "OK"
110msgid "OK"
99msgstr "OK"
111msgstr "OK"
100
112
101−#: qml/Components/PassphraseLockscreen.qml:62
113+#: qml/Components/PassphraseLockscreen.qml:61
102#, qt-format
114#, qt-format
103msgid "Hello %1"
115msgid "Hello %1"
104msgstr "Hello %1"
116msgstr "Hello %1"
105
117
106−#: qml/Components/PassphraseLockscreen.qml:62
118+#: qml/Components/PassphraseLockscreen.qml:61
107msgid "Hello"
119msgid "Hello"
108msgstr "Hello"
120msgstr "Hello"
109
121
110−#: qml/Components/PinLockscreen.qml:198
122+#: qml/Components/PinLockscreen.qml:197
111msgid "CANCEL"
123msgid "CANCEL"
112msgstr "CANCEL"
124msgstr "CANCEL"
113
125
114−#: qml/Components/PinLockscreen.qml:216
126+#: qml/Components/PinLockscreen.qml:215
115msgid "DONE"
127msgid "DONE"
116msgstr "DONE"
128msgstr "DONE"
117
129
118−#: qml/Dash/GenericScopeView.qml:358
130+#: qml/Dash/GenericScopeView.qml:360
119msgid "See less"
131msgid "See less"
120msgstr "See less"
132msgstr "See less"
121
133
122−#: qml/Dash/GenericScopeView.qml:358
134+#: qml/Dash/GenericScopeView.qml:360
123msgid "See all"
135msgid "See all"
124msgstr "See all"
136msgstr "See all"
125
137
138+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
139+msgid "Search"
140+msgstr "Search"
141+
126#: qml/Dash/Previews/PreviewActionCombo.qml:34
142#: qml/Dash/Previews/PreviewActionCombo.qml:34
127msgid "More..."
143msgid "More..."
128msgstr "More..."
144msgstr "More..."
@@ -143,25 +159,25 @@ msgstr "Add a review"
143msgid "Send"
159msgid "Send"
144msgstr "Send"
160msgstr "Send"
145
161
146−#: qml/Dash/ScopesOverview.qml:200
162+#: qml/Dash/ScopesOverview.qml:201
147msgid "Manage Dash"
163msgid "Manage Dash"
148−msgstr ""
164+msgstr "Manage Dash"
149
165
150−#: qml/Dash/ScopesOverview.qml:405
166+#: qml/Dash/ScopesOverview.qml:408
151msgid "Done"
167msgid "Done"
152−msgstr ""
168+msgstr "Done"
153
169
154−#: qml/Dash/ScopesOverview.qml:431
170+#: qml/Dash/ScopesOverview.qml:434
155msgid "Store"
171msgid "Store"
156−msgstr ""
172+msgstr "Store"
157
173
158#: qml/Dash/ScopesOverviewTab.qml:36
174#: qml/Dash/ScopesOverviewTab.qml:36
159msgid "Favorites"
175msgid "Favorites"
160−msgstr ""
176+msgstr "Favourites"
161
177
162#: qml/Dash/ScopesOverviewTab.qml:54
178#: qml/Dash/ScopesOverviewTab.qml:54
163msgid "All"
179msgid "All"
164−msgstr ""
180+msgstr "All"
165
181
166#: qml/Greeter/Greeter.qml:157
182#: qml/Greeter/Greeter.qml:157
167msgid "Swipe to unlock"
183msgid "Swipe to unlock"
@@ -229,17 +245,58 @@ msgstr "Failed, tap to retry"
229
245
230#: qml/Panel/Indicators/ModemInfoItem.qml:105
246#: qml/Panel/Indicators/ModemInfoItem.qml:105
231msgid "Unlock SIM"
247msgid "Unlock SIM"
232−msgstr ""
248+msgstr "Unlock SIM"
233
249
234#: qml/Panel/Indicators/RoamingIndication.qml:27
250#: qml/Panel/Indicators/RoamingIndication.qml:27
235msgid "Roaming"
251msgid "Roaming"
236−msgstr ""
252+msgstr "Roaming"
237
253
238−#: qml/Panel/SearchIndicator.qml:27
254+#: qml/Shell.qml:267
255+msgid "passphrase"
256+msgstr "passphrase"
257+
258+#: qml/Shell.qml:267
239−msgid "Search"
259+msgid "passcode"
240−msgstr "Search"
260+msgstr "passcode"
241
261
242−#: qml/Shell.qml:256
262+#: qml/Shell.qml:269
243#, qt-format
263#, qt-format
244−msgid "Please enter %1"
264+msgid "Enter your %1"
265+msgstr "Enter your %1"
266+
267+#: qml/Shell.qml:270
268+#, qt-format
269+msgid "Incorrect %1"
270+msgstr "Incorrect %1"
271+
272+#: qml/Shell.qml:272
273+msgid "Please re-enter"
245−msgstr "Please enter %1"
274+msgstr "Please re-enter"
275+
276+#: qml/Shell.qml:306
277+msgid "Sorry, incorrect passphrase."
278+msgstr "Sorry, incorrect passphrase."
279+
280+#: qml/Shell.qml:307
281+msgid "Sorry, incorrect passcode."
282+msgstr "Sorry, incorrect passcode."
283+
284+#: qml/Shell.qml:308
285+msgid "This will be your last attempt."
286+msgstr "This will be your last attempt."
287+
288+#: qml/Shell.qml:310
289+msgid ""
290+"If passphrase is entered incorrectly, your phone will conduct a factory "
291+"reset and all personal data will be deleted."
292+msgstr ""
293+"If passphrase is entered incorrectly, your phone will conduct a factory "
294+"reset and all personal data will be deleted."
295+
296+#: qml/Shell.qml:311
297+msgid ""
298+"If passcode is entered incorrectly, your phone will conduct a factory reset "
299+"and all personal data will be deleted."
300+msgstr ""
301+"If passcode is entered incorrectly, your phone will conduct a factory reset "
302+"and all personal data will be deleted."
po/eo.po+70−17
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\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"
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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr ""
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
238msgstr ""
263msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
242−msgid "Please enter %1"
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/es.po+90−33
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-06 15:24+0000\n"
11+"PO-Revision-Date: 2014-08-17 04:37+0000\n"
12−"Last-Translator: Leo Arias <leo.arias@canonical.com>\n"
12+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
13"Language-Team: Spanish <es@li.org>\n"
13"Language-Team: Spanish <es@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Contraseña: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "Desanclar"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "¿Está seguro de que quiere apagarlo?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Apagar"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Reiniciar"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Cancelar"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -93,38 +97,50 @@ msgstr ""
93"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
97"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
94"la pantalla para comenzar"
98"la pantalla para comenzar"
95
99
96−#: qml/Components/Lockscreen.qml:220
100+#: qml/Components/Lockscreen.qml:161
101+msgid "Too many incorrect attempts"
102+msgstr "Demasiados intentos incorrectos"
103+
104+#: qml/Components/Lockscreen.qml:163
105+msgid "Please wait"
106+msgstr "Espere un momento"
107+
108+#: qml/Components/Lockscreen.qml:245
97msgid "Emergency Call"
109msgid "Emergency Call"
98msgstr "Llamada de emergencia"
110msgstr "Llamada de emergencia"
99
111
100−#: qml/Components/Lockscreen.qml:243
112+#: qml/Components/Lockscreen.qml:268
101msgid "OK"
113msgid "OK"
102msgstr "Aceptar"
114msgstr "Aceptar"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105#, qt-format
117#, qt-format
106msgid "Hello %1"
118msgid "Hello %1"
107msgstr "Hola, %1"
119msgstr "Hola, %1"
108
120
109−#: qml/Components/PassphraseLockscreen.qml:62
121+#: qml/Components/PassphraseLockscreen.qml:61
110msgid "Hello"
122msgid "Hello"
111msgstr "Hola"
123msgstr "Hola"
112
124
113−#: qml/Components/PinLockscreen.qml:198
125+#: qml/Components/PinLockscreen.qml:197
114msgid "CANCEL"
126msgid "CANCEL"
115msgstr "CANCELAR"
127msgstr "CANCELAR"
116
128
117−#: qml/Components/PinLockscreen.qml:216
129+#: qml/Components/PinLockscreen.qml:215
118msgid "DONE"
130msgid "DONE"
119msgstr "HECHO"
131msgstr "HECHO"
120
132
121−#: qml/Dash/GenericScopeView.qml:358
133+#: qml/Dash/GenericScopeView.qml:360
122msgid "See less"
134msgid "See less"
123msgstr "Ver menos"
135msgstr "Ver menos"
124
136
125−#: qml/Dash/GenericScopeView.qml:358
137+#: qml/Dash/GenericScopeView.qml:360
126msgid "See all"
138msgid "See all"
127−msgstr "Ver todas"
139+msgstr "Ver todo"
140+
141+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
142+msgid "Search"
143+msgstr "Buscar"
128
144
129#: qml/Dash/Previews/PreviewActionCombo.qml:34
145#: qml/Dash/Previews/PreviewActionCombo.qml:34
130msgid "More..."
146msgid "More..."
@@ -146,25 +162,25 @@ msgstr "Añadir una reseña"
146msgid "Send"
162msgid "Send"
147msgstr "Enviar"
163msgstr "Enviar"
148
164
149−#: qml/Dash/ScopesOverview.qml:200
165+#: qml/Dash/ScopesOverview.qml:201
150msgid "Manage Dash"
166msgid "Manage Dash"
151−msgstr ""
167+msgstr "Gestionar tablero"
152
168
153−#: qml/Dash/ScopesOverview.qml:405
169+#: qml/Dash/ScopesOverview.qml:408
154msgid "Done"
170msgid "Done"
155−msgstr ""
171+msgstr "Hecho"
156
172
157−#: qml/Dash/ScopesOverview.qml:431
173+#: qml/Dash/ScopesOverview.qml:434
158msgid "Store"
174msgid "Store"
159−msgstr ""
175+msgstr "Tienda"
160
176
161#: qml/Dash/ScopesOverviewTab.qml:36
177#: qml/Dash/ScopesOverviewTab.qml:36
162msgid "Favorites"
178msgid "Favorites"
163−msgstr ""
179+msgstr "Favoritos"
164
180
165#: qml/Dash/ScopesOverviewTab.qml:54
181#: qml/Dash/ScopesOverviewTab.qml:54
166msgid "All"
182msgid "All"
167−msgstr ""
183+msgstr "Todo"
168
184
169#: qml/Greeter/Greeter.qml:157
185#: qml/Greeter/Greeter.qml:157
170msgid "Swipe to unlock"
186msgid "Swipe to unlock"
@@ -232,17 +248,58 @@ msgstr "Falló, toque para reintentar"
232
248
233#: qml/Panel/Indicators/ModemInfoItem.qml:105
249#: qml/Panel/Indicators/ModemInfoItem.qml:105
234msgid "Unlock SIM"
250msgid "Unlock SIM"
235−msgstr ""
251+msgstr "Desbloquear SIM"
236
252
237#: qml/Panel/Indicators/RoamingIndication.qml:27
253#: qml/Panel/Indicators/RoamingIndication.qml:27
238msgid "Roaming"
254msgid "Roaming"
239−msgstr ""
255+msgstr "Itinerancia"
240
256
241−#: qml/Panel/SearchIndicator.qml:27
257+#: qml/Shell.qml:267
258+msgid "passphrase"
259+msgstr "frase de paso"
260+
261+#: qml/Shell.qml:267
242−msgid "Search"
262+msgid "passcode"
243−msgstr "Buscar"
263+msgstr "Código de paso"
244
264
245−#: qml/Shell.qml:256
265+#: qml/Shell.qml:269
246#, qt-format
266#, qt-format
267+msgid "Enter your %1"
268+msgstr "Introduzca su %1"
269+
270+#: qml/Shell.qml:270
271+#, qt-format
272+msgid "Incorrect %1"
273+msgstr "%1 incorrecta"
274+
275+#: qml/Shell.qml:272
247−msgid "Please enter %1"
276+msgid "Please re-enter"
277+msgstr "Vuelva a introducirla"
278+
279+#: qml/Shell.qml:306
280+msgid "Sorry, incorrect passphrase."
281+msgstr "Frase de paso incorrecta"
282+
283+#: qml/Shell.qml:307
284+msgid "Sorry, incorrect passcode."
285+msgstr "Código de paso incorrecto"
286+
287+#: qml/Shell.qml:308
288+msgid "This will be your last attempt."
289+msgstr "Este será su último intento."
290+
291+#: qml/Shell.qml:310
292+msgid ""
293+"If passphrase is entered incorrectly, your phone will conduct a factory "
294+"reset and all personal data will be deleted."
295+msgstr ""
296+"Si se introduce la frase incorrectamente, el teléfono volverá a la "
297+"configuración de fábrica y se perderán todos los datos personales."
298+
299+#: qml/Shell.qml:311
300+msgid ""
301+"If passcode is entered incorrectly, your phone will conduct a factory reset "
302+"and all personal data will be deleted."
248−msgstr "Introduzca %1"
303+msgstr ""
304+"Si se introduce el código incorrectamente, el teléfono volverá a la "
305+"configuración de fábrica y se perderán todos los datos personales."
po/eu.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-08-06 22:51+0000\n"
11"PO-Revision-Date: 2014-08-06 22:51+0000\n"
12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
13"Language-Team: Basque <eu@li.org>\n"
13"Language-Team: Basque <eu@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -93,39 +97,51 @@ msgstr ""
93"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
97"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
94"zaitezke<br><br>Sakatu pantailan hasteko"
98"zaitezke<br><br>Sakatu pantailan hasteko"
95
99
96−#: qml/Components/Lockscreen.qml:220
100+#: qml/Components/Lockscreen.qml:161
101+msgid "Too many incorrect attempts"
102+msgstr ""
103+
104+#: qml/Components/Lockscreen.qml:163
105+msgid "Please wait"
106+msgstr ""
107+
108+#: qml/Components/Lockscreen.qml:245
97msgid "Emergency Call"
109msgid "Emergency Call"
98msgstr "Larrialdi-deia"
110msgstr "Larrialdi-deia"
99
111
100−#: qml/Components/Lockscreen.qml:243
112+#: qml/Components/Lockscreen.qml:268
101msgid "OK"
113msgid "OK"
102msgstr "Ados"
114msgstr "Ados"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105#, qt-format
117#, qt-format
106msgid "Hello %1"
118msgid "Hello %1"
107msgstr "Kaixo %1"
119msgstr "Kaixo %1"
108
120
109−#: qml/Components/PassphraseLockscreen.qml:62
121+#: qml/Components/PassphraseLockscreen.qml:61
110msgid "Hello"
122msgid "Hello"
111msgstr "Kaixo"
123msgstr "Kaixo"
112
124
113−#: qml/Components/PinLockscreen.qml:198
125+#: qml/Components/PinLockscreen.qml:197
114msgid "CANCEL"
126msgid "CANCEL"
115msgstr "UTZI"
127msgstr "UTZI"
116
128
117−#: qml/Components/PinLockscreen.qml:216
129+#: qml/Components/PinLockscreen.qml:215
118msgid "DONE"
130msgid "DONE"
119msgstr "EGINDA"
131msgstr "EGINDA"
120
132
121−#: qml/Dash/GenericScopeView.qml:358
133+#: qml/Dash/GenericScopeView.qml:360
122msgid "See less"
134msgid "See less"
123msgstr "Ikusi gutxiago"
135msgstr "Ikusi gutxiago"
124
136
125−#: qml/Dash/GenericScopeView.qml:358
137+#: qml/Dash/GenericScopeView.qml:360
126msgid "See all"
138msgid "See all"
127msgstr "Ikusi guztiak"
139msgstr "Ikusi guztiak"
128
140
141+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
142+msgid "Search"
143+msgstr "Bilatu"
144+
129#: qml/Dash/Previews/PreviewActionCombo.qml:34
145#: qml/Dash/Previews/PreviewActionCombo.qml:34
130msgid "More..."
146msgid "More..."
131msgstr "Gehiago..."
147msgstr "Gehiago..."
@@ -146,15 +162,15 @@ msgstr "Gehitu kritika"
146msgid "Send"
162msgid "Send"
147msgstr "Bidali"
163msgstr "Bidali"
148
164
149−#: qml/Dash/ScopesOverview.qml:200
165+#: qml/Dash/ScopesOverview.qml:201
150msgid "Manage Dash"
166msgid "Manage Dash"
151msgstr ""
167msgstr ""
152
168
153−#: qml/Dash/ScopesOverview.qml:405
169+#: qml/Dash/ScopesOverview.qml:408
154msgid "Done"
170msgid "Done"
155msgstr ""
171msgstr ""
156
172
157−#: qml/Dash/ScopesOverview.qml:431
173+#: qml/Dash/ScopesOverview.qml:434
158msgid "Store"
174msgid "Store"
159msgstr ""
175msgstr ""
160
176
@@ -238,11 +254,48 @@ msgstr ""
238msgid "Roaming"
254msgid "Roaming"
239msgstr ""
255msgstr ""
240
256
241−#: qml/Panel/SearchIndicator.qml:27
257+#: qml/Shell.qml:267
258+msgid "passphrase"
259+msgstr ""
260+
261+#: qml/Shell.qml:267
242−msgid "Search"
262+msgid "passcode"
243−msgstr "Bilatu"
263+msgstr ""
264+
265+#: qml/Shell.qml:269
266+#, qt-format
267+msgid "Enter your %1"
268+msgstr ""
244
269
245−#: qml/Shell.qml:256
270+#: qml/Shell.qml:270
246#, qt-format
271#, qt-format
272+msgid "Incorrect %1"
273+msgstr ""
274+
275+#: qml/Shell.qml:272
247−msgid "Please enter %1"
276+msgid "Please re-enter"
277+msgstr ""
278+
279+#: qml/Shell.qml:306
280+msgid "Sorry, incorrect passphrase."
248−msgstr "Sartu %1"
281+msgstr ""
282+
283+#: qml/Shell.qml:307
284+msgid "Sorry, incorrect passcode."
285+msgstr ""
286+
287+#: qml/Shell.qml:308
288+msgid "This will be your last attempt."
289+msgstr ""
290+
291+#: qml/Shell.qml:310
292+msgid ""
293+"If passphrase is entered incorrectly, your phone will conduct a factory "
294+"reset and all personal data will be deleted."
295+msgstr ""
296+
297+#: qml/Shell.qml:311
298+msgid ""
299+"If passcode is entered incorrectly, your phone will conduct a factory reset "
300+"and all personal data will be deleted."
301+msgstr ""
po/fa.po+89−32
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-03 13:00+0000\n"
11+"PO-Revision-Date: 2014-08-15 14:00+0000\n"
12−"Last-Translator: Arash Badie Modiri <arashbm@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "گذرواژه: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "برداشتن سنجاق میانبر"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "مطمئنید که می‌خواهید خاموش کنید؟"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "خاموش کردن"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "شروع مجدّد"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "لغو"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -90,39 +94,51 @@ msgstr ""
90"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
94"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
91"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
95"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
92
96
93−#: qml/Components/Lockscreen.qml:220
97+#: qml/Components/Lockscreen.qml:161
98+msgid "Too many incorrect attempts"
99+msgstr "تلاش‌های ناموفّق زیاد"
100+
101+#: qml/Components/Lockscreen.qml:163
102+msgid "Please wait"
103+msgstr "لطفاً صبر کنید"
104+
105+#: qml/Components/Lockscreen.qml:245
94msgid "Emergency Call"
106msgid "Emergency Call"
95msgstr "تماس اضطراری"
107msgstr "تماس اضطراری"
96
108
97−#: qml/Components/Lockscreen.qml:243
109+#: qml/Components/Lockscreen.qml:268
98msgid "OK"
110msgid "OK"
99msgstr "قبول"
111msgstr "قبول"
100
112
101−#: qml/Components/PassphraseLockscreen.qml:62
113+#: qml/Components/PassphraseLockscreen.qml:61
102#, qt-format
114#, qt-format
103msgid "Hello %1"
115msgid "Hello %1"
104msgstr "سلام %1"
116msgstr "سلام %1"
105
117
106−#: qml/Components/PassphraseLockscreen.qml:62
118+#: qml/Components/PassphraseLockscreen.qml:61
107msgid "Hello"
119msgid "Hello"
108msgstr "سلام"
120msgstr "سلام"
109
121
110−#: qml/Components/PinLockscreen.qml:198
122+#: qml/Components/PinLockscreen.qml:197
111msgid "CANCEL"
123msgid "CANCEL"
112msgstr "لغو"
124msgstr "لغو"
113
125
114−#: qml/Components/PinLockscreen.qml:216
126+#: qml/Components/PinLockscreen.qml:215
115msgid "DONE"
127msgid "DONE"
116msgstr "انجام شد"
128msgstr "انجام شد"
117
129
118−#: qml/Dash/GenericScopeView.qml:358
130+#: qml/Dash/GenericScopeView.qml:360
119msgid "See less"
131msgid "See less"
120msgstr "کم‌تر ببینید"
132msgstr "کم‌تر ببینید"
121
133
122−#: qml/Dash/GenericScopeView.qml:358
134+#: qml/Dash/GenericScopeView.qml:360
123msgid "See all"
135msgid "See all"
124msgstr "دیدن همه"
136msgstr "دیدن همه"
125
137
138+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
139+msgid "Search"
140+msgstr "جست‌وجو"
141+
126#: qml/Dash/Previews/PreviewActionCombo.qml:34
142#: qml/Dash/Previews/PreviewActionCombo.qml:34
127msgid "More..."
143msgid "More..."
128msgstr "بیش‌تر…"
144msgstr "بیش‌تر…"
@@ -143,25 +159,25 @@ msgstr "افزودن یک بازبینی"
143msgid "Send"
159msgid "Send"
144msgstr "ارسال"
160msgstr "ارسال"
145
161
146−#: qml/Dash/ScopesOverview.qml:200
162+#: qml/Dash/ScopesOverview.qml:201
147msgid "Manage Dash"
163msgid "Manage Dash"
148−msgstr ""
164+msgstr "مدیریت دش"
149
165
150−#: qml/Dash/ScopesOverview.qml:405
166+#: qml/Dash/ScopesOverview.qml:408
151msgid "Done"
167msgid "Done"
152−msgstr ""
168+msgstr "انجام شد"
153
169
154−#: qml/Dash/ScopesOverview.qml:431
170+#: qml/Dash/ScopesOverview.qml:434
155msgid "Store"
171msgid "Store"
156−msgstr ""
172+msgstr "فروشگاه"
157
173
158#: qml/Dash/ScopesOverviewTab.qml:36
174#: qml/Dash/ScopesOverviewTab.qml:36
159msgid "Favorites"
175msgid "Favorites"
160−msgstr ""
176+msgstr "برگزیده‌ها"
161
177
162#: qml/Dash/ScopesOverviewTab.qml:54
178#: qml/Dash/ScopesOverviewTab.qml:54
163msgid "All"
179msgid "All"
164−msgstr ""
180+msgstr "همه"
165
181
166#: qml/Greeter/Greeter.qml:157
182#: qml/Greeter/Greeter.qml:157
167msgid "Swipe to unlock"
183msgid "Swipe to unlock"
@@ -229,17 +245,58 @@ msgstr "شکست خورد، برای تلاش دوباره ضربه بزنید"
229
245
230#: qml/Panel/Indicators/ModemInfoItem.qml:105
246#: qml/Panel/Indicators/ModemInfoItem.qml:105
231msgid "Unlock SIM"
247msgid "Unlock SIM"
232−msgstr ""
248+msgstr "باز کردن قفل سیم‌کارت"
233
249
234#: qml/Panel/Indicators/RoamingIndication.qml:27
250#: qml/Panel/Indicators/RoamingIndication.qml:27
235msgid "Roaming"
251msgid "Roaming"
236−msgstr ""
252+msgstr "رومینگ"
237
253
238−#: qml/Panel/SearchIndicator.qml:27
254+#: qml/Shell.qml:267
239−msgid "Search"
255+msgid "passphrase"
240−msgstr "جست‌وجو"
256+msgstr "عبارت‌عبور"
257+
258+#: qml/Shell.qml:267
259+msgid "passcode"
260+msgstr "رمزعبور"
241
261
242−#: qml/Shell.qml:256
262+#: qml/Shell.qml:269
243#, qt-format
263#, qt-format
264+msgid "Enter your %1"
265+msgstr "%1 خود را وارد کنید"
266+
267+#: qml/Shell.qml:270
268+#, qt-format
269+msgid "Incorrect %1"
270+msgstr "%1 نادرست"
271+
272+#: qml/Shell.qml:272
244−msgid "Please enter %1"
273+msgid "Please re-enter"
245−msgstr "لطفا %1 را وارد کنید"
274+msgstr "لطفاً دوباره وارد کنید"
275+
276+#: qml/Shell.qml:306
277+msgid "Sorry, incorrect passphrase."
278+msgstr "متأسّفیم، عبارت‌عبور نادرست است."
279+
280+#: qml/Shell.qml:307
281+msgid "Sorry, incorrect passcode."
282+msgstr "متأسّفیم، رمزعبور نادرست است."
283+
284+#: qml/Shell.qml:308
285+msgid "This will be your last attempt."
286+msgstr "این آخرین تلاش شما خواهد بود."
287+
288+#: qml/Shell.qml:310
289+msgid ""
290+"If passphrase is entered incorrectly, your phone will conduct a factory "
291+"reset and all personal data will be deleted."
292+msgstr ""
293+"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
294+"اطّلاعات شخصی حذف خواهند شد."
295+
296+#: qml/Shell.qml:311
297+msgid ""
298+"If passcode is entered incorrectly, your phone will conduct a factory reset "
299+"and all personal data will be deleted."
300+msgstr ""
301+"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
302+"اطّلاعات شخصی حذف خواهند شد."
po/fi.po+88−31
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-25 16:07+0000\n"
11+"PO-Revision-Date: 2014-08-17 16:53+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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Salasana: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "Poista pikakuvakkeen kiinnitys"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "Haluatko varmasti sammuttaa laitteen?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Sammuta"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Käynnistä uudelleen"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Peru"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -90,39 +94,51 @@ msgstr ""
90"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
94"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
91"käytön<br><br>Napauta näyttöä aloittaaksesi"
95"käytön<br><br>Napauta näyttöä aloittaaksesi"
92
96
93−#: qml/Components/Lockscreen.qml:220
97+#: qml/Components/Lockscreen.qml:161
98+msgid "Too many incorrect attempts"
99+msgstr "Liian monta virheellistä yritystä"
100+
101+#: qml/Components/Lockscreen.qml:163
102+msgid "Please wait"
103+msgstr "Odota hetki"
104+
105+#: qml/Components/Lockscreen.qml:245
94msgid "Emergency Call"
106msgid "Emergency Call"
95msgstr "Hätäpuhelu"
107msgstr "Hätäpuhelu"
96
108
97−#: qml/Components/Lockscreen.qml:243
109+#: qml/Components/Lockscreen.qml:268
98msgid "OK"
110msgid "OK"
99msgstr "OK"
111msgstr "OK"
100
112
101−#: qml/Components/PassphraseLockscreen.qml:62
113+#: qml/Components/PassphraseLockscreen.qml:61
102#, qt-format
114#, qt-format
103msgid "Hello %1"
115msgid "Hello %1"
104msgstr "Hei %1!"
116msgstr "Hei %1!"
105
117
106−#: qml/Components/PassphraseLockscreen.qml:62
118+#: qml/Components/PassphraseLockscreen.qml:61
107msgid "Hello"
119msgid "Hello"
108msgstr "Hei"
120msgstr "Hei"
109
121
110−#: qml/Components/PinLockscreen.qml:198
122+#: qml/Components/PinLockscreen.qml:197
111msgid "CANCEL"
123msgid "CANCEL"
112msgstr "PERU"
124msgstr "PERU"
113
125
114−#: qml/Components/PinLockscreen.qml:216
126+#: qml/Components/PinLockscreen.qml:215
115msgid "DONE"
127msgid "DONE"
116msgstr "VALMIS"
128msgstr "VALMIS"
117
129
118−#: qml/Dash/GenericScopeView.qml:358
130+#: qml/Dash/GenericScopeView.qml:360
119msgid "See less"
131msgid "See less"
120msgstr "Näytä vähemmän"
132msgstr "Näytä vähemmän"
121
133
122−#: qml/Dash/GenericScopeView.qml:358
134+#: qml/Dash/GenericScopeView.qml:360
123msgid "See all"
135msgid "See all"
124msgstr "Näytä kaikki"
136msgstr "Näytä kaikki"
125
137
138+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
139+msgid "Search"
140+msgstr "Hae"
141+
126#: qml/Dash/Previews/PreviewActionCombo.qml:34
142#: qml/Dash/Previews/PreviewActionCombo.qml:34
127msgid "More..."
143msgid "More..."
128msgstr "Lisää..."
144msgstr "Lisää..."
@@ -143,25 +159,25 @@ msgstr "Lisää arvostelu"
143msgid "Send"
159msgid "Send"
144msgstr "Lähetä"
160msgstr "Lähetä"
145
161
146−#: qml/Dash/ScopesOverview.qml:200
162+#: qml/Dash/ScopesOverview.qml:201
147msgid "Manage Dash"
163msgid "Manage Dash"
148−msgstr ""
164+msgstr "Dashin hallinta"
149
165
150−#: qml/Dash/ScopesOverview.qml:405
166+#: qml/Dash/ScopesOverview.qml:408
151msgid "Done"
167msgid "Done"
152−msgstr ""
168+msgstr "Valmis"
153
169
154−#: qml/Dash/ScopesOverview.qml:431
170+#: qml/Dash/ScopesOverview.qml:434
155msgid "Store"
171msgid "Store"
156−msgstr ""
172+msgstr "Kauppa"
157
173
158#: qml/Dash/ScopesOverviewTab.qml:36
174#: qml/Dash/ScopesOverviewTab.qml:36
159msgid "Favorites"
175msgid "Favorites"
160−msgstr ""
176+msgstr "Suosikit"
161
177
162#: qml/Dash/ScopesOverviewTab.qml:54
178#: qml/Dash/ScopesOverviewTab.qml:54
163msgid "All"
179msgid "All"
164−msgstr ""
180+msgstr "Kaikki"
165
181
166#: qml/Greeter/Greeter.qml:157
182#: qml/Greeter/Greeter.qml:157
167msgid "Swipe to unlock"
183msgid "Swipe to unlock"
@@ -229,17 +245,58 @@ msgstr "Epäonnistunut, napauta yrittääksesi uudelleen"
229
245
230#: qml/Panel/Indicators/ModemInfoItem.qml:105
246#: qml/Panel/Indicators/ModemInfoItem.qml:105
231msgid "Unlock SIM"
247msgid "Unlock SIM"
232−msgstr ""
248+msgstr "Avaa SIM-kortin lukitus"
233
249
234#: qml/Panel/Indicators/RoamingIndication.qml:27
250#: qml/Panel/Indicators/RoamingIndication.qml:27
235msgid "Roaming"
251msgid "Roaming"
236−msgstr ""
252+msgstr "Verkkovierailu"
237
253
238−#: qml/Panel/SearchIndicator.qml:27
254+#: qml/Shell.qml:267
255+msgid "passphrase"
256+msgstr "tunnuslause"
257+
258+#: qml/Shell.qml:267
239−msgid "Search"
259+msgid "passcode"
240−msgstr "Hae"
260+msgstr "tunnuskoodi"
241
261
242−#: qml/Shell.qml:256
262+#: qml/Shell.qml:269
243#, qt-format
263#, qt-format
264+msgid "Enter your %1"
265+msgstr "Anna %1"
266+
267+#: qml/Shell.qml:270
268+#, qt-format
269+msgid "Incorrect %1"
270+msgstr "Virheellinen %1"
271+
272+#: qml/Shell.qml:272
244−msgid "Please enter %1"
273+msgid "Please re-enter"
274+msgstr "Anna uudelleen"
275+
276+#: qml/Shell.qml:306
277+msgid "Sorry, incorrect passphrase."
278+msgstr "Virheellinen tunnuslause."
279+
280+#: qml/Shell.qml:307
281+msgid "Sorry, incorrect passcode."
282+msgstr "Virheellinen tunnuskoodi."
283+
284+#: qml/Shell.qml:308
285+msgid "This will be your last attempt."
286+msgstr "Tämä on viimeinen yritys."
287+
288+#: qml/Shell.qml:310
289+msgid ""
290+"If passphrase is entered incorrectly, your phone will conduct a factory "
291+"reset and all personal data will be deleted."
245−msgstr "Kirjoita %1"
292+msgstr ""
293+"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
294+"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
295+
296+#: qml/Shell.qml:311
297+msgid ""
298+"If passcode is entered incorrectly, your phone will conduct a factory reset "
299+"and all personal data will be deleted."
300+msgstr ""
301+"Jos kirjoitat tunnuskoodin virheellisesti, puhelimesi palautetaan "
302+"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
po/fo.po+71−18
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\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"
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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "Leita"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
238−msgstr "Leita"
254+msgstr ""
239
255
240−#: qml/Shell.qml:256
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
241#, qt-format
261#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
264+
265+#: qml/Shell.qml:270
266+#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/fr.po+91−32
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-26 20:52+0000\n"
11+"PO-Revision-Date: 2014-08-16 12:13+0000\n"
12−"Last-Translator: Anne <anneonyme017@gmail.com>\n"
12+"Last-Translator: Jean Marc <Unknown>\n"
13"Language-Team: French <fr@li.org>\n"
13"Language-Team: French <fr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Mot de passe : "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "Détacher le raccourci"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "Êtes-vous sûr de vouloir éteindre ?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Éteindre"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Redémarrer"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Annuler"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -97,39 +101,51 @@ msgstr ""
97"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
101"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
98"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
102"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
99
103
100−#: qml/Components/Lockscreen.qml:220
104+#: qml/Components/Lockscreen.qml:161
105+msgid "Too many incorrect attempts"
106+msgstr "Trop de tentatives incorrectes"
107+
108+#: qml/Components/Lockscreen.qml:163
109+msgid "Please wait"
110+msgstr "Veuillez patienter"
111+
112+#: qml/Components/Lockscreen.qml:245
101msgid "Emergency Call"
113msgid "Emergency Call"
102msgstr "Appel d'urgence"
114msgstr "Appel d'urgence"
103
115
104−#: qml/Components/Lockscreen.qml:243
116+#: qml/Components/Lockscreen.qml:268
105msgid "OK"
117msgid "OK"
106msgstr "OK"
118msgstr "OK"
107
119
108−#: qml/Components/PassphraseLockscreen.qml:62
120+#: qml/Components/PassphraseLockscreen.qml:61
109#, qt-format
121#, qt-format
110msgid "Hello %1"
122msgid "Hello %1"
111msgstr "Bonjour %1"
123msgstr "Bonjour %1"
112
124
113−#: qml/Components/PassphraseLockscreen.qml:62
125+#: qml/Components/PassphraseLockscreen.qml:61
114msgid "Hello"
126msgid "Hello"
115msgstr "Bonjour"
127msgstr "Bonjour"
116
128
117−#: qml/Components/PinLockscreen.qml:198
129+#: qml/Components/PinLockscreen.qml:197
118msgid "CANCEL"
130msgid "CANCEL"
119msgstr "ANNULER"
131msgstr "ANNULER"
120
132
121−#: qml/Components/PinLockscreen.qml:216
133+#: qml/Components/PinLockscreen.qml:215
122msgid "DONE"
134msgid "DONE"
123msgstr "VALIDER"
135msgstr "VALIDER"
124
136
125−#: qml/Dash/GenericScopeView.qml:358
137+#: qml/Dash/GenericScopeView.qml:360
126msgid "See less"
138msgid "See less"
127msgstr "Voir moins"
139msgstr "Voir moins"
128
140
129−#: qml/Dash/GenericScopeView.qml:358
141+#: qml/Dash/GenericScopeView.qml:360
130msgid "See all"
142msgid "See all"
131msgstr "Tout voir"
143msgstr "Tout voir"
132
144
145+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
146+msgid "Search"
147+msgstr "Rechercher"
148+
133#: qml/Dash/Previews/PreviewActionCombo.qml:34
149#: qml/Dash/Previews/PreviewActionCombo.qml:34
134msgid "More..."
150msgid "More..."
135msgstr "Plus..."
151msgstr "Plus..."
@@ -140,7 +156,7 @@ msgstr "Moins..."
140
156
141#: qml/Dash/Previews/PreviewRatingInput.qml:81
157#: qml/Dash/Previews/PreviewRatingInput.qml:81
142msgid "Rate this"
158msgid "Rate this"
143−msgstr "Evaluez ceci"
159+msgstr "Évaluez ceci"
144
160
145#: qml/Dash/Previews/PreviewRatingInput.qml:126
161#: qml/Dash/Previews/PreviewRatingInput.qml:126
146msgid "Add a review"
162msgid "Add a review"
@@ -150,25 +166,25 @@ msgstr "Ajouter un avis"
150msgid "Send"
166msgid "Send"
151msgstr "Envoyer"
167msgstr "Envoyer"
152
168
153−#: qml/Dash/ScopesOverview.qml:200
169+#: qml/Dash/ScopesOverview.qml:201
154msgid "Manage Dash"
170msgid "Manage Dash"
155−msgstr ""
171+msgstr "Gérer le tableau de bord"
156
172
157−#: qml/Dash/ScopesOverview.qml:405
173+#: qml/Dash/ScopesOverview.qml:408
158msgid "Done"
174msgid "Done"
159−msgstr ""
175+msgstr "Terminé"
160
176
161−#: qml/Dash/ScopesOverview.qml:431
177+#: qml/Dash/ScopesOverview.qml:434
162msgid "Store"
178msgid "Store"
163msgstr ""
179msgstr ""
164
180
165#: qml/Dash/ScopesOverviewTab.qml:36
181#: qml/Dash/ScopesOverviewTab.qml:36
166msgid "Favorites"
182msgid "Favorites"
167−msgstr ""
183+msgstr "Favorites"
168
184
169#: qml/Dash/ScopesOverviewTab.qml:54
185#: qml/Dash/ScopesOverviewTab.qml:54
170msgid "All"
186msgid "All"
171−msgstr ""
187+msgstr "Toutes"
172
188
173#: qml/Greeter/Greeter.qml:157
189#: qml/Greeter/Greeter.qml:157
174msgid "Swipe to unlock"
190msgid "Swipe to unlock"
@@ -236,17 +252,60 @@ msgstr "Échec, appuyez pour réessayer"
236
252
237#: qml/Panel/Indicators/ModemInfoItem.qml:105
253#: qml/Panel/Indicators/ModemInfoItem.qml:105
238msgid "Unlock SIM"
254msgid "Unlock SIM"
239−msgstr ""
255+msgstr "Déverrouiller la carte SIM"
240
256
241#: qml/Panel/Indicators/RoamingIndication.qml:27
257#: qml/Panel/Indicators/RoamingIndication.qml:27
242msgid "Roaming"
258msgid "Roaming"
243−msgstr ""
259+msgstr "Roaming"
244
260
245−#: qml/Panel/SearchIndicator.qml:27
261+#: qml/Shell.qml:267
262+msgid "passphrase"
263+msgstr "phrase secrète"
264+
265+#: qml/Shell.qml:267
246−msgid "Search"
266+msgid "passcode"
247−msgstr "Rechercher"
267+msgstr "code"
248
268
249−#: qml/Shell.qml:256
269+#: qml/Shell.qml:269
250#, qt-format
270#, qt-format
271+msgid "Enter your %1"
272+msgstr "Saisissez votre %1"
273+
274+#: qml/Shell.qml:270
275+#, qt-format
276+msgid "Incorrect %1"
277+msgstr "%1 non valide"
278+
279+#: qml/Shell.qml:272
251−msgid "Please enter %1"
280+msgid "Please re-enter"
252−msgstr "Veuillez saisir %1"
281+msgstr "Veuillez recommencer"
282+
283+#: qml/Shell.qml:306
284+msgid "Sorry, incorrect passphrase."
285+msgstr "Désolé, phrase secrète incorrecte."
286+
287+#: qml/Shell.qml:307
288+msgid "Sorry, incorrect passcode."
289+msgstr "Désolé, code incorrect."
290+
291+#: qml/Shell.qml:308
292+msgid "This will be your last attempt."
293+msgstr "Ceci sera votre dernière tentative."
294+
295+#: qml/Shell.qml:310
296+msgid ""
297+"If passphrase is entered incorrectly, your phone will conduct a factory "
298+"reset and all personal data will be deleted."
299+msgstr ""
300+"Si la phrase secrète est saisie de manière incorrecte, votre téléphone "
301+"effectuera une réinitialisation aux paramètres d'usine et toutes les données "
302+"personnelles seront supprimées."
303+
304+#: qml/Shell.qml:311
305+msgid ""
306+"If passcode is entered incorrectly, your phone will conduct a factory reset "
307+"and all personal data will be deleted."
308+msgstr ""
309+"Si le code est saisi de manière incorrecte, votre téléphone effectuera une "
310+"réinitialisation aux paramètres d'usine et toutes les données personnelles "
311+"seront supprimées."
po/gd.po+84−31
@@ -7,17 +7,21 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-25 22:02+0000\n"
11+"PO-Revision-Date: 2014-08-13 00:21+0000\n"
12−"Last-Translator: GunChleoc <Unknown>\n"
12+"Last-Translator: Akerbeltz <fios@akerbeltz.org>\n"
13"Language-Team: Fòram na Gàidhlig http://www.foramnagaidhlig.net\n"
13"Language-Team: Fòram na Gàidhlig http://www.foramnagaidhlig.net\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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19"Language: gd\n"
19"Language: gd\n"
20
20
21+#: plugins/LightDM/Greeter.cpp:129
22+msgid "Password: "
23+msgstr ""
24+
21#: plugins/Unity/Launcher/launcheritem.cpp:43
25#: plugins/Unity/Launcher/launcheritem.cpp:43
22#: plugins/Unity/Launcher/launcheritem.cpp:73
26#: plugins/Unity/Launcher/launcheritem.cpp:73
23msgid "Pin shortcut"
27msgid "Pin shortcut"
@@ -29,19 +33,19 @@ msgstr "Neo-phrìnich an ath-ghoirid"
29
33
30#: qml/Components/Dialogs.qml:142
34#: qml/Components/Dialogs.qml:142
31msgid "Are you sure you would like to turn power off?"
35msgid "Are you sure you would like to turn power off?"
32−msgstr ""
36+msgstr "A bheil thu cinnteach gu bheil thu airson a chur dheth?"
33
37
34#: qml/Components/Dialogs.qml:144
38#: qml/Components/Dialogs.qml:144
35msgid "Power off"
39msgid "Power off"
36−msgstr ""
40+msgstr "Cuir a' chumhachd dheth"
37
41
38#: qml/Components/Dialogs.qml:153
42#: qml/Components/Dialogs.qml:153
39msgid "Restart"
43msgid "Restart"
40−msgstr ""
44+msgstr "Ath-thòisich"
41
45
42#: qml/Components/Dialogs.qml:162
46#: qml/Components/Dialogs.qml:162
43msgid "Cancel"
47msgid "Cancel"
44−msgstr ""
48+msgstr "Sguir dheth"
45
49
46#: qml/Components/EdgeDemoOverlay.qml:151
50#: qml/Components/EdgeDemoOverlay.qml:151
47msgid "Skip intro"
51msgid "Skip intro"
@@ -97,39 +101,51 @@ msgstr ""
97"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "
101"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "
98"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"
102"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"
99
103
100−#: qml/Components/Lockscreen.qml:220
104+#: qml/Components/Lockscreen.qml:161
105+msgid "Too many incorrect attempts"
106+msgstr ""
107+
108+#: qml/Components/Lockscreen.qml:163
109+msgid "Please wait"
110+msgstr ""
111+
112+#: qml/Components/Lockscreen.qml:245
101msgid "Emergency Call"
113msgid "Emergency Call"
102msgstr "Gairm èiginn"
114msgstr "Gairm èiginn"
103
115
104−#: qml/Components/Lockscreen.qml:243
116+#: qml/Components/Lockscreen.qml:268
105msgid "OK"
117msgid "OK"
106msgstr "Ceart ma-thà"
118msgstr "Ceart ma-thà"
107
119
108−#: qml/Components/PassphraseLockscreen.qml:62
120+#: qml/Components/PassphraseLockscreen.qml:61
109#, qt-format
121#, qt-format
110msgid "Hello %1"
122msgid "Hello %1"
111msgstr "Shin thu, %1"
123msgstr "Shin thu, %1"
112
124
113−#: qml/Components/PassphraseLockscreen.qml:62
125+#: qml/Components/PassphraseLockscreen.qml:61
114msgid "Hello"
126msgid "Hello"
115msgstr "Shin thu"
127msgstr "Shin thu"
116
128
117−#: qml/Components/PinLockscreen.qml:198
129+#: qml/Components/PinLockscreen.qml:197
118msgid "CANCEL"
130msgid "CANCEL"
119msgstr "SGUIR DHETH"
131msgstr "SGUIR DHETH"
120
132
121−#: qml/Components/PinLockscreen.qml:216
133+#: qml/Components/PinLockscreen.qml:215
122msgid "DONE"
134msgid "DONE"
123msgstr "DÈANTA"
135msgstr "DÈANTA"
124
136
125−#: qml/Dash/GenericScopeView.qml:358
137+#: qml/Dash/GenericScopeView.qml:360
126msgid "See less"
138msgid "See less"
127msgstr "Seall nas lugha"
139msgstr "Seall nas lugha"
128
140
129−#: qml/Dash/GenericScopeView.qml:358
141+#: qml/Dash/GenericScopeView.qml:360
130msgid "See all"
142msgid "See all"
131msgstr "Seall na h-uile"
143msgstr "Seall na h-uile"
132
144
145+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
146+msgid "Search"
147+msgstr "Lorg"
148+
133#: qml/Dash/Previews/PreviewActionCombo.qml:34
149#: qml/Dash/Previews/PreviewActionCombo.qml:34
134msgid "More..."
150msgid "More..."
135msgstr "Barrachd..."
151msgstr "Barrachd..."
@@ -150,25 +166,25 @@ msgstr "Cuir lèirmheas ris"
150msgid "Send"
166msgid "Send"
151msgstr "Cuir"
167msgstr "Cuir"
152
168
153−#: qml/Dash/ScopesOverview.qml:200
169+#: qml/Dash/ScopesOverview.qml:201
154msgid "Manage Dash"
170msgid "Manage Dash"
155−msgstr ""
171+msgstr "Stiùirich an deas-bhòrd"
156
172
157−#: qml/Dash/ScopesOverview.qml:405
173+#: qml/Dash/ScopesOverview.qml:408
158msgid "Done"
174msgid "Done"
159−msgstr ""
175+msgstr "Deiseil"
160
176
161−#: qml/Dash/ScopesOverview.qml:431
177+#: qml/Dash/ScopesOverview.qml:434
162msgid "Store"
178msgid "Store"
163−msgstr ""
179+msgstr "Am bùth"
164
180
165#: qml/Dash/ScopesOverviewTab.qml:36
181#: qml/Dash/ScopesOverviewTab.qml:36
166msgid "Favorites"
182msgid "Favorites"
167−msgstr ""
183+msgstr "Annsachdan"
168
184
169#: qml/Dash/ScopesOverviewTab.qml:54
185#: qml/Dash/ScopesOverviewTab.qml:54
170msgid "All"
186msgid "All"
171−msgstr ""
187+msgstr "Na h-uile"
172
188
173#: qml/Greeter/Greeter.qml:157
189#: qml/Greeter/Greeter.qml:157
174msgid "Swipe to unlock"
190msgid "Swipe to unlock"
@@ -236,17 +252,54 @@ msgstr "Dh'fhàillig leis, thoir gnogag gus feuchainn a-rithist"
236
252
237#: qml/Panel/Indicators/ModemInfoItem.qml:105
253#: qml/Panel/Indicators/ModemInfoItem.qml:105
238msgid "Unlock SIM"
254msgid "Unlock SIM"
239−msgstr ""
255+msgstr "Thoir a' ghlas far an SIM"
240
256
241#: qml/Panel/Indicators/RoamingIndication.qml:27
257#: qml/Panel/Indicators/RoamingIndication.qml:27
242msgid "Roaming"
258msgid "Roaming"
259+msgstr "Air fàrsan"
260+
261+#: qml/Shell.qml:267
262+msgid "passphrase"
243msgstr ""
263msgstr ""
244
264
245−#: qml/Panel/SearchIndicator.qml:27
265+#: qml/Shell.qml:267
246−msgid "Search"
266+msgid "passcode"
267+msgstr ""
268+
269+#: qml/Shell.qml:269
270+#, qt-format
271+msgid "Enter your %1"
247−msgstr "Lorg"
272+msgstr ""
248
273
249−#: qml/Shell.qml:256
274+#: qml/Shell.qml:270
250#, qt-format
275#, qt-format
251−msgid "Please enter %1"
276+msgid "Incorrect %1"
252−msgstr "Cuir a-steach %1"
277+msgstr ""
278+
279+#: qml/Shell.qml:272
280+msgid "Please re-enter"
281+msgstr ""
282+
283+#: qml/Shell.qml:306
284+msgid "Sorry, incorrect passphrase."
285+msgstr ""
286+
287+#: qml/Shell.qml:307
288+msgid "Sorry, incorrect passcode."
289+msgstr ""
290+
291+#: qml/Shell.qml:308
292+msgid "This will be your last attempt."
293+msgstr ""
294+
295+#: qml/Shell.qml:310
296+msgid ""
297+"If passphrase is entered incorrectly, your phone will conduct a factory "
298+"reset and all personal data will be deleted."
299+msgstr ""
300+
301+#: qml/Shell.qml:311
302+msgid ""
303+"If passcode is entered incorrectly, your phone will conduct a factory reset "
304+"and all personal data will be deleted."
305+msgstr ""
po/gl.po+87−30
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-25 17:22+0000\n"
11+"PO-Revision-Date: 2014-08-14 14:23+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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Contrasinal : "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "Eliminar o atallo"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "Está certo de apagar o aparato?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Apagar"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Reiniciar"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Cancelar"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -92,39 +96,51 @@ msgstr ""
92"Agora xa domina os xestos dos bordos e pode comezar a usar o "
96"Agora xa domina os xestos dos bordos e pode comezar a usar o "
93"teléfono<br><br>Toque na pantalla para comezar"
97"teléfono<br><br>Toque na pantalla para comezar"
94
98
95−#: qml/Components/Lockscreen.qml:220
99+#: qml/Components/Lockscreen.qml:161
100+msgid "Too many incorrect attempts"
101+msgstr "Demasiados erros"
102+
103+#: qml/Components/Lockscreen.qml:163
104+msgid "Please wait"
105+msgstr "Agarde"
106+
107+#: qml/Components/Lockscreen.qml:245
96msgid "Emergency Call"
108msgid "Emergency Call"
97msgstr "Chamada de emerxencia"
109msgstr "Chamada de emerxencia"
98
110
99−#: qml/Components/Lockscreen.qml:243
111+#: qml/Components/Lockscreen.qml:268
100msgid "OK"
112msgid "OK"
101msgstr "Aceptar"
113msgstr "Aceptar"
102
114
103−#: qml/Components/PassphraseLockscreen.qml:62
115+#: qml/Components/PassphraseLockscreen.qml:61
104#, qt-format
116#, qt-format
105msgid "Hello %1"
117msgid "Hello %1"
106msgstr "Ola %1"
118msgstr "Ola %1"
107
119
108−#: qml/Components/PassphraseLockscreen.qml:62
120+#: qml/Components/PassphraseLockscreen.qml:61
109msgid "Hello"
121msgid "Hello"
110msgstr "Ola"
122msgstr "Ola"
111
123
112−#: qml/Components/PinLockscreen.qml:198
124+#: qml/Components/PinLockscreen.qml:197
113msgid "CANCEL"
125msgid "CANCEL"
114msgstr "CANCELAR"
126msgstr "CANCELAR"
115
127
116−#: qml/Components/PinLockscreen.qml:216
128+#: qml/Components/PinLockscreen.qml:215
117msgid "DONE"
129msgid "DONE"
118msgstr "FEITO"
130msgstr "FEITO"
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See less"
133msgid "See less"
122msgstr "Ver menos"
134msgstr "Ver menos"
123
135
124−#: qml/Dash/GenericScopeView.qml:358
136+#: qml/Dash/GenericScopeView.qml:360
125msgid "See all"
137msgid "See all"
126msgstr "Ver todo"
138msgstr "Ver todo"
127
139
140+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
141+msgid "Search"
142+msgstr "Buscar"
143+
128#: qml/Dash/Previews/PreviewActionCombo.qml:34
144#: qml/Dash/Previews/PreviewActionCombo.qml:34
129msgid "More..."
145msgid "More..."
130msgstr "Máis…"
146msgstr "Máis…"
@@ -145,25 +161,25 @@ msgstr "Engadir unha opinión"
145msgid "Send"
161msgid "Send"
146msgstr "Enviar"
162msgstr "Enviar"
147
163
148−#: qml/Dash/ScopesOverview.qml:200
164+#: qml/Dash/ScopesOverview.qml:201
149msgid "Manage Dash"
165msgid "Manage Dash"
150−msgstr ""
166+msgstr "Xestionar o Panel"
151
167
152−#: qml/Dash/ScopesOverview.qml:405
168+#: qml/Dash/ScopesOverview.qml:408
153msgid "Done"
169msgid "Done"
154−msgstr ""
170+msgstr "Feito"
155
171
156−#: qml/Dash/ScopesOverview.qml:431
172+#: qml/Dash/ScopesOverview.qml:434
157msgid "Store"
173msgid "Store"
158−msgstr ""
174+msgstr "Tenda"
159
175
160#: qml/Dash/ScopesOverviewTab.qml:36
176#: qml/Dash/ScopesOverviewTab.qml:36
161msgid "Favorites"
177msgid "Favorites"
162−msgstr ""
178+msgstr "Favoritos"
163
179
164#: qml/Dash/ScopesOverviewTab.qml:54
180#: qml/Dash/ScopesOverviewTab.qml:54
165msgid "All"
181msgid "All"
166−msgstr ""
182+msgstr "Todos"
167
183
168#: qml/Greeter/Greeter.qml:157
184#: qml/Greeter/Greeter.qml:157
169msgid "Swipe to unlock"
185msgid "Swipe to unlock"
@@ -231,17 +247,58 @@ msgstr "Fallou, toque para reintentar"
231
247
232#: qml/Panel/Indicators/ModemInfoItem.qml:105
248#: qml/Panel/Indicators/ModemInfoItem.qml:105
233msgid "Unlock SIM"
249msgid "Unlock SIM"
234−msgstr ""
250+msgstr "Desbloquear a SIM"
235
251
236#: qml/Panel/Indicators/RoamingIndication.qml:27
252#: qml/Panel/Indicators/RoamingIndication.qml:27
237msgid "Roaming"
253msgid "Roaming"
238−msgstr ""
254+msgstr "Itinerancia"
239
255
240−#: qml/Panel/SearchIndicator.qml:27
256+#: qml/Shell.qml:267
257+msgid "passphrase"
258+msgstr "Frase de paso"
259+
260+#: qml/Shell.qml:267
241−msgid "Search"
261+msgid "passcode"
242−msgstr "Buscar"
262+msgstr "código"
243
263
244−#: qml/Shell.qml:256
264+#: qml/Shell.qml:269
245#, qt-format
265#, qt-format
246−msgid "Please enter %1"
266+msgid "Enter your %1"
247msgstr "Introduza %1"
267msgstr "Introduza %1"
268+
269+#: qml/Shell.qml:270
270+#, qt-format
271+msgid "Incorrect %1"
272+msgstr "Incorrecto %1"
273+
274+#: qml/Shell.qml:272
275+msgid "Please re-enter"
276+msgstr "Introducir de novo"
277+
278+#: qml/Shell.qml:306
279+msgid "Sorry, incorrect passphrase."
280+msgstr "Sentímolo é incorrecta."
281+
282+#: qml/Shell.qml:307
283+msgid "Sorry, incorrect passcode."
284+msgstr "Sentímolo é incorrecto."
285+
286+#: qml/Shell.qml:308
287+msgid "This will be your last attempt."
288+msgstr "Este será o seu último intento."
289+
290+#: qml/Shell.qml:310
291+msgid ""
292+"If passphrase is entered incorrectly, your phone will conduct a factory "
293+"reset and all personal data will be deleted."
294+msgstr ""
295+"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "
296+"valores de fábrica e perderá todos os datos persoais."
297+
298+#: qml/Shell.qml:311
299+msgid ""
300+"If passcode is entered incorrectly, your phone will conduct a factory reset "
301+"and all personal data will be deleted."
302+msgstr ""
303+"Se o código introducido é incorrecto, o teléfono restabelecerá os valores de "
304+"fábrica e perderá todos os datos persoais."
po/he.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-07-25 16:26+0000\n"
11"PO-Revision-Date: 2014-07-25 16:26+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"
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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -90,39 +94,51 @@ msgstr ""
90"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
94"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
91"לגעת במסך כדי להתחיל"
95"לגעת במסך כדי להתחיל"
92
96
93−#: qml/Components/Lockscreen.qml:220
97+#: qml/Components/Lockscreen.qml:161
98+msgid "Too many incorrect attempts"
99+msgstr ""
100+
101+#: qml/Components/Lockscreen.qml:163
102+msgid "Please wait"
103+msgstr ""
104+
105+#: qml/Components/Lockscreen.qml:245
94msgid "Emergency Call"
106msgid "Emergency Call"
95msgstr "שיחת חירום"
107msgstr "שיחת חירום"
96
108
97−#: qml/Components/Lockscreen.qml:243
109+#: qml/Components/Lockscreen.qml:268
98msgid "OK"
110msgid "OK"
99msgstr "אישור"
111msgstr "אישור"
100
112
101−#: qml/Components/PassphraseLockscreen.qml:62
113+#: qml/Components/PassphraseLockscreen.qml:61
102#, qt-format
114#, qt-format
103msgid "Hello %1"
115msgid "Hello %1"
104msgstr "שלום %1"
116msgstr "שלום %1"
105
117
106−#: qml/Components/PassphraseLockscreen.qml:62
118+#: qml/Components/PassphraseLockscreen.qml:61
107msgid "Hello"
119msgid "Hello"
108msgstr "שלום"
120msgstr "שלום"
109
121
110−#: qml/Components/PinLockscreen.qml:198
122+#: qml/Components/PinLockscreen.qml:197
111msgid "CANCEL"
123msgid "CANCEL"
112msgstr "ביטול"
124msgstr "ביטול"
113
125
114−#: qml/Components/PinLockscreen.qml:216
126+#: qml/Components/PinLockscreen.qml:215
115msgid "DONE"
127msgid "DONE"
116msgstr "בוצע"
128msgstr "בוצע"
117
129
118−#: qml/Dash/GenericScopeView.qml:358
130+#: qml/Dash/GenericScopeView.qml:360
119msgid "See less"
131msgid "See less"
120msgstr "לראות פחות"
132msgstr "לראות פחות"
121
133
122−#: qml/Dash/GenericScopeView.qml:358
134+#: qml/Dash/GenericScopeView.qml:360
123msgid "See all"
135msgid "See all"
124msgstr "להציג הכול"
136msgstr "להציג הכול"
125
137
138+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
139+msgid "Search"
140+msgstr "חיפוש"
141+
126#: qml/Dash/Previews/PreviewActionCombo.qml:34
142#: qml/Dash/Previews/PreviewActionCombo.qml:34
127msgid "More..."
143msgid "More..."
128msgstr "עוד…"
144msgstr "עוד…"
@@ -143,15 +159,15 @@ msgstr "הוספת סקירה"
143msgid "Send"
159msgid "Send"
144msgstr "שליחה"
160msgstr "שליחה"
145
161
146−#: qml/Dash/ScopesOverview.qml:200
162+#: qml/Dash/ScopesOverview.qml:201
147msgid "Manage Dash"
163msgid "Manage Dash"
148msgstr ""
164msgstr ""
149
165
150−#: qml/Dash/ScopesOverview.qml:405
166+#: qml/Dash/ScopesOverview.qml:408
151msgid "Done"
167msgid "Done"
152msgstr ""
168msgstr ""
153
169
154−#: qml/Dash/ScopesOverview.qml:431
170+#: qml/Dash/ScopesOverview.qml:434
155msgid "Store"
171msgid "Store"
156msgstr ""
172msgstr ""
157
173
@@ -235,11 +251,48 @@ msgstr ""
235msgid "Roaming"
251msgid "Roaming"
236msgstr ""
252msgstr ""
237
253
238−#: qml/Panel/SearchIndicator.qml:27
254+#: qml/Shell.qml:267
255+msgid "passphrase"
256+msgstr ""
257+
258+#: qml/Shell.qml:267
239−msgid "Search"
259+msgid "passcode"
240−msgstr "חיפוש"
260+msgstr ""
261+
262+#: qml/Shell.qml:269
263+#, qt-format
264+msgid "Enter your %1"
265+msgstr ""
241
266
242−#: qml/Shell.qml:256
267+#: qml/Shell.qml:270
243#, qt-format
268#, qt-format
269+msgid "Incorrect %1"
270+msgstr ""
271+
272+#: qml/Shell.qml:272
244−msgid "Please enter %1"
273+msgid "Please re-enter"
274+msgstr ""
275+
276+#: qml/Shell.qml:306
277+msgid "Sorry, incorrect passphrase."
245−msgstr "נא להזין %1"
278+msgstr ""
279+
280+#: qml/Shell.qml:307
281+msgid "Sorry, incorrect passcode."
282+msgstr ""
283+
284+#: qml/Shell.qml:308
285+msgid "This will be your last attempt."
286+msgstr ""
287+
288+#: qml/Shell.qml:310
289+msgid ""
290+"If passphrase is entered incorrectly, your phone will conduct a factory "
291+"reset and all personal data will be deleted."
292+msgstr ""
293+
294+#: qml/Shell.qml:311
295+msgid ""
296+"If passcode is entered incorrectly, your phone will conduct a factory reset "
297+"and all personal data will be deleted."
298+msgstr ""
po/hi.po+71−18
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\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"
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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr "आपातकालीन कॉल"
105msgstr "आपातकालीन कॉल"
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr "नमस्ते"
118msgstr "नमस्ते"
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "खोजें"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr "समीक्षा दे"
141msgid "Send"
157msgid "Send"
142msgstr "भेजें"
158msgstr "भेजें"
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
238−msgstr "खोजें"
254+msgstr ""
239
255
240−#: qml/Shell.qml:256
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
241#, qt-format
261#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
264+
265+#: qml/Shell.qml:270
266+#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/hr.po+71−18
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\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"
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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "Pretraživanje"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
238−msgstr "Pretraživanje"
254+msgstr ""
239
255
240−#: qml/Shell.qml:256
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
241#, qt-format
261#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
264+
265+#: qml/Shell.qml:270
266+#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/hu.po+68−15
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-06 07:41+0000\n"
11+"PO-Revision-Date: 2014-08-19 06:56+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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-19 06:59+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Jelszó: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -32,15 +36,15 @@ msgstr ""
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Kikapcsolás"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Újraindítás"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Mégse"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -92,6 +96,14 @@ msgstr ""
92"Elsajátította a gesztusokat, és megkezdheti a telefon "
96"Elsajátította a gesztusokat, és megkezdheti a telefon "
93"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
97"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
94
98
99+#: qml/Components/Lockscreen.qml:161
100+msgid "Too many incorrect attempts"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:163
104+msgid "Please wait"
105+msgstr "Kérem várjon"
106+
95#: qml/Components/Lockscreen.qml:220
107#: qml/Components/Lockscreen.qml:220
96msgid "Emergency Call"
108msgid "Emergency Call"
97msgstr "Vészhívás"
109msgstr "Vészhívás"
@@ -125,6 +137,10 @@ msgstr "Kevesebb"
125msgid "See all"
137msgid "See all"
126msgstr "Összes megtekintése"
138msgstr "Összes megtekintése"
127
139
140+#: qml/Panel/SearchIndicator.qml:27
141+msgid "Search"
142+msgstr "Keresés"
143+
128#: qml/Dash/Previews/PreviewActionCombo.qml:34
144#: qml/Dash/Previews/PreviewActionCombo.qml:34
129msgid "More..."
145msgid "More..."
130msgstr "Több…"
146msgstr "Több…"
@@ -159,11 +175,11 @@ msgstr ""
159
175
160#: qml/Dash/ScopesOverviewTab.qml:36
176#: qml/Dash/ScopesOverviewTab.qml:36
161msgid "Favorites"
177msgid "Favorites"
162−msgstr ""
178+msgstr "Kedvencek"
163
179
164#: qml/Dash/ScopesOverviewTab.qml:54
180#: qml/Dash/ScopesOverviewTab.qml:54
165msgid "All"
181msgid "All"
166−msgstr ""
182+msgstr "Összes"
167
183
168#: qml/Greeter/Greeter.qml:157
184#: qml/Greeter/Greeter.qml:157
169msgid "Swipe to unlock"
185msgid "Swipe to unlock"
@@ -231,17 +247,54 @@ msgstr "Sikertelen, koppintson az újrapróbáláshoz"
231
247
232#: qml/Panel/Indicators/ModemInfoItem.qml:105
248#: qml/Panel/Indicators/ModemInfoItem.qml:105
233msgid "Unlock SIM"
249msgid "Unlock SIM"
234−msgstr ""
250+msgstr "SIM feloldása"
235
251
236#: qml/Panel/Indicators/RoamingIndication.qml:27
252#: qml/Panel/Indicators/RoamingIndication.qml:27
237msgid "Roaming"
253msgid "Roaming"
254+msgstr "Barangolás"
255+
256+#: qml/Shell.qml:267
257+msgid "passphrase"
238msgstr ""
258msgstr ""
239
259
240−#: qml/Panel/SearchIndicator.qml:27
260+#: qml/Shell.qml:267
241−msgid "Search"
261+msgid "passcode"
242−msgstr "Keresés"
262+msgstr ""
243
263
244−#: qml/Shell.qml:256
264+#: qml/Shell.qml:269
245#, qt-format
265#, qt-format
266+msgid "Enter your %1"
267+msgstr ""
268+
269+#: qml/Shell.qml:270
270+#, qt-format
271+msgid "Incorrect %1"
272+msgstr ""
273+
274+#: qml/Shell.qml:272
246−msgid "Please enter %1"
275+msgid "Please re-enter"
247−msgstr "Adja meg a következőt: %1"
276+msgstr ""
277+
278+#: qml/Shell.qml:306
279+msgid "Sorry, incorrect passphrase."
280+msgstr ""
281+
282+#: qml/Shell.qml:307
283+msgid "Sorry, incorrect passcode."
284+msgstr ""
285+
286+#: qml/Shell.qml:308
287+msgid "This will be your last attempt."
288+msgstr ""
289+
290+#: qml/Shell.qml:310
291+msgid ""
292+"If passphrase is entered incorrectly, your phone will conduct a factory "
293+"reset and all personal data will be deleted."
294+msgstr ""
295+
296+#: qml/Shell.qml:311
297+msgid ""
298+"If passcode is entered incorrectly, your phone will conduct a factory reset "
299+"and all personal data will be deleted."
300+msgstr ""
po/hy.po+71−18
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2013-06-27 04:43+0000\n"
11"PO-Revision-Date: 2013-06-27 04:43+0000\n"
12"Last-Translator: iAbaS <sosabazyan@yandex.ru>\n"
12"Last-Translator: iAbaS <sosabazyan@yandex.ru>\n"
13"Language-Team: Armenian <hy@li.org>\n"
13"Language-Team: Armenian <hy@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "Որոնում"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
238−msgstr "Որոնում"
254+msgstr ""
239
255
240−#: qml/Shell.qml:256
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
241#, qt-format
261#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
264+
265+#: qml/Shell.qml:270
266+#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/id.po+70−17
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\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"
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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr ""
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
238msgstr ""
263msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
242−msgid "Please enter %1"
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/is.po+72−19
@@ -9,17 +9,21 @@ msgid ""
9msgstr ""
9msgstr ""
10"Project-Id-Version: po_unity8-is\n"
10"Project-Id-Version: po_unity8-is\n"
11"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
12−"POT-Creation-Date: 2014-08-08 11:17+0200\n"
12+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
13"PO-Revision-Date: 2014-07-31 16:10+0000\n"
13"PO-Revision-Date: 2014-07-31 16:10+0000\n"
14"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
14"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
15"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
15"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
16"MIME-Version: 1.0\n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"
18"Content-Transfer-Encoding: 8bit\n"
19−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
19+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
20"X-Generator: Launchpad (build 17156)\n"
20"X-Generator: Launchpad (build 17156)\n"
21"Language: is\n"
21"Language: is\n"
22
22
23+#: plugins/LightDM/Greeter.cpp:129
24+msgid "Password: "
25+msgstr ""
26+
23#: plugins/Unity/Launcher/launcheritem.cpp:43
27#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:73
28#: plugins/Unity/Launcher/launcheritem.cpp:73
25msgid "Pin shortcut"
29msgid "Pin shortcut"
@@ -94,39 +98,51 @@ msgstr ""
94"Þú ert núna með æfingu í að nota skjáhreyfingar og getur því farið að nota "
98"Þú ert núna með æfingu í að nota skjáhreyfingar og getur því farið að nota "
95"símann<br><br>Sláðu létt á skjáinn til að byrja"
99"símann<br><br>Sláðu létt á skjáinn til að byrja"
96
100
97−#: qml/Components/Lockscreen.qml:220
101+#: qml/Components/Lockscreen.qml:161
102+msgid "Too many incorrect attempts"
103+msgstr ""
104+
105+#: qml/Components/Lockscreen.qml:163
106+msgid "Please wait"
107+msgstr ""
108+
109+#: qml/Components/Lockscreen.qml:245
98msgid "Emergency Call"
110msgid "Emergency Call"
99msgstr "Neyðarsímtal"
111msgstr "Neyðarsímtal"
100
112
101−#: qml/Components/Lockscreen.qml:243
113+#: qml/Components/Lockscreen.qml:268
102msgid "OK"
114msgid "OK"
103msgstr "Í lagi"
115msgstr "Í lagi"
104
116
105−#: qml/Components/PassphraseLockscreen.qml:62
117+#: qml/Components/PassphraseLockscreen.qml:61
106#, qt-format
118#, qt-format
107msgid "Hello %1"
119msgid "Hello %1"
108msgstr "Hæ %1"
120msgstr "Hæ %1"
109
121
110−#: qml/Components/PassphraseLockscreen.qml:62
122+#: qml/Components/PassphraseLockscreen.qml:61
111msgid "Hello"
123msgid "Hello"
112msgstr "Hæ"
124msgstr "Hæ"
113
125
114−#: qml/Components/PinLockscreen.qml:198
126+#: qml/Components/PinLockscreen.qml:197
115msgid "CANCEL"
127msgid "CANCEL"
116msgstr "HÆTTA VIÐ"
128msgstr "HÆTTA VIÐ"
117
129
118−#: qml/Components/PinLockscreen.qml:216
130+#: qml/Components/PinLockscreen.qml:215
119msgid "DONE"
131msgid "DONE"
120msgstr "BÚIÐ"
132msgstr "BÚIÐ"
121
133
122−#: qml/Dash/GenericScopeView.qml:358
134+#: qml/Dash/GenericScopeView.qml:360
123msgid "See less"
135msgid "See less"
124msgstr "Sjá minna"
136msgstr "Sjá minna"
125
137
126−#: qml/Dash/GenericScopeView.qml:358
138+#: qml/Dash/GenericScopeView.qml:360
127msgid "See all"
139msgid "See all"
128msgstr "Sjá allt"
140msgstr "Sjá allt"
129
141
142+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
143+msgid "Search"
144+msgstr "Leita"
145+
130#: qml/Dash/Previews/PreviewActionCombo.qml:34
146#: qml/Dash/Previews/PreviewActionCombo.qml:34
131msgid "More..."
147msgid "More..."
132msgstr "Meira..."
148msgstr "Meira..."
@@ -147,15 +163,15 @@ msgstr "Gefa umsögn"
147msgid "Send"
163msgid "Send"
148msgstr "Senda"
164msgstr "Senda"
149
165
150−#: qml/Dash/ScopesOverview.qml:200
166+#: qml/Dash/ScopesOverview.qml:201
151msgid "Manage Dash"
167msgid "Manage Dash"
152msgstr ""
168msgstr ""
153
169
154−#: qml/Dash/ScopesOverview.qml:405
170+#: qml/Dash/ScopesOverview.qml:408
155msgid "Done"
171msgid "Done"
156msgstr ""
172msgstr ""
157
173
158−#: qml/Dash/ScopesOverview.qml:431
174+#: qml/Dash/ScopesOverview.qml:434
159msgid "Store"
175msgid "Store"
160msgstr ""
176msgstr ""
161
177
@@ -239,11 +255,48 @@ msgstr ""
239msgid "Roaming"
255msgid "Roaming"
240msgstr ""
256msgstr ""
241
257
242−#: qml/Panel/SearchIndicator.qml:27
258+#: qml/Shell.qml:267
259+msgid "passphrase"
260+msgstr ""
261+
262+#: qml/Shell.qml:267
243−msgid "Search"
263+msgid "passcode"
244−msgstr "Leita"
264+msgstr ""
265+
266+#: qml/Shell.qml:269
267+#, qt-format
268+msgid "Enter your %1"
269+msgstr ""
245
270
246−#: qml/Shell.qml:256
271+#: qml/Shell.qml:270
247#, qt-format
272#, qt-format
273+msgid "Incorrect %1"
274+msgstr ""
275+
276+#: qml/Shell.qml:272
248−msgid "Please enter %1"
277+msgid "Please re-enter"
278+msgstr ""
279+
280+#: qml/Shell.qml:306
281+msgid "Sorry, incorrect passphrase."
249−msgstr "Settu inn %1"
282+msgstr ""
283+
284+#: qml/Shell.qml:307
285+msgid "Sorry, incorrect passcode."
286+msgstr ""
287+
288+#: qml/Shell.qml:308
289+msgid "This will be your last attempt."
290+msgstr ""
291+
292+#: qml/Shell.qml:310
293+msgid ""
294+"If passphrase is entered incorrectly, your phone will conduct a factory "
295+"reset and all personal data will be deleted."
296+msgstr ""
297+
298+#: qml/Shell.qml:311
299+msgid ""
300+"If passcode is entered incorrectly, your phone will conduct a factory reset "
301+"and all personal data will be deleted."
302+msgstr ""
po/it.po+87−30
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-25 16:09+0000\n"
11+"PO-Revision-Date: 2014-08-14 11:35+0000\n"
12"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"
12"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"
13"Language-Team: Italian <it@li.org>\n"
13"Language-Team: Italian <it@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Password: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "Sblocca scorciatoia"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "Spegnere veramente il dispositivo?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Spegni"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Riavvia"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Annulla"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -95,39 +99,51 @@ msgstr ""
95"L'apprendimento dei gesti è stato completato. È ora possibile iniziare a "
99"L'apprendimento dei gesti è stato completato. È ora possibile iniziare a "
96"usare il telefono.<br><br>Toccare lo schermo per iniziare"
100"usare il telefono.<br><br>Toccare lo schermo per iniziare"
97
101
98−#: qml/Components/Lockscreen.qml:220
102+#: qml/Components/Lockscreen.qml:161
103+msgid "Too many incorrect attempts"
104+msgstr "Troppi tentativi errati"
105+
106+#: qml/Components/Lockscreen.qml:163
107+msgid "Please wait"
108+msgstr "Attendere"
109+
110+#: qml/Components/Lockscreen.qml:245
99msgid "Emergency Call"
111msgid "Emergency Call"
100msgstr "Chiamata di emergenza"
112msgstr "Chiamata di emergenza"
101
113
102−#: qml/Components/Lockscreen.qml:243
114+#: qml/Components/Lockscreen.qml:268
103msgid "OK"
115msgid "OK"
104msgstr "OK"
116msgstr "OK"
105
117
106−#: qml/Components/PassphraseLockscreen.qml:62
118+#: qml/Components/PassphraseLockscreen.qml:61
107#, qt-format
119#, qt-format
108msgid "Hello %1"
120msgid "Hello %1"
109msgstr "Ciao %1"
121msgstr "Ciao %1"
110
122
111−#: qml/Components/PassphraseLockscreen.qml:62
123+#: qml/Components/PassphraseLockscreen.qml:61
112msgid "Hello"
124msgid "Hello"
113msgstr "Ciao"
125msgstr "Ciao"
114
126
115−#: qml/Components/PinLockscreen.qml:198
127+#: qml/Components/PinLockscreen.qml:197
116msgid "CANCEL"
128msgid "CANCEL"
117msgstr "Annulla"
129msgstr "Annulla"
118
130
119−#: qml/Components/PinLockscreen.qml:216
131+#: qml/Components/PinLockscreen.qml:215
120msgid "DONE"
132msgid "DONE"
121msgstr "Fatto"
133msgstr "Fatto"
122
134
123−#: qml/Dash/GenericScopeView.qml:358
135+#: qml/Dash/GenericScopeView.qml:360
124msgid "See less"
136msgid "See less"
125msgstr "Mostra meno"
137msgstr "Mostra meno"
126
138
127−#: qml/Dash/GenericScopeView.qml:358
139+#: qml/Dash/GenericScopeView.qml:360
128msgid "See all"
140msgid "See all"
129msgstr "Mostra tutto"
141msgstr "Mostra tutto"
130
142
143+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
144+msgid "Search"
145+msgstr "Cerca"
146+
131#: qml/Dash/Previews/PreviewActionCombo.qml:34
147#: qml/Dash/Previews/PreviewActionCombo.qml:34
132msgid "More..."
148msgid "More..."
133msgstr "Altro..."
149msgstr "Altro..."
@@ -148,25 +164,25 @@ msgstr "Aggiungi una recensione"
148msgid "Send"
164msgid "Send"
149msgstr "Invia"
165msgstr "Invia"
150
166
151−#: qml/Dash/ScopesOverview.qml:200
167+#: qml/Dash/ScopesOverview.qml:201
152msgid "Manage Dash"
168msgid "Manage Dash"
153−msgstr ""
169+msgstr "Gestione della Dash"
154
170
155−#: qml/Dash/ScopesOverview.qml:405
171+#: qml/Dash/ScopesOverview.qml:408
156msgid "Done"
172msgid "Done"
157−msgstr ""
173+msgstr "Fatto"
158
174
159−#: qml/Dash/ScopesOverview.qml:431
175+#: qml/Dash/ScopesOverview.qml:434
160msgid "Store"
176msgid "Store"
161−msgstr ""
177+msgstr "Store"
162
178
163#: qml/Dash/ScopesOverviewTab.qml:36
179#: qml/Dash/ScopesOverviewTab.qml:36
164msgid "Favorites"
180msgid "Favorites"
165−msgstr ""
181+msgstr "Preferiti"
166
182
167#: qml/Dash/ScopesOverviewTab.qml:54
183#: qml/Dash/ScopesOverviewTab.qml:54
168msgid "All"
184msgid "All"
169−msgstr ""
185+msgstr "Tutto"
170
186
171#: qml/Greeter/Greeter.qml:157
187#: qml/Greeter/Greeter.qml:157
172msgid "Swipe to unlock"
188msgid "Swipe to unlock"
@@ -234,17 +250,58 @@ msgstr "Non riuscito. Tocca per riprovare"
234
250
235#: qml/Panel/Indicators/ModemInfoItem.qml:105
251#: qml/Panel/Indicators/ModemInfoItem.qml:105
236msgid "Unlock SIM"
252msgid "Unlock SIM"
237−msgstr ""
253+msgstr "Sblocca SIM"
238
254
239#: qml/Panel/Indicators/RoamingIndication.qml:27
255#: qml/Panel/Indicators/RoamingIndication.qml:27
240msgid "Roaming"
256msgid "Roaming"
241−msgstr ""
257+msgstr "Roaming"
242
258
243−#: qml/Panel/SearchIndicator.qml:27
259+#: qml/Shell.qml:267
260+msgid "passphrase"
261+msgstr "passphrase"
262+
263+#: qml/Shell.qml:267
244−msgid "Search"
264+msgid "passcode"
245−msgstr "Cerca"
265+msgstr "passcode"
246
266
247−#: qml/Shell.qml:256
267+#: qml/Shell.qml:269
248#, qt-format
268#, qt-format
249−msgid "Please enter %1"
269+msgid "Enter your %1"
250msgstr "Inserire %1"
270msgstr "Inserire %1"
271+
272+#: qml/Shell.qml:270
273+#, qt-format
274+msgid "Incorrect %1"
275+msgstr "Errore %1"
276+
277+#: qml/Shell.qml:272
278+msgid "Please re-enter"
279+msgstr "Inserire nuovamente"
280+
281+#: qml/Shell.qml:306
282+msgid "Sorry, incorrect passphrase."
283+msgstr "Passphrase non corretta"
284+
285+#: qml/Shell.qml:307
286+msgid "Sorry, incorrect passcode."
287+msgstr "Passcode non corretto"
288+
289+#: qml/Shell.qml:308
290+msgid "This will be your last attempt."
291+msgstr "Questo sarà l'ultimo tentativo."
292+
293+#: qml/Shell.qml:310
294+msgid ""
295+"If passphrase is entered incorrectly, your phone will conduct a factory "
296+"reset and all personal data will be deleted."
297+msgstr ""
298+"Se verrà inserita una passphrase errata, il telefono eseguirà un ripristino "
299+"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
300+
301+#: qml/Shell.qml:311
302+msgid ""
303+"If passcode is entered incorrectly, your phone will conduct a factory reset "
304+"and all personal data will be deleted."
305+msgstr ""
306+"Se verrà inserito una passcode errato, il telefono eseguirà un ripristino "
307+"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
po/ja.po+89−35
@@ -7,40 +7,44 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-08 06:18+0000\n"
11+"PO-Revision-Date: 2014-08-18 15:03+0000\n"
12"Last-Translator: Mitsuya Shibata <mty.shibata@gmail.com>\n"
12"Last-Translator: Mitsuya Shibata <mty.shibata@gmail.com>\n"
13"Language-Team: Japanese <ja@li.org>\n"
13"Language-Team: Japanese <ja@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-19 06:59+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "パスワード: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
23−msgstr ""
27+msgstr "ショートカットを追加する"
24
28
25#: plugins/Unity/Launcher/launcheritem.cpp:73
29#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Unpin shortcut"
30msgid "Unpin shortcut"
27−msgstr ""
31+msgstr "ショートカットを削除する"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "本当に電源を切りますか?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "電源を切る"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "再起動"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "キャンセル"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -52,7 +56,7 @@ msgstr "右端"
52
56
53#: qml/Components/EdgeDemo.qml:113
57#: qml/Components/EdgeDemo.qml:113
54msgid "Try swiping from the right edge to unlock the phone"
58msgid "Try swiping from the right edge to unlock the phone"
55−msgstr ""
59+msgstr "アンロックするには右端からスワイプしてみてください"
56
60
57#: qml/Components/EdgeDemo.qml:144
61#: qml/Components/EdgeDemo.qml:144
58msgid "Top edge"
62msgid "Top edge"
@@ -87,6 +91,15 @@ msgid ""
87"You have now mastered the edge gestures and can start using the "
91"You have now mastered the edge gestures and can start using the "
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
94+"これでスマートフォンの操作に必要な、画面端を用いたジェスチャーを習得できました。<br><br>利用を開始するなら画面をタップしてください"
95+
96+#: qml/Components/Lockscreen.qml:161
97+msgid "Too many incorrect attempts"
98+msgstr "失敗回数が上限に達しました"
99+
100+#: qml/Components/Lockscreen.qml:163
101+msgid "Please wait"
102+msgstr "お待ちください"
90
103
91#: qml/Components/Lockscreen.qml:220
104#: qml/Components/Lockscreen.qml:220
92msgid "Emergency Call"
105msgid "Emergency Call"
@@ -107,11 +120,11 @@ msgstr "こんにちは"
107
120
108#: qml/Components/PinLockscreen.qml:198
121#: qml/Components/PinLockscreen.qml:198
109msgid "CANCEL"
122msgid "CANCEL"
110−msgstr ""
123+msgstr "キャンセル"
111
124
112#: qml/Components/PinLockscreen.qml:216
125#: qml/Components/PinLockscreen.qml:216
113msgid "DONE"
126msgid "DONE"
114−msgstr ""
127+msgstr "完了"
115
128
116#: qml/Dash/GenericScopeView.qml:358
129#: qml/Dash/GenericScopeView.qml:358
117msgid "See less"
130msgid "See less"
@@ -119,19 +132,23 @@ msgstr ""
119
132
120#: qml/Dash/GenericScopeView.qml:358
133#: qml/Dash/GenericScopeView.qml:358
121msgid "See all"
134msgid "See all"
122−msgstr ""
135+msgstr "すべて表示する"
136+
137+#: qml/Panel/SearchIndicator.qml:27
138+msgid "Search"
139+msgstr "検索"
123
140
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
141#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
142msgid "More..."
126−msgstr ""
143+msgstr "さらに ..."
127
144
128#: qml/Dash/Previews/PreviewActionCombo.qml:34
145#: qml/Dash/Previews/PreviewActionCombo.qml:34
129msgid "Less..."
146msgid "Less..."
130−msgstr ""
147+msgstr "隠す..."
131
148
132#: qml/Dash/Previews/PreviewRatingInput.qml:81
149#: qml/Dash/Previews/PreviewRatingInput.qml:81
133msgid "Rate this"
150msgid "Rate this"
134−msgstr ""
151+msgstr "評価する"
135
152
136#: qml/Dash/Previews/PreviewRatingInput.qml:126
153#: qml/Dash/Previews/PreviewRatingInput.qml:126
137msgid "Add a review"
154msgid "Add a review"
@@ -143,27 +160,27 @@ msgstr "送信"
143
160
144#: qml/Dash/ScopesOverview.qml:200
161#: qml/Dash/ScopesOverview.qml:200
145msgid "Manage Dash"
162msgid "Manage Dash"
146−msgstr ""
163+msgstr "Dashの管理"
147
164
148#: qml/Dash/ScopesOverview.qml:405
165#: qml/Dash/ScopesOverview.qml:405
149msgid "Done"
166msgid "Done"
150−msgstr ""
167+msgstr "完了"
151
168
152#: qml/Dash/ScopesOverview.qml:431
169#: qml/Dash/ScopesOverview.qml:431
153msgid "Store"
170msgid "Store"
154−msgstr ""
171+msgstr "保存"
155
172
156#: qml/Dash/ScopesOverviewTab.qml:36
173#: qml/Dash/ScopesOverviewTab.qml:36
157msgid "Favorites"
174msgid "Favorites"
158−msgstr ""
175+msgstr "お気に入り"
159
176
160#: qml/Dash/ScopesOverviewTab.qml:54
177#: qml/Dash/ScopesOverviewTab.qml:54
161msgid "All"
178msgid "All"
162−msgstr ""
179+msgstr "すべて"
163
180
164#: qml/Greeter/Greeter.qml:157
181#: qml/Greeter/Greeter.qml:157
165msgid "Swipe to unlock"
182msgid "Swipe to unlock"
166−msgstr ""
183+msgstr "スワイプしてロック解除"
167
184
168#: qml/Hud/HudParametrizedActionsPage.qml:132
185#: qml/Hud/HudParametrizedActionsPage.qml:132
169msgid "Confirm"
186msgid "Confirm"
@@ -171,7 +188,7 @@ msgstr "確認"
171
188
172#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
189#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
173msgid "Type or say a command"
190msgid "Type or say a command"
174−msgstr ""
191+msgstr "コマンドを音声かキーボードから入力"
175
192
176#: qml/Hud/Hud.qml:84
193#: qml/Hud/Hud.qml:84
177msgid "Loading. Please Wait..."
194msgid "Loading. Please Wait..."
@@ -191,11 +208,11 @@ msgstr "パスワードを表示"
191
208
192#: qml/Notifications/NotificationMenuItemFactory.qml:115
209#: qml/Notifications/NotificationMenuItemFactory.qml:115
193msgid "Please enter SIM PIN"
210msgid "Please enter SIM PIN"
194−msgstr ""
211+msgstr "SIM PINを入力してください"
195
212
196#: qml/Panel/ActiveCallHint.qml:77
213#: qml/Panel/ActiveCallHint.qml:77
197msgid "Tap to return to call..."
214msgid "Tap to return to call..."
198−msgstr ""
215+msgstr "タップすると通話に戻ります..."
199
216
200#: qml/Panel/ActiveCallHint.qml:90
217#: qml/Panel/ActiveCallHint.qml:90
201msgid "Conference"
218msgid "Conference"
@@ -207,11 +224,11 @@ msgstr ""
207
224
208#: qml/Panel/Indicators/MenuItemFactory.qml:655
225#: qml/Panel/Indicators/MenuItemFactory.qml:655
209msgid "Downloading"
226msgid "Downloading"
210−msgstr ""
227+msgstr "ダウンロード中"
211
228
212#: qml/Panel/Indicators/MenuItemFactory.qml:657
229#: qml/Panel/Indicators/MenuItemFactory.qml:657
213msgid "Paused, tap to resume"
230msgid "Paused, tap to resume"
214−msgstr ""
231+msgstr "停止中、再開するにはタップしてください"
215
232
216#: qml/Panel/Indicators/MenuItemFactory.qml:659
233#: qml/Panel/Indicators/MenuItemFactory.qml:659
217msgid "Canceled"
234msgid "Canceled"
@@ -223,21 +240,58 @@ msgstr ""
223
240
224#: qml/Panel/Indicators/MenuItemFactory.qml:663
241#: qml/Panel/Indicators/MenuItemFactory.qml:663
225msgid "Failed, tap to retry"
242msgid "Failed, tap to retry"
226−msgstr ""
243+msgstr "失敗しました、再試行するにはタップしてください"
227
244
228#: qml/Panel/Indicators/ModemInfoItem.qml:105
245#: qml/Panel/Indicators/ModemInfoItem.qml:105
229msgid "Unlock SIM"
246msgid "Unlock SIM"
230−msgstr ""
247+msgstr "SIMのアンロック"
231
248
232#: qml/Panel/Indicators/RoamingIndication.qml:27
249#: qml/Panel/Indicators/RoamingIndication.qml:27
233msgid "Roaming"
250msgid "Roaming"
234−msgstr ""
251+msgstr "ローミング"
235
252
236−#: qml/Panel/SearchIndicator.qml:27
253+#: qml/Shell.qml:267
237−msgid "Search"
254+msgid "passphrase"
238−msgstr "検索"
255+msgstr "パスフレーズ"
239
256
240−#: qml/Shell.qml:256
257+#: qml/Shell.qml:267
258+msgid "passcode"
259+msgstr "パスコード"
260+
261+#: qml/Shell.qml:269
262+#, qt-format
263+msgid "Enter your %1"
264+msgstr "%1を入力してください"
265+
266+#: qml/Shell.qml:270
241#, qt-format
267#, qt-format
268+msgid "Incorrect %1"
269+msgstr "%1が間違っています"
270+
271+#: qml/Shell.qml:272
242−msgid "Please enter %1"
272+msgid "Please re-enter"
273+msgstr "再入力してください"
274+
275+#: qml/Shell.qml:306
276+msgid "Sorry, incorrect passphrase."
277+msgstr "パスフレーズが間違っています。"
278+
279+#: qml/Shell.qml:307
280+msgid "Sorry, incorrect passcode."
281+msgstr "パスコードが間違っています。"
282+
283+#: qml/Shell.qml:308
284+msgid "This will be your last attempt."
285+msgstr "これが最後のチャンスです。"
286+
287+#: qml/Shell.qml:310
288+msgid ""
289+"If passphrase is entered incorrectly, your phone will conduct a factory "
290+"reset and all personal data will be deleted."
291+msgstr ""
292+
293+#: qml/Shell.qml:311
294+msgid ""
295+"If passcode is entered incorrectly, your phone will conduct a factory reset "
296+"and all personal data will be deleted."
243msgstr ""
297msgstr ""
po/km.po+83−30
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-01 04:02+0000\n"
11+"PO-Revision-Date: 2014-08-13 04:57+0000\n"
12"Last-Translator: Sok Sophea <sksophea@gmail.com>\n"
12"Last-Translator: Sok Sophea <sksophea@gmail.com>\n"
13"Language-Team: Khmer <km@li.org>\n"
13"Language-Team: Khmer <km@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "មិន​ភ្ជាប់ផ្លូវកាត់"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "តើ​អ្នក​ពិតជា​ចង់​បិទ​មែន​ឬ?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "បិទ"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "ចាប់ផ្ដើម​ឡើងវិញ"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "បោះបង់"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -92,39 +96,51 @@ msgstr ""
92"ឥឡូវ​អ្នក​បាន​ពិនិត្យ​កាយវិការ​គែម​ "
96"ឥឡូវ​អ្នក​បាន​ពិនិត្យ​កាយវិការ​គែម​ "
93"និង​អាច​ចាប់ផ្ដើម​ប្រើ​ទូរស័ព្ទ<br><br>ប៉ះ លើ​អេក្រង់​ដើម្បី​ចាប់ផ្ដើម"
97"និង​អាច​ចាប់ផ្ដើម​ប្រើ​ទូរស័ព្ទ<br><br>ប៉ះ លើ​អេក្រង់​ដើម្បី​ចាប់ផ្ដើម"
94
98
95−#: qml/Components/Lockscreen.qml:220
99+#: qml/Components/Lockscreen.qml:161
100+msgid "Too many incorrect attempts"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:163
104+msgid "Please wait"
105+msgstr ""
106+
107+#: qml/Components/Lockscreen.qml:245
96msgid "Emergency Call"
108msgid "Emergency Call"
97msgstr "ការ​ហៅ​ពេល​អាសន្ន"
109msgstr "ការ​ហៅ​ពេល​អាសន្ន"
98
110
99−#: qml/Components/Lockscreen.qml:243
111+#: qml/Components/Lockscreen.qml:268
100msgid "OK"
112msgid "OK"
101msgstr "យល់ព្រម"
113msgstr "យល់ព្រម"
102
114
103−#: qml/Components/PassphraseLockscreen.qml:62
115+#: qml/Components/PassphraseLockscreen.qml:61
104#, qt-format
116#, qt-format
105msgid "Hello %1"
117msgid "Hello %1"
106msgstr "សួស្ដី %1"
118msgstr "សួស្ដី %1"
107
119
108−#: qml/Components/PassphraseLockscreen.qml:62
120+#: qml/Components/PassphraseLockscreen.qml:61
109msgid "Hello"
121msgid "Hello"
110msgstr "សួស្តី"
122msgstr "សួស្តី"
111
123
112−#: qml/Components/PinLockscreen.qml:198
124+#: qml/Components/PinLockscreen.qml:197
113msgid "CANCEL"
125msgid "CANCEL"
114msgstr "បោះបង់"
126msgstr "បោះបង់"
115
127
116−#: qml/Components/PinLockscreen.qml:216
128+#: qml/Components/PinLockscreen.qml:215
117msgid "DONE"
129msgid "DONE"
118msgstr "រួចរាល់"
130msgstr "រួចរាល់"
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See less"
133msgid "See less"
122msgstr "មើល​តិច​ជាង"
134msgstr "មើល​តិច​ជាង"
123
135
124−#: qml/Dash/GenericScopeView.qml:358
136+#: qml/Dash/GenericScopeView.qml:360
125msgid "See all"
137msgid "See all"
126msgstr "មើល​ទាំងអស់"
138msgstr "មើល​ទាំងអស់"
127
139
140+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
141+msgid "Search"
142+msgstr "ស្វែង​រក"
143+
128#: qml/Dash/Previews/PreviewActionCombo.qml:34
144#: qml/Dash/Previews/PreviewActionCombo.qml:34
129msgid "More..."
145msgid "More..."
130msgstr "ច្រើនជាង​..."
146msgstr "ច្រើនជាង​..."
@@ -145,25 +161,25 @@ msgstr "បន្ថែម​ការ​ពិនិត្យ"
145msgid "Send"
161msgid "Send"
146msgstr "ផ្ញើ"
162msgstr "ផ្ញើ"
147
163
148−#: qml/Dash/ScopesOverview.qml:200
164+#: qml/Dash/ScopesOverview.qml:201
149msgid "Manage Dash"
165msgid "Manage Dash"
150−msgstr ""
166+msgstr "គ្រប់គ្រង​ផ្ទាំង"
151
167
152−#: qml/Dash/ScopesOverview.qml:405
168+#: qml/Dash/ScopesOverview.qml:408
153msgid "Done"
169msgid "Done"
154−msgstr ""
170+msgstr "ធ្វើរួច"
155
171
156−#: qml/Dash/ScopesOverview.qml:431
172+#: qml/Dash/ScopesOverview.qml:434
157msgid "Store"
173msgid "Store"
158−msgstr ""
174+msgstr "រក្សាទុក"
159
175
160#: qml/Dash/ScopesOverviewTab.qml:36
176#: qml/Dash/ScopesOverviewTab.qml:36
161msgid "Favorites"
177msgid "Favorites"
162−msgstr ""
178+msgstr "និយម"
163
179
164#: qml/Dash/ScopesOverviewTab.qml:54
180#: qml/Dash/ScopesOverviewTab.qml:54
165msgid "All"
181msgid "All"
166−msgstr ""
182+msgstr "ទាំងអស់"
167
183
168#: qml/Greeter/Greeter.qml:157
184#: qml/Greeter/Greeter.qml:157
169msgid "Swipe to unlock"
185msgid "Swipe to unlock"
@@ -231,17 +247,54 @@ msgstr "បាន​បរាជ័យ ប៉ះ​ ដើម្បី​ព្
231
247
232#: qml/Panel/Indicators/ModemInfoItem.qml:105
248#: qml/Panel/Indicators/ModemInfoItem.qml:105
233msgid "Unlock SIM"
249msgid "Unlock SIM"
234−msgstr ""
250+msgstr "ដោះ​សោ​ស៊ីម"
235
251
236#: qml/Panel/Indicators/RoamingIndication.qml:27
252#: qml/Panel/Indicators/RoamingIndication.qml:27
237msgid "Roaming"
253msgid "Roaming"
254+msgstr "រ៉ូមីង"
255+
256+#: qml/Shell.qml:267
257+msgid "passphrase"
238msgstr ""
258msgstr ""
239
259
240−#: qml/Panel/SearchIndicator.qml:27
260+#: qml/Shell.qml:267
241−msgid "Search"
261+msgid "passcode"
262+msgstr ""
263+
264+#: qml/Shell.qml:269
265+#, qt-format
266+msgid "Enter your %1"
242−msgstr "ស្វែង​រក"
267+msgstr ""
243
268
244−#: qml/Shell.qml:256
269+#: qml/Shell.qml:270
245#, qt-format
270#, qt-format
271+msgid "Incorrect %1"
272+msgstr ""
273+
274+#: qml/Shell.qml:272
246−msgid "Please enter %1"
275+msgid "Please re-enter"
247−msgstr "សូម​បញ្ចូល %1"
276+msgstr ""
277+
278+#: qml/Shell.qml:306
279+msgid "Sorry, incorrect passphrase."
280+msgstr ""
281+
282+#: qml/Shell.qml:307
283+msgid "Sorry, incorrect passcode."
284+msgstr ""
285+
286+#: qml/Shell.qml:308
287+msgid "This will be your last attempt."
288+msgstr ""
289+
290+#: qml/Shell.qml:310
291+msgid ""
292+"If passphrase is entered incorrectly, your phone will conduct a factory "
293+"reset and all personal data will be deleted."
294+msgstr ""
295+
296+#: qml/Shell.qml:311
297+msgid ""
298+"If passcode is entered incorrectly, your phone will conduct a factory reset "
299+"and all personal data will be deleted."
300+msgstr ""
po/kn.po+71−18
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2013-06-27 05:43+0000\n"
11"PO-Revision-Date: 2013-06-27 05:43+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: Kannada <kn@li.org>\n"
13"Language-Team: Kannada <kn@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "ಹುಡುಕು"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
238−msgstr "ಹುಡುಕು"
254+msgstr ""
239
255
240−#: qml/Shell.qml:256
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
241#, qt-format
261#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
264+
265+#: qml/Shell.qml:270
266+#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/ko.po+69−16
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-17 03:56+0000\n"
11+"PO-Revision-Date: 2014-08-19 05:12+0000\n"
12"Last-Translator: MinSik CHO <Unknown>\n"
12"Last-Translator: MinSik CHO <Unknown>\n"
13"Language-Team: Korean <ko@li.org>\n"
13"Language-Team: Korean <ko@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-19 06:59+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "열쇠글: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "바로가기를 고정 해제하기"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "정말로 전원을 끌까요?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "전원 끄기"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "재시작"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "취소"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -90,6 +94,14 @@ msgstr ""
90"여러분은 끝에서 끌어오기 제스쳐를 완벽히 익히셨기 때문에 휴대 전화를 사용하기 시작할 수 있습니다. <br><br> 스크린을 터치해서 "
94"여러분은 끝에서 끌어오기 제스쳐를 완벽히 익히셨기 때문에 휴대 전화를 사용하기 시작할 수 있습니다. <br><br> 스크린을 터치해서 "
91"시작하세요."
95"시작하세요."
92
96
97+#: qml/Components/Lockscreen.qml:161
98+msgid "Too many incorrect attempts"
99+msgstr "너무 많이 틀리셨습니다"
100+
101+#: qml/Components/Lockscreen.qml:163
102+msgid "Please wait"
103+msgstr "기다려주십시오"
104+
93#: qml/Components/Lockscreen.qml:220
105#: qml/Components/Lockscreen.qml:220
94msgid "Emergency Call"
106msgid "Emergency Call"
95msgstr "긴급 통화"
107msgstr "긴급 통화"
@@ -121,7 +133,11 @@ msgstr "간단히 표시하기"
121
133
122#: qml/Dash/GenericScopeView.qml:358
134#: qml/Dash/GenericScopeView.qml:358
123msgid "See all"
135msgid "See all"
124−msgstr ""
136+msgstr "모두 보기"
137+
138+#: qml/Panel/SearchIndicator.qml:27
139+msgid "Search"
140+msgstr "검색"
125
141
126#: qml/Dash/Previews/PreviewActionCombo.qml:34
142#: qml/Dash/Previews/PreviewActionCombo.qml:34
127msgid "More..."
143msgid "More..."
@@ -145,11 +161,11 @@ msgstr "보내기"
145
161
146#: qml/Dash/ScopesOverview.qml:200
162#: qml/Dash/ScopesOverview.qml:200
147msgid "Manage Dash"
163msgid "Manage Dash"
148−msgstr ""
164+msgstr "대시 관리"
149
165
150#: qml/Dash/ScopesOverview.qml:405
166#: qml/Dash/ScopesOverview.qml:405
151msgid "Done"
167msgid "Done"
152−msgstr ""
168+msgstr "완료"
153
169
154#: qml/Dash/ScopesOverview.qml:431
170#: qml/Dash/ScopesOverview.qml:431
155msgid "Store"
171msgid "Store"
@@ -235,11 +251,48 @@ msgstr ""
235msgid "Roaming"
251msgid "Roaming"
236msgstr ""
252msgstr ""
237
253
238−#: qml/Panel/SearchIndicator.qml:27
254+#: qml/Shell.qml:267
239−msgid "Search"
255+msgid "passphrase"
240−msgstr "검색"
256+msgstr ""
241
257
242−#: qml/Shell.qml:256
258+#: qml/Shell.qml:267
259+msgid "passcode"
260+msgstr ""
261+
262+#: qml/Shell.qml:269
263+#, qt-format
264+msgid "Enter your %1"
265+msgstr ""
266+
267+#: qml/Shell.qml:270
243#, qt-format
268#, qt-format
269+msgid "Incorrect %1"
270+msgstr ""
271+
272+#: qml/Shell.qml:272
244−msgid "Please enter %1"
273+msgid "Please re-enter"
245−msgstr "%1 를 입력해주세요."
274+msgstr ""
275+
276+#: qml/Shell.qml:306
277+msgid "Sorry, incorrect passphrase."
278+msgstr ""
279+
280+#: qml/Shell.qml:307
281+msgid "Sorry, incorrect passcode."
282+msgstr ""
283+
284+#: qml/Shell.qml:308
285+msgid "This will be your last attempt."
286+msgstr ""
287+
288+#: qml/Shell.qml:310
289+msgid ""
290+"If passphrase is entered incorrectly, your phone will conduct a factory "
291+"reset and all personal data will be deleted."
292+msgstr ""
293+
294+#: qml/Shell.qml:311
295+msgid ""
296+"If passcode is entered incorrectly, your phone will conduct a factory reset "
297+"and all personal data will be deleted."
298+msgstr ""
po/ky.po+71−18
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2013-06-27 06:17+0000\n"
11"PO-Revision-Date: 2013-06-27 06:17+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: Kirghiz <ky@li.org>\n"
13"Language-Team: Kirghiz <ky@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "Издөө"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
238−msgstr "Издөө"
254+msgstr ""
239
255
240−#: qml/Shell.qml:256
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
241#, qt-format
261#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
264+
265+#: qml/Shell.qml:270
266+#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/lo.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2013-10-02 10:00+0000\n"
11"PO-Revision-Date: 2013-10-02 10:00+0000\n"
12"Last-Translator: Anousak <anousak@gmail.com>\n"
12"Last-Translator: Anousak <anousak@gmail.com>\n"
13"Language-Team: Lao <lo@li.org>\n"
13"Language-Team: Lao <lo@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr "ສະບາຍດີ %1"
114msgstr "ສະບາຍດີ %1"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr "ສະບາຍດີ"
118msgstr "ສະບາຍດີ"
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "ຊອກຫາ"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr "ສົ່ງ"
158msgstr "ສົ່ງ"
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
237−msgid "Search"
257+msgid "passcode"
238−msgstr "ຊອກຫາ"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
243−msgstr "ກະລູນາປ້ອນ %1"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
296+msgstr ""
po/lt.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-05-19 17:15+0000\n"
11"PO-Revision-Date: 2014-05-19 17:15+0000\n"
12"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
12"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
13"Language-Team: Lithuanian <lt@li.org>\n"
13"Language-Team: Lithuanian <lt@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -91,39 +95,51 @@ msgid ""
91"phone<br><br>Tap on the screen to start"
95"phone<br><br>Tap on the screen to start"
92msgstr ""
96msgstr ""
93
97
94−#: qml/Components/Lockscreen.qml:220
98+#: qml/Components/Lockscreen.qml:161
99+msgid "Too many incorrect attempts"
100+msgstr ""
101+
102+#: qml/Components/Lockscreen.qml:163
103+msgid "Please wait"
104+msgstr ""
105+
106+#: qml/Components/Lockscreen.qml:245
95msgid "Emergency Call"
107msgid "Emergency Call"
96msgstr "Pagalbos skambutis"
108msgstr "Pagalbos skambutis"
97
109
98−#: qml/Components/Lockscreen.qml:243
110+#: qml/Components/Lockscreen.qml:268
99msgid "OK"
111msgid "OK"
100msgstr ""
112msgstr ""
101
113
102−#: qml/Components/PassphraseLockscreen.qml:62
114+#: qml/Components/PassphraseLockscreen.qml:61
103#, qt-format
115#, qt-format
104msgid "Hello %1"
116msgid "Hello %1"
105msgstr "Laba diena, %1"
117msgstr "Laba diena, %1"
106
118
107−#: qml/Components/PassphraseLockscreen.qml:62
119+#: qml/Components/PassphraseLockscreen.qml:61
108msgid "Hello"
120msgid "Hello"
109msgstr "Sveiki"
121msgstr "Sveiki"
110
122
111−#: qml/Components/PinLockscreen.qml:198
123+#: qml/Components/PinLockscreen.qml:197
112msgid "CANCEL"
124msgid "CANCEL"
113msgstr ""
125msgstr ""
114
126
115−#: qml/Components/PinLockscreen.qml:216
127+#: qml/Components/PinLockscreen.qml:215
116msgid "DONE"
128msgid "DONE"
117msgstr ""
129msgstr ""
118
130
119−#: qml/Dash/GenericScopeView.qml:358
131+#: qml/Dash/GenericScopeView.qml:360
120msgid "See less"
132msgid "See less"
121msgstr ""
133msgstr ""
122
134
123−#: qml/Dash/GenericScopeView.qml:358
135+#: qml/Dash/GenericScopeView.qml:360
124msgid "See all"
136msgid "See all"
125msgstr ""
137msgstr ""
126
138
139+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
140+msgid "Search"
141+msgstr "Paieška"
142+
127#: qml/Dash/Previews/PreviewActionCombo.qml:34
143#: qml/Dash/Previews/PreviewActionCombo.qml:34
128msgid "More..."
144msgid "More..."
129msgstr "Daugiau..."
145msgstr "Daugiau..."
@@ -144,15 +160,15 @@ msgstr "Pridėkite apžvalgą"
144msgid "Send"
160msgid "Send"
145msgstr "Siųsti"
161msgstr "Siųsti"
146
162
147−#: qml/Dash/ScopesOverview.qml:200
163+#: qml/Dash/ScopesOverview.qml:201
148msgid "Manage Dash"
164msgid "Manage Dash"
149msgstr ""
165msgstr ""
150
166
151−#: qml/Dash/ScopesOverview.qml:405
167+#: qml/Dash/ScopesOverview.qml:408
152msgid "Done"
168msgid "Done"
153msgstr ""
169msgstr ""
154
170
155−#: qml/Dash/ScopesOverview.qml:431
171+#: qml/Dash/ScopesOverview.qml:434
156msgid "Store"
172msgid "Store"
157msgstr ""
173msgstr ""
158
174
@@ -236,11 +252,48 @@ msgstr ""
236msgid "Roaming"
252msgid "Roaming"
237msgstr ""
253msgstr ""
238
254
239−#: qml/Panel/SearchIndicator.qml:27
255+#: qml/Shell.qml:267
256+msgid "passphrase"
257+msgstr ""
258+
259+#: qml/Shell.qml:267
240−msgid "Search"
260+msgid "passcode"
241−msgstr "Paieška"
261+msgstr ""
262+
263+#: qml/Shell.qml:269
264+#, qt-format
265+msgid "Enter your %1"
266+msgstr ""
242
267
243−#: qml/Shell.qml:256
268+#: qml/Shell.qml:270
244#, qt-format
269#, qt-format
270+msgid "Incorrect %1"
271+msgstr ""
272+
273+#: qml/Shell.qml:272
245−msgid "Please enter %1"
274+msgid "Please re-enter"
275+msgstr ""
276+
277+#: qml/Shell.qml:306
278+msgid "Sorry, incorrect passphrase."
246−msgstr "Prašom įvesti %1"
279+msgstr ""
280+
281+#: qml/Shell.qml:307
282+msgid "Sorry, incorrect passcode."
283+msgstr ""
284+
285+#: qml/Shell.qml:308
286+msgid "This will be your last attempt."
287+msgstr ""
288+
289+#: qml/Shell.qml:310
290+msgid ""
291+"If passphrase is entered incorrectly, your phone will conduct a factory "
292+"reset and all personal data will be deleted."
293+msgstr ""
294+
295+#: qml/Shell.qml:311
296+msgid ""
297+"If passcode is entered incorrectly, your phone will conduct a factory reset "
298+"and all personal data will be deleted."
299+msgstr ""
po/lv.po+80−27
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-26 16:21+0000\n"
11+"PO-Revision-Date: 2014-08-12 19:07+0000\n"
12"Last-Translator: Jānis-Marks Gailis <jm-gailis@fai-vianet.fr>\n"
12"Last-Translator: Jānis-Marks Gailis <jm-gailis@fai-vianet.fr>\n"
13"Language-Team: Latvian <lv@li.org>\n"
13"Language-Team: Latvian <lv@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -32,15 +36,15 @@ msgstr ""
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Izslēgt"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Pārstartēt"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Atcelt"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr "Neatliekamās Palīdzības zvans"
105msgstr "Neatliekamās Palīdzības zvans"
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr "LABI"
109msgstr "LABI"
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr "Sveiki, %1"
114msgstr "Sveiki, %1"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr "Sveiki"
118msgstr "Sveiki"
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr "ATCELT"
122msgstr "ATCELT"
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr "IZDARĪTS"
126msgstr "IZDARĪTS"
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr "Redzēt mazāk"
130msgstr "Redzēt mazāk"
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr "Skatīt visus"
134msgstr "Skatīt visus"
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "Meklēt"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr "Vairāk..."
142msgstr "Vairāk..."
@@ -141,25 +157,25 @@ msgstr "Komentēt"
141msgid "Send"
157msgid "Send"
142msgstr "Sūtīt"
158msgstr "Sūtīt"
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150−msgstr ""
166+msgstr "Pabeigts"
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
156#: qml/Dash/ScopesOverviewTab.qml:36
172#: qml/Dash/ScopesOverviewTab.qml:36
157msgid "Favorites"
173msgid "Favorites"
158−msgstr ""
174+msgstr "Iecienītās"
159
175
160#: qml/Dash/ScopesOverviewTab.qml:54
176#: qml/Dash/ScopesOverviewTab.qml:54
161msgid "All"
177msgid "All"
162−msgstr ""
178+msgstr "Visi"
163
179
164#: qml/Greeter/Greeter.qml:157
180#: qml/Greeter/Greeter.qml:157
165msgid "Swipe to unlock"
181msgid "Swipe to unlock"
@@ -227,17 +243,54 @@ msgstr ""
227
243
228#: qml/Panel/Indicators/ModemInfoItem.qml:105
244#: qml/Panel/Indicators/ModemInfoItem.qml:105
229msgid "Unlock SIM"
245msgid "Unlock SIM"
230−msgstr ""
246+msgstr "Atbloķēt SIM"
231
247
232#: qml/Panel/Indicators/RoamingIndication.qml:27
248#: qml/Panel/Indicators/RoamingIndication.qml:27
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
238−msgstr "Meklēt"
254+msgstr ""
239
255
240−#: qml/Shell.qml:256
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
264+
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
243−msgstr "Lūdzu ievadiet %1"
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
296+msgstr ""
po/ml.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2013-11-23 11:44+0000\n"
11"PO-Revision-Date: 2013-11-23 11:44+0000\n"
12"Last-Translator: ST Alfas <Unknown>\n"
12"Last-Translator: ST Alfas <Unknown>\n"
13"Language-Team: Malayalam <ml@li.org>\n"
13"Language-Team: Malayalam <ml@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -90,39 +94,51 @@ msgid ""
90"phone<br><br>Tap on the screen to start"
94"phone<br><br>Tap on the screen to start"
91msgstr ""
95msgstr ""
92
96
93−#: qml/Components/Lockscreen.qml:220
97+#: qml/Components/Lockscreen.qml:161
98+msgid "Too many incorrect attempts"
99+msgstr ""
100+
101+#: qml/Components/Lockscreen.qml:163
102+msgid "Please wait"
103+msgstr ""
104+
105+#: qml/Components/Lockscreen.qml:245
94msgid "Emergency Call"
106msgid "Emergency Call"
95msgstr "അടിയന്തിര വിളി"
107msgstr "അടിയന്തിര വിളി"
96
108
97−#: qml/Components/Lockscreen.qml:243
109+#: qml/Components/Lockscreen.qml:268
98msgid "OK"
110msgid "OK"
99msgstr ""
111msgstr ""
100
112
101−#: qml/Components/PassphraseLockscreen.qml:62
113+#: qml/Components/PassphraseLockscreen.qml:61
102#, qt-format
114#, qt-format
103msgid "Hello %1"
115msgid "Hello %1"
104msgstr "ഹലോ %1"
116msgstr "ഹലോ %1"
105
117
106−#: qml/Components/PassphraseLockscreen.qml:62
118+#: qml/Components/PassphraseLockscreen.qml:61
107msgid "Hello"
119msgid "Hello"
108msgstr "ഹലോ"
120msgstr "ഹലോ"
109
121
110−#: qml/Components/PinLockscreen.qml:198
122+#: qml/Components/PinLockscreen.qml:197
111msgid "CANCEL"
123msgid "CANCEL"
112msgstr ""
124msgstr ""
113
125
114−#: qml/Components/PinLockscreen.qml:216
126+#: qml/Components/PinLockscreen.qml:215
115msgid "DONE"
127msgid "DONE"
116msgstr ""
128msgstr ""
117
129
118−#: qml/Dash/GenericScopeView.qml:358
130+#: qml/Dash/GenericScopeView.qml:360
119msgid "See less"
131msgid "See less"
120msgstr ""
132msgstr ""
121
133
122−#: qml/Dash/GenericScopeView.qml:358
134+#: qml/Dash/GenericScopeView.qml:360
123msgid "See all"
135msgid "See all"
124msgstr ""
136msgstr ""
125
137
138+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
139+msgid "Search"
140+msgstr "തിരയുക"
141+
126#: qml/Dash/Previews/PreviewActionCombo.qml:34
142#: qml/Dash/Previews/PreviewActionCombo.qml:34
127msgid "More..."
143msgid "More..."
128msgstr ""
144msgstr ""
@@ -143,15 +159,15 @@ msgstr "ഒരു അവലോകനം ചേര്‍ക്കുക"
143msgid "Send"
159msgid "Send"
144msgstr "അയയ്‌ക്കുക"
160msgstr "അയയ്‌ക്കുക"
145
161
146−#: qml/Dash/ScopesOverview.qml:200
162+#: qml/Dash/ScopesOverview.qml:201
147msgid "Manage Dash"
163msgid "Manage Dash"
148msgstr ""
164msgstr ""
149
165
150−#: qml/Dash/ScopesOverview.qml:405
166+#: qml/Dash/ScopesOverview.qml:408
151msgid "Done"
167msgid "Done"
152msgstr ""
168msgstr ""
153
169
154−#: qml/Dash/ScopesOverview.qml:431
170+#: qml/Dash/ScopesOverview.qml:434
155msgid "Store"
171msgid "Store"
156msgstr ""
172msgstr ""
157
173
@@ -235,11 +251,48 @@ msgstr ""
235msgid "Roaming"
251msgid "Roaming"
236msgstr ""
252msgstr ""
237
253
238−#: qml/Panel/SearchIndicator.qml:27
254+#: qml/Shell.qml:267
255+msgid "passphrase"
256+msgstr ""
257+
258+#: qml/Shell.qml:267
239−msgid "Search"
259+msgid "passcode"
240−msgstr "തിരയുക"
260+msgstr ""
261+
262+#: qml/Shell.qml:269
263+#, qt-format
264+msgid "Enter your %1"
265+msgstr ""
241
266
242−#: qml/Shell.qml:256
267+#: qml/Shell.qml:270
243#, qt-format
268#, qt-format
269+msgid "Incorrect %1"
270+msgstr ""
271+
272+#: qml/Shell.qml:272
244−msgid "Please enter %1"
273+msgid "Please re-enter"
245−msgstr "ദയവായി %1 നല്‍കുക"
274+msgstr ""
275+
276+#: qml/Shell.qml:306
277+msgid "Sorry, incorrect passphrase."
278+msgstr ""
279+
280+#: qml/Shell.qml:307
281+msgid "Sorry, incorrect passcode."
282+msgstr ""
283+
284+#: qml/Shell.qml:308
285+msgid "This will be your last attempt."
286+msgstr ""
287+
288+#: qml/Shell.qml:310
289+msgid ""
290+"If passphrase is entered incorrectly, your phone will conduct a factory "
291+"reset and all personal data will be deleted."
292+msgstr ""
293+
294+#: qml/Shell.qml:311
295+msgid ""
296+"If passcode is entered incorrectly, your phone will conduct a factory reset "
297+"and all personal data will be deleted."
298+msgstr ""
po/mr.po+70−17
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-01-14 19:54+0000\n"
11"PO-Revision-Date: 2014-01-14 19:54+0000\n"
12"Last-Translator: Rohan Deshmukh <Unknown>\n"
12"Last-Translator: Rohan Deshmukh <Unknown>\n"
13"Language-Team: Marathi <mr@li.org>\n"
13"Language-Team: Marathi <mr@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr ""
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
238msgstr ""
263msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
242−msgid "Please enter %1"
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/ms.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-01-17 09:05+0000\n"
11"PO-Revision-Date: 2014-01-17 09:05+0000\n"
12"Last-Translator: abuyop <Unknown>\n"
12"Last-Translator: abuyop <Unknown>\n"
13"Language-Team: Malay <ms@li.org>\n"
13"Language-Team: Malay <ms@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr "panggilan Kecemasan"
105msgstr "panggilan Kecemasan"
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr "Hai %1"
114msgstr "Hai %1"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr "Hello"
118msgstr "Hello"
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "Gelintar"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr "Tambah ulasan"
141msgid "Send"
157msgid "Send"
142msgstr "Hantar"
158msgstr "Hantar"
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
237−msgid "Search"
257+msgid "passcode"
238−msgstr "Gelintar"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
243−msgstr "Sila masukkan %1"
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
296+msgstr ""
po/my.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2013-12-12 11:12+0000\n"
11"PO-Revision-Date: 2013-12-12 11:12+0000\n"
12"Last-Translator: Pyae Sone <Unknown>\n"
12"Last-Translator: Pyae Sone <Unknown>\n"
13"Language-Team: Burmese <my@li.org>\n"
13"Language-Team: Burmese <my@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr "အရေးပေါ်ခေါ်မည်"
105msgstr "အရေးပေါ်ခေါ်မည်"
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr "ဟဲလို %1"
114msgstr "ဟဲလို %1"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr "ဟဲလို"
118msgstr "ဟဲလို"
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "ရှာဖွေ"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr "ပို့မည်"
158msgstr "ပို့မည်"
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
237−msgid "Search"
257+msgid "passcode"
238−msgstr "ရှာဖွေ"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
243−msgstr "%1ကိုရိုက်ထည့်ပါ"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
296+msgstr ""
po/nb.po+87−30
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-26 12:05+0000\n"
11+"PO-Revision-Date: 2014-08-14 16:56+0000\n"
12"Last-Translator: Åka Sikrom <Unknown>\n"
12"Last-Translator: Åka Sikrom <Unknown>\n"
13"Language-Team: Norwegian Bokmal <nb@li.org>\n"
13"Language-Team: Norwegian Bokmal <nb@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Passord: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "Fjern snarvei"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "Er du sikker på at du vil slå av?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Slå av"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Start på nytt"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Avbryt"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -90,39 +94,51 @@ msgstr ""
90"Du har nå mestret kantbevegelsene, og er klar til å bruke "
94"Du har nå mestret kantbevegelsene, og er klar til å bruke "
91"telefonen<br><br>Trykk på skjermen for å begynne"
95"telefonen<br><br>Trykk på skjermen for å begynne"
92
96
93−#: qml/Components/Lockscreen.qml:220
97+#: qml/Components/Lockscreen.qml:161
98+msgid "Too many incorrect attempts"
99+msgstr "Du har tastet feil for mange ganger"
100+
101+#: qml/Components/Lockscreen.qml:163
102+msgid "Please wait"
103+msgstr "Vent litt"
104+
105+#: qml/Components/Lockscreen.qml:245
94msgid "Emergency Call"
106msgid "Emergency Call"
95msgstr "Nødanrop"
107msgstr "Nødanrop"
96
108
97−#: qml/Components/Lockscreen.qml:243
109+#: qml/Components/Lockscreen.qml:268
98msgid "OK"
110msgid "OK"
99msgstr "OK"
111msgstr "OK"
100
112
101−#: qml/Components/PassphraseLockscreen.qml:62
113+#: qml/Components/PassphraseLockscreen.qml:61
102#, qt-format
114#, qt-format
103msgid "Hello %1"
115msgid "Hello %1"
104msgstr "Hei, %1"
116msgstr "Hei, %1"
105
117
106−#: qml/Components/PassphraseLockscreen.qml:62
118+#: qml/Components/PassphraseLockscreen.qml:61
107msgid "Hello"
119msgid "Hello"
108msgstr "Hei"
120msgstr "Hei"
109
121
110−#: qml/Components/PinLockscreen.qml:198
122+#: qml/Components/PinLockscreen.qml:197
111msgid "CANCEL"
123msgid "CANCEL"
112msgstr "AVBRYT"
124msgstr "AVBRYT"
113
125
114−#: qml/Components/PinLockscreen.qml:216
126+#: qml/Components/PinLockscreen.qml:215
115msgid "DONE"
127msgid "DONE"
116msgstr "FERDIG"
128msgstr "FERDIG"
117
129
118−#: qml/Dash/GenericScopeView.qml:358
130+#: qml/Dash/GenericScopeView.qml:360
119msgid "See less"
131msgid "See less"
120msgstr "Vis mindre"
132msgstr "Vis mindre"
121
133
122−#: qml/Dash/GenericScopeView.qml:358
134+#: qml/Dash/GenericScopeView.qml:360
123msgid "See all"
135msgid "See all"
124msgstr "Vis alt"
136msgstr "Vis alt"
125
137
138+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
139+msgid "Search"
140+msgstr "Søk"
141+
126#: qml/Dash/Previews/PreviewActionCombo.qml:34
142#: qml/Dash/Previews/PreviewActionCombo.qml:34
127msgid "More..."
143msgid "More..."
128msgstr "Mer …"
144msgstr "Mer …"
@@ -143,25 +159,25 @@ msgstr "Skriv en anmeldelse"
143msgid "Send"
159msgid "Send"
144msgstr "Send"
160msgstr "Send"
145
161
146−#: qml/Dash/ScopesOverview.qml:200
162+#: qml/Dash/ScopesOverview.qml:201
147msgid "Manage Dash"
163msgid "Manage Dash"
148−msgstr ""
164+msgstr "Håndter dashbord"
149
165
150−#: qml/Dash/ScopesOverview.qml:405
166+#: qml/Dash/ScopesOverview.qml:408
151msgid "Done"
167msgid "Done"
152−msgstr ""
168+msgstr "Ferdig"
153
169
154−#: qml/Dash/ScopesOverview.qml:431
170+#: qml/Dash/ScopesOverview.qml:434
155msgid "Store"
171msgid "Store"
156−msgstr ""
172+msgstr "Butikk"
157
173
158#: qml/Dash/ScopesOverviewTab.qml:36
174#: qml/Dash/ScopesOverviewTab.qml:36
159msgid "Favorites"
175msgid "Favorites"
160−msgstr ""
176+msgstr "Favoritter"
161
177
162#: qml/Dash/ScopesOverviewTab.qml:54
178#: qml/Dash/ScopesOverviewTab.qml:54
163msgid "All"
179msgid "All"
164−msgstr ""
180+msgstr "Alt"
165
181
166#: qml/Greeter/Greeter.qml:157
182#: qml/Greeter/Greeter.qml:157
167msgid "Swipe to unlock"
183msgid "Swipe to unlock"
@@ -229,17 +245,58 @@ msgstr "Feilet. Trykk for å prøve på nytt"
229
245
230#: qml/Panel/Indicators/ModemInfoItem.qml:105
246#: qml/Panel/Indicators/ModemInfoItem.qml:105
231msgid "Unlock SIM"
247msgid "Unlock SIM"
232−msgstr ""
248+msgstr "Lås opp SIM"
233
249
234#: qml/Panel/Indicators/RoamingIndication.qml:27
250#: qml/Panel/Indicators/RoamingIndication.qml:27
235msgid "Roaming"
251msgid "Roaming"
236−msgstr ""
252+msgstr "Fremmednett"
237
253
238−#: qml/Panel/SearchIndicator.qml:27
254+#: qml/Shell.qml:267
255+msgid "passphrase"
256+msgstr "passordfrase"
257+
258+#: qml/Shell.qml:267
239−msgid "Search"
259+msgid "passcode"
240−msgstr "Søk"
260+msgstr "kode"
241
261
242−#: qml/Shell.qml:256
262+#: qml/Shell.qml:269
243#, qt-format
263#, qt-format
244−msgid "Please enter %1"
264+msgid "Enter your %1"
245msgstr "Skriv inn %1"
265msgstr "Skriv inn %1"
266+
267+#: qml/Shell.qml:270
268+#, qt-format
269+msgid "Incorrect %1"
270+msgstr "Feil %1"
271+
272+#: qml/Shell.qml:272
273+msgid "Please re-enter"
274+msgstr "Prøv på nytt"
275+
276+#: qml/Shell.qml:306
277+msgid "Sorry, incorrect passphrase."
278+msgstr "Feil passordfrase."
279+
280+#: qml/Shell.qml:307
281+msgid "Sorry, incorrect passcode."
282+msgstr "Feil kode."
283+
284+#: qml/Shell.qml:308
285+msgid "This will be your last attempt."
286+msgstr "Dette er ditt siste forsøk."
287+
288+#: qml/Shell.qml:310
289+msgid ""
290+"If passphrase is entered incorrectly, your phone will conduct a factory "
291+"reset and all personal data will be deleted."
292+msgstr ""
293+"Hvis du skriver feil passordfrase en gang til, tilbakestilles telefonen til "
294+"fabrikkinnstillinger, og alle personlige data slettes."
295+
296+#: qml/Shell.qml:311
297+msgid ""
298+"If passcode is entered incorrectly, your phone will conduct a factory reset "
299+"and all personal data will be deleted."
300+msgstr ""
301+"Hvis du skriver feil kode en gang til, tilbakestilles telefonen til "
302+"fabrikkinnstillinger, og alle personlige data slettes."
po/nl.po+88−31
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-27 19:12+0000\n"
11+"PO-Revision-Date: 2014-08-14 19:08+0000\n"
12"Last-Translator: rob <linuxned@gmail.com>\n"
12"Last-Translator: rob <linuxned@gmail.com>\n"
13"Language-Team: Dutch <nl@li.org>\n"
13"Language-Team: Dutch <nl@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Wachtwoord: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "Snelkoppeling losmaken"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "Weet u zeker dat u het apparaat wilt uitschakelen?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Uitschakelen"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Herstarten"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Annuleren"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -90,39 +94,51 @@ msgstr ""
90"Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "
94"Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "
91"het gebruiken van de telefoon<br><br>Tik op het scherm om te beginnen"
95"het gebruiken van de telefoon<br><br>Tik op het scherm om te beginnen"
92
96
93−#: qml/Components/Lockscreen.qml:220
97+#: qml/Components/Lockscreen.qml:161
98+msgid "Too many incorrect attempts"
99+msgstr "Te veel mislukte pogingen"
100+
101+#: qml/Components/Lockscreen.qml:163
102+msgid "Please wait"
103+msgstr "Even geduld a.u.b."
104+
105+#: qml/Components/Lockscreen.qml:245
94msgid "Emergency Call"
106msgid "Emergency Call"
95msgstr "Noodoproep"
107msgstr "Noodoproep"
96
108
97−#: qml/Components/Lockscreen.qml:243
109+#: qml/Components/Lockscreen.qml:268
98msgid "OK"
110msgid "OK"
99msgstr "Ok"
111msgstr "Ok"
100
112
101−#: qml/Components/PassphraseLockscreen.qml:62
113+#: qml/Components/PassphraseLockscreen.qml:61
102#, qt-format
114#, qt-format
103msgid "Hello %1"
115msgid "Hello %1"
104msgstr "Hallo %1"
116msgstr "Hallo %1"
105
117
106−#: qml/Components/PassphraseLockscreen.qml:62
118+#: qml/Components/PassphraseLockscreen.qml:61
107msgid "Hello"
119msgid "Hello"
108msgstr "Hallo"
120msgstr "Hallo"
109
121
110−#: qml/Components/PinLockscreen.qml:198
122+#: qml/Components/PinLockscreen.qml:197
111msgid "CANCEL"
123msgid "CANCEL"
112msgstr "ANNULEREN"
124msgstr "ANNULEREN"
113
125
114−#: qml/Components/PinLockscreen.qml:216
126+#: qml/Components/PinLockscreen.qml:215
115msgid "DONE"
127msgid "DONE"
116msgstr "KLAAR"
128msgstr "KLAAR"
117
129
118−#: qml/Dash/GenericScopeView.qml:358
130+#: qml/Dash/GenericScopeView.qml:360
119msgid "See less"
131msgid "See less"
120msgstr "Minder zien"
132msgstr "Minder zien"
121
133
122−#: qml/Dash/GenericScopeView.qml:358
134+#: qml/Dash/GenericScopeView.qml:360
123msgid "See all"
135msgid "See all"
124msgstr "Alles zien"
136msgstr "Alles zien"
125
137
138+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
139+msgid "Search"
140+msgstr "Zoeken"
141+
126#: qml/Dash/Previews/PreviewActionCombo.qml:34
142#: qml/Dash/Previews/PreviewActionCombo.qml:34
127msgid "More..."
143msgid "More..."
128msgstr "Meer…"
144msgstr "Meer…"
@@ -143,25 +159,25 @@ msgstr "Voeg recensie toe"
143msgid "Send"
159msgid "Send"
144msgstr "Versturen"
160msgstr "Versturen"
145
161
146−#: qml/Dash/ScopesOverview.qml:200
162+#: qml/Dash/ScopesOverview.qml:201
147msgid "Manage Dash"
163msgid "Manage Dash"
148−msgstr ""
164+msgstr "Snelzoeker-beheer"
149
165
150−#: qml/Dash/ScopesOverview.qml:405
166+#: qml/Dash/ScopesOverview.qml:408
151msgid "Done"
167msgid "Done"
152−msgstr ""
168+msgstr "Klaar"
153
169
154−#: qml/Dash/ScopesOverview.qml:431
170+#: qml/Dash/ScopesOverview.qml:434
155msgid "Store"
171msgid "Store"
156−msgstr ""
172+msgstr "Winkel"
157
173
158#: qml/Dash/ScopesOverviewTab.qml:36
174#: qml/Dash/ScopesOverviewTab.qml:36
159msgid "Favorites"
175msgid "Favorites"
160−msgstr ""
176+msgstr "Favorieten"
161
177
162#: qml/Dash/ScopesOverviewTab.qml:54
178#: qml/Dash/ScopesOverviewTab.qml:54
163msgid "All"
179msgid "All"
164−msgstr ""
180+msgstr "Alles"
165
181
166#: qml/Greeter/Greeter.qml:157
182#: qml/Greeter/Greeter.qml:157
167msgid "Swipe to unlock"
183msgid "Swipe to unlock"
@@ -229,17 +245,58 @@ msgstr "Mislukt, tik om het opnieuw te proberen"
229
245
230#: qml/Panel/Indicators/ModemInfoItem.qml:105
246#: qml/Panel/Indicators/ModemInfoItem.qml:105
231msgid "Unlock SIM"
247msgid "Unlock SIM"
232−msgstr ""
248+msgstr "SIM-kaart deblokkeren"
233
249
234#: qml/Panel/Indicators/RoamingIndication.qml:27
250#: qml/Panel/Indicators/RoamingIndication.qml:27
235msgid "Roaming"
251msgid "Roaming"
236−msgstr ""
252+msgstr "Roaming"
237
253
238−#: qml/Panel/SearchIndicator.qml:27
254+#: qml/Shell.qml:267
255+msgid "passphrase"
256+msgstr "wachtwoordzin"
257+
258+#: qml/Shell.qml:267
239−msgid "Search"
259+msgid "passcode"
240−msgstr "Zoeken"
260+msgstr "toegangscode"
241
261
242−#: qml/Shell.qml:256
262+#: qml/Shell.qml:269
243#, qt-format
263#, qt-format
264+msgid "Enter your %1"
265+msgstr "Voer uw %1 in"
266+
267+#: qml/Shell.qml:270
268+#, qt-format
269+msgid "Incorrect %1"
270+msgstr "%1 onjuist"
271+
272+#: qml/Shell.qml:272
244−msgid "Please enter %1"
273+msgid "Please re-enter"
245−msgstr "Voer %1 in"
274+msgstr "A.u.b. opnieuw invoeren"
275+
276+#: qml/Shell.qml:306
277+msgid "Sorry, incorrect passphrase."
278+msgstr "Sorry, onjuiste wachtwoordzin."
279+
280+#: qml/Shell.qml:307
281+msgid "Sorry, incorrect passcode."
282+msgstr "Sorry, onjuiste toegangscode."
283+
284+#: qml/Shell.qml:308
285+msgid "This will be your last attempt."
286+msgstr "Dit zal uw laatste poging worden."
287+
288+#: qml/Shell.qml:310
289+msgid ""
290+"If passphrase is entered incorrectly, your phone will conduct a factory "
291+"reset and all personal data will be deleted."
292+msgstr ""
293+"Wanneer de wachtwoordzin nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "
294+"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."
295+
296+#: qml/Shell.qml:311
297+msgid ""
298+"If passcode is entered incorrectly, your phone will conduct a factory reset "
299+"and all personal data will be deleted."
300+msgstr ""
301+"Wanneer de toegangscode nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "
302+"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."
po/pl.po+63−10
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-31 13:51+0000\n"
11+"PO-Revision-Date: 2014-08-18 20:25+0000\n"
12−"Last-Translator: Michał Radwański <radwanski.michal@outlook.com>\n"
12+"Last-Translator: Paweł Stroka <pawstr@gmail.com>\n"
13"Language-Team: Polish <pl@li.org>\n"
13"Language-Team: Polish <pl@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-19 06:59+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -92,6 +96,14 @@ msgstr ""
92"Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do "
96"Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do "
93"pracy.<br><br>Dotknij ekranu by rozpocząć"
97"pracy.<br><br>Dotknij ekranu by rozpocząć"
94
98
99+#: qml/Components/Lockscreen.qml:161
100+msgid "Too many incorrect attempts"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:163
104+msgid "Please wait"
105+msgstr ""
106+
95#: qml/Components/Lockscreen.qml:220
107#: qml/Components/Lockscreen.qml:220
96msgid "Emergency Call"
108msgid "Emergency Call"
97msgstr "Telefon ratunkowy"
109msgstr "Telefon ratunkowy"
@@ -125,6 +137,10 @@ msgstr "Zobacz mniej"
125msgid "See all"
137msgid "See all"
126msgstr "Zobacz wszystko"
138msgstr "Zobacz wszystko"
127
139
140+#: qml/Panel/SearchIndicator.qml:27
141+msgid "Search"
142+msgstr "Szukaj"
143+
128#: qml/Dash/Previews/PreviewActionCombo.qml:34
144#: qml/Dash/Previews/PreviewActionCombo.qml:34
129msgid "More..."
145msgid "More..."
130msgstr "Więcej..."
146msgstr "Więcej..."
@@ -237,11 +253,48 @@ msgstr ""
237msgid "Roaming"
253msgid "Roaming"
238msgstr ""
254msgstr ""
239
255
240−#: qml/Panel/SearchIndicator.qml:27
256+#: qml/Shell.qml:267
257+msgid "passphrase"
258+msgstr "hasło"
259+
260+#: qml/Shell.qml:267
241−msgid "Search"
261+msgid "passcode"
242−msgstr "Szukaj"
262+msgstr "kod"
243
263
244−#: qml/Shell.qml:256
264+#: qml/Shell.qml:269
245#, qt-format
265#, qt-format
266+msgid "Enter your %1"
267+msgstr ""
268+
269+#: qml/Shell.qml:270
270+#, qt-format
271+msgid "Incorrect %1"
272+msgstr ""
273+
274+#: qml/Shell.qml:272
246−msgid "Please enter %1"
275+msgid "Please re-enter"
276+msgstr "Proszę wprowadzić ponownie"
277+
278+#: qml/Shell.qml:306
279+msgid "Sorry, incorrect passphrase."
280+msgstr "Niestety, błędne hasło"
281+
282+#: qml/Shell.qml:307
283+msgid "Sorry, incorrect passcode."
284+msgstr "Niestety, błędny kod"
285+
286+#: qml/Shell.qml:308
287+msgid "This will be your last attempt."
288+msgstr ""
289+
290+#: qml/Shell.qml:310
291+msgid ""
292+"If passphrase is entered incorrectly, your phone will conduct a factory "
293+"reset and all personal data will be deleted."
247−msgstr "Wprowadź %1"
294+msgstr ""
295+
296+#: qml/Shell.qml:311
297+msgid ""
298+"If passcode is entered incorrectly, your phone will conduct a factory reset "
299+"and all personal data will be deleted."
300+msgstr ""
po/pt.po+85−30
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-25 12:04+0000\n"
11+"PO-Revision-Date: 2014-08-17 20:27+0000\n"
12"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
12"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
13"Language-Team: Portuguese <pt@li.org>\n"
13"Language-Team: Portuguese <pt@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Senha: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "Remover atalho"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "Tem a certeza de que quer desligar?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Desligar"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Reiniciar"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Cancelar"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -91,39 +95,51 @@ msgstr ""
91"Já domina os gestos dos limites e pode começar a usar o "
95"Já domina os gestos dos limites e pode começar a usar o "
92"telefone<br><br>Toque no ecrã para começar"
96"telefone<br><br>Toque no ecrã para começar"
93
97
94−#: qml/Components/Lockscreen.qml:220
98+#: qml/Components/Lockscreen.qml:161
99+msgid "Too many incorrect attempts"
100+msgstr "Demasiadas tentativas incorrectas"
101+
102+#: qml/Components/Lockscreen.qml:163
103+msgid "Please wait"
104+msgstr "Por favor aguarde"
105+
106+#: qml/Components/Lockscreen.qml:245
95msgid "Emergency Call"
107msgid "Emergency Call"
96msgstr "Chamada de emergência"
108msgstr "Chamada de emergência"
97
109
98−#: qml/Components/Lockscreen.qml:243
110+#: qml/Components/Lockscreen.qml:268
99msgid "OK"
111msgid "OK"
100msgstr "OK"
112msgstr "OK"
101
113
102−#: qml/Components/PassphraseLockscreen.qml:62
114+#: qml/Components/PassphraseLockscreen.qml:61
103#, qt-format
115#, qt-format
104msgid "Hello %1"
116msgid "Hello %1"
105msgstr "Olá %1"
117msgstr "Olá %1"
106
118
107−#: qml/Components/PassphraseLockscreen.qml:62
119+#: qml/Components/PassphraseLockscreen.qml:61
108msgid "Hello"
120msgid "Hello"
109msgstr "Olá"
121msgstr "Olá"
110
122
111−#: qml/Components/PinLockscreen.qml:198
123+#: qml/Components/PinLockscreen.qml:197
112msgid "CANCEL"
124msgid "CANCEL"
113msgstr "CANCELAR"
125msgstr "CANCELAR"
114
126
115−#: qml/Components/PinLockscreen.qml:216
127+#: qml/Components/PinLockscreen.qml:215
116msgid "DONE"
128msgid "DONE"
117msgstr "FEITO"
129msgstr "FEITO"
118
130
119−#: qml/Dash/GenericScopeView.qml:358
131+#: qml/Dash/GenericScopeView.qml:360
120msgid "See less"
132msgid "See less"
121msgstr "Ver menos"
133msgstr "Ver menos"
122
134
123−#: qml/Dash/GenericScopeView.qml:358
135+#: qml/Dash/GenericScopeView.qml:360
124msgid "See all"
136msgid "See all"
125msgstr "Ver todos"
137msgstr "Ver todos"
126
138
139+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
140+msgid "Search"
141+msgstr "Procurar"
142+
127#: qml/Dash/Previews/PreviewActionCombo.qml:34
143#: qml/Dash/Previews/PreviewActionCombo.qml:34
128msgid "More..."
144msgid "More..."
129msgstr "Mais..."
145msgstr "Mais..."
@@ -144,25 +160,25 @@ msgstr "Adicione uma crítica"
144msgid "Send"
160msgid "Send"
145msgstr "Enviar"
161msgstr "Enviar"
146
162
147−#: qml/Dash/ScopesOverview.qml:200
163+#: qml/Dash/ScopesOverview.qml:201
148msgid "Manage Dash"
164msgid "Manage Dash"
149−msgstr ""
165+msgstr "Gerir o Dash"
150
166
151−#: qml/Dash/ScopesOverview.qml:405
167+#: qml/Dash/ScopesOverview.qml:408
152msgid "Done"
168msgid "Done"
153−msgstr ""
169+msgstr "Concluído"
154
170
155−#: qml/Dash/ScopesOverview.qml:431
171+#: qml/Dash/ScopesOverview.qml:434
156msgid "Store"
172msgid "Store"
157−msgstr ""
173+msgstr "Loja"
158
174
159#: qml/Dash/ScopesOverviewTab.qml:36
175#: qml/Dash/ScopesOverviewTab.qml:36
160msgid "Favorites"
176msgid "Favorites"
161−msgstr ""
177+msgstr "Favoritos"
162
178
163#: qml/Dash/ScopesOverviewTab.qml:54
179#: qml/Dash/ScopesOverviewTab.qml:54
164msgid "All"
180msgid "All"
165−msgstr ""
181+msgstr "Todos"
166
182
167#: qml/Greeter/Greeter.qml:157
183#: qml/Greeter/Greeter.qml:157
168msgid "Swipe to unlock"
184msgid "Swipe to unlock"
@@ -230,17 +246,56 @@ msgstr "Falhou, toque para repetir"
230
246
231#: qml/Panel/Indicators/ModemInfoItem.qml:105
247#: qml/Panel/Indicators/ModemInfoItem.qml:105
232msgid "Unlock SIM"
248msgid "Unlock SIM"
233−msgstr ""
249+msgstr "Desbloquear SIM"
234
250
235#: qml/Panel/Indicators/RoamingIndication.qml:27
251#: qml/Panel/Indicators/RoamingIndication.qml:27
236msgid "Roaming"
252msgid "Roaming"
253+msgstr "Roaming"
254+
255+#: qml/Shell.qml:267
256+msgid "passphrase"
257+msgstr "frase de acesso"
258+
259+#: qml/Shell.qml:267
260+msgid "passcode"
237msgstr ""
261msgstr ""
238
262
239−#: qml/Panel/SearchIndicator.qml:27
263+#: qml/Shell.qml:269
240−msgid "Search"
264+#, qt-format
241−msgstr "Procurar"
265+msgid "Enter your %1"
266+msgstr "Introduza o seu %1"
242
267
243−#: qml/Shell.qml:256
268+#: qml/Shell.qml:270
244#, qt-format
269#, qt-format
270+msgid "Incorrect %1"
271+msgstr "Incorreto %1"
272+
273+#: qml/Shell.qml:272
245−msgid "Please enter %1"
274+msgid "Please re-enter"
246−msgstr "Por favor, introduza %1"
275+msgstr "Por favor, volte a reintroduzir"
276+
277+#: qml/Shell.qml:306
278+msgid "Sorry, incorrect passphrase."
279+msgstr "Desculpe, frase de acesso incorreta."
280+
281+#: qml/Shell.qml:307
282+msgid "Sorry, incorrect passcode."
283+msgstr ""
284+
285+#: qml/Shell.qml:308
286+msgid "This will be your last attempt."
287+msgstr "Esta será a sua última tentativa."
288+
289+#: qml/Shell.qml:310
290+msgid ""
291+"If passphrase is entered incorrectly, your phone will conduct a factory "
292+"reset and all personal data will be deleted."
293+msgstr ""
294+"Se a frase de acesso for introduzida incorretamente, o seu telemóvel vai "
295+"proceder ao restauro de fábrica e apagará toda a sua informação pessoal."
296+
297+#: qml/Shell.qml:311
298+msgid ""
299+"If passcode is entered incorrectly, your phone will conduct a factory reset "
300+"and all personal data will be deleted."
301+msgstr ""
po/pt_BR.po+78−21
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-07 12:34+0000\n"
11+"PO-Revision-Date: 2014-08-18 14:14+0000\n"
12−"Last-Translator: Salomão Carneiro de Brito <salomaocar@gmail.com>\n"
12+"Last-Translator: Rafael Neri <Unknown>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
13"Language-Team: Brazilian Portuguese <pt_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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-19 06:59+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Senha: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "Desafixar atalho"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "Você tem certeza de que deseja desligar?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Desligar"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Reiniciar"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Cancelar"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -92,6 +96,14 @@ msgstr ""
92"Agora você já domina os gestos das bordas e pode começar a usar o "
96"Agora você já domina os gestos das bordas e pode começar a usar o "
93"telefone<br><br>Toque na tela para iniciar"
97"telefone<br><br>Toque na tela para iniciar"
94
98
99+#: qml/Components/Lockscreen.qml:161
100+msgid "Too many incorrect attempts"
101+msgstr "Muitas tentativas incorretas"
102+
103+#: qml/Components/Lockscreen.qml:163
104+msgid "Please wait"
105+msgstr "Por favor, aguarde"
106+
95#: qml/Components/Lockscreen.qml:220
107#: qml/Components/Lockscreen.qml:220
96msgid "Emergency Call"
108msgid "Emergency Call"
97msgstr "Chamada de emergência"
109msgstr "Chamada de emergência"
@@ -125,6 +137,10 @@ msgstr "Ver menos"
125msgid "See all"
137msgid "See all"
126msgstr "Ver todos"
138msgstr "Ver todos"
127
139
140+#: qml/Panel/SearchIndicator.qml:27
141+msgid "Search"
142+msgstr "Pesquisar"
143+
128#: qml/Dash/Previews/PreviewActionCombo.qml:34
144#: qml/Dash/Previews/PreviewActionCombo.qml:34
129msgid "More..."
145msgid "More..."
130msgstr "Mais..."
146msgstr "Mais..."
@@ -147,23 +163,23 @@ msgstr "Enviar"
147
163
148#: qml/Dash/ScopesOverview.qml:200
164#: qml/Dash/ScopesOverview.qml:200
149msgid "Manage Dash"
165msgid "Manage Dash"
150−msgstr ""
166+msgstr "Gerencia painel"
151
167
152#: qml/Dash/ScopesOverview.qml:405
168#: qml/Dash/ScopesOverview.qml:405
153msgid "Done"
169msgid "Done"
154−msgstr ""
170+msgstr "Concluído"
155
171
156#: qml/Dash/ScopesOverview.qml:431
172#: qml/Dash/ScopesOverview.qml:431
157msgid "Store"
173msgid "Store"
158−msgstr ""
174+msgstr "Loja"
159
175
160#: qml/Dash/ScopesOverviewTab.qml:36
176#: qml/Dash/ScopesOverviewTab.qml:36
161msgid "Favorites"
177msgid "Favorites"
162−msgstr ""
178+msgstr "Favoritos"
163
179
164#: qml/Dash/ScopesOverviewTab.qml:54
180#: qml/Dash/ScopesOverviewTab.qml:54
165msgid "All"
181msgid "All"
166−msgstr ""
182+msgstr "Tudo"
167
183
168#: qml/Greeter/Greeter.qml:157
184#: qml/Greeter/Greeter.qml:157
169msgid "Swipe to unlock"
185msgid "Swipe to unlock"
@@ -231,17 +247,58 @@ msgstr "Falhou, toque para tentar novamente"
231
247
232#: qml/Panel/Indicators/ModemInfoItem.qml:105
248#: qml/Panel/Indicators/ModemInfoItem.qml:105
233msgid "Unlock SIM"
249msgid "Unlock SIM"
234−msgstr ""
250+msgstr "Desbloquear SIM"
235
251
236#: qml/Panel/Indicators/RoamingIndication.qml:27
252#: qml/Panel/Indicators/RoamingIndication.qml:27
237msgid "Roaming"
253msgid "Roaming"
238−msgstr ""
254+msgstr "Roaming"
239
255
240−#: qml/Panel/SearchIndicator.qml:27
256+#: qml/Shell.qml:267
257+msgid "passphrase"
258+msgstr "senha"
259+
260+#: qml/Shell.qml:267
241−msgid "Search"
261+msgid "passcode"
242−msgstr "Pesquisar"
262+msgstr "código de acesso"
243
263
244−#: qml/Shell.qml:256
264+#: qml/Shell.qml:269
245#, qt-format
265#, qt-format
266+msgid "Enter your %1"
267+msgstr "Digite o seu %1"
268+
269+#: qml/Shell.qml:270
270+#, qt-format
271+msgid "Incorrect %1"
272+msgstr "%1 incorreto"
273+
274+#: qml/Shell.qml:272
246−msgid "Please enter %1"
275+msgid "Please re-enter"
247−msgstr "Por favor, digite %1"
276+msgstr "Por favor, digite novamente"
277+
278+#: qml/Shell.qml:306
279+msgid "Sorry, incorrect passphrase."
280+msgstr "Desculpe, senha incorreta."
281+
282+#: qml/Shell.qml:307
283+msgid "Sorry, incorrect passcode."
284+msgstr "Desculpe, código de acesso incorreto."
285+
286+#: qml/Shell.qml:308
287+msgid "This will be your last attempt."
288+msgstr "Esta será a sua última tentativa."
289+
290+#: qml/Shell.qml:310
291+msgid ""
292+"If passphrase is entered incorrectly, your phone will conduct a factory "
293+"reset and all personal data will be deleted."
294+msgstr ""
295+"Se a senha for digitada incorretamente, o telefone será restaurado aos "
296+"padrões de fábrica e todos os dados pessoais serão apagados."
297+
298+#: qml/Shell.qml:311
299+msgid ""
300+"If passcode is entered incorrectly, your phone will conduct a factory reset "
301+"and all personal data will be deleted."
302+msgstr ""
303+"Se o código de acesso for digitado incorretamente, o telefone será "
304+"restaurado aos padrões de fábrica e todos os dados pessoais serão apagados."
po/ro.po+78−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-12 06:27+0000\n"
11+"PO-Revision-Date: 2014-08-14 19:34+0000\n"
12"Last-Translator: Marian Vasile <marianvasile1972@gmail.com>\n"
12"Last-Translator: Marian Vasile <marianvasile1972@gmail.com>\n"
13"Language-Team: Romanian <ro@li.org>\n"
13"Language-Team: Romanian <ro@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Parolă: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -93,39 +97,51 @@ msgstr ""
93"De acum stăpâniți gesturile de control și puteți începe să utilizați "
97"De acum stăpâniți gesturile de control și puteți începe să utilizați "
94"telefonul<br><br>Atingeți ecranul pentru a începe"
98"telefonul<br><br>Atingeți ecranul pentru a începe"
95
99
96−#: qml/Components/Lockscreen.qml:220
100+#: qml/Components/Lockscreen.qml:161
101+msgid "Too many incorrect attempts"
102+msgstr "Prea multe încercări greșite"
103+
104+#: qml/Components/Lockscreen.qml:163
105+msgid "Please wait"
106+msgstr "Așteptați"
107+
108+#: qml/Components/Lockscreen.qml:245
97msgid "Emergency Call"
109msgid "Emergency Call"
98msgstr "Apel de urgență"
110msgstr "Apel de urgență"
99
111
100−#: qml/Components/Lockscreen.qml:243
112+#: qml/Components/Lockscreen.qml:268
101msgid "OK"
113msgid "OK"
102msgstr "În regulă"
114msgstr "În regulă"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105#, qt-format
117#, qt-format
106msgid "Hello %1"
118msgid "Hello %1"
107msgstr "Salutări %1"
119msgstr "Salutări %1"
108
120
109−#: qml/Components/PassphraseLockscreen.qml:62
121+#: qml/Components/PassphraseLockscreen.qml:61
110msgid "Hello"
122msgid "Hello"
111msgstr "Salutări"
123msgstr "Salutări"
112
124
113−#: qml/Components/PinLockscreen.qml:198
125+#: qml/Components/PinLockscreen.qml:197
114msgid "CANCEL"
126msgid "CANCEL"
115msgstr "ANULEAZĂ"
127msgstr "ANULEAZĂ"
116
128
117−#: qml/Components/PinLockscreen.qml:216
129+#: qml/Components/PinLockscreen.qml:215
118msgid "DONE"
130msgid "DONE"
119msgstr "EFECTUAT"
131msgstr "EFECTUAT"
120
132
121−#: qml/Dash/GenericScopeView.qml:358
133+#: qml/Dash/GenericScopeView.qml:360
122msgid "See less"
134msgid "See less"
123msgstr "Afișează mai puține"
135msgstr "Afișează mai puține"
124
136
125−#: qml/Dash/GenericScopeView.qml:358
137+#: qml/Dash/GenericScopeView.qml:360
126msgid "See all"
138msgid "See all"
127msgstr "Afișează tot"
139msgstr "Afișează tot"
128
140
141+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
142+msgid "Search"
143+msgstr "Căutare"
144+
129#: qml/Dash/Previews/PreviewActionCombo.qml:34
145#: qml/Dash/Previews/PreviewActionCombo.qml:34
130msgid "More..."
146msgid "More..."
131msgstr "Mai mult ..."
147msgstr "Mai mult ..."
@@ -146,15 +162,15 @@ msgstr "Adăugați o recenzie"
146msgid "Send"
162msgid "Send"
147msgstr "Trimite"
163msgstr "Trimite"
148
164
149−#: qml/Dash/ScopesOverview.qml:200
165+#: qml/Dash/ScopesOverview.qml:201
150msgid "Manage Dash"
166msgid "Manage Dash"
151msgstr "Administrare Panou principal"
167msgstr "Administrare Panou principal"
152
168
153−#: qml/Dash/ScopesOverview.qml:405
169+#: qml/Dash/ScopesOverview.qml:408
154msgid "Done"
170msgid "Done"
155msgstr "Finalizat"
171msgstr "Finalizat"
156
172
157−#: qml/Dash/ScopesOverview.qml:431
173+#: qml/Dash/ScopesOverview.qml:434
158msgid "Store"
174msgid "Store"
159msgstr "Magazin"
175msgstr "Magazin"
160
176
@@ -238,11 +254,54 @@ msgstr "Deblocare SIM"
238msgid "Roaming"
254msgid "Roaming"
239msgstr "Roaming"
255msgstr "Roaming"
240
256
241−#: qml/Panel/SearchIndicator.qml:27
257+#: qml/Shell.qml:267
258+msgid "passphrase"
259+msgstr "frază parolă"
260+
261+#: qml/Shell.qml:267
242−msgid "Search"
262+msgid "passcode"
243−msgstr "Căutare"
263+msgstr "parolă"
244
264
245−#: qml/Shell.qml:256
265+#: qml/Shell.qml:269
246#, qt-format
266#, qt-format
247−msgid "Please enter %1"
267+msgid "Enter your %1"
248msgstr "Introduceți %1"
268msgstr "Introduceți %1"
269+
270+#: qml/Shell.qml:270
271+#, qt-format
272+msgid "Incorrect %1"
273+msgstr "%1 greșit"
274+
275+#: qml/Shell.qml:272
276+msgid "Please re-enter"
277+msgstr "Vă rugăm să încercați din nou"
278+
279+#: qml/Shell.qml:306
280+msgid "Sorry, incorrect passphrase."
281+msgstr "Frază parolă greșită"
282+
283+#: qml/Shell.qml:307
284+msgid "Sorry, incorrect passcode."
285+msgstr "Parolă greșită"
286+
287+#: qml/Shell.qml:308
288+msgid "This will be your last attempt."
289+msgstr "Aceasta va fi ultima încercare"
290+
291+#: qml/Shell.qml:310
292+msgid ""
293+"If passphrase is entered incorrectly, your phone will conduct a factory "
294+"reset and all personal data will be deleted."
295+msgstr ""
296+"Dacă fraza parolă este introdusă greșit, telefonul va iniția o resetare la "
297+"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "
298+"șterse."
299+
300+#: qml/Shell.qml:311
301+msgid ""
302+"If passcode is entered incorrectly, your phone will conduct a factory reset "
303+"and all personal data will be deleted."
304+msgstr ""
305+"Dacă parola este introdusă greșit, telefonul va iniția o resetare la "
306+"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "
307+"șterse."
po/ru.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-07-31 09:39+0000\n"
11"PO-Revision-Date: 2014-07-31 09:39+0000\n"
12"Last-Translator: Jay ZDLin <Unknown>\n"
12"Last-Translator: Jay ZDLin <Unknown>\n"
13"Language-Team: Russian <ru@li.org>\n"
13"Language-Team: Russian <ru@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -95,39 +99,51 @@ msgstr ""
95"Вы научились пользоваться Ubuntu и можете начать использовать свой "
99"Вы научились пользоваться Ubuntu и можете начать использовать свой "
96"телефон<br><br>Нажмите на экран"
100"телефон<br><br>Нажмите на экран"
97
101
98−#: qml/Components/Lockscreen.qml:220
102+#: qml/Components/Lockscreen.qml:161
103+msgid "Too many incorrect attempts"
104+msgstr ""
105+
106+#: qml/Components/Lockscreen.qml:163
107+msgid "Please wait"
108+msgstr ""
109+
110+#: qml/Components/Lockscreen.qml:245
99msgid "Emergency Call"
111msgid "Emergency Call"
100msgstr "Экстренный вызов"
112msgstr "Экстренный вызов"
101
113
102−#: qml/Components/Lockscreen.qml:243
114+#: qml/Components/Lockscreen.qml:268
103msgid "OK"
115msgid "OK"
104msgstr "ОК"
116msgstr "ОК"
105
117
106−#: qml/Components/PassphraseLockscreen.qml:62
118+#: qml/Components/PassphraseLockscreen.qml:61
107#, qt-format
119#, qt-format
108msgid "Hello %1"
120msgid "Hello %1"
109msgstr "Привет, %1"
121msgstr "Привет, %1"
110
122
111−#: qml/Components/PassphraseLockscreen.qml:62
123+#: qml/Components/PassphraseLockscreen.qml:61
112msgid "Hello"
124msgid "Hello"
113msgstr "Привет"
125msgstr "Привет"
114
126
115−#: qml/Components/PinLockscreen.qml:198
127+#: qml/Components/PinLockscreen.qml:197
116msgid "CANCEL"
128msgid "CANCEL"
117msgstr "ОТМЕНИТЬ"
129msgstr "ОТМЕНИТЬ"
118
130
119−#: qml/Components/PinLockscreen.qml:216
131+#: qml/Components/PinLockscreen.qml:215
120msgid "DONE"
132msgid "DONE"
121msgstr "ГОТОВО"
133msgstr "ГОТОВО"
122
134
123−#: qml/Dash/GenericScopeView.qml:358
135+#: qml/Dash/GenericScopeView.qml:360
124msgid "See less"
136msgid "See less"
125msgstr "Вкратце"
137msgstr "Вкратце"
126
138
127−#: qml/Dash/GenericScopeView.qml:358
139+#: qml/Dash/GenericScopeView.qml:360
128msgid "See all"
140msgid "See all"
129msgstr "Показать всё"
141msgstr "Показать всё"
130
142
143+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
144+msgid "Search"
145+msgstr "Поиск"
146+
131#: qml/Dash/Previews/PreviewActionCombo.qml:34
147#: qml/Dash/Previews/PreviewActionCombo.qml:34
132msgid "More..."
148msgid "More..."
133msgstr "Ещё..."
149msgstr "Ещё..."
@@ -148,15 +164,15 @@ msgstr "Добавьте отзыв"
148msgid "Send"
164msgid "Send"
149msgstr "Отправить"
165msgstr "Отправить"
150
166
151−#: qml/Dash/ScopesOverview.qml:200
167+#: qml/Dash/ScopesOverview.qml:201
152msgid "Manage Dash"
168msgid "Manage Dash"
153msgstr ""
169msgstr ""
154
170
155−#: qml/Dash/ScopesOverview.qml:405
171+#: qml/Dash/ScopesOverview.qml:408
156msgid "Done"
172msgid "Done"
157msgstr ""
173msgstr ""
158
174
159−#: qml/Dash/ScopesOverview.qml:431
175+#: qml/Dash/ScopesOverview.qml:434
160msgid "Store"
176msgid "Store"
161msgstr ""
177msgstr ""
162
178
@@ -240,11 +256,48 @@ msgstr ""
240msgid "Roaming"
256msgid "Roaming"
241msgstr ""
257msgstr ""
242
258
243−#: qml/Panel/SearchIndicator.qml:27
259+#: qml/Shell.qml:267
260+msgid "passphrase"
261+msgstr ""
262+
263+#: qml/Shell.qml:267
244−msgid "Search"
264+msgid "passcode"
245−msgstr "Поиск"
265+msgstr ""
266+
267+#: qml/Shell.qml:269
268+#, qt-format
269+msgid "Enter your %1"
270+msgstr ""
246
271
247−#: qml/Shell.qml:256
272+#: qml/Shell.qml:270
248#, qt-format
273#, qt-format
274+msgid "Incorrect %1"
275+msgstr ""
276+
277+#: qml/Shell.qml:272
249−msgid "Please enter %1"
278+msgid "Please re-enter"
250−msgstr "Пожалуйста, введите %1"
279+msgstr ""
280+
281+#: qml/Shell.qml:306
282+msgid "Sorry, incorrect passphrase."
283+msgstr ""
284+
285+#: qml/Shell.qml:307
286+msgid "Sorry, incorrect passcode."
287+msgstr ""
288+
289+#: qml/Shell.qml:308
290+msgid "This will be your last attempt."
291+msgstr ""
292+
293+#: qml/Shell.qml:310
294+msgid ""
295+"If passphrase is entered incorrectly, your phone will conduct a factory "
296+"reset and all personal data will be deleted."
297+msgstr ""
298+
299+#: qml/Shell.qml:311
300+msgid ""
301+"If passcode is entered incorrectly, your phone will conduct a factory reset "
302+"and all personal data will be deleted."
303+msgstr ""
po/shn.po+70−17
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2013-10-07 11:46+0000\n"
11"PO-Revision-Date: 2013-10-07 11:46+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Shan <shn@li.org>\n"
13"Language-Team: Shan <shn@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr ""
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
238msgstr ""
263msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
242−msgid "Please enter %1"
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/si.po+70−17
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2013-06-26 22:36+0000\n"
11"PO-Revision-Date: 2013-06-26 22:36+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Sinhalese <si@li.org>\n"
13"Language-Team: Sinhalese <si@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr ""
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
238msgstr ""
263msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
242−msgid "Please enter %1"
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/sl.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-08-06 06:11+0000\n"
11"PO-Revision-Date: 2014-08-06 06:11+0000\n"
12"Last-Translator: Damir Jerovšek <Unknown>\n"
12"Last-Translator: Damir Jerovšek <Unknown>\n"
13"Language-Team: Slovenian <sl@li.org>\n"
13"Language-Team: Slovenian <sl@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -92,39 +96,51 @@ msgstr ""
92"Sedaj, ko ste osvojili poteze robov, lahko začnete uporabljati "
96"Sedaj, ko ste osvojili poteze robov, lahko začnete uporabljati "
93"telefon<br><br>Tapnite na zaslon za začetek"
97"telefon<br><br>Tapnite na zaslon za začetek"
94
98
95−#: qml/Components/Lockscreen.qml:220
99+#: qml/Components/Lockscreen.qml:161
100+msgid "Too many incorrect attempts"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:163
104+msgid "Please wait"
105+msgstr ""
106+
107+#: qml/Components/Lockscreen.qml:245
96msgid "Emergency Call"
108msgid "Emergency Call"
97msgstr "Klic v sili"
109msgstr "Klic v sili"
98
110
99−#: qml/Components/Lockscreen.qml:243
111+#: qml/Components/Lockscreen.qml:268
100msgid "OK"
112msgid "OK"
101msgstr "V REDU"
113msgstr "V REDU"
102
114
103−#: qml/Components/PassphraseLockscreen.qml:62
115+#: qml/Components/PassphraseLockscreen.qml:61
104#, qt-format
116#, qt-format
105msgid "Hello %1"
117msgid "Hello %1"
106msgstr "Pozdravljeni, %1"
118msgstr "Pozdravljeni, %1"
107
119
108−#: qml/Components/PassphraseLockscreen.qml:62
120+#: qml/Components/PassphraseLockscreen.qml:61
109msgid "Hello"
121msgid "Hello"
110msgstr "Pozdravljeni"
122msgstr "Pozdravljeni"
111
123
112−#: qml/Components/PinLockscreen.qml:198
124+#: qml/Components/PinLockscreen.qml:197
113msgid "CANCEL"
125msgid "CANCEL"
114msgstr "PREKLIČI"
126msgstr "PREKLIČI"
115
127
116−#: qml/Components/PinLockscreen.qml:216
128+#: qml/Components/PinLockscreen.qml:215
117msgid "DONE"
129msgid "DONE"
118msgstr "KONČANO"
130msgstr "KONČANO"
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See less"
133msgid "See less"
122msgstr "Pokaži manj"
134msgstr "Pokaži manj"
123
135
124−#: qml/Dash/GenericScopeView.qml:358
136+#: qml/Dash/GenericScopeView.qml:360
125msgid "See all"
137msgid "See all"
126msgstr "Ogled vsega"
138msgstr "Ogled vsega"
127
139
140+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
141+msgid "Search"
142+msgstr "Iskanje"
143+
128#: qml/Dash/Previews/PreviewActionCombo.qml:34
144#: qml/Dash/Previews/PreviewActionCombo.qml:34
129msgid "More..."
145msgid "More..."
130msgstr "Več ..."
146msgstr "Več ..."
@@ -145,15 +161,15 @@ msgstr "Dodaj oceno"
145msgid "Send"
161msgid "Send"
146msgstr "Pošlji"
162msgstr "Pošlji"
147
163
148−#: qml/Dash/ScopesOverview.qml:200
164+#: qml/Dash/ScopesOverview.qml:201
149msgid "Manage Dash"
165msgid "Manage Dash"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:405
168+#: qml/Dash/ScopesOverview.qml:408
153msgid "Done"
169msgid "Done"
154msgstr ""
170msgstr ""
155
171
156−#: qml/Dash/ScopesOverview.qml:431
172+#: qml/Dash/ScopesOverview.qml:434
157msgid "Store"
173msgid "Store"
158msgstr ""
174msgstr ""
159
175
@@ -237,11 +253,48 @@ msgstr ""
237msgid "Roaming"
253msgid "Roaming"
238msgstr ""
254msgstr ""
239
255
240−#: qml/Panel/SearchIndicator.qml:27
256+#: qml/Shell.qml:267
257+msgid "passphrase"
258+msgstr ""
259+
260+#: qml/Shell.qml:267
241−msgid "Search"
261+msgid "passcode"
242−msgstr "Iskanje"
262+msgstr ""
263+
264+#: qml/Shell.qml:269
265+#, qt-format
266+msgid "Enter your %1"
267+msgstr ""
243
268
244−#: qml/Shell.qml:256
269+#: qml/Shell.qml:270
245#, qt-format
270#, qt-format
271+msgid "Incorrect %1"
272+msgstr ""
273+
274+#: qml/Shell.qml:272
246−msgid "Please enter %1"
275+msgid "Please re-enter"
276+msgstr ""
277+
278+#: qml/Shell.qml:306
279+msgid "Sorry, incorrect passphrase."
247−msgstr "Vnesite %1"
280+msgstr ""
281+
282+#: qml/Shell.qml:307
283+msgid "Sorry, incorrect passcode."
284+msgstr ""
285+
286+#: qml/Shell.qml:308
287+msgid "This will be your last attempt."
288+msgstr ""
289+
290+#: qml/Shell.qml:310
291+msgid ""
292+"If passphrase is entered incorrectly, your phone will conduct a factory "
293+"reset and all personal data will be deleted."
294+msgstr ""
295+
296+#: qml/Shell.qml:311
297+msgid ""
298+"If passcode is entered incorrectly, your phone will conduct a factory reset "
299+"and all personal data will be deleted."
300+msgstr ""
po/sq.po+70−17
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-01-15 13:51+0000\n"
11"PO-Revision-Date: 2014-01-15 13:51+0000\n"
12"Last-Translator: Besmir Zanaj <besmirzanaj@gmail.com>\n"
12"Last-Translator: Besmir Zanaj <besmirzanaj@gmail.com>\n"
13"Language-Team: Albanian <sq@li.org>\n"
13"Language-Team: Albanian <sq@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−"X-Launchpad-Export-Date: 2014-08-12 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -89,39 +93,51 @@ msgid ""
89"phone<br><br>Tap on the screen to start"
93"phone<br><br>Tap on the screen to start"
90msgstr ""
94msgstr ""
91
95
92−#: qml/Components/Lockscreen.qml:220
96+#: qml/Components/Lockscreen.qml:161
97+msgid "Too many incorrect attempts"
98+msgstr ""
99+
100+#: qml/Components/Lockscreen.qml:163
101+msgid "Please wait"
102+msgstr ""
103+
104+#: qml/Components/Lockscreen.qml:245
93msgid "Emergency Call"
105msgid "Emergency Call"
94msgstr ""
106msgstr ""
95
107
96−#: qml/Components/Lockscreen.qml:243
108+#: qml/Components/Lockscreen.qml:268
97msgid "OK"
109msgid "OK"
98msgstr ""
110msgstr ""
99
111
100−#: qml/Components/PassphraseLockscreen.qml:62
112+#: qml/Components/PassphraseLockscreen.qml:61
101#, qt-format
113#, qt-format
102msgid "Hello %1"
114msgid "Hello %1"
103msgstr ""
115msgstr ""
104
116
105−#: qml/Components/PassphraseLockscreen.qml:62
117+#: qml/Components/PassphraseLockscreen.qml:61
106msgid "Hello"
118msgid "Hello"
107msgstr ""
119msgstr ""
108
120
109−#: qml/Components/PinLockscreen.qml:198
121+#: qml/Components/PinLockscreen.qml:197
110msgid "CANCEL"
122msgid "CANCEL"
111msgstr ""
123msgstr ""
112
124
113−#: qml/Components/PinLockscreen.qml:216
125+#: qml/Components/PinLockscreen.qml:215
114msgid "DONE"
126msgid "DONE"
115msgstr ""
127msgstr ""
116
128
117−#: qml/Dash/GenericScopeView.qml:358
129+#: qml/Dash/GenericScopeView.qml:360
118msgid "See less"
130msgid "See less"
119msgstr ""
131msgstr ""
120
132
121−#: qml/Dash/GenericScopeView.qml:358
133+#: qml/Dash/GenericScopeView.qml:360
122msgid "See all"
134msgid "See all"
123msgstr ""
135msgstr ""
124
136
137+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
138+msgid "Search"
139+msgstr ""
140+
125#: qml/Dash/Previews/PreviewActionCombo.qml:34
141#: qml/Dash/Previews/PreviewActionCombo.qml:34
126msgid "More..."
142msgid "More..."
127msgstr ""
143msgstr ""
@@ -142,15 +158,15 @@ msgstr "Shto një rishikim"
142msgid "Send"
158msgid "Send"
143msgstr ""
159msgstr ""
144
160
145−#: qml/Dash/ScopesOverview.qml:200
161+#: qml/Dash/ScopesOverview.qml:201
146msgid "Manage Dash"
162msgid "Manage Dash"
147msgstr ""
163msgstr ""
148
164
149−#: qml/Dash/ScopesOverview.qml:405
165+#: qml/Dash/ScopesOverview.qml:408
150msgid "Done"
166msgid "Done"
151msgstr ""
167msgstr ""
152
168
153−#: qml/Dash/ScopesOverview.qml:431
169+#: qml/Dash/ScopesOverview.qml:434
154msgid "Store"
170msgid "Store"
155msgstr ""
171msgstr ""
156
172
@@ -234,11 +250,48 @@ msgstr ""
234msgid "Roaming"
250msgid "Roaming"
235msgstr ""
251msgstr ""
236
252
237−#: qml/Panel/SearchIndicator.qml:27
253+#: qml/Shell.qml:267
238−msgid "Search"
254+msgid "passphrase"
255+msgstr ""
256+
257+#: qml/Shell.qml:267
258+msgid "passcode"
259+msgstr ""
260+
261+#: qml/Shell.qml:269
262+#, qt-format
263+msgid "Enter your %1"
239msgstr ""
264msgstr ""
240
265
241−#: qml/Shell.qml:256
266+#: qml/Shell.qml:270
242#, qt-format
267#, qt-format
243−msgid "Please enter %1"
268+msgid "Incorrect %1"
269+msgstr ""
270+
271+#: qml/Shell.qml:272
272+msgid "Please re-enter"
273+msgstr ""
274+
275+#: qml/Shell.qml:306
276+msgid "Sorry, incorrect passphrase."
277+msgstr ""
278+
279+#: qml/Shell.qml:307
280+msgid "Sorry, incorrect passcode."
281+msgstr ""
282+
283+#: qml/Shell.qml:308
284+msgid "This will be your last attempt."
285+msgstr ""
286+
287+#: qml/Shell.qml:310
288+msgid ""
289+"If passphrase is entered incorrectly, your phone will conduct a factory "
290+"reset and all personal data will be deleted."
291+msgstr ""
292+
293+#: qml/Shell.qml:311
294+msgid ""
295+"If passcode is entered incorrectly, your phone will conduct a factory reset "
296+"and all personal data will be deleted."
244msgstr ""
297msgstr ""
po/sr.po+71−18
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2013-06-27 09:19+0000\n"
11"PO-Revision-Date: 2013-06-27 09:19+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: Serbian <sr@li.org>\n"
13"Language-Team: Serbian <sr@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "Претрага"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
238−msgstr "Претрага"
254+msgstr ""
239
255
240−#: qml/Shell.qml:256
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
241#, qt-format
261#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
264+
265+#: qml/Shell.qml:270
266+#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/sv.po+78−25
@@ -7,17 +7,21 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-31 08:10+0000\n"
11+"PO-Revision-Date: 2014-08-14 18:22+0000\n"
12−"Last-Translator: Peter Hultqvist <phq@silentorbit.com>\n"
12+"Last-Translator: Erik Simmesgård <Unknown>\n"
13"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
13"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19"Language: sv\n"
19"Language: sv\n"
20
20
21+#: plugins/LightDM/Greeter.cpp:129
22+msgid "Password: "
23+msgstr "Lösenord: "
24+
21#: plugins/Unity/Launcher/launcheritem.cpp:43
25#: plugins/Unity/Launcher/launcheritem.cpp:43
22#: plugins/Unity/Launcher/launcheritem.cpp:73
26#: plugins/Unity/Launcher/launcheritem.cpp:73
23msgid "Pin shortcut"
27msgid "Pin shortcut"
@@ -37,11 +41,11 @@ msgstr ""
37
41
38#: qml/Components/Dialogs.qml:153
42#: qml/Components/Dialogs.qml:153
39msgid "Restart"
43msgid "Restart"
40−msgstr ""
44+msgstr "Starta om"
41
45
42#: qml/Components/Dialogs.qml:162
46#: qml/Components/Dialogs.qml:162
43msgid "Cancel"
47msgid "Cancel"
44−msgstr ""
48+msgstr "Avbryt"
45
49
46#: qml/Components/EdgeDemoOverlay.qml:151
50#: qml/Components/EdgeDemoOverlay.qml:151
47msgid "Skip intro"
51msgid "Skip intro"
@@ -91,39 +95,51 @@ msgstr ""
91"Du har nu bemästrat kantgesterna och kan börja använda "
95"Du har nu bemästrat kantgesterna och kan börja använda "
92"telefonen<br><br>Tryck på skärmen för att starta"
96"telefonen<br><br>Tryck på skärmen för att starta"
93
97
94−#: qml/Components/Lockscreen.qml:220
98+#: qml/Components/Lockscreen.qml:161
99+msgid "Too many incorrect attempts"
100+msgstr ""
101+
102+#: qml/Components/Lockscreen.qml:163
103+msgid "Please wait"
104+msgstr "Var god vänta"
105+
106+#: qml/Components/Lockscreen.qml:245
95msgid "Emergency Call"
107msgid "Emergency Call"
96msgstr "Nödsamtal"
108msgstr "Nödsamtal"
97
109
98−#: qml/Components/Lockscreen.qml:243
110+#: qml/Components/Lockscreen.qml:268
99msgid "OK"
111msgid "OK"
100msgstr "Ok"
112msgstr "Ok"
101
113
102−#: qml/Components/PassphraseLockscreen.qml:62
114+#: qml/Components/PassphraseLockscreen.qml:61
103#, qt-format
115#, qt-format
104msgid "Hello %1"
116msgid "Hello %1"
105msgstr "Hej %1"
117msgstr "Hej %1"
106
118
107−#: qml/Components/PassphraseLockscreen.qml:62
119+#: qml/Components/PassphraseLockscreen.qml:61
108msgid "Hello"
120msgid "Hello"
109msgstr "Hej"
121msgstr "Hej"
110
122
111−#: qml/Components/PinLockscreen.qml:198
123+#: qml/Components/PinLockscreen.qml:197
112msgid "CANCEL"
124msgid "CANCEL"
113msgstr "AVBRYT"
125msgstr "AVBRYT"
114
126
115−#: qml/Components/PinLockscreen.qml:216
127+#: qml/Components/PinLockscreen.qml:215
116msgid "DONE"
128msgid "DONE"
117msgstr "KLAR"
129msgstr "KLAR"
118
130
119−#: qml/Dash/GenericScopeView.qml:358
131+#: qml/Dash/GenericScopeView.qml:360
120msgid "See less"
132msgid "See less"
121msgstr "Visa mindre"
133msgstr "Visa mindre"
122
134
123−#: qml/Dash/GenericScopeView.qml:358
135+#: qml/Dash/GenericScopeView.qml:360
124msgid "See all"
136msgid "See all"
125msgstr "Visa alla"
137msgstr "Visa alla"
126
138
139+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
140+msgid "Search"
141+msgstr "Sök"
142+
127#: qml/Dash/Previews/PreviewActionCombo.qml:34
143#: qml/Dash/Previews/PreviewActionCombo.qml:34
128msgid "More..."
144msgid "More..."
129msgstr "Mer…"
145msgstr "Mer…"
@@ -144,21 +160,21 @@ msgstr "Lägg till en recension"
144msgid "Send"
160msgid "Send"
145msgstr "Skicka"
161msgstr "Skicka"
146
162
147−#: qml/Dash/ScopesOverview.qml:200
163+#: qml/Dash/ScopesOverview.qml:201
148msgid "Manage Dash"
164msgid "Manage Dash"
149msgstr ""
165msgstr ""
150
166
151−#: qml/Dash/ScopesOverview.qml:405
167+#: qml/Dash/ScopesOverview.qml:408
152msgid "Done"
168msgid "Done"
153msgstr ""
169msgstr ""
154
170
155−#: qml/Dash/ScopesOverview.qml:431
171+#: qml/Dash/ScopesOverview.qml:434
156msgid "Store"
172msgid "Store"
157msgstr ""
173msgstr ""
158
174
159#: qml/Dash/ScopesOverviewTab.qml:36
175#: qml/Dash/ScopesOverviewTab.qml:36
160msgid "Favorites"
176msgid "Favorites"
161−msgstr ""
177+msgstr "Favoriter"
162
178
163#: qml/Dash/ScopesOverviewTab.qml:54
179#: qml/Dash/ScopesOverviewTab.qml:54
164msgid "All"
180msgid "All"
@@ -230,17 +246,54 @@ msgstr "Misslyckades, tryck för att försöka igen"
230
246
231#: qml/Panel/Indicators/ModemInfoItem.qml:105
247#: qml/Panel/Indicators/ModemInfoItem.qml:105
232msgid "Unlock SIM"
248msgid "Unlock SIM"
233−msgstr ""
249+msgstr "Lås upp SIM-kort"
234
250
235#: qml/Panel/Indicators/RoamingIndication.qml:27
251#: qml/Panel/Indicators/RoamingIndication.qml:27
236msgid "Roaming"
252msgid "Roaming"
253+msgstr "Roaming"
254+
255+#: qml/Shell.qml:267
256+msgid "passphrase"
237msgstr ""
257msgstr ""
238
258
239−#: qml/Panel/SearchIndicator.qml:27
259+#: qml/Shell.qml:267
240−msgid "Search"
260+msgid "passcode"
241−msgstr "Sök"
261+msgstr ""
242
262
243−#: qml/Shell.qml:256
263+#: qml/Shell.qml:269
244#, qt-format
264#, qt-format
265+msgid "Enter your %1"
266+msgstr "Skriv in din %1"
267+
268+#: qml/Shell.qml:270
269+#, qt-format
270+msgid "Incorrect %1"
271+msgstr "Inkorrekt %1"
272+
273+#: qml/Shell.qml:272
245−msgid "Please enter %1"
274+msgid "Please re-enter"
275+msgstr ""
276+
277+#: qml/Shell.qml:306
278+msgid "Sorry, incorrect passphrase."
246−msgstr "Vänligen fyll i %1"
279+msgstr ""
280+
281+#: qml/Shell.qml:307
282+msgid "Sorry, incorrect passcode."
283+msgstr ""
284+
285+#: qml/Shell.qml:308
286+msgid "This will be your last attempt."
287+msgstr ""
288+
289+#: qml/Shell.qml:310
290+msgid ""
291+"If passphrase is entered incorrectly, your phone will conduct a factory "
292+"reset and all personal data will be deleted."
293+msgstr ""
294+
295+#: qml/Shell.qml:311
296+msgid ""
297+"If passcode is entered incorrectly, your phone will conduct a factory reset "
298+"and all personal data will be deleted."
299+msgstr ""
po/sw.po+71−18
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-01-14 19:28+0000\n"
11"PO-Revision-Date: 2014-01-14 19:28+0000\n"
12"Last-Translator: Damas <Unknown>\n"
12"Last-Translator: Damas <Unknown>\n"
13"Language-Team: Swahili <sw@li.org>\n"
13"Language-Team: Swahili <sw@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "Tafuta"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr "Tuma"
158msgstr "Tuma"
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
238−msgstr "Tafuta"
254+msgstr ""
239
255
240−#: qml/Shell.qml:256
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
241#, qt-format
261#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
264+
265+#: qml/Shell.qml:270
266+#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/ta.po+72−19
@@ -7,17 +7,21 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2013-10-24 11:36+0000\n"
11"PO-Revision-Date: 2013-10-24 11:36+0000\n"
12"Last-Translator: Arun Kumar - அருண் குமார் <thangam.arunx@gmail.com>\n"
12"Last-Translator: Arun Kumar - அருண் குமார் <thangam.arunx@gmail.com>\n"
13"Language-Team: Ubuntu Tamil Team/Free Tamil Computing/Thamizha\n"
13"Language-Team: Ubuntu Tamil Team/Free Tamil Computing/Thamizha\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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19"Language: ta\n"
19"Language: ta\n"
20
20
21+#: plugins/LightDM/Greeter.cpp:129
22+msgid "Password: "
23+msgstr ""
24+
21#: plugins/Unity/Launcher/launcheritem.cpp:43
25#: plugins/Unity/Launcher/launcheritem.cpp:43
22#: plugins/Unity/Launcher/launcheritem.cpp:73
26#: plugins/Unity/Launcher/launcheritem.cpp:73
23msgid "Pin shortcut"
27msgid "Pin shortcut"
@@ -91,39 +95,51 @@ msgid ""
91"phone<br><br>Tap on the screen to start"
95"phone<br><br>Tap on the screen to start"
92msgstr ""
96msgstr ""
93
97
94−#: qml/Components/Lockscreen.qml:220
98+#: qml/Components/Lockscreen.qml:161
99+msgid "Too many incorrect attempts"
100+msgstr ""
101+
102+#: qml/Components/Lockscreen.qml:163
103+msgid "Please wait"
104+msgstr ""
105+
106+#: qml/Components/Lockscreen.qml:245
95msgid "Emergency Call"
107msgid "Emergency Call"
96msgstr "அவசர அழைப்பு"
108msgstr "அவசர அழைப்பு"
97
109
98−#: qml/Components/Lockscreen.qml:243
110+#: qml/Components/Lockscreen.qml:268
99msgid "OK"
111msgid "OK"
100msgstr ""
112msgstr ""
101
113
102−#: qml/Components/PassphraseLockscreen.qml:62
114+#: qml/Components/PassphraseLockscreen.qml:61
103#, qt-format
115#, qt-format
104msgid "Hello %1"
116msgid "Hello %1"
105msgstr "வணக்கம் %1"
117msgstr "வணக்கம் %1"
106
118
107−#: qml/Components/PassphraseLockscreen.qml:62
119+#: qml/Components/PassphraseLockscreen.qml:61
108msgid "Hello"
120msgid "Hello"
109msgstr "வணக்கம்"
121msgstr "வணக்கம்"
110
122
111−#: qml/Components/PinLockscreen.qml:198
123+#: qml/Components/PinLockscreen.qml:197
112msgid "CANCEL"
124msgid "CANCEL"
113msgstr ""
125msgstr ""
114
126
115−#: qml/Components/PinLockscreen.qml:216
127+#: qml/Components/PinLockscreen.qml:215
116msgid "DONE"
128msgid "DONE"
117msgstr ""
129msgstr ""
118
130
119−#: qml/Dash/GenericScopeView.qml:358
131+#: qml/Dash/GenericScopeView.qml:360
120msgid "See less"
132msgid "See less"
121msgstr ""
133msgstr ""
122
134
123−#: qml/Dash/GenericScopeView.qml:358
135+#: qml/Dash/GenericScopeView.qml:360
124msgid "See all"
136msgid "See all"
125msgstr ""
137msgstr ""
126
138
139+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
140+msgid "Search"
141+msgstr "தெடு"
142+
127#: qml/Dash/Previews/PreviewActionCombo.qml:34
143#: qml/Dash/Previews/PreviewActionCombo.qml:34
128msgid "More..."
144msgid "More..."
129msgstr ""
145msgstr ""
@@ -144,15 +160,15 @@ msgstr "ஒரு பரிசீலனையை சேர்"
144msgid "Send"
160msgid "Send"
145msgstr "அனுப்பு"
161msgstr "அனுப்பு"
146
162
147−#: qml/Dash/ScopesOverview.qml:200
163+#: qml/Dash/ScopesOverview.qml:201
148msgid "Manage Dash"
164msgid "Manage Dash"
149msgstr ""
165msgstr ""
150
166
151−#: qml/Dash/ScopesOverview.qml:405
167+#: qml/Dash/ScopesOverview.qml:408
152msgid "Done"
168msgid "Done"
153msgstr ""
169msgstr ""
154
170
155−#: qml/Dash/ScopesOverview.qml:431
171+#: qml/Dash/ScopesOverview.qml:434
156msgid "Store"
172msgid "Store"
157msgstr ""
173msgstr ""
158
174
@@ -236,11 +252,48 @@ msgstr ""
236msgid "Roaming"
252msgid "Roaming"
237msgstr ""
253msgstr ""
238
254
239−#: qml/Panel/SearchIndicator.qml:27
255+#: qml/Shell.qml:267
256+msgid "passphrase"
257+msgstr ""
258+
259+#: qml/Shell.qml:267
240−msgid "Search"
260+msgid "passcode"
241−msgstr "தெடு"
261+msgstr ""
262+
263+#: qml/Shell.qml:269
264+#, qt-format
265+msgid "Enter your %1"
266+msgstr ""
242
267
243−#: qml/Shell.qml:256
268+#: qml/Shell.qml:270
244#, qt-format
269#, qt-format
270+msgid "Incorrect %1"
271+msgstr ""
272+
273+#: qml/Shell.qml:272
245−msgid "Please enter %1"
274+msgid "Please re-enter"
246−msgstr "தயவுச்செய்து %1 உள்ளிடு"
275+msgstr ""
276+
277+#: qml/Shell.qml:306
278+msgid "Sorry, incorrect passphrase."
279+msgstr ""
280+
281+#: qml/Shell.qml:307
282+msgid "Sorry, incorrect passcode."
283+msgstr ""
284+
285+#: qml/Shell.qml:308
286+msgid "This will be your last attempt."
287+msgstr ""
288+
289+#: qml/Shell.qml:310
290+msgid ""
291+"If passphrase is entered incorrectly, your phone will conduct a factory "
292+"reset and all personal data will be deleted."
293+msgstr ""
294+
295+#: qml/Shell.qml:311
296+msgid ""
297+"If passcode is entered incorrectly, your phone will conduct a factory reset "
298+"and all personal data will be deleted."
299+msgstr ""
po/te.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-07-19 10:04+0000\n"
11"PO-Revision-Date: 2014-07-19 10:04+0000\n"
12"Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"
12"Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"
13"Language-Team: Telugu <te@li.org>\n"
13"Language-Team: Telugu <te@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr "అత్యవసర పిలుపు"
105msgstr "అత్యవసర పిలుపు"
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr "సరే"
109msgstr "సరే"
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr "హలో %1"
114msgstr "హలో %1"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr "హలో"
118msgstr "హలో"
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr "రద్దుచేయి"
122msgstr "రద్దుచేయి"
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr "పూర్తయ్యింది"
126msgstr "పూర్తయ్యింది"
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "వెతుకు"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr "మరిన్ని..."
142msgstr "మరిన్ని..."
@@ -141,15 +157,15 @@ msgstr "ఒక సమీక్షను వ్రాయండి"
141msgid "Send"
157msgid "Send"
142msgstr "పంపు"
158msgstr "పంపు"
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
237−msgid "Search"
257+msgid "passcode"
238−msgstr "వెతుకు"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
243−msgstr "దయచేసి %1 ప్రవేశపెట్టండి"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
296+msgstr ""
po/tr.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-07-16 17:58+0000\n"
11"PO-Revision-Date: 2014-07-16 17:58+0000\n"
12"Last-Translator: Volkan Gezer <Unknown>\n"
12"Last-Translator: Volkan Gezer <Unknown>\n"
13"Language-Team: Turkish <tr@li.org>\n"
13"Language-Team: Turkish <tr@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -91,39 +95,51 @@ msgstr ""
91"Kenar haraketlerini öğrendiniz ve telefonu kullanmaya "
95"Kenar haraketlerini öğrendiniz ve telefonu kullanmaya "
92"başlayabilirsiniz<br><br>Başlamak için ekrana dokunun"
96"başlayabilirsiniz<br><br>Başlamak için ekrana dokunun"
93
97
94−#: qml/Components/Lockscreen.qml:220
98+#: qml/Components/Lockscreen.qml:161
99+msgid "Too many incorrect attempts"
100+msgstr ""
101+
102+#: qml/Components/Lockscreen.qml:163
103+msgid "Please wait"
104+msgstr ""
105+
106+#: qml/Components/Lockscreen.qml:245
95msgid "Emergency Call"
107msgid "Emergency Call"
96msgstr "Acil Arama"
108msgstr "Acil Arama"
97
109
98−#: qml/Components/Lockscreen.qml:243
110+#: qml/Components/Lockscreen.qml:268
99msgid "OK"
111msgid "OK"
100msgstr "Tamam"
112msgstr "Tamam"
101
113
102−#: qml/Components/PassphraseLockscreen.qml:62
114+#: qml/Components/PassphraseLockscreen.qml:61
103#, qt-format
115#, qt-format
104msgid "Hello %1"
116msgid "Hello %1"
105msgstr "Merhaba %1"
117msgstr "Merhaba %1"
106
118
107−#: qml/Components/PassphraseLockscreen.qml:62
119+#: qml/Components/PassphraseLockscreen.qml:61
108msgid "Hello"
120msgid "Hello"
109msgstr "Merhaba"
121msgstr "Merhaba"
110
122
111−#: qml/Components/PinLockscreen.qml:198
123+#: qml/Components/PinLockscreen.qml:197
112msgid "CANCEL"
124msgid "CANCEL"
113msgstr "İPTAL"
125msgstr "İPTAL"
114
126
115−#: qml/Components/PinLockscreen.qml:216
127+#: qml/Components/PinLockscreen.qml:215
116msgid "DONE"
128msgid "DONE"
117msgstr "BİTTİ"
129msgstr "BİTTİ"
118
130
119−#: qml/Dash/GenericScopeView.qml:358
131+#: qml/Dash/GenericScopeView.qml:360
120msgid "See less"
132msgid "See less"
121msgstr "Daha azını gör"
133msgstr "Daha azını gör"
122
134
123−#: qml/Dash/GenericScopeView.qml:358
135+#: qml/Dash/GenericScopeView.qml:360
124msgid "See all"
136msgid "See all"
125msgstr ""
137msgstr ""
126
138
139+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
140+msgid "Search"
141+msgstr "Ara"
142+
127#: qml/Dash/Previews/PreviewActionCombo.qml:34
143#: qml/Dash/Previews/PreviewActionCombo.qml:34
128msgid "More..."
144msgid "More..."
129msgstr "Daha fazlası..."
145msgstr "Daha fazlası..."
@@ -144,15 +160,15 @@ msgstr "Bir inceleme ekle"
144msgid "Send"
160msgid "Send"
145msgstr "Gönder"
161msgstr "Gönder"
146
162
147−#: qml/Dash/ScopesOverview.qml:200
163+#: qml/Dash/ScopesOverview.qml:201
148msgid "Manage Dash"
164msgid "Manage Dash"
149msgstr ""
165msgstr ""
150
166
151−#: qml/Dash/ScopesOverview.qml:405
167+#: qml/Dash/ScopesOverview.qml:408
152msgid "Done"
168msgid "Done"
153msgstr ""
169msgstr ""
154
170
155−#: qml/Dash/ScopesOverview.qml:431
171+#: qml/Dash/ScopesOverview.qml:434
156msgid "Store"
172msgid "Store"
157msgstr ""
173msgstr ""
158
174
@@ -236,11 +252,48 @@ msgstr ""
236msgid "Roaming"
252msgid "Roaming"
237msgstr ""
253msgstr ""
238
254
239−#: qml/Panel/SearchIndicator.qml:27
255+#: qml/Shell.qml:267
256+msgid "passphrase"
257+msgstr ""
258+
259+#: qml/Shell.qml:267
240−msgid "Search"
260+msgid "passcode"
241−msgstr "Ara"
261+msgstr ""
262+
263+#: qml/Shell.qml:269
264+#, qt-format
265+msgid "Enter your %1"
266+msgstr ""
242
267
243−#: qml/Shell.qml:256
268+#: qml/Shell.qml:270
244#, qt-format
269#, qt-format
270+msgid "Incorrect %1"
271+msgstr ""
272+
273+#: qml/Shell.qml:272
245−msgid "Please enter %1"
274+msgid "Please re-enter"
275+msgstr ""
276+
277+#: qml/Shell.qml:306
278+msgid "Sorry, incorrect passphrase."
246−msgstr "Lütfen %1 girin"
279+msgstr ""
280+
281+#: qml/Shell.qml:307
282+msgid "Sorry, incorrect passcode."
283+msgstr ""
284+
285+#: qml/Shell.qml:308
286+msgid "This will be your last attempt."
287+msgstr ""
288+
289+#: qml/Shell.qml:310
290+msgid ""
291+"If passphrase is entered incorrectly, your phone will conduct a factory "
292+"reset and all personal data will be deleted."
293+msgstr ""
294+
295+#: qml/Shell.qml:311
296+msgid ""
297+"If passcode is entered incorrectly, your phone will conduct a factory reset "
298+"and all personal data will be deleted."
299+msgstr ""
po/ug.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-07-29 04:06+0000\n"
11"PO-Revision-Date: 2014-07-29 04:06+0000\n"
12"Last-Translator: Gheyret T.Kenji <Unknown>\n"
12"Last-Translator: Gheyret T.Kenji <Unknown>\n"
13"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
13"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -90,39 +94,51 @@ msgstr ""
90"ئېكراننى چېكىپ باشلاڭ<br><br>سىز ھازىر گىرۋەك بارماق ئىشارەتلىرىنى ئىگىلەپ "
94"ئېكراننى چېكىپ باشلاڭ<br><br>سىز ھازىر گىرۋەك بارماق ئىشارەتلىرىنى ئىگىلەپ "
91"بولدىڭىز،ئەمدى تېلېفوننى ئىشلىتىشنى باشلىسىڭىز بولىدۇ"
95"بولدىڭىز،ئەمدى تېلېفوننى ئىشلىتىشنى باشلىسىڭىز بولىدۇ"
92
96
93−#: qml/Components/Lockscreen.qml:220
97+#: qml/Components/Lockscreen.qml:161
98+msgid "Too many incorrect attempts"
99+msgstr ""
100+
101+#: qml/Components/Lockscreen.qml:163
102+msgid "Please wait"
103+msgstr ""
104+
105+#: qml/Components/Lockscreen.qml:245
94msgid "Emergency Call"
106msgid "Emergency Call"
95msgstr "جىددىي تېلېفون"
107msgstr "جىددىي تېلېفون"
96
108
97−#: qml/Components/Lockscreen.qml:243
109+#: qml/Components/Lockscreen.qml:268
98msgid "OK"
110msgid "OK"
99msgstr "تامام"
111msgstr "تامام"
100
112
101−#: qml/Components/PassphraseLockscreen.qml:62
113+#: qml/Components/PassphraseLockscreen.qml:61
102#, qt-format
114#, qt-format
103msgid "Hello %1"
115msgid "Hello %1"
104msgstr "سالام %1"
116msgstr "سالام %1"
105
117
106−#: qml/Components/PassphraseLockscreen.qml:62
118+#: qml/Components/PassphraseLockscreen.qml:61
107msgid "Hello"
119msgid "Hello"
108msgstr "ئەسسالامۇئەلەيكۇم"
120msgstr "ئەسسالامۇئەلەيكۇم"
109
121
110−#: qml/Components/PinLockscreen.qml:198
122+#: qml/Components/PinLockscreen.qml:197
111msgid "CANCEL"
123msgid "CANCEL"
112msgstr "ۋاز كەچ"
124msgstr "ۋاز كەچ"
113
125
114−#: qml/Components/PinLockscreen.qml:216
126+#: qml/Components/PinLockscreen.qml:215
115msgid "DONE"
127msgid "DONE"
116msgstr "تامام"
128msgstr "تامام"
117
129
118−#: qml/Dash/GenericScopeView.qml:358
130+#: qml/Dash/GenericScopeView.qml:360
119msgid "See less"
131msgid "See less"
120msgstr "ئازراق كۆرۈش"
132msgstr "ئازراق كۆرۈش"
121
133
122−#: qml/Dash/GenericScopeView.qml:358
134+#: qml/Dash/GenericScopeView.qml:360
123msgid "See all"
135msgid "See all"
124msgstr "ھەممىنى كۆرۈش…"
136msgstr "ھەممىنى كۆرۈش…"
125
137
138+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
139+msgid "Search"
140+msgstr "ئىزدە"
141+
126#: qml/Dash/Previews/PreviewActionCombo.qml:34
142#: qml/Dash/Previews/PreviewActionCombo.qml:34
127msgid "More..."
143msgid "More..."
128msgstr "تېخىمۇ كۆپ…"
144msgstr "تېخىمۇ كۆپ…"
@@ -143,15 +159,15 @@ msgstr "باھا قوشۇش"
143msgid "Send"
159msgid "Send"
144msgstr "ئەۋەت"
160msgstr "ئەۋەت"
145
161
146−#: qml/Dash/ScopesOverview.qml:200
162+#: qml/Dash/ScopesOverview.qml:201
147msgid "Manage Dash"
163msgid "Manage Dash"
148msgstr ""
164msgstr ""
149
165
150−#: qml/Dash/ScopesOverview.qml:405
166+#: qml/Dash/ScopesOverview.qml:408
151msgid "Done"
167msgid "Done"
152msgstr ""
168msgstr ""
153
169
154−#: qml/Dash/ScopesOverview.qml:431
170+#: qml/Dash/ScopesOverview.qml:434
155msgid "Store"
171msgid "Store"
156msgstr ""
172msgstr ""
157
173
@@ -235,11 +251,48 @@ msgstr ""
235msgid "Roaming"
251msgid "Roaming"
236msgstr ""
252msgstr ""
237
253
238−#: qml/Panel/SearchIndicator.qml:27
254+#: qml/Shell.qml:267
255+msgid "passphrase"
256+msgstr ""
257+
258+#: qml/Shell.qml:267
239−msgid "Search"
259+msgid "passcode"
240−msgstr "ئىزدە"
260+msgstr ""
261+
262+#: qml/Shell.qml:269
263+#, qt-format
264+msgid "Enter your %1"
265+msgstr ""
241
266
242−#: qml/Shell.qml:256
267+#: qml/Shell.qml:270
243#, qt-format
268#, qt-format
269+msgid "Incorrect %1"
270+msgstr ""
271+
272+#: qml/Shell.qml:272
244−msgid "Please enter %1"
273+msgid "Please re-enter"
245−msgstr "%1 نى كىرگۈزۈڭ"
274+msgstr ""
275+
276+#: qml/Shell.qml:306
277+msgid "Sorry, incorrect passphrase."
278+msgstr ""
279+
280+#: qml/Shell.qml:307
281+msgid "Sorry, incorrect passcode."
282+msgstr ""
283+
284+#: qml/Shell.qml:308
285+msgid "This will be your last attempt."
286+msgstr ""
287+
288+#: qml/Shell.qml:310
289+msgid ""
290+"If passphrase is entered incorrectly, your phone will conduct a factory "
291+"reset and all personal data will be deleted."
292+msgstr ""
293+
294+#: qml/Shell.qml:311
295+msgid ""
296+"If passcode is entered incorrectly, your phone will conduct a factory reset "
297+"and all personal data will be deleted."
298+msgstr ""
po/uk.po+88−31
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-29 07:53+0000\n"
11+"PO-Revision-Date: 2014-08-17 14:49+0000\n"
12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
13"Language-Team: Ukrainian <uk@li.org>\n"
13"Language-Team: Ukrainian <uk@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr "Пароль: "
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "Розблокувати кнопку"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "Ви справді хочете вимкнути пристрій?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "Вимкнути"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "Перезавантажити"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "Скасувати"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -93,39 +97,51 @@ msgstr ""
93"Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер телефоном "
97"Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер телефоном "
94"можна користуватися.<br><br>Торкніться екрана, щоб розпочати."
98"можна користуватися.<br><br>Торкніться екрана, щоб розпочати."
95
99
96−#: qml/Components/Lockscreen.qml:220
100+#: qml/Components/Lockscreen.qml:161
101+msgid "Too many incorrect attempts"
102+msgstr "Забагато помилкових спроб"
103+
104+#: qml/Components/Lockscreen.qml:163
105+msgid "Please wait"
106+msgstr "Будь ласка, зачекайте"
107+
108+#: qml/Components/Lockscreen.qml:245
97msgid "Emergency Call"
109msgid "Emergency Call"
98msgstr "Терміновий виклик"
110msgstr "Терміновий виклик"
99
111
100−#: qml/Components/Lockscreen.qml:243
112+#: qml/Components/Lockscreen.qml:268
101msgid "OK"
113msgid "OK"
102msgstr "Гаразд"
114msgstr "Гаразд"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105#, qt-format
117#, qt-format
106msgid "Hello %1"
118msgid "Hello %1"
107msgstr "Привіт, %1"
119msgstr "Привіт, %1"
108
120
109−#: qml/Components/PassphraseLockscreen.qml:62
121+#: qml/Components/PassphraseLockscreen.qml:61
110msgid "Hello"
122msgid "Hello"
111msgstr "Привіт!"
123msgstr "Привіт!"
112
124
113−#: qml/Components/PinLockscreen.qml:198
125+#: qml/Components/PinLockscreen.qml:197
114msgid "CANCEL"
126msgid "CANCEL"
115msgstr "Скасувати"
127msgstr "Скасувати"
116
128
117−#: qml/Components/PinLockscreen.qml:216
129+#: qml/Components/PinLockscreen.qml:215
118msgid "DONE"
130msgid "DONE"
119msgstr "Виконано"
131msgstr "Виконано"
120
132
121−#: qml/Dash/GenericScopeView.qml:358
133+#: qml/Dash/GenericScopeView.qml:360
122msgid "See less"
134msgid "See less"
123msgstr "Стисліше"
135msgstr "Стисліше"
124
136
125−#: qml/Dash/GenericScopeView.qml:358
137+#: qml/Dash/GenericScopeView.qml:360
126msgid "See all"
138msgid "See all"
127msgstr "Детальніше"
139msgstr "Детальніше"
128
140
141+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
142+msgid "Search"
143+msgstr "Пошук"
144+
129#: qml/Dash/Previews/PreviewActionCombo.qml:34
145#: qml/Dash/Previews/PreviewActionCombo.qml:34
130msgid "More..."
146msgid "More..."
131msgstr "Більше…"
147msgstr "Більше…"
@@ -146,25 +162,25 @@ msgstr "Додати рецензію"
146msgid "Send"
162msgid "Send"
147msgstr "Надіслати"
163msgstr "Надіслати"
148
164
149−#: qml/Dash/ScopesOverview.qml:200
165+#: qml/Dash/ScopesOverview.qml:201
150msgid "Manage Dash"
166msgid "Manage Dash"
151−msgstr ""
167+msgstr "Керування панеллю"
152
168
153−#: qml/Dash/ScopesOverview.qml:405
169+#: qml/Dash/ScopesOverview.qml:408
154msgid "Done"
170msgid "Done"
155−msgstr ""
171+msgstr "Виконано"
156
172
157−#: qml/Dash/ScopesOverview.qml:431
173+#: qml/Dash/ScopesOverview.qml:434
158msgid "Store"
174msgid "Store"
159−msgstr ""
175+msgstr "Крамниця"
160
176
161#: qml/Dash/ScopesOverviewTab.qml:36
177#: qml/Dash/ScopesOverviewTab.qml:36
162msgid "Favorites"
178msgid "Favorites"
163−msgstr ""
179+msgstr "Улюблене"
164
180
165#: qml/Dash/ScopesOverviewTab.qml:54
181#: qml/Dash/ScopesOverviewTab.qml:54
166msgid "All"
182msgid "All"
167−msgstr ""
183+msgstr "Все"
168
184
169#: qml/Greeter/Greeter.qml:157
185#: qml/Greeter/Greeter.qml:157
170msgid "Swipe to unlock"
186msgid "Swipe to unlock"
@@ -232,17 +248,58 @@ msgstr "Помилка, торкніться, щоб повторити спро
232
248
233#: qml/Panel/Indicators/ModemInfoItem.qml:105
249#: qml/Panel/Indicators/ModemInfoItem.qml:105
234msgid "Unlock SIM"
250msgid "Unlock SIM"
235−msgstr ""
251+msgstr "Розблокувати SIM"
236
252
237#: qml/Panel/Indicators/RoamingIndication.qml:27
253#: qml/Panel/Indicators/RoamingIndication.qml:27
238msgid "Roaming"
254msgid "Roaming"
239−msgstr ""
255+msgstr "Роумінг"
240
256
241−#: qml/Panel/SearchIndicator.qml:27
257+#: qml/Shell.qml:267
258+msgid "passphrase"
259+msgstr "пароль"
260+
261+#: qml/Shell.qml:267
242−msgid "Search"
262+msgid "passcode"
243−msgstr "Пошук"
263+msgstr "код-пароль"
244
264
245−#: qml/Shell.qml:256
265+#: qml/Shell.qml:269
246#, qt-format
266#, qt-format
267+msgid "Enter your %1"
268+msgstr "Вкажіть ваш %1"
269+
270+#: qml/Shell.qml:270
271+#, qt-format
272+msgid "Incorrect %1"
273+msgstr "Помилковий %1"
274+
275+#: qml/Shell.qml:272
247−msgid "Please enter %1"
276+msgid "Please re-enter"
248−msgstr "Будь ласка, введіть %1"
277+msgstr "Будь ласка, вкажіть ще раз"
278+
279+#: qml/Shell.qml:306
280+msgid "Sorry, incorrect passphrase."
281+msgstr "Вибачте, помилковий пароль."
282+
283+#: qml/Shell.qml:307
284+msgid "Sorry, incorrect passcode."
285+msgstr "Вибачте, помилковий код-пароль."
286+
287+#: qml/Shell.qml:308
288+msgid "This will be your last attempt."
289+msgstr "Ця спроба буде останньою."
290+
291+#: qml/Shell.qml:310
292+msgid ""
293+"If passphrase is entered incorrectly, your phone will conduct a factory "
294+"reset and all personal data will be deleted."
295+msgstr ""
296+"Якщо пароль буде вказано неправильно, телефон повернеться до початкового "
297+"стану, усі особисті дані буде вилучено."
298+
299+#: qml/Shell.qml:311
300+msgid ""
301+"If passcode is entered incorrectly, your phone will conduct a factory reset "
302+"and all personal data will be deleted."
303+msgstr ""
304+"Якщо код-пароль буде вказано неправильно, телефон повернеться до початкового "
305+"стану, усі особисті дані буде вилучено."
po/unity8.pot+69−16
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: \n"
10"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
17"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"
18"Content-Transfer-Encoding: 8bit\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr ""
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
238msgstr ""
263msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
242−msgid "Please enter %1"
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/vi.po+70−17
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-01-15 01:19+0000\n"
11"PO-Revision-Date: 2014-01-15 01:19+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Vietnamese <vi@li.org>\n"
13"Language-Team: Vietnamese <vi@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr ""
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
238msgstr ""
263msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
242−msgid "Please enter %1"
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/xh.po+70−17
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2013-09-28 13:20+0000\n"
11"PO-Revision-Date: 2013-09-28 13:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Xhosa <xh@li.org>\n"
13"Language-Team: Xhosa <xh@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr ""
93msgstr ""
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr ""
105msgstr ""
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr ""
109msgstr ""
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr ""
114msgstr ""
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr ""
122msgstr ""
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr ""
126msgstr ""
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr ""
130msgstr ""
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr ""
134msgstr ""
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr ""
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr ""
142msgstr ""
@@ -141,15 +157,15 @@ msgstr ""
141msgid "Send"
157msgid "Send"
142msgstr ""
158msgstr ""
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
237−msgid "Search"
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
238msgstr ""
263msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
242−msgid "Please enter %1"
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
243msgstr ""
296msgstr ""
po/zh_CN.po+84−31
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-29 02:48+0000\n"
11+"PO-Revision-Date: 2014-08-12 14:09+0000\n"
12−"Last-Translator: Luo Lei <luolei@ubuntukylin.com>\n"
12+"Last-Translator: Anthony Wong <anthony.wong@ubuntu.com>\n"
13"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
13"Language-Team: Chinese (Simplified) <zh_CN@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:29+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -28,19 +32,19 @@ msgstr "取消固定快捷方式"
28
32
29#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
30msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
31−msgstr ""
35+msgstr "确定要关闭电源吗?"
32
36
33#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
34msgid "Power off"
38msgid "Power off"
35−msgstr ""
39+msgstr "关机"
36
40
37#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
38msgid "Restart"
42msgid "Restart"
39−msgstr ""
43+msgstr "重启"
40
44
41#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
42msgid "Cancel"
46msgid "Cancel"
43−msgstr ""
47+msgstr "取消"
44
48
45#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
46msgid "Skip intro"
50msgid "Skip intro"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr "您现在已经掌握了边缘滑动手势,可以开始使用手机了<br><br>请点击屏幕开始使用"
93msgstr "您现在已经掌握了边缘滑动手势,可以开始使用手机了<br><br>请点击屏幕开始使用"
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr "紧急电话"
105msgstr "紧急电话"
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr "确定"
109msgstr "确定"
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr "你好,%1"
114msgstr "你好,%1"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr "你好"
118msgstr "你好"
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr "取消"
122msgstr "取消"
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr "完成"
126msgstr "完成"
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr "显示更少"
130msgstr "显示更少"
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr "查看全部"
134msgstr "查看全部"
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "搜索"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr "更多..."
142msgstr "更多..."
@@ -141,25 +157,25 @@ msgstr "添加评论"
141msgid "Send"
157msgid "Send"
142msgstr "发送"
158msgstr "发送"
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146−msgstr ""
162+msgstr "管理 Dash"
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150−msgstr ""
166+msgstr "完成"
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154−msgstr ""
170+msgstr "商店"
155
171
156#: qml/Dash/ScopesOverviewTab.qml:36
172#: qml/Dash/ScopesOverviewTab.qml:36
157msgid "Favorites"
173msgid "Favorites"
158−msgstr ""
174+msgstr "收藏夹"
159
175
160#: qml/Dash/ScopesOverviewTab.qml:54
176#: qml/Dash/ScopesOverviewTab.qml:54
161msgid "All"
177msgid "All"
162−msgstr ""
178+msgstr "所有"
163
179
164#: qml/Greeter/Greeter.qml:157
180#: qml/Greeter/Greeter.qml:157
165msgid "Swipe to unlock"
181msgid "Swipe to unlock"
@@ -227,17 +243,54 @@ msgstr "下载失败,请点击重试"
227
243
228#: qml/Panel/Indicators/ModemInfoItem.qml:105
244#: qml/Panel/Indicators/ModemInfoItem.qml:105
229msgid "Unlock SIM"
245msgid "Unlock SIM"
230−msgstr ""
246+msgstr "解开 SIM"
231
247
232#: qml/Panel/Indicators/RoamingIndication.qml:27
248#: qml/Panel/Indicators/RoamingIndication.qml:27
233msgid "Roaming"
249msgid "Roaming"
250+msgstr "漫游"
251+
252+#: qml/Shell.qml:267
253+msgid "passphrase"
234msgstr ""
254msgstr ""
235
255
236−#: qml/Panel/SearchIndicator.qml:27
256+#: qml/Shell.qml:267
237−msgid "Search"
257+msgid "passcode"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
238−msgstr "搜索"
263+msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
243−msgstr "请输入 %1"
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
296+msgstr ""
po/zh_HK.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-08-10 11:45+0000\n"
11"PO-Revision-Date: 2014-08-10 11:45+0000\n"
12"Last-Translator: Daniel Cheung <daniel.2345@hotmail.com>\n"
12"Last-Translator: Daniel Cheung <daniel.2345@hotmail.com>\n"
13"Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
13"Language-Team: Chinese (Hong Kong) <zh_HK@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr "您現在已熟練邊緣手勢,可以開始使用手機了<br><br>輕觸螢幕開始使用"
93msgstr "您現在已熟練邊緣手勢,可以開始使用手機了<br><br>輕觸螢幕開始使用"
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr "緊急電話"
105msgstr "緊急電話"
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr "確定"
109msgstr "確定"
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr "您好 %1"
114msgstr "您好 %1"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr "您好"
118msgstr "您好"
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr "取消"
122msgstr "取消"
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr "完成"
126msgstr "完成"
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr "縮減查看"
130msgstr "縮減查看"
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr "查看全部"
134msgstr "查看全部"
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "搜尋"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr "更多..."
142msgstr "更多..."
@@ -141,15 +157,15 @@ msgstr "新增評論"
141msgid "Send"
157msgid "Send"
142msgstr "傳送"
158msgstr "傳送"
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
237−msgid "Search"
257+msgid "passcode"
238−msgstr "搜尋"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
243−msgstr "請輸入 %1"
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
296+msgstr ""
po/zh_TW.po+72−19
@@ -7,16 +7,20 @@ 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-08-08 11:17+0200\n"
10+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11"PO-Revision-Date: 2014-07-26 16:21+0000\n"
11"PO-Revision-Date: 2014-07-26 16:21+0000\n"
12"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
12"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
13"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
13"Language-Team: Chinese (Traditional) <zh_TW@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−"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18"X-Generator: Launchpad (build 17156)\n"
18"X-Generator: Launchpad (build 17156)\n"
19
19
20+#: plugins/LightDM/Greeter.cpp:129
21+msgid "Password: "
22+msgstr ""
23+
20#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
26msgid "Pin shortcut"
@@ -88,39 +92,51 @@ msgid ""
88"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
89msgstr "您現在已熟練邊緣手勢,可以開始使用手機了<br><br>輕觸螢幕開始使用"
93msgstr "您現在已熟練邊緣手勢,可以開始使用手機了<br><br>輕觸螢幕開始使用"
90
94
91−#: qml/Components/Lockscreen.qml:220
95+#: qml/Components/Lockscreen.qml:161
96+msgid "Too many incorrect attempts"
97+msgstr ""
98+
99+#: qml/Components/Lockscreen.qml:163
100+msgid "Please wait"
101+msgstr ""
102+
103+#: qml/Components/Lockscreen.qml:245
92msgid "Emergency Call"
104msgid "Emergency Call"
93msgstr "緊急通話"
105msgstr "緊急通話"
94
106
95−#: qml/Components/Lockscreen.qml:243
107+#: qml/Components/Lockscreen.qml:268
96msgid "OK"
108msgid "OK"
97msgstr "確定"
109msgstr "確定"
98
110
99−#: qml/Components/PassphraseLockscreen.qml:62
111+#: qml/Components/PassphraseLockscreen.qml:61
100#, qt-format
112#, qt-format
101msgid "Hello %1"
113msgid "Hello %1"
102msgstr "%1 您好"
114msgstr "%1 您好"
103
115
104−#: qml/Components/PassphraseLockscreen.qml:62
116+#: qml/Components/PassphraseLockscreen.qml:61
105msgid "Hello"
117msgid "Hello"
106msgstr "您好"
118msgstr "您好"
107
119
108−#: qml/Components/PinLockscreen.qml:198
120+#: qml/Components/PinLockscreen.qml:197
109msgid "CANCEL"
121msgid "CANCEL"
110msgstr "取消"
122msgstr "取消"
111
123
112−#: qml/Components/PinLockscreen.qml:216
124+#: qml/Components/PinLockscreen.qml:215
113msgid "DONE"
125msgid "DONE"
114msgstr "完成"
126msgstr "完成"
115
127
116−#: qml/Dash/GenericScopeView.qml:358
128+#: qml/Dash/GenericScopeView.qml:360
117msgid "See less"
129msgid "See less"
118msgstr "縮減查看"
130msgstr "縮減查看"
119
131
120−#: qml/Dash/GenericScopeView.qml:358
132+#: qml/Dash/GenericScopeView.qml:360
121msgid "See all"
133msgid "See all"
122msgstr "查看全部"
134msgstr "查看全部"
123
135
136+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+msgid "Search"
138+msgstr "搜尋"
139+
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
125msgid "More..."
141msgid "More..."
126msgstr "更多…"
142msgstr "更多…"
@@ -141,15 +157,15 @@ msgstr "新增評論"
141msgid "Send"
157msgid "Send"
142msgstr "發送"
158msgstr "發送"
143
159
144−#: qml/Dash/ScopesOverview.qml:200
160+#: qml/Dash/ScopesOverview.qml:201
145msgid "Manage Dash"
161msgid "Manage Dash"
146msgstr ""
162msgstr ""
147
163
148−#: qml/Dash/ScopesOverview.qml:405
164+#: qml/Dash/ScopesOverview.qml:408
149msgid "Done"
165msgid "Done"
150msgstr ""
166msgstr ""
151
167
152−#: qml/Dash/ScopesOverview.qml:431
168+#: qml/Dash/ScopesOverview.qml:434
153msgid "Store"
169msgid "Store"
154msgstr ""
170msgstr ""
155
171
@@ -233,11 +249,48 @@ msgstr ""
233msgid "Roaming"
249msgid "Roaming"
234msgstr ""
250msgstr ""
235
251
236−#: qml/Panel/SearchIndicator.qml:27
252+#: qml/Shell.qml:267
253+msgid "passphrase"
254+msgstr ""
255+
256+#: qml/Shell.qml:267
237−msgid "Search"
257+msgid "passcode"
238−msgstr "搜尋"
258+msgstr ""
259+
260+#: qml/Shell.qml:269
261+#, qt-format
262+msgid "Enter your %1"
263+msgstr ""
239
264
240−#: qml/Shell.qml:256
265+#: qml/Shell.qml:270
241#, qt-format
266#, qt-format
267+msgid "Incorrect %1"
268+msgstr ""
269+
270+#: qml/Shell.qml:272
242−msgid "Please enter %1"
271+msgid "Please re-enter"
272+msgstr ""
273+
274+#: qml/Shell.qml:306
275+msgid "Sorry, incorrect passphrase."
243−msgstr "請輸入 %1"
276+msgstr ""
277+
278+#: qml/Shell.qml:307
279+msgid "Sorry, incorrect passcode."
280+msgstr ""
281+
282+#: qml/Shell.qml:308
283+msgid "This will be your last attempt."
284+msgstr ""
285+
286+#: qml/Shell.qml:310
287+msgid ""
288+"If passphrase is entered incorrectly, your phone will conduct a factory "
289+"reset and all personal data will be deleted."
290+msgstr ""
291+
292+#: qml/Shell.qml:311
293+msgid ""
294+"If passcode is entered incorrectly, your phone will conduct a factory reset "
295+"and all personal data will be deleted."
296+msgstr ""
qml/Components/Dialogs.qml+21−25
@@ -18,15 +18,18 @@ import QtQuick 2.0
18
18
19import Unity.Application 0.1
19import Unity.Application 0.1
20import Unity.Session 0.1
20import Unity.Session 0.1
21−import Ubuntu.Components 0.1
21+import Ubuntu.Components 1.1
22import Ubuntu.Components.Popups 0.1
22import Ubuntu.Components.Popups 0.1
23
23
24Item {
24Item {
25 id: root
25 id: root
26
26
27 function onPowerKeyPressed() {
27 function onPowerKeyPressed() {
28+ // FIXME: event.isAutoRepeat is always false on Nexus 4.
29+ // So we use powerKeyTimer.running to avoid the PowerOff key repeat
30+ // https://launchpad.net/bugs/1349416
28 if (!powerKeyTimer.running) {
31 if (!powerKeyTimer.running) {
29− powerKeyTimer.start();
32+ powerKeyTimer.restart();
30 }
33 }
31 }
34 }
32
35
@@ -64,17 +67,17 @@ Item {
64 id: logoutDialog
67 id: logoutDialog
65 Dialog {
68 Dialog {
66 id: dialogueLogout
69 id: dialogueLogout
67− title: "Logout"
70+ title: i18n.tr("Log out")
68− text: "Are you sure that you want to logout?"
71+ text: i18n.tr("Are you sure you want to log out?")
69 Button {
72 Button {
70− text: "Cancel"
73+ text: i18n.tr("No")
71 onClicked: {
74 onClicked: {
72 PopupUtils.close(dialogueLogout);
75 PopupUtils.close(dialogueLogout);
73 d.dialogShown = false;
76 d.dialogShown = false;
74 }
77 }
75 }
78 }
76 Button {
79 Button {
77− text: "Yes"
80+ text: i18n.tr("Yes")
78 onClicked: {
81 onClicked: {
79 DBusUnitySessionService.Logout();
82 DBusUnitySessionService.Logout();
80 PopupUtils.close(dialogueLogout);
83 PopupUtils.close(dialogueLogout);
@@ -88,17 +91,17 @@ Item {
88 id: shutdownDialog
91 id: shutdownDialog
89 Dialog {
92 Dialog {
90 id: dialogueShutdown
93 id: dialogueShutdown
91− title: "Shutdown"
94+ title: i18n.tr("Shut down")
92− text: "Are you sure that you want to shutdown?"
95+ text: i18n.tr("Are you sure you want to shut down?")
93 Button {
96 Button {
94− text: "Cancel"
97+ text: i18n.tr("No")
95 onClicked: {
98 onClicked: {
96 PopupUtils.close(dialogueShutdown);
99 PopupUtils.close(dialogueShutdown);
97 d.dialogShown = false;
100 d.dialogShown = false;
98 }
101 }
99 }
102 }
100 Button {
103 Button {
101− text: "Yes"
104+ text: i18n.tr("Yes")
102 onClicked: {
105 onClicked: {
103 dBusUnitySessionServiceConnection.closeAllApps();
106 dBusUnitySessionServiceConnection.closeAllApps();
104 DBusUnitySessionService.Shutdown();
107 DBusUnitySessionService.Shutdown();
@@ -113,17 +116,17 @@ Item {
113 id: rebootDialog
116 id: rebootDialog
114 Dialog {
117 Dialog {
115 id: dialogueReboot
118 id: dialogueReboot
116− title: "Reboot"
119+ title: i18n.tr("Reboot")
117− text: "Are you sure that you want to reboot?"
120+ text: i18n.tr("Are you sure you want to reboot?")
118 Button {
121 Button {
119− text: "Cancel"
122+ text: i18n.tr("No")
120 onClicked: {
123 onClicked: {
121 PopupUtils.close(dialogueReboot)
124 PopupUtils.close(dialogueReboot)
122 d.dialogShown = false;
125 d.dialogShown = false;
123 }
126 }
124 }
127 }
125 Button {
128 Button {
126− text: "Yes"
129+ text: i18n.tr("Yes")
127 onClicked: {
130 onClicked: {
128 dBusUnitySessionServiceConnection.closeAllApps();
131 dBusUnitySessionServiceConnection.closeAllApps();
129 DBusUnitySessionService.Reboot();
132 DBusUnitySessionService.Reboot();
@@ -138,8 +141,8 @@ Item {
138 id: powerDialog
141 id: powerDialog
139 Dialog {
142 Dialog {
140 id: dialoguePower
143 id: dialoguePower
141− title: "Power"
144+ title: i18n.tr("Power")
142− text: i18n.tr("Are you sure you would like to turn power off?")
145+ text: i18n.tr("Are you sure you would like\nto power off?")
143 Button {
146 Button {
144 text: i18n.tr("Power off")
147 text: i18n.tr("Power off")
145 onClicked: {
148 onClicked: {
@@ -148,15 +151,7 @@ Item {
148 d.dialogShown = false;
151 d.dialogShown = false;
149 root.powerOffClicked();
152 root.powerOffClicked();
150 }
153 }
151− }
154+ color: UbuntuColors.red
152− Button {
153− text: i18n.tr("Restart")
154− onClicked: {
155− dBusUnitySessionServiceConnection.closeAllApps();
156− DBusUnitySessionService.Reboot();
157− PopupUtils.close(dialoguePower);
158− d.dialogShown = false;
159− }
160 }
155 }
161 Button {
156 Button {
162 text: i18n.tr("Cancel")
157 text: i18n.tr("Cancel")
@@ -164,6 +159,7 @@ Item {
164 PopupUtils.close(dialoguePower);
159 PopupUtils.close(dialoguePower);
165 d.dialogShown = false;
160 d.dialogShown = false;
166 }
161 }
162+ color: UbuntuColors.coolGrey
167 }
163 }
168 }
164 }
169 }
165 }
qml/Components/Lockscreen.qml+34−9
@@ -57,10 +57,15 @@ Showable {
57
57
58 onRequiredChanged: {
58 onRequiredChanged: {
59 if (required && pinPadLoader.item) {
59 if (required && pinPadLoader.item) {
60− pinPadLoader.item.clear(false);
60+ clear(false)
61 }
61 }
62 }
62 }
63
63
64+ function forceDelay(delay) {
65+ forcedDelayTimer.interval = delay
66+ forcedDelayTimer.start()
67+ }
68+
64 function reset() {
69 function reset() {
65 // This causes the loader below to destry and recreate the source
70 // This causes the loader below to destry and recreate the source
66 pinPadLoader.resetting = true;
71 pinPadLoader.resetting = true;
@@ -68,13 +73,22 @@ Showable {
68 }
73 }
69
74
70 function clear(showAnimation) {
75 function clear(showAnimation) {
76+ if (pinPadLoader.item) {
71− pinPadLoader.item.clear(showAnimation);
77+ pinPadLoader.item.clear(showAnimation);
78+ }
79+ pinPadLoader.showWrongText = showAnimation
80+ pinPadLoader.waiting = false
72 }
81 }
73
82
74 function showInfoPopup(title, text) {
83 function showInfoPopup(title, text) {
75 PopupUtils.open(infoPopupComponent, root, {title: title, text: text})
84 PopupUtils.open(infoPopupComponent, root, {title: title, text: text})
76 }
85 }
77
86
87+ Timer {
88+ id: forcedDelayTimer
89+ onTriggered: pinPadLoader.showWrongText = false
90+ }
91+
78 Rectangle {
92 Rectangle {
79 // In case background fails to load or is undefined
93 // In case background fails to load or is undefined
80 id: backgroundBackup
94 id: backgroundBackup
@@ -131,8 +145,6 @@ Showable {
131 }
145 }
132 }
146 }
133
147
134−
135−
136 Loader {
148 Loader {
137 id: pinPadLoader
149 id: pinPadLoader
138 objectName: "pinPadLoader"
150 objectName: "pinPadLoader"
@@ -143,13 +155,24 @@ Showable {
143 verticalCenterOffset: root.alphaNumeric ? -units.gu(10) : -units.gu(4)
155 verticalCenterOffset: root.alphaNumeric ? -units.gu(10) : -units.gu(4)
144 }
156 }
145 property bool resetting: false
157 property bool resetting: false
158+ property bool waiting: false
159+ property bool showWrongText: false
160+
161+ readonly property string forcedDelayText: i18n.tr("Too many incorrect attempts") +
162+ "\n" +
163+ i18n.tr("Please wait")
146
164
147 source: (!resetting && root.required) ? (root.alphaNumeric ? "PassphraseLockscreen.qml" : "PinLockscreen.qml") : ""
165 source: (!resetting && root.required) ? (root.alphaNumeric ? "PassphraseLockscreen.qml" : "PinLockscreen.qml") : ""
166+ onSourceChanged: {
167+ waiting = false
168+ showWrongText = false
169+ }
148
170
149 Connections {
171 Connections {
150 target: pinPadLoader.item
172 target: pinPadLoader.item
151
173
152 onEntered: {
174 onEntered: {
175+ pinPadLoader.waiting = true
153 root.entered(passphrase);
176 root.entered(passphrase);
154 }
177 }
155
178
@@ -171,17 +194,19 @@ Showable {
171 Binding {
194 Binding {
172 target: pinPadLoader.item
195 target: pinPadLoader.item
173 property: "placeholderText"
196 property: "placeholderText"
197+ value: forcedDelayTimer.running ? pinPadLoader.forcedDelayText :
198+ (pinPadLoader.showWrongText ? root.wrongPlaceholderText :
174− value: root.placeholderText
199+ root.placeholderText)
175 }
200 }
176 Binding {
201 Binding {
177 target: pinPadLoader.item
202 target: pinPadLoader.item
178− property: "wrongPlaceholderText"
203+ property: "username"
179− value: root.wrongPlaceholderText
204+ value: root.username
180 }
205 }
181 Binding {
206 Binding {
182 target: pinPadLoader.item
207 target: pinPadLoader.item
183− property: "username"
208+ property: "entryEnabled"
184− value: root.username
209+ value: !pinPadLoader.waiting && !forcedDelayTimer.running
185 }
210 }
186 }
211 }
187
212
qml/Components/PassphraseLockscreen.qml+3−4
@@ -23,15 +23,14 @@ Item {
23 height: highlightItem.height
23 height: highlightItem.height
24
24
25 property string placeholderText
25 property string placeholderText
26− property string wrongPlaceholderText
27 property string username: ""
26 property string username: ""
27+ property bool entryEnabled: true
28
28
29 signal entered(string passphrase)
29 signal entered(string passphrase)
30 signal cancel()
30 signal cancel()
31
31
32 function clear(playAnimation) {
32 function clear(playAnimation) {
33 pinentryField.text = "";
33 pinentryField.text = "";
34− pinentryField.enabled = true
35 if (playAnimation) {
34 if (playAnimation) {
36 wrongPasswordAnimation.start();
35 wrongPasswordAnimation.start();
37 pinentryField.forceActiveFocus();
36 pinentryField.forceActiveFocus();
@@ -76,11 +75,11 @@ Item {
76 echoMode: TextInput.Password
75 echoMode: TextInput.Password
77 opacity: 0.9
76 opacity: 0.9
78 hasClearButton: false
77 hasClearButton: false
79− placeholderText: wrongPasswordAnimation.running ? root.wrongPlaceholderText : root.placeholderText
78+ enabled: entryEnabled
79+ placeholderText: root.placeholderText
80
80
81 onAccepted: {
81 onAccepted: {
82 if (pinentryField.text) {
82 if (pinentryField.text) {
83− pinentryField.enabled = false;
84 root.entered(pinentryField.text);
83 root.entered(pinentryField.text);
85 }
84 }
86 }
85 }
qml/Components/PinLockscreen.qml+3−4
@@ -25,7 +25,6 @@ Column {
25 spacing: units.gu(3.5)
25 spacing: units.gu(3.5)
26
26
27 property alias placeholderText: pinentryField.placeholderText
27 property alias placeholderText: pinentryField.placeholderText
28− property alias wrongPlaceholderText: pinentryField.wrongPlaceholderText
29 property int padWidth: units.gu(34)
28 property int padWidth: units.gu(34)
30 property int padHeight: units.gu(28)
29 property int padHeight: units.gu(28)
31 property int minPinLength: -1
30 property int minPinLength: -1
@@ -58,7 +57,6 @@ Column {
58 radius: "medium"
57 radius: "medium"
59 property string text: ""
58 property string text: ""
60 property string placeholderText: ""
59 property string placeholderText: ""
61− property string wrongPlaceholderText: ""
62
60
63 function appendChar(character) {
61 function appendChar(character) {
64 if (root.maxPinLength == -1 || pinentryField.text.length < root.maxPinLength) {
62 if (root.maxPinLength == -1 || pinentryField.text.length < root.maxPinLength) {
@@ -90,9 +88,10 @@ Column {
90 id: pinentryFieldPlaceHolder
88 id: pinentryFieldPlaceHolder
91 objectName: "pinentryFieldPlaceHolder"
89 objectName: "pinentryFieldPlaceHolder"
92 anchors.centerIn: parent
90 anchors.centerIn: parent
91+ horizontalAlignment: Text.AlignHCenter
93 color: "#f3f3e7"
92 color: "#f3f3e7"
94 opacity: 0.6
93 opacity: 0.6
95− text: wrongPasswordAnimation.running ? parent.wrongPlaceholderText : parent.placeholderText
94+ text: parent.placeholderText
96 visible: pinentryFieldLabel.text.length == 0
95 visible: pinentryFieldLabel.text.length == 0
97 }
96 }
98
97
@@ -107,7 +106,7 @@ Column {
107 bottom: parent.bottom
106 bottom: parent.bottom
108 bottomMargin: units.gu(1)
107 bottomMargin: units.gu(1)
109 }
108 }
110− visible: !priv.autoConfirm
109+ visible: entryEnabled && !priv.autoConfirm
111 width: height
110 width: height
112 name: "erase"
111 name: "erase"
113 color: "#f3f3e7"
112 color: "#f3f3e7"
qml/Dash/CardHorizontalList.qmlnew file+62
@@ -0,0 +1,62 @@
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+import QtQuick 2.2
18+import Ubuntu.Components 1.1
19+import "../Components"
20+
21+DashRenderer {
22+ id: root
23+
24+ expandedHeight: cardTool.cardHeight + units.gu(2)
25+ collapsedHeight: expandedHeight
26+ clip: true
27+
28+ ListView {
29+ id: listView
30+ anchors {
31+ fill: parent
32+ margins: units.gu(1)
33+ rightMargin: 0
34+ }
35+ rightMargin: units.gu(1)
36+ spacing: units.gu(1)
37+ model: root.model
38+ orientation: ListView.Horizontal
39+
40+ delegate: Loader {
41+ id: loader
42+ sourceComponent: cardTool.cardComponent
43+ anchors { top: parent.top; bottom: parent.bottom }
44+ width: cardTool.cardWidth
45+ onLoaded: {
46+ item.objectName = "delegate" + index;
47+ item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
48+ item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
49+ item.cardData = Qt.binding(function() { return model; });
50+ item.template = Qt.binding(function() { return cardTool.template; });
51+ item.components = Qt.binding(function() { return cardTool.components; });
52+ item.headerAlignment = Qt.binding(function() { return cardTool.headerAlignment; });
53+ item.scopeStyle = root.scopeStyle;
54+ }
55+ Connections {
56+ target: loader.item
57+ onClicked: root.clicked(index, result, loader.item, model)
58+ onPressAndHold: root.pressAndHold(index, model)
59+ }
60+ }
61+ }
62+}
qml/Dash/CardTool.qml+2
@@ -91,6 +91,7 @@ Item {
91 }
91 }
92 return units.gu(18.5);
92 return units.gu(18.5);
93 case "carousel":
93 case "carousel":
94+ case "horizontal-list":
94 return carouselTool.minimumTileWidth;
95 return carouselTool.minimumTileWidth;
95 case undefined:
96 case undefined:
96 case "organic-grid":
97 case "organic-grid":
@@ -111,6 +112,7 @@ Item {
111 if (template["card-size"] >= 12 && template["card-size"] <= 38) return units.gu(template["card-size"]);
112 if (template["card-size"] >= 12 && template["card-size"] <= 38) return units.gu(template["card-size"]);
112 return units.gu(18.5);
113 return units.gu(18.5);
113 case "grid":
114 case "grid":
115+ case "horizontal-list":
114 return cardLoader.item ? cardLoader.item.implicitHeight : 0
116 return cardLoader.item ? cardLoader.item.implicitHeight : 0
115 case "carousel":
117 case "carousel":
116 return cardWidth / (components ? components["art"]["aspect-ratio"] : 1)
118 return cardWidth / (components ? components["art"]["aspect-ratio"] : 1)
qml/Dash/DashNavigation.qml+2−2
@@ -80,7 +80,7 @@ AbstractButton {
80 anchors.margins: units.gu(2)
80 anchors.margins: units.gu(2)
81 verticalAlignment: Text.AlignVCenter
81 verticalAlignment: Text.AlignVCenter
82 text: root.currentNavigation ? root.currentNavigation.label : ""
82 text: root.currentNavigation ? root.currentNavigation.label : ""
83− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
83+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
84 }
84 }
85
85
86 Icon {
86 Icon {
@@ -90,7 +90,7 @@ AbstractButton {
90 name: showList ? "up" : "down"
90 name: showList ? "up" : "down"
91 height: units.gu(2)
91 height: units.gu(2)
92 width: height
92 width: height
93− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
93+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
94 }
94 }
95
95
96 // navigationListView is outside root
96 // navigationListView is outside root
qml/Dash/DashNavigationList.qml+1−1
@@ -27,7 +27,7 @@ Item {
27 signal allNavigationClicked()
27 signal allNavigationClicked()
28
28
29 readonly property int itemHeight: units.gu(5)
29 readonly property int itemHeight: units.gu(5)
30− readonly property color foregroundColor: root.scopeStyle ? root.scopeStyle.foreground : "grey"
30+ readonly property color foregroundColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
31 implicitHeight: flickable.contentHeight
31 implicitHeight: flickable.contentHeight
32
32
33 Rectangle {
33 Rectangle {
qml/Dash/GenericScopeView.qml+3−2
@@ -227,6 +227,7 @@ FocusScope {
227 switch (cardTool.categoryLayout) {
227 switch (cardTool.categoryLayout) {
228 case "carousel": return "CardCarousel.qml";
228 case "carousel": return "CardCarousel.qml";
229 case "vertical-journal": return "CardVerticalJournal.qml";
229 case "vertical-journal": return "CardVerticalJournal.qml";
230+ case "horizontal-list": return "CardHorizontalList.qml";
230 case "grid":
231 case "grid":
231 default: return "CardGrid.qml";
232 default: return "CardGrid.qml";
232 }
233 }
@@ -364,7 +365,7 @@ FocusScope {
364 }
365 }
365 fontSize: "small"
366 fontSize: "small"
366 font.weight: Font.Bold
367 font.weight: Font.Bold
367− color: scopeStyle ? scopeStyle.foreground : "grey"
368+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
368 visible: baseItem.expandable && !baseItem.headerLink
369 visible: baseItem.expandable && !baseItem.headerLink
369 }
370 }
370 }
371 }
@@ -402,7 +403,7 @@ FocusScope {
402 width: categoryView.width
403 width: categoryView.width
403 height: section != "" ? units.gu(5) : 0
404 height: section != "" ? units.gu(5) : 0
404 text: section
405 text: section
405− color: scopeStyle ? scopeStyle.foreground : "grey"
406+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
406 iconName: delegate && delegate.headerLink ? "go-next" : ""
407 iconName: delegate && delegate.headerLink ? "go-next" : ""
407 onClicked: {
408 onClicked: {
408 if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);
409 if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);
qml/Components/PageHeader.qml → qml/Dash/PageHeader.qmlrenamed+4−3
@@ -19,7 +19,8 @@ import Ubuntu.Components 1.1
19import Ubuntu.Components.Themes.Ambiance 1.1
19import Ubuntu.Components.Themes.Ambiance 1.1
20import Ubuntu.Components.Popups 1.0
20import Ubuntu.Components.Popups 1.0
21import Ubuntu.Components.ListItems 1.0
21import Ubuntu.Components.ListItems 1.0
22+import "../Components"
22−import "SearchHistoryModel"
23+import "../Components/SearchHistoryModel"
23
24
24Item {
25Item {
25 id: root
26 id: root
@@ -172,7 +173,7 @@ Item {
172 property var styledItem: searchHeader
173 property var styledItem: searchHeader
173 property string title
174 property string title
174 property var config: PageHeadConfiguration {
175 property var config: PageHeadConfiguration {
175− foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : "grey"
176+ foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText
176 backAction: Action {
177 backAction: Action {
177 iconName: "back"
178 iconName: "back"
178 onTriggered: {
179 onTriggered: {
@@ -242,7 +243,7 @@ Item {
242 property var styledItem: header
243 property var styledItem: header
243 property string title: root.title
244 property string title: root.title
244 property var config: PageHeadConfiguration {
245 property var config: PageHeadConfiguration {
245− foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : "grey"
246+ foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText
246 backAction: Action {
247 backAction: Action {
247 iconName: "back"
248 iconName: "back"
248 visible: root.showBackButton
249 visible: root.showBackButton
qml/Dash/PreviewListView.qml−8
@@ -65,14 +65,6 @@ Item {
65 maximumFlickVelocity: width * 5
65 maximumFlickVelocity: width * 5
66 cacheBuffer: 0
66 cacheBuffer: 0
67
67
68− // To be set before opening the preview
69− property string categoryId: ""
70−
71− // because the ListView is built asynchronous, setting the
72− // currentIndex directly won't work. We need to refresh it
73− // when the first preview is ready to be displayed.
74− property bool init: true
75−
76 property bool open: false
68 property bool open: false
77
69
78 onOpenChanged: {
70 onOpenChanged: {
qml/Dash/Previews/PreviewAudioPlayback.qml+3−3
@@ -139,7 +139,7 @@ PreviewWidget {
139 objectName: "trackTitleLabel"
139 objectName: "trackTitleLabel"
140 anchors { top: parent.top; left: parent.left; right: parent.right }
140 anchors { top: parent.top; left: parent.left; right: parent.right }
141 opacity: 0.9
141 opacity: 0.9
142− color: scopeStyle ? scopeStyle.foreground : "grey"
142+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
143 fontSize: "small"
143 fontSize: "small"
144 horizontalAlignment: Text.AlignLeft
144 horizontalAlignment: Text.AlignLeft
145 text: modelData["title"]
145 text: modelData["title"]
@@ -152,7 +152,7 @@ PreviewWidget {
152 anchors { top: trackTitleLabel.bottom; left: parent.left; right: parent.right }
152 anchors { top: trackTitleLabel.bottom; left: parent.left; right: parent.right }
153 visible: text !== ""
153 visible: text !== ""
154 opacity: 0.9
154 opacity: 0.9
155− color: scopeStyle ? scopeStyle.foreground : "grey"
155+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
156 font.weight: Font.Light
156 font.weight: Font.Light
157 fontSize: "small"
157 fontSize: "small"
158 horizontalAlignment: Text.AlignLeft
158 horizontalAlignment: Text.AlignLeft
@@ -193,7 +193,7 @@ PreviewWidget {
193 anchors.verticalCenter: parent.verticalCenter
193 anchors.verticalCenter: parent.verticalCenter
194 width: parent.column3Width
194 width: parent.column3Width
195 opacity: 0.9
195 opacity: 0.9
196− color: scopeStyle ? scopeStyle.foreground : "grey"
196+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
197 fontSize: "small"
197 fontSize: "small"
198 horizontalAlignment: Text.AlignRight
198 horizontalAlignment: Text.AlignRight
199 text: audio.lengthToString(modelData["length"])
199 text: audio.lengthToString(modelData["length"])
qml/Dash/Previews/PreviewExpandable.qml+1−1
@@ -41,7 +41,7 @@ PreviewWidget {
41 right: expandButton.left
41 right: expandButton.left
42 }
42 }
43 fontSize: "large"
43 fontSize: "large"
44− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
44+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
45 visible: text !== ""
45 visible: text !== ""
46 opacity: .8
46 opacity: .8
47 text: widgetData["title"] || ""
47 text: widgetData["title"] || ""
qml/Dash/Previews/PreviewHeader.qml+1−1
@@ -35,7 +35,7 @@ PreviewWidget {
35 readonly property url mascot: root.widgetData["mascot"] || ""
35 readonly property url mascot: root.widgetData["mascot"] || ""
36 readonly property string title: root.widgetData["title"] || ""
36 readonly property string title: root.widgetData["title"] || ""
37 readonly property string subtitle: root.widgetData["subtitle"] || ""
37 readonly property string subtitle: root.widgetData["subtitle"] || ""
38− readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : "grey"
38+ readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
39
39
40 implicitHeight: row.height + row.margins * 2
40 implicitHeight: row.height + row.margins * 2
41 width: parent.width
41 width: parent.width
qml/Dash/Previews/PreviewRatingDisplay.qml+2−2
@@ -72,7 +72,7 @@ PreviewWidget {
72 id: authorLabel
72 id: authorLabel
73 objectName: "authorLabel"
73 objectName: "authorLabel"
74 anchors { left: parent.left; right: parent.right }
74 anchors { left: parent.left; right: parent.right }
75− color: scopeStyle ? scopeStyle.foreground : "grey"
75+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
76 opacity: .8
76 opacity: .8
77 text: modelData["author"] || ""
77 text: modelData["author"] || ""
78 visible: text !== ""
78 visible: text !== ""
@@ -83,7 +83,7 @@ PreviewWidget {
83 id: reviewLabel
83 id: reviewLabel
84 objectName: "reviewLabel"
84 objectName: "reviewLabel"
85 anchors { left: parent.left; right: parent.right }
85 anchors { left: parent.left; right: parent.right }
86− color: scopeStyle ? scopeStyle.foreground : "grey"
86+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
87 opacity: .8
87 opacity: .8
88 text: modelData["review"] || ""
88 text: modelData["review"] || ""
89 visible: text !== ""
89 visible: text !== ""
qml/Dash/Previews/PreviewRatingInput.qml+2−2
@@ -76,7 +76,7 @@ PreviewWidget {
76 verticalCenter: parent.verticalCenter
76 verticalCenter: parent.verticalCenter
77 left: parent.left
77 left: parent.left
78 }
78 }
79− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
79+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
80 opacity: .8
80 opacity: .8
81 text: widgetData["rating-label"] || i18n.tr("Rate this")
81 text: widgetData["rating-label"] || i18n.tr("Rate this")
82 }
82 }
@@ -121,7 +121,7 @@ PreviewWidget {
121 left: parent.left
121 left: parent.left
122 right: parent.right
122 right: parent.right
123 }
123 }
124− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
124+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
125 opacity: .8
125 opacity: .8
126 text: widgetData["review-label"] || i18n.tr("Add a review")
126 text: widgetData["review-label"] || i18n.tr("Add a review")
127 }
127 }
qml/Dash/Previews/PreviewTextSummary.qml+2−2
@@ -39,7 +39,7 @@ PreviewWidget {
39 }
39 }
40 height: visible ? implicitHeight : 0
40 height: visible ? implicitHeight : 0
41 fontSize: "large"
41 fontSize: "large"
42− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
42+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
43 visible: text !== ""
43 visible: text !== ""
44 opacity: .8
44 opacity: .8
45 text: widgetData["title"] || ""
45 text: widgetData["title"] || ""
@@ -61,7 +61,7 @@ PreviewWidget {
61 clip: true
61 clip: true
62 fontSize: "small"
62 fontSize: "small"
63 lineHeight: 1.2
63 lineHeight: 1.2
64− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
64+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
65 opacity: .8
65 opacity: .8
66 text: widgetData["text"]
66 text: widgetData["text"]
67 wrapMode: Text.Wrap
67 wrapMode: Text.Wrap
qml/Dash/ScopesOverview.qml+12−5
@@ -32,7 +32,7 @@ Item {
32 property alias currentTab: tabBar.currentTab
32 property alias currentTab: tabBar.currentTab
33
33
34 // Properties used by parent
34 // Properties used by parent
35− readonly property bool processing: searchResultsViewer.processing || tempScopeItem.processing
35+ readonly property bool processing: searchResultsViewer.processing || tempScopeItem.processing || previewListView.processing
36 property bool growingDashFromPos: false
36 property bool growingDashFromPos: false
37 readonly property bool searching: scope && scope.searchQuery == ""
37 readonly property bool searching: scope && scope.searchQuery == ""
38 readonly property bool showingNonFavoriteScope: tempScopeItem.scope != null
38 readonly property bool showingNonFavoriteScope: tempScopeItem.scope != null
@@ -366,7 +366,16 @@ Item {
366 }
366 }
367
367
368 function itemPressedAndHeld(index, itemModel, resultsModel, limitedCategoryItemCount) {
368 function itemPressedAndHeld(index, itemModel, resultsModel, limitedCategoryItemCount) {
369− // Do nothing
369+ if (itemModel.uri.indexOf("scope://") === 0) {
370+ // Preview can call openScope so make sure restorePosition and restoreSize are set
371+ scopesOverviewXYScaler.restorePosition = undefined;
372+ scopesOverviewXYScaler.restoreSize = allCardSize;
373+
374+ previewListView.model = resultsModel;
375+ previewListView.currentIndex = -1;
376+ previewListView.currentIndex = index;
377+ previewListView.open = true;
378+ }
370 }
379 }
371 }
380 }
372
381
@@ -400,7 +409,7 @@ Item {
400 border.color: "white"
409 border.color: "white"
401 border.width: units.dp(1)
410 border.width: units.dp(1)
402 radius: units.dp(10)
411 radius: units.dp(10)
403− color: parent.pressed ? "gray" : "transparent"
412+ color: parent.pressed ? Theme.palette.normal.baseText : "transparent"
404 }
413 }
405 Label {
414 Label {
406 id: label
415 id: label
@@ -455,8 +464,6 @@ Item {
455 anchors.left: scopesOverviewContent.right
464 anchors.left: scopesOverviewContent.right
456 }
465 }
457
466
458−
459−
460 Item {
467 Item {
461 id: scopesOverviewXYScaler
468 id: scopesOverviewXYScaler
462 width: parent.width
469 width: parent.width
qml/Components/graphics/PageHeaderBaseDivider@18.png → qml/Dash/graphics/PageHeaderBaseDivider@18.pngrenamed

Binary file not shown.

qml/Components/graphics/PageHeaderBaseDivider@18.sci → qml/Dash/graphics/PageHeaderBaseDivider@18.scirenamed

The content is the same.

qml/Components/graphics/pagination_dot_off@30.png → qml/Dash/graphics/pagination_dot_off@30.pngrenamed

Binary file not shown.

qml/Components/graphics/pagination_dot_on@30.png → qml/Dash/graphics/pagination_dot_on@30.pngrenamed

Binary file not shown.

qml/Hud/HudParametrizedActionsPage.qml+9−2
@@ -15,7 +15,8 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.1
19+import Ubuntu.Components.Themes.Ambiance 1.1
19import "../Components"
20import "../Components"
20
21
21Item {
22Item {
@@ -89,12 +90,18 @@ Item {
89 anchors.left: parent.left
90 anchors.left: parent.left
90 anchors.right: parent.right
91 anchors.right: parent.right
91
92
92− PageHeader {
93+ PageHeadStyle {
93 id: header
94 id: header
94 anchors.top: parent.top
95 anchors.top: parent.top
95 anchors.left: parent.left
96 anchors.left: parent.left
96 anchors.right: parent.right
97 anchors.right: parent.right
97 anchors.topMargin: units.gu(1)
98 anchors.topMargin: units.gu(1)
99+ height: units.gu(6.5)
100+ contentHeight: height
101+ separatorSource: ""
102+ property var styledItem: header
103+ property string title
104+ property var config: PageHeadConfiguration { }
98 }
105 }
99 }
106 }
100 }
107 }
qml/Launcher/LauncherPanel.qml+4
@@ -146,6 +146,10 @@ Rectangle {
146 delegate: FoldingLauncherDelegate {
146 delegate: FoldingLauncherDelegate {
147 id: launcherDelegate
147 id: launcherDelegate
148 objectName: "launcherDelegate" + index
148 objectName: "launcherDelegate" + index
149+ // We need the appId in the delegate in order to find
150+ // the right app when running autopilot tests for
151+ // multiple apps.
152+ readonly property string appId: model.appId
149 itemHeight: launcherListView.itemHeight
153 itemHeight: launcherListView.itemHeight
150 itemWidth: launcherListView.itemWidth
154 itemWidth: launcherListView.itemWidth
151 width: itemWidth
155 width: itemWidth
qml/Notifications/Notification.qml+5
@@ -257,6 +257,7 @@ Item {
257 font.bold: true
257 font.bold: true
258 color: Theme.palette.selected.backgroundText
258 color: Theme.palette.selected.backgroundText
259 elide: Text.ElideRight
259 elide: Text.ElideRight
260+ textFormat: Text.PlainText
260 }
261 }
261
262
262 Label {
263 Label {
@@ -274,6 +275,7 @@ Item {
274 wrapMode: Text.WordWrap
275 wrapMode: Text.WordWrap
275 maximumLineCount: 10
276 maximumLineCount: 10
276 elide: Text.ElideRight
277 elide: Text.ElideRight
278+ textFormat: Text.PlainText
277 }
279 }
278 }
280 }
279 }
281 }
@@ -311,6 +313,9 @@ Item {
311 onLoaded: {
313 onLoaded: {
312 notification.fullscreen = Qt.binding(function() { return fullscreen; });
314 notification.fullscreen = Qt.binding(function() { return fullscreen; });
313 }
315 }
316+ onAccepted: {
317+ notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
318+ }
314 }
319 }
315 }
320 }
316 }
321 }
qml/Notifications/NotificationMenuItemFactory.qml+5−1
@@ -30,6 +30,8 @@ Loader {
30 property int maxHeight
30 property int maxHeight
31 readonly property bool fullscreen: menuData.type === "com.canonical.snapdecision.pinlock"
31 readonly property bool fullscreen: menuData.type === "com.canonical.snapdecision.pinlock"
32
32
33+ signal accepted()
34+
33 property var _map: {
35 property var _map: {
34 "com.canonical.snapdecision.textfield": textfield,
36 "com.canonical.snapdecision.textfield": textfield,
35 "com.canonical.snapdecision.pinlock" : pinLock,
37 "com.canonical.snapdecision.pinlock" : pinLock,
@@ -82,6 +84,9 @@ Loader {
82 onTextChanged: {
84 onTextChanged: {
83 menuModel.changeState(menuIndex, text);
85 menuModel.changeState(menuIndex, text);
84 }
86 }
87+ onAccepted: {
88+ menuFactory.accepted()
89+ }
85 }
90 }
86
91
87 Row {
92 Row {
@@ -117,7 +122,6 @@ Loader {
117
122
118 onEntered: {
123 onEntered: {
119 menuModel.changeState(menuIndex, passphrase);
124 menuModel.changeState(menuIndex, passphrase);
120− entryEnabled = false;
121 }
125 }
122
126
123 onCancel: {
127 onCancel: {
qml/Shell.qml+71−14
@@ -19,7 +19,9 @@ import AccountsService 0.1
19import GSettings 1.0
19import GSettings 1.0
20import Unity.Application 0.1
20import Unity.Application 0.1
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22+import Ubuntu.Components.Popups 1.0
22import Ubuntu.Gestures 0.1
23import Ubuntu.Gestures 0.1
24+import Ubuntu.SystemImage 0.1
23import Unity.Launcher 0.1
25import Unity.Launcher 0.1
24import Utils 0.1
26import Utils 0.1
25import LightDM 0.1 as LightDM
27import LightDM 0.1 as LightDM
@@ -53,6 +55,10 @@ Item {
53 property bool sideStageEnabled: shell.width >= units.gu(100)
55 property bool sideStageEnabled: shell.width >= units.gu(100)
54 readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
56 readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
55
57
58+ property int maxFailedLogins: -1 // disabled by default for now, will enable via settings in future
59+ property int failedLoginsDelayAttempts: 7 // number of failed logins
60+ property int failedLoginsDelaySeconds: 5 * 60 // seconds of forced waiting
61+
56 function activateApplication(appId) {
62 function activateApplication(appId) {
57 if (ApplicationManager.findApplication(appId)) {
63 if (ApplicationManager.findApplication(appId)) {
58 ApplicationManager.requestFocusApplication(appId);
64 ApplicationManager.requestFocusApplication(appId);
@@ -62,6 +68,13 @@ Item {
62 }
68 }
63 }
69 }
64
70
71+ function setFakeActiveForApp(app) {
72+ if (shell.locked) {
73+ greeter.fakeActiveForApp = app
74+ lockscreen.hide()
75+ }
76+ }
77+
65 Binding {
78 Binding {
66 target: LauncherModel
79 target: LauncherModel
67 property: "applicationManager"
80 property: "applicationManager"
@@ -124,7 +137,11 @@ Item {
124 Connections {
137 Connections {
125 target: ApplicationManager
138 target: ApplicationManager
126 onFocusRequested: {
139 onFocusRequested: {
140+ if (appId === "dialer-app") {
141+ // Always let the dialer-app through. Either user asked
142+ // for an emergency call or accepted an incoming call.
143+ setFakeActiveForApp(appId)
127− if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== appId) {
144+ } else if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== appId) {
128 lockscreen.show();
145 lockscreen.show();
129 }
146 }
130 greeter.hide();
147 greeter.hide();
@@ -141,6 +158,11 @@ Item {
141 if (greeter.shown && appId != "unity8-dash") {
158 if (greeter.shown && appId != "unity8-dash") {
142 greeter.hide();
159 greeter.hide();
143 }
160 }
161+ if (appId === "dialer-app") {
162+ // Always let the dialer-app through. Either user asked
163+ // for an emergency call or accepted an incoming call.
164+ setFakeActiveForApp(appId)
165+ }
144 }
166 }
145 }
167 }
146
168
@@ -233,11 +255,7 @@ Item {
233
255
234 onEntered: LightDM.Greeter.respond(passphrase);
256 onEntered: LightDM.Greeter.respond(passphrase);
235 onCancel: greeter.show()
257 onCancel: greeter.show()
236− onEmergencyCall: {
237− greeter.fakeActiveForApp = "dialer-app"
238− shell.activateApplication("dialer-app")
258+ onEmergencyCall: shell.activateApplication("dialer-app") // will automatically enter fake-active mode
239− lockscreen.hide()
240− }
241
259
242 onShownChanged: if (shown) greeter.fakeActiveForApp = ""
260 onShownChanged: if (shown) greeter.fakeActiveForApp = ""
243
261
@@ -255,13 +273,21 @@ Item {
255
273
256 onShowPrompt: {
274 onShowPrompt: {
257 if (greeter.narrowMode) {
275 if (greeter.narrowMode) {
276+ var promptText = text.toLowerCase()
277+ if (isDefaultPrompt) {
278+ promptText = lockscreen.alphaNumeric ?
279+ i18n.tr("passphrase") : i18n.tr("passcode")
280+ }
258− lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text.toLowerCase());
281+ lockscreen.placeholderText = i18n.tr("Enter your %1").arg(promptText)
282+ lockscreen.wrongPlaceholderText = i18n.tr("Incorrect %1").arg(promptText) +
283+ "\n" +
284+ i18n.tr("Please re-enter")
259 lockscreen.show();
285 lockscreen.show();
260 }
286 }
261 }
287 }
262
288
263 onPromptlessChanged: {
289 onPromptlessChanged: {
264− if (LightDM.Greeter.promptless) {
290+ if (LightDM.Greeter.promptless && LightDM.Greeter.authenticated) {
265 lockscreen.hide()
291 lockscreen.hide()
266 } else {
292 } else {
267 lockscreen.reset();
293 lockscreen.reset();
@@ -270,13 +296,40 @@ Item {
270 }
296 }
271
297
272 onAuthenticationComplete: {
298 onAuthenticationComplete: {
299+ if (LightDM.Greeter.authenticated) {
300+ AccountsService.failedLogins = 0
301+ }
302+ // Else only penalize user for a failed login if they actually were
303+ // prompted for a password. We do this below after the promptless
304+ // early exit.
305+
273 if (LightDM.Greeter.promptless) {
306 if (LightDM.Greeter.promptless) {
274 return;
307 return;
275 }
308 }
309+
276 if (LightDM.Greeter.authenticated) {
310 if (LightDM.Greeter.authenticated) {
277 lockscreen.hide();
311 lockscreen.hide();
278 greeter.login();
312 greeter.login();
279 } else {
313 } else {
314+ AccountsService.failedLogins++
315+ if (maxFailedLogins >= 2) { // require at least a warning
316+ if (AccountsService.failedLogins === maxFailedLogins - 1) {
317+ var title = lockscreen.alphaNumeric ?
318+ i18n.tr("Sorry, incorrect passphrase.") :
319+ i18n.tr("Sorry, incorrect passcode.")
320+ var text = i18n.tr("This will be your last attempt.") + " " +
321+ (lockscreen.alphaNumeric ?
322+ i18n.tr("If passphrase is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted.") :
323+ i18n.tr("If passcode is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted."))
324+ lockscreen.showInfoPopup(title, text)
325+ } else if (AccountsService.failedLogins >= maxFailedLogins) {
326+ SystemImage.factoryReset() // Ouch!
327+ }
328+ }
329+ if (failedLoginsDelayAttempts > 0 && AccountsService.failedLogins % failedLoginsDelayAttempts == 0) {
330+ lockscreen.forceDelay(failedLoginsDelaySeconds * 1000)
331+ }
332+
280 lockscreen.clear(true);
333 lockscreen.clear(true);
281 if (greeter.narrowMode) {
334 if (greeter.narrowMode) {
282 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
335 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
@@ -311,8 +364,16 @@ Item {
311 }
364 }
312
365
313 property bool fullyShown: showProgress === 1.0
366 property bool fullyShown: showProgress === 1.0
367+ onFullyShownChanged: {
368+ // Wait until the greeter is completely covering lockscreen before resetting it.
369+ if (fullyShown && !LightDM.Greeter.authenticated) {
370+ lockscreen.reset();
371+ lockscreen.show();
372+ }
373+ }
374+
314 readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
375 readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
315− onShowProgressChanged: if (LightDM.Greeter.promptless && showProgress === 0) greeter.login()
376+ onShowProgressChanged: if (LightDM.Greeter.authenticated && showProgress === 0) greeter.login()
316
377
317 Greeter {
378 Greeter {
318 id: greeter
379 id: greeter
@@ -350,10 +411,6 @@ Item {
350 if (greeter.narrowMode) {
411 if (greeter.narrowMode) {
351 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
412 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
352 }
413 }
353− if (!LightDM.Greeter.promptless) {
354− lockscreen.reset();
355− lockscreen.show();
356− }
357 greeter.fakeActiveForApp = "";
414 greeter.fakeActiveForApp = "";
358 greeter.forceActiveFocus();
415 greeter.forceActiveFocus();
359 }
416 }
@@ -403,7 +460,7 @@ Item {
403 }
460 }
404
461
405 if (LightDM.Greeter.active) {
462 if (LightDM.Greeter.active) {
406− if (!LightDM.Greeter.promptless) {
463+ if (!LightDM.Greeter.authenticated) {
407 lockscreen.show()
464 lockscreen.show()
408 }
465 }
409 greeter.hide()
466 greeter.hide()
run.sh+19−18
@@ -18,6 +18,7 @@ usage() {
18 echo " -f, --fake Force use of fake Qml modules." >&2
18 echo " -f, --fake Force use of fake Qml modules." >&2
19 echo " -p, --pinlock Use a pin protected user." >&2
19 echo " -p, --pinlock Use a pin protected user." >&2
20 echo " -k, --keylock Use a passphrase protected user." >&2
20 echo " -k, --keylock Use a passphrase protected user." >&2
21+ echo " -l, --lightdm Use the specified lightdm mock." >&2
21 echo " -g, --gdb Run through gdb." >&2
22 echo " -g, --gdb Run through gdb." >&2
22 echo " -h, --help Show this help." >&2
23 echo " -h, --help Show this help." >&2
23 echo " -m, --nomousetouch Run without -mousetouch argument." >&2
24 echo " -m, --nomousetouch Run without -mousetouch argument." >&2
@@ -25,16 +26,20 @@ usage() {
25 exit 1
26 exit 1
26}
27}
27
28
28−ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,help,nomousetouch" -o "fpkghm" -- "$@"`
29+ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,help,lightdm:,nomousetouch" -o "fpkl:ghm" -- "$@"`
29[ $? -ne 0 ] && usage
30[ $? -ne 0 ] && usage
30eval set -- "$ARGS"
31eval set -- "$ARGS"
31
32
32while [ $# -gt 0 ]
33while [ $# -gt 0 ]
33do
34do
34 case "$1" in
35 case "$1" in
35− -f|--fake) FAKE=true; USE_MOCKS=true;;
36+ -f|--fake) USE_MOCKS=true;;
36− -p|--pinlock) PINLOCK=true; USE_MOCKS=true;;
37+ -p|--pinlock) USE_MOCKS=true; LIGHTDM_MOCK=single-pin;;
37− -k|--keylock) KEYLOCK=true; USE_MOCKS=true;;
38+ -k|--keylock) USE_MOCKS=true; LIGHTDM_MOCK=single-passphrase;;
39+ -l|--lightdm) LIGHTDM_MOCK=$2; shift;
40+ if [ -z "$LIGHTDM_MOCK" ]; then
41+ echo "Please specify an argument to --lightdm"
42+ fi;;
38 -g|--gdb) GDB=true;;
43 -g|--gdb) GDB=true;;
39 -h|--help) usage;;
44 -h|--help) usage;;
40 -m|--nomousetouch) MOUSE_TOUCH=false;;
45 -m|--nomousetouch) MOUSE_TOUCH=false;;
@@ -43,27 +48,23 @@ do
43 shift
48 shift
44done
49done
45
50
46−if $FAKE; then
51+if [ -z "$LIGHTDM_MOCK" ]; then
47− export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single
52+ LIGHTDM_MOCK=single
48fi
53fi
49
54
50−if $PINLOCK; then
55+# Even without USE_MOCKS set, we want to fake our lightdm backend, because it's
51− export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-pin
56+# annoying to be prompted for your password when testing. To get the same
52−fi
57+# backend used in production, pass '--lightdm=demo'.
53−
54−if $KEYLOCK; then
55− export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase
58+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/$LIGHTDM_MOCK
56−fi
57
59
58if $USE_MOCKS; then
60if $USE_MOCKS; then
59 rm -f $PWD/builddir/nonmirplugins/LightDM # undo symlink (from below) for cleanliness
61 rm -f $PWD/builddir/nonmirplugins/LightDM # undo symlink (from below) for cleanliness
60 export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
62 export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
63+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics
61else
64else
62− # Still fake no-login user for convenience (it's annoying to be prompted for your password when testing)
63− # And in particular, just link our LightDM mock into the nonmirplugins folder. We don't want the rest of
65+ # Just link our LightDM mock into the nonmirplugins folder. We don't want
64− # our plugins to be used.
66+ # the rest of our plugins to be used.
65− ln -s $PWD/builddir/tests/mocks/LightDM $PWD/builddir/nonmirplugins/
67+ ln -sf $PWD/builddir/tests/mocks/LightDM $PWD/builddir/nonmirplugins/
66− export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/single
67fi
68fi
68
69
69QML_PHONE_SHELL_ARGS=""
70QML_PHONE_SHELL_ARGS=""
src/Dash/CMakeLists.txt+1
@@ -1,6 +1,7 @@
1set(DASH_SRCS
1set(DASH_SRCS
2 main.cpp
2 main.cpp
3 ../MouseTouchAdaptor.cpp
3 ../MouseTouchAdaptor.cpp
4+ ../CachingNetworkManagerFactory.cpp
4)
5)
5
6
6add_executable(unity8-dash ${DASH_SRCS})
7add_executable(unity8-dash ${DASH_SRCS})
src/Dash/main.cpp+4
@@ -28,6 +28,7 @@
28
28
29#include <paths.h>
29#include <paths.h>
30#include "../MouseTouchAdaptor.h"
30#include "../MouseTouchAdaptor.h"
31+#include "../CachingNetworkManagerFactory.h"
31
32
32int main(int argc, const char *argv[])
33int main(int argc, const char *argv[])
33{
34{
@@ -84,6 +85,9 @@ int main(int argc, const char *argv[])
84 prependImportPaths(view->engine(), ::overrideImportPaths());
85 prependImportPaths(view->engine(), ::overrideImportPaths());
85 appendImportPaths(view->engine(), ::fallbackImportPaths());
86 appendImportPaths(view->engine(), ::fallbackImportPaths());
86
87
88+ CachingNetworkManagerFactory *managerFactory = new CachingNetworkManagerFactory();
89+ view->engine()->setNetworkAccessManagerFactory(managerFactory);
90+
87 view->setSource(source);
91 view->setSource(source);
88 view->show();
92 view->show();
89
93
tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+15
@@ -115,3 +115,18 @@ class ApplicationLifecycleTests(tests.ApplicationLifeCycleTestCase):
115 self.launch_upstart_application(application_name)
115 self.launch_upstart_application(application_name)
116 self.assertThat(greeter.created, Eventually(Equals(False)))
116 self.assertThat(greeter.created, Eventually(Equals(False)))
117 self.assert_current_focused_application(application_name)
117 self.assert_current_focused_application(application_name)
118+
119+ def test_click_dash_icon_must_unfocus_application(self):
120+ application_name = self.launch_fake_app()
121+ self.assert_current_focused_application(application_name)
122+
123+ self.main_window.show_dash_from_launcher()
124+
125+ self.assert_current_focused_application('unity8-dash')
126+
127+ def test_click_app_icon_on_dash_must_focus_it(self):
128+ application_name = self.launch_fake_app()
129+ self.main_window.show_dash_from_launcher()
130+
131+ self.main_window.launch_application(application_name)
132+ self.assert_current_focused_application(application_name)
tests/autopilot/unity8/indicators/tests/test_indicators.py+1−1
@@ -76,7 +76,7 @@ class IndicatorPageTitleMatchesWidgetTestCase(IndicatorTestCase):
76 ('Location', dict(indicator_name='indicator-location',
76 ('Location', dict(indicator_name='indicator-location',
77 title='Location')),
77 title='Location')),
78 ('Messaging', dict(indicator_name='indicator-messages',
78 ('Messaging', dict(indicator_name='indicator-messages',
79− title='Incoming')),
79+ title='Notification center')),
80 ('Network', dict(indicator_name='indicator-network',
80 ('Network', dict(indicator_name='indicator-network',
81 title='Network')),
81 title='Network')),
82 ('Power', dict(indicator_name='indicator-power',
82 ('Power', dict(indicator_name='indicator-power',
tests/autopilot/unity8/shell/emulators/dash.py+16−6
@@ -24,7 +24,6 @@ from unity8.shell import emulators
24
24
25from autopilot import logging as autopilot_logging
25from autopilot import logging as autopilot_logging
26from autopilot.introspection import dbus
26from autopilot.introspection import dbus
27−from testtools.matchers import MatchesAny, Equals
28from ubuntuuitoolkit import emulators as toolkit_emulators
27from ubuntuuitoolkit import emulators as toolkit_emulators
29
28
30
29
@@ -146,7 +145,8 @@ class Dash(emulators.UnityEmulatorBase):
146 current_header.globalRect.y +
145 current_header.globalRect.y +
147 current_header.height / 4)
146 current_header.height / 4)
148 self.pointing_device.click()
147 self.pointing_device.click()
149− headerContainer = current_header.select_single(objectName="headerContainer")
148+ headerContainer = current_header.select_single(
149+ objectName="headerContainer")
150 headerContainer.contentY.wait_for(0)
150 headerContainer.contentY.wait_for(0)
151 search_text_field = self._get_search_text_field()
151 search_text_field = self._get_search_text_field()
152 search_text_field.write(query)
152 search_text_field.write(query)
@@ -177,22 +177,32 @@ class GenericScopeView(emulators.UnityEmulatorBase):
177 """Open the preview of an application.
177 """Open the preview of an application.
178
178
179 :parameter category: The name of the category where the application is.
179 :parameter category: The name of the category where the application is.
180− :app_name: The name of the application.
180+ :parameter app_name: The name of the application.
181 :return: The opened preview.
181 :return: The opened preview.
182
182
183 """
183 """
184− category_element = self._get_category_element(category)
185− icon = category_element.select_single('AbstractButton', title=app_name)
186 # FIXME some categories need a long press in order to see the preview.
184 # FIXME some categories need a long press in order to see the preview.
187 # Some categories do not show previews, like recent apps.
185 # Some categories do not show previews, like recent apps.
188 # --elopio - 2014-1-14
186 # --elopio - 2014-1-14
189− self.pointing_device.click_object(icon)
187+ self.click_scope_item(category, app_name)
190 preview_list = self.wait_select_single(
188 preview_list = self.wait_select_single(
191 'PreviewListView', objectName='previewListView')
189 'PreviewListView', objectName='previewListView')
192 preview_list.x.wait_for(0)
190 preview_list.x.wait_for(0)
193 return preview_list.select_single(
191 return preview_list.select_single(
194 Preview, objectName='preview{}'.format(preview_list.currentIndex))
192 Preview, objectName='preview{}'.format(preview_list.currentIndex))
195
193
194+ @autopilot_logging.log_action(logger.debug)
195+ def click_scope_item(self, category, title):
196+ """Click an item from the scope.
197+
198+ :parameter category: The name of the category where the item is.
199+ :parameter title: The title of the item.
200+
201+ """
202+ category_element = self._get_category_element(category)
203+ icon = category_element.select_single('AbstractButton', title=title)
204+ self.pointing_device.click_object(icon)
205+
196 def _get_category_element(self, category):
206 def _get_category_element(self, category):
197 try:
207 try:
198 return self.wait_select_single(
208 return self.wait_select_single(
tests/autopilot/unity8/shell/emulators/launcher.py+38−11
@@ -1,7 +1,7 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
2#
3# Unity Autopilot Test Suite
3# Unity Autopilot Test Suite
4−# Copyright (C) 2012-2013 Canonical
4+# Copyright (C) 2012, 2013, 2014 Canonical
5#
5#
6# This program is free software: you can redistribute it and/or modify
6# This program is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
7# it under the terms of the GNU General Public License as published by
@@ -17,22 +17,49 @@
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
18#
19
19
20−from unity8.shell.emulators import UnityEmulatorBase
20+import logging
21−from autopilot.input import Touch
22
21
22+import autopilot.logging
23
23
24+from unity8.shell import emulators
25+
26+
27+logger = logging.getLogger(__name__)
28+
29+
24−class Launcher(UnityEmulatorBase):
30+class Launcher(emulators.UnityEmulatorBase):
25
31
26 """An emulator that understands the Launcher."""
32 """An emulator that understands the Launcher."""
27
33
34+ @autopilot.logging.log_action(logger.debug)
28 def show(self):
35 def show(self):
29− """Swipes open the launcher."""
36+ """Show the launcher swiping it to the right."""
30− touch = Touch.create()
37+ if not self.shown:
38+ self._swipe_to_show_launcher()
39+ self.shown.wait_for(True)
40+ else:
41+ logger.debug('The launcher is already opened.')
31
42
43+ def _swipe_to_show_launcher(self):
32 view = self.get_root_instance().select_single('QQuickView')
44 view = self.get_root_instance().select_single('QQuickView')
45+ start_y = stop_y = view.y + view.height // 2
46+
33 start_x = view.x + 1
47 start_x = view.x + 1
34− start_y = view.y + view.height / 2
35− stop_x = start_x + self.panelWidth + 1
48+ stop_x = start_x + self.panelWidth - 1
36− stop_y = start_y
49+
37− touch.drag(start_x, start_y, stop_x, stop_y)
50+ self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
51+
52+ @autopilot.logging.log_action(logger.debug)
53+ def click_dash_icon(self):
38− self.shown.wait_for(True)
54+ if self.shown:
55+ dash_icon = self.select_single(
56+ 'QQuickImage', objectName='dashItem')
57+ self.pointing_device.click_object(dash_icon)
58+ else:
59+ raise emulators.UnityEmulatorException('The launcher is closed.')
60+
61+ @autopilot.logging.log_action(logger.debug)
62+ def click_application_launcher_icon(self, application_name):
63+ launcher_delegate = self.select_single(
64+ 'LauncherDelegate', appId=application_name)
65+ self.pointing_device.click_object(launcher_delegate)
tests/autopilot/unity8/shell/emulators/main_window.py+32−3
@@ -63,9 +63,6 @@ class QQuickView(emulators.UnityEmulatorBase):
63 def get_bottombar(self):
63 def get_bottombar(self):
64 return self.select_single("Bottombar")
64 return self.select_single("Bottombar")
65
65
66− def get_launcher(self):
67− return self.select_single(Launcher)
68−
69 def get_pinPadLoader(self):
66 def get_pinPadLoader(self):
70 return self.select_single(
67 return self.select_single(
71 "QQuickLoader",
68 "QQuickLoader",
@@ -113,6 +110,7 @@ class QQuickView(emulators.UnityEmulatorBase):
113 start_y = end_y = y + height // 2
110 start_y = end_y = y + height // 2
114
111
115 self.pointing_device.drag(start_x, start_y, end_x, end_y)
112 self.pointing_device.drag(start_x, start_y, end_x, end_y)
113+ self.get_current_focused_app_id().wait_for('unity8-dash')
116
114
117 def _get_shell(self):
115 def _get_shell(self):
118 return self.select_single('Shell')
116 return self.select_single('Shell')
@@ -122,6 +120,37 @@ class QQuickView(emulators.UnityEmulatorBase):
122 return self._get_shell().focusedApplicationId
120 return self._get_shell().focusedApplicationId
123
121
124 @autopilot_logging.log_action(logger.info)
122 @autopilot_logging.log_action(logger.info)
123+ def show_dash_from_launcher(self):
124+ """Open the dash clicking the dash icon on the launcher."""
125+ launcher = self.open_launcher()
126+ launcher.click_dash_icon()
127+ self.get_current_focused_app_id().wait_for('unity8-dash')
128+ launcher.shown.wait_for(False)
129+
130+ @autopilot_logging.log_action(logger.info)
131+ def open_launcher(self):
132+ launcher = self._get_launcher()
133+ launcher.show()
134+ return launcher
135+
136+ def _get_launcher(self):
137+ return self.select_single(Launcher)
138+
139+ def is_launcher_open(self):
140+ return self._get_launcher().shown
141+
142+ @autopilot_logging.log_action(logger.info)
143+ def launch_application(self, application_name):
144+ """Launch an application.
145+
146+ :parameter application_name: The name of the application to launch.
147+
148+ """
149+ launcher = self.open_launcher()
150+ launcher.click_application_launcher_icon(application_name)
151+ self.get_current_focused_app_id().wait_for(application_name)
152+ launcher.shown.wait_for(False)
153+
125 def enter_pin_code(self, code):
154 def enter_pin_code(self, code):
126 """Enter code 'code' into the single-pin lightdm pincode entry screen.
155 """Enter code 'code' into the single-pin lightdm pincode entry screen.
127
156
tests/autopilot/unity8/shell/tests/disabled_test_hud.py+1−2
@@ -184,12 +184,11 @@ class TestHud(UnityTestCase, DragMixin):
184 unity_proxy = self.launch_unity()
184 unity_proxy = self.launch_unity()
185 unlock_unity(unity_proxy)
185 unlock_unity(unity_proxy)
186 hud = self.main_window.get_hud()
186 hud = self.main_window.get_hud()
187− launcher = self.main_window.get_launcher()
188
187
189 self._launch_test_app_from_app_screen()
188 self._launch_test_app_from_app_screen()
190
189
191 hud.show()
190 hud.show()
192− launcher.show()
191+ self.main_window.open_launcher()
193
192
194 self.assertThat(hud.shown, Eventually(Equals(False)))
193 self.assertThat(hud.shown, Eventually(Equals(False)))
195
194
tests/autopilot/unity8/shell/tests/test_notifications.py+2−2
@@ -242,8 +242,8 @@ class InteractiveNotificationBase(NotificationsBase):
242 # the shell)
242 # the shell)
243 time.sleep(1)
243 time.sleep(1)
244 self.main_window.show_dash_swiping()
244 self.main_window.show_dash_swiping()
245− launcher = self.main_window.get_launcher()
246− self.assertThat(launcher.shown, Eventually(Equals(False)))
245+ self.assertThat(
246+ self.main_window.is_launcher_open, Eventually(Equals(False)))
247
247
248 # verify and interact with the triggered snap-decision notification
248 # verify and interact with the triggered snap-decision notification
249 notify_list = self._get_notifications_list()
249 notify_list = self._get_notifications_list()
tests/mocks/AccountsService/AccountsService.cpp+13−1
@@ -23,7 +23,8 @@
23AccountsService::AccountsService(QObject* parent)
23AccountsService::AccountsService(QObject* parent)
24 : QObject(parent),
24 : QObject(parent),
25 m_backgroundFile(qmlDirectory() + "graphics/phone_background.jpg"),
25 m_backgroundFile(qmlDirectory() + "graphics/phone_background.jpg"),
26− m_statsWelcomeScreen(true)
26+ m_statsWelcomeScreen(true),
27+ m_failedLogins(0)
27{
28{
28}
29}
29
30
@@ -78,3 +79,14 @@ AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() cons
78 else
79 else
79 return PasswordDisplayHint::Keyboard;
80 return PasswordDisplayHint::Keyboard;
80}
81}
82+
83+uint AccountsService::failedLogins() const
84+{
85+ return m_failedLogins;
86+}
87+
88+void AccountsService::setFailedLogins(uint failedLogins)
89+{
90+ m_failedLogins = failedLogins;
91+ failedLoginsChanged();
92+}
tests/mocks/AccountsService/AccountsService.h+8
@@ -47,6 +47,10 @@ class AccountsService: public QObject
47 Q_PROPERTY (PasswordDisplayHint passwordDisplayHint
47 Q_PROPERTY (PasswordDisplayHint passwordDisplayHint
48 READ passwordDisplayHint
48 READ passwordDisplayHint
49 NOTIFY passwordDisplayHintChanged)
49 NOTIFY passwordDisplayHintChanged)
50+ Q_PROPERTY (uint failedLogins
51+ READ failedLogins
52+ WRITE setFailedLogins
53+ NOTIFY failedLoginsChanged)
50
54
51public:
55public:
52 enum PasswordDisplayHint {
56 enum PasswordDisplayHint {
@@ -65,6 +69,8 @@ public:
65 bool statsWelcomeScreen() const;
69 bool statsWelcomeScreen() const;
66 void setStatsWelcomeScreen(bool statsWelcomeScreen);
70 void setStatsWelcomeScreen(bool statsWelcomeScreen);
67 PasswordDisplayHint passwordDisplayHint() const;
71 PasswordDisplayHint passwordDisplayHint() const;
72+ uint failedLogins() const;
73+ void setFailedLogins(uint failedLogins);
68
74
69Q_SIGNALS:
75Q_SIGNALS:
70 void userChanged();
76 void userChanged();
@@ -72,11 +78,13 @@ Q_SIGNALS:
72 void backgroundFileChanged();
78 void backgroundFileChanged();
73 void statsWelcomeScreenChanged();
79 void statsWelcomeScreenChanged();
74 void passwordDisplayHintChanged();
80 void passwordDisplayHintChanged();
81+ void failedLoginsChanged();
75
82
76private:
83private:
77 QString m_backgroundFile;
84 QString m_backgroundFile;
78 QString m_user;
85 QString m_user;
79 bool m_statsWelcomeScreen;
86 bool m_statsWelcomeScreen;
87+ uint m_failedLogins;
80};
88};
81
89
82#endif
90#endif
tests/mocks/AccountsService/AccountsService.qmltypes+8
@@ -14,9 +14,17 @@ Module {
14 isCreatable: false
14 isCreatable: false
15 isSingleton: true
15 isSingleton: true
16 exportMetaObjectRevisions: [0]
16 exportMetaObjectRevisions: [0]
17+ Enum {
18+ name: "PasswordDisplayHint"
19+ values: {
20+ "Keyboard": 0,
21+ "Numeric": 1
22+ }
23+ }
17 Property { name: "user"; type: "string" }
24 Property { name: "user"; type: "string" }
18 Property { name: "demoEdges"; type: "bool" }
25 Property { name: "demoEdges"; type: "bool" }
19 Property { name: "backgroundFile"; type: "string" }
26 Property { name: "backgroundFile"; type: "string" }
20 Property { name: "statsWelcomeScreen"; type: "bool" }
27 Property { name: "statsWelcomeScreen"; type: "bool" }
28+ Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
21 }
29 }
22}
30}
tests/mocks/LightDM/Greeter.cpp+11
@@ -19,6 +19,7 @@
19#include "Greeter.h"
19#include "Greeter.h"
20#include "GreeterPrivate.h"
20#include "GreeterPrivate.h"
21#include <QtCore/QCoreApplication>
21#include <QtCore/QCoreApplication>
22+#include <QTimer>
22
23
23namespace QLightDM
24namespace QLightDM
24{
25{
@@ -164,4 +165,14 @@ void Greeter::respond(const QString &response)
164 d->handleRespond(response);
165 d->handleRespond(response);
165}
166}
166
167
168+void Greeter::sendAuthenticationComplete()
169+{
170+ if (qgetenv("UNITY_TESTING").isEmpty()) {
171+ // simulate PAM's delay
172+ QTimer::singleShot(1000, this, SIGNAL(authenticationComplete()));
173+ } else {
174+ Q_EMIT authenticationComplete();
175+ }
176+}
177+
167}
178}
tests/mocks/LightDM/Greeter.h+3
@@ -96,6 +96,9 @@ Q_SIGNALS:
96 void authenticationComplete();
96 void authenticationComplete();
97 void autologinTimerExpired();
97 void autologinTimerExpired();
98
98
99+protected:
100+ void sendAuthenticationComplete();
101+
99private:
102private:
100 GreeterPrivate *d_ptr;
103 GreeterPrivate *d_ptr;
101 Q_DECLARE_PRIVATE(Greeter)
104 Q_DECLARE_PRIVATE(Greeter)
tests/mocks/LightDM/LightDM.qmltypes+7
@@ -14,6 +14,7 @@ Module {
14 isCreatable: false
14 isCreatable: false
15 isSingleton: true
15 isSingleton: true
16 exportMetaObjectRevisions: [0]
16 exportMetaObjectRevisions: [0]
17+ Property { name: "active"; type: "bool" }
17 Property { name: "authenticated"; type: "bool"; isReadonly: true }
18 Property { name: "authenticated"; type: "bool"; isReadonly: true }
18 Property { name: "authenticationUser"; type: "string"; isReadonly: true }
19 Property { name: "authenticationUser"; type: "string"; isReadonly: true }
19 Property { name: "promptless"; type: "bool"; isReadonly: true }
20 Property { name: "promptless"; type: "bool"; isReadonly: true }
@@ -32,6 +33,8 @@ Module {
32 name: "authenticationUserChanged"
33 name: "authenticationUserChanged"
33 Parameter { name: "user"; type: "string" }
34 Parameter { name: "user"; type: "string" }
34 }
35 }
36+ Signal { name: "isActiveChanged" }
37+ Signal { name: "showGreeter" }
35 Signal {
38 Signal {
36 name: "requestAuthenticationUser"
39 name: "requestAuthenticationUser"
37 Parameter { name: "user"; type: "string" }
40 Parameter { name: "user"; type: "string" }
@@ -51,6 +54,10 @@ Module {
51 Parameter { name: "session"; type: "string" }
54 Parameter { name: "session"; type: "string" }
52 }
55 }
53 Method { name: "startSessionSync"; type: "bool" }
56 Method { name: "startSessionSync"; type: "bool" }
57+ Method {
58+ name: "setIsActive"
59+ Parameter { name: "isActive"; type: "bool" }
60+ }
54 }
61 }
55 Component {
62 Component {
56 name: "QAbstractProxyModel"
63 name: "QAbstractProxyModel"
tests/mocks/LightDM/demo/CMakeLists.txt+13
@@ -9,6 +9,7 @@ set(LibLightDM_SOURCES
9 )
9 )
10
10
11add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})
11add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})
12+add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})
12
13
13include_directories(
14include_directories(
14 ${CMAKE_CURRENT_BINARY_DIR}
15 ${CMAKE_CURRENT_BINARY_DIR}
@@ -19,5 +20,17 @@ target_link_libraries(MockLightDM-demo
19 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
20 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
20 -lpam
21 -lpam
21)
22)
23+target_link_libraries(MockLightDM-demo-shared
24+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}
25+ -lpam
26+)
22
27
23qt5_use_modules(MockLightDM-demo Concurrent Gui)
28qt5_use_modules(MockLightDM-demo Concurrent Gui)
29+qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)
30+
31+set_target_properties(MockLightDM-demo-shared PROPERTIES
32+ OUTPUT_NAME lightdm-qt5-2)
33+
34+install(TARGETS MockLightDM-demo-shared
35+ DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/demo
36+ )
tests/mocks/LightDM/full/GreeterPrivate.cpp+4−4
@@ -54,7 +54,7 @@ void GreeterPrivate::handleAuthenticate()
54 authenticated = true;
54 authenticated = true;
55 Q_EMIT q->authenticationComplete();
55 Q_EMIT q->authenticationComplete();
56 } else if (authenticationUser == "has-pin"){
56 } else if (authenticationUser == "has-pin"){
57− Q_EMIT q->showPrompt("Password:", Greeter::PromptTypeSecret);
57+ Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
58 } else if (authenticationUser == "auth-error") {
58 } else if (authenticationUser == "auth-error") {
59 authenticated = false;
59 authenticated = false;
60 Q_EMIT q->authenticationComplete();
60 Q_EMIT q->authenticationComplete();
@@ -78,11 +78,11 @@ void GreeterPrivate::handleRespond(const QString &response)
78 Q_EMIT q->showPrompt("otp", Greeter::PromptTypeQuestion);
78 Q_EMIT q->showPrompt("otp", Greeter::PromptTypeQuestion);
79 } else {
79 } else {
80 authenticated = false;
80 authenticated = false;
81− Q_EMIT q->authenticationComplete();
81+ q->sendAuthenticationComplete();
82 }
82 }
83 } else {
83 } else {
84 authenticated = (response == "otp");
84 authenticated = (response == "otp");
85− Q_EMIT q->authenticationComplete();
85+ q->sendAuthenticationComplete();
86 }
86 }
87 return;
87 return;
88 }
88 }
@@ -92,7 +92,7 @@ void GreeterPrivate::handleRespond(const QString &response)
92 } else {
92 } else {
93 authenticated = (response == "password");
93 authenticated = (response == "password");
94 }
94 }
95− Q_EMIT q->authenticationComplete();
95+ q->sendAuthenticationComplete();
96}
96}
97
97
98}
98}
tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp+2−9
@@ -19,8 +19,6 @@
19#include "../Greeter.h"
19#include "../Greeter.h"
20#include "../GreeterPrivate.h"
20#include "../GreeterPrivate.h"
21
21
22−#include <QDebug>
23−
24namespace QLightDM
22namespace QLightDM
25{
23{
26
24
@@ -34,20 +32,15 @@ GreeterPrivate::GreeterPrivate(Greeter* parent)
34void GreeterPrivate::handleAuthenticate()
32void GreeterPrivate::handleAuthenticate()
35{
33{
36 Q_Q(Greeter);
34 Q_Q(Greeter);
37−
38− qDebug() << "handleAuthentication called!" << authenticationUser;
39−
40− Q_EMIT q->showPrompt("Password:", Greeter::PromptTypeSecret);
35+ Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
41}
36}
42
37
43void GreeterPrivate::handleRespond(const QString &response)
38void GreeterPrivate::handleRespond(const QString &response)
44{
39{
45 Q_Q(Greeter);
40 Q_Q(Greeter);
46
41
47−
48 authenticated = (response == "password");
42 authenticated = (response == "password");
49− qDebug() << "responding" << response << authenticated;
43+ q->sendAuthenticationComplete();
50− Q_EMIT q->authenticationComplete();
51}
44}
52
45
53}
46}
tests/mocks/LightDM/single-pin/GreeterPrivate.cpp+3−2
@@ -32,14 +32,15 @@ GreeterPrivate::GreeterPrivate(Greeter* parent)
32void GreeterPrivate::handleAuthenticate()
32void GreeterPrivate::handleAuthenticate()
33{
33{
34 Q_Q(Greeter);
34 Q_Q(Greeter);
35− Q_EMIT q->showPrompt("Password:", Greeter::PromptTypeSecret);
35+ Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
36}
36}
37
37
38void GreeterPrivate::handleRespond(const QString &response)
38void GreeterPrivate::handleRespond(const QString &response)
39{
39{
40 Q_Q(Greeter);
40 Q_Q(Greeter);
41+
41 authenticated = (response == "1234");
42 authenticated = (response == "1234");
42− Q_EMIT q->authenticationComplete();
43+ q->sendAuthenticationComplete();
43}
44}
44
45
45}
46}
tests/mocks/QMenuModel/QMenuModel.qmltypes+1
@@ -23,6 +23,7 @@ Module {
23 Property { name: "actions"; type: "QVariantMap" }
23 Property { name: "actions"; type: "QVariantMap" }
24 Property { name: "menuObjectPath"; type: "QByteArray" }
24 Property { name: "menuObjectPath"; type: "QByteArray" }
25 Property { name: "actionStateParser"; type: "ActionStateParser"; isPointer: true }
25 Property { name: "actionStateParser"; type: "ActionStateParser"; isPointer: true }
26+ Property { name: "nameOwner"; type: "string"; isReadonly: true }
26 Method {
27 Method {
27 name: "insertRow"
28 name: "insertRow"
28 Parameter { name: "row"; type: "int" }
29 Parameter { name: "row"; type: "int" }
tests/mocks/Ubuntu/CMakeLists.txt+1
@@ -1,4 +1,5 @@
1add_subdirectory(DownloadDaemonListener)
1add_subdirectory(DownloadDaemonListener)
2add_subdirectory(Payments)
2add_subdirectory(Payments)
3+add_subdirectory(SystemImage)
3add_subdirectory(Telephony)
4add_subdirectory(Telephony)
4add_subdirectory(Thumbnailer)
5add_subdirectory(Thumbnailer)
tests/mocks/Ubuntu/SystemImage/CMakeLists.txtnew file+10
@@ -0,0 +1,10 @@
1+set(MOCK_SYSTEMIMAGE_SOURCES
2+ plugin.cpp
3+ MockSystemImage.cpp
4+)
5+
6+add_library(MockSystemImage MODULE ${MOCK_SYSTEMIMAGE_SOURCES})
7+
8+qt5_use_modules(MockSystemImage Qml Quick Core)
9+
10+add_unity8_mock(Ubuntu.SystemImage 0.1 Ubuntu/SystemImage TARGETS MockSystemImage)
tests/mocks/Ubuntu/SystemImage/MockSystemImage.cppnew file+27
@@ -0,0 +1,27 @@
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 "MockSystemImage.h"
18+
19+MockSystemImage::MockSystemImage(QObject *parent)
20+ : QObject(parent)
21+{
22+}
23+
24+void MockSystemImage::factoryReset()
25+{
26+ Q_EMIT resettingDevice();
27+}
tests/mocks/Ubuntu/SystemImage/MockSystemImage.hnew file+36
@@ -0,0 +1,36 @@
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 MOCK_SYSTEMIMAGE_H
18+#define MOCK_SYSTEMIMAGE_H
19+
20+#include <QObject>
21+
22+class MockSystemImage : public QObject
23+{
24+ Q_OBJECT
25+ Q_DISABLE_COPY(MockSystemImage)
26+
27+public:
28+ explicit MockSystemImage(QObject *parent = 0);
29+
30+ Q_INVOKABLE void factoryReset();
31+
32+Q_SIGNALS:
33+ void resettingDevice(); // only for mock
34+};
35+
36+#endif // MOCK_SYSTEMIMAGE_H
tests/mocks/Ubuntu/SystemImage/SystemImage.qmltypesnew file+18
@@ -0,0 +1,18 @@
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 Ubuntu.SystemImage 0.1 plugins'
8+
9+Module {
10+ Component {
11+ name: "MockSystemImage"
12+ prototype: "QObject"
13+ exports: ["Ubuntu.SystemImage/SystemImage 0.1"]
14+ exportMetaObjectRevisions: [0]
15+ Signal { name: "resettingDevice" }
16+ Method { name: "factoryReset" }
17+ }
18+}
tests/mocks/Ubuntu/SystemImage/plugin.cppnew file+34
@@ -0,0 +1,34 @@
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 "plugin.h"
18+#include "MockSystemImage.h"
19+
20+#include <QtQml>
21+
22+static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
23+{
24+ Q_UNUSED(engine)
25+ Q_UNUSED(scriptEngine)
26+ return new MockSystemImage();
27+}
28+
29+void BackendPlugin::registerTypes(const char *uri)
30+{
31+ Q_ASSERT(uri == QLatin1String("Ubuntu.SystemImage"));
32+
33+ qmlRegisterSingletonType<MockSystemImage>(uri, 0, 1, "SystemImage", service_provider);
34+}
tests/mocks/Ubuntu/SystemImage/plugin.hnew file+31
@@ -0,0 +1,31 @@
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 MOCK_SYSTEMIMAGE_PLUGIN_H
18+#define MOCK_SYSTEMIMAGE_PLUGIN_H
19+
20+#include <QQmlExtensionPlugin>
21+
22+class BackendPlugin : public QQmlExtensionPlugin
23+{
24+ Q_OBJECT
25+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
26+
27+public:
28+ void registerTypes(const char *uri);
29+};
30+
31+#endif // MOCK_SYSTEMIMAGE_PLUGIN_H
tests/mocks/Ubuntu/SystemImage/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module Ubuntu.SystemImage
2+plugin MockSystemImage
3+typeinfo SystemImage.qmltypes
tests/mocks/Ubuntu/Telephony/Telephony.qmltypesnew file+57
@@ -0,0 +1,57 @@
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 Ubuntu.Telephony 0.1 tests/mocks'
8+
9+Module {
10+ Component {
11+ name: "ContactWatcherData"
12+ prototype: "QObject"
13+ exports: ["Ubuntu.Telephony/ContactWatcherData 0.1"]
14+ isCreatable: false
15+ exportMetaObjectRevisions: [0]
16+ Property { name: "contactData"; type: "QVariant" }
17+ }
18+ Component {
19+ name: "MockCallEntry"
20+ prototype: "QObject"
21+ exports: ["Ubuntu.Telephony/CallEntry 0.1"]
22+ exportMetaObjectRevisions: [0]
23+ Property { name: "phoneNumber"; type: "string" }
24+ Property { name: "isConference"; type: "bool" }
25+ Property { name: "elapsedTime"; type: "int"; isReadonly: true }
26+ }
27+ Component {
28+ name: "MockCallManager"
29+ prototype: "QObject"
30+ exports: ["Ubuntu.Telephony/CallManager 0.1"]
31+ isCreatable: false
32+ exportMetaObjectRevisions: [0]
33+ Property { name: "foregroundCall"; type: "QObject"; isPointer: true }
34+ Property { name: "backgroundCall"; type: "QObject"; isPointer: true }
35+ Property { name: "hasCalls"; type: "bool"; isReadonly: true }
36+ Property { name: "callIndicatorVisible"; type: "bool" }
37+ }
38+ Component {
39+ name: "MockContactWatcher"
40+ prototype: "QObject"
41+ exports: ["Ubuntu.Telephony/ContactWatcher 0.1"]
42+ exportMetaObjectRevisions: [0]
43+ Property { name: "phoneNumber"; type: "string" }
44+ Property { name: "alias"; type: "string"; isReadonly: true }
45+ }
46+ Component {
47+ name: "MockTelepathyHelper"
48+ prototype: "QObject"
49+ exports: ["Ubuntu.Telephony/TelepathyHelper 0.1"]
50+ isCreatable: false
51+ exportMetaObjectRevisions: [0]
52+ Method {
53+ name: "registerChannelObserver"
54+ Parameter { name: "name"; type: "string" }
55+ }
56+ }
57+}
tests/mocks/Unity/Application/Application.qmltypes+133−8
@@ -33,15 +33,58 @@ Module {
33 exportMetaObjectRevisions: [0]
33 exportMetaObjectRevisions: [0]
34 Property { name: "fullscreen"; type: "bool" }
34 Property { name: "fullscreen"; type: "bool" }
35 Property { name: "stage"; type: "Stage" }
35 Property { name: "stage"; type: "Stage" }
36+ Property { name: "surface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }
37+ Property { name: "promptSurfaces"; type: "MirSurfaceItem"; isList: true; isReadonly: true }
36 Property { name: "imageQml"; type: "string" }
38 Property { name: "imageQml"; type: "string" }
37 Property { name: "windowQml"; type: "string" }
39 Property { name: "windowQml"; type: "string" }
40+ Signal {
38− Signal { name: "appIdChanged" }
41+ name: "appIdChanged"
42+ Parameter { type: "string" }
43+ }
44+ Signal {
39− Signal { name: "nameChanged" }
45+ name: "nameChanged"
46+ Parameter { type: "string" }
47+ }
48+ Signal {
40− Signal { name: "commentChanged" }
49+ name: "commentChanged"
50+ Parameter { type: "string" }
51+ }
52+ Signal {
41− Signal { name: "iconChanged" }
53+ name: "iconChanged"
54+ Parameter { type: "QUrl" }
55+ }
56+ Signal {
57+ name: "stageChanged"
58+ Parameter { type: "Stage" }
59+ }
60+ Signal {
42− Signal { name: "stateChanged" }
61+ name: "stateChanged"
62+ Parameter { type: "State" }
63+ }
64+ Signal {
43− Signal { name: "focusedChanged" }
65+ name: "focusedChanged"
66+ Parameter { type: "bool" }
67+ }
68+ Signal {
69+ name: "fullscreenChanged"
70+ Parameter { type: "bool" }
71+ }
72+ Signal {
73+ name: "imageQmlChanged"
74+ Parameter { type: "string" }
75+ }
76+ Signal {
77+ name: "windowQmlChanged"
78+ Parameter { type: "string" }
79+ }
80+ Signal {
44− Signal { name: "screenshotChanged" }
81+ name: "screenshotChanged"
82+ Parameter { type: "QUrl" }
83+ }
84+ Signal {
85+ name: "surfaceChanged"
86+ Parameter { type: "MirSurfaceItem"; isPointer: true }
87+ }
45 }
88 }
46 Component {
89 Component {
47 name: "ApplicationManager"
90 name: "ApplicationManager"
@@ -102,11 +145,11 @@ Module {
102 "ForceMainStage": 1
145 "ForceMainStage": 1
103 }
146 }
104 }
147 }
148+ Property { name: "empty"; type: "bool"; isReadonly: true }
105 Property { name: "sideStageWidth"; type: "int"; isReadonly: true }
149 Property { name: "sideStageWidth"; type: "int"; isReadonly: true }
106 Property { name: "stageHint"; type: "StageHint"; isReadonly: true }
150 Property { name: "stageHint"; type: "StageHint"; isReadonly: true }
107 Property { name: "formFactorHint"; type: "FormFactorHint"; isReadonly: true }
151 Property { name: "formFactorHint"; type: "FormFactorHint"; isReadonly: true }
108 Property { name: "fake"; type: "bool"; isReadonly: true }
152 Property { name: "fake"; type: "bool"; isReadonly: true }
109− Property { name: "rightMargin"; type: "int" }
110 Signal {
153 Signal {
111 name: "focusRequested"
154 name: "focusRequested"
112 Parameter { name: "favoriteApplication"; type: "FavoriteApplication" }
155 Parameter { name: "favoriteApplication"; type: "FavoriteApplication" }
@@ -115,6 +158,10 @@ Module {
115 name: "focusRequested"
158 name: "focusRequested"
116 Parameter { name: "appId"; type: "string" }
159 Parameter { name: "appId"; type: "string" }
117 }
160 }
161+ Signal {
162+ name: "emptyChanged"
163+ Parameter { name: "empty"; type: "bool" }
164+ }
118 Method {
165 Method {
119 name: "get"
166 name: "get"
120 type: "ApplicationInfo*"
167 type: "ApplicationInfo*"
@@ -177,6 +224,84 @@ Module {
177 }
224 }
178 Method { name: "availableApplications"; type: "QStringList" }
225 Method { name: "availableApplications"; type: "QStringList" }
179 }
226 }
227+ Component {
228+ name: "MirSurfaceItem"
229+ defaultProperty: "data"
230+ prototype: "QQuickPaintedItem"
231+ exports: ["Unity.Application/MirSurfaceItem 0.1"]
232+ isCreatable: false
233+ exportMetaObjectRevisions: [0]
234+ Enum {
235+ name: "Type"
236+ values: {
237+ "Normal": 0,
238+ "Utility": 1,
239+ "Dialog": 2,
240+ "Overlay": 3,
241+ "Freestyle": 4,
242+ "Popover": 5,
243+ "InputMethod": 6
244+ }
245+ }
246+ Enum {
247+ name: "State"
248+ values: {
249+ "Unknown": 0,
250+ "Restored": 1,
251+ "Minimized": 2,
252+ "Maximized": 3,
253+ "VertMaximized": 4,
254+ "Fullscreen": 5
255+ }
256+ }
257+ Property { name: "type"; type: "Type"; isReadonly: true }
258+ Property { name: "state"; type: "State"; isReadonly: true }
259+ Property { name: "name"; type: "string"; isReadonly: true }
260+ Property { name: "parentSurface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }
261+ Property { name: "childSurfaces"; type: "MirSurfaceItem"; isList: true; isReadonly: true }
262+ Signal {
263+ name: "typeChanged"
264+ Parameter { type: "Type" }
265+ }
266+ Signal {
267+ name: "stateChanged"
268+ Parameter { type: "State" }
269+ }
270+ Signal {
271+ name: "nameChanged"
272+ Parameter { type: "string" }
273+ }
274+ Signal {
275+ name: "parentSurfaceChanged"
276+ Parameter { type: "MirSurfaceItem"; isPointer: true }
277+ }
278+ Signal { name: "removed" }
279+ Signal { name: "inputMethodRequested" }
280+ Signal { name: "inputMethodDismissed" }
281+ Method {
282+ name: "setState"
283+ Parameter { name: "newState"; type: "State" }
284+ }
285+ Method { name: "release" }
286+ }
287+ Component {
288+ name: "SurfaceManager"
289+ prototype: "QObject"
290+ exports: ["Unity.Application/SurfaceManager 0.1"]
291+ isCreatable: false
292+ isSingleton: true
293+ exportMetaObjectRevisions: [0]
294+ Signal { name: "countChanged" }
295+ Signal {
296+ name: "surfaceCreated"
297+ Parameter { name: "surface"; type: "MirSurfaceItem"; isPointer: true }
298+ }
299+ Signal {
300+ name: "surfaceDestroyed"
301+ Parameter { name: "surface"; type: "MirSurfaceItem"; isPointer: true }
302+ }
303+ Method { name: "inputMethodSurface"; type: "MirSurfaceItem*" }
304+ }
180 Component {
305 Component {
181 name: "unity::shell::application::ApplicationInfoInterface"
306 name: "unity::shell::application::ApplicationInfoInterface"
182 prototype: "QObject"
307 prototype: "QObject"
tests/mocks/Unity/Application/ApplicationInfo.cpp+1
@@ -54,6 +54,7 @@ ApplicationInfo::~ApplicationInfo()
54 if (m_surface) {
54 if (m_surface) {
55 Q_EMIT SurfaceManager::singleton()->surfaceDestroyed(m_surface);
55 Q_EMIT SurfaceManager::singleton()->surfaceDestroyed(m_surface);
56 m_surface->deleteLater();
56 m_surface->deleteLater();
57+ setSurface(nullptr);
57 }
58 }
58}
59}
59
60
tests/mocks/Unity/DashCommunicator/DashCommunicator.qmltypesnew file+46
@@ -0,0 +1,46 @@
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 Unity.DashCommunicator 0.1 tests/mocks'
8+
9+Module {
10+ Component {
11+ name: "DashCommunicator"
12+ prototype: "QObject"
13+ exports: ["Unity.DashCommunicator/DashCommunicator 0.1"]
14+ exportMetaObjectRevisions: [0]
15+ Signal {
16+ name: "setCurrentScopeCalled"
17+ Parameter { name: "scopeId"; type: "string" }
18+ Parameter { name: "animate"; type: "bool" }
19+ Parameter { name: "reset"; type: "bool" }
20+ }
21+ Method {
22+ name: "setCurrentScope"
23+ Parameter { name: "scopeId"; type: "string" }
24+ Parameter { name: "animate"; type: "bool" }
25+ Parameter { name: "reset"; type: "bool" }
26+ }
27+ }
28+ Component {
29+ name: "DashCommunicatorService"
30+ prototype: "QObject"
31+ exports: ["Unity.DashCommunicator/DashCommunicatorService 0.1"]
32+ exportMetaObjectRevisions: [0]
33+ Signal {
34+ name: "setCurrentScopeRequested"
35+ Parameter { name: "scopeId"; type: "string" }
36+ Parameter { name: "animate"; type: "bool" }
37+ Parameter { name: "reset"; type: "bool" }
38+ }
39+ Method {
40+ name: "mockSetCurrentScope"
41+ Parameter { name: "scopeId"; type: "string" }
42+ Parameter { name: "animate"; type: "bool" }
43+ Parameter { name: "reset"; type: "bool" }
44+ }
45+ }
46+}
tests/mocks/Unity/fake_categories.cpp+3
@@ -149,6 +149,9 @@ Categories::data(const QModelIndex& index, int role) const
149 map["card-size"] = "medium";
149 map["card-size"] = "medium";
150 map["overlay"] = true;
150 map["overlay"] = true;
151 }
151 }
152+ if (index.row() == 18) {
153+ map["category-layout"] = "horizontal-list";
154+ }
152 if (index.row() == 19) {
155 if (index.row() == 19) {
153 map["category-layout"] = "grid";
156 map["category-layout"] = "grid";
154 map["collapsed-rows"] = 0;
157 map["collapsed-rows"] = 0;
tests/mocks/Unity/fake_previewmodel.cpp+10−1
@@ -29,6 +29,7 @@
29
29
30PreviewModel::PreviewModel(QObject* parent)
30PreviewModel::PreviewModel(QObject* parent)
31 : unity::shell::scopes::PreviewModelInterface(parent)
31 : unity::shell::scopes::PreviewModelInterface(parent)
32+ , m_loaded(true)
32{
33{
33 // we have one column by default
34 // we have one column by default
34 PreviewWidgetModel* columnModel = new PreviewWidgetModel(this);
35 PreviewWidgetModel* columnModel = new PreviewWidgetModel(this);
@@ -49,7 +50,7 @@ int PreviewModel::widgetColumnCount() const
49
50
50bool PreviewModel::loaded() const
51bool PreviewModel::loaded() const
51{
52{
52− return true;
53+ return m_loaded;
53}
54}
54
55
55bool PreviewModel::processingAction() const
56bool PreviewModel::processingAction() const
@@ -71,3 +72,11 @@ QVariant PreviewModel::data(const QModelIndex& index, int role) const
71 return QVariant();
72 return QVariant();
72 }
73 }
73}
74}
75+
76+void PreviewModel::setLoaded(bool loaded)
77+{
78+ if (m_loaded != loaded) {
79+ m_loaded = loaded;
80+ Q_EMIT loadedChanged();
81+ }
82+}
tests/mocks/Unity/fake_previewmodel.h+3
@@ -40,8 +40,11 @@ public:
40 bool loaded() const override;
40 bool loaded() const override;
41 bool processingAction() const override;
41 bool processingAction() const override;
42
42
43+ Q_INVOKABLE void setLoaded(bool); // Only available for testing
44+
43private:
45private:
44 QList<PreviewWidgetModel*> m_previewWidgetModels;
46 QList<PreviewWidgetModel*> m_previewWidgetModels;
47+ bool m_loaded;
45};
48};
46
49
47Q_DECLARE_METATYPE(PreviewModel*)
50Q_DECLARE_METATYPE(PreviewModel*)
tests/mocks/Unity/fake_resultsmodel.cpp+5
@@ -29,6 +29,11 @@ ResultsModel::ResultsModel(int result_count, int categoryId, QObject* parent)
29{
29{
30}
30}
31
31
32+ResultsModel::ResultsModel(QObject *parent)
33+ : ResultsModel::ResultsModel(10, 1, parent)
34+{
35+}
36+
32QString ResultsModel::categoryId() const
37QString ResultsModel::categoryId() const
33{
38{
34 return QString::number(m_categoryId);
39 return QString::number(m_categoryId);
tests/mocks/Unity/fake_resultsmodel.h+1
@@ -29,6 +29,7 @@ class ResultsModel : public unity::shell::scopes::ResultsModelInterface
29
29
30public:
30public:
31 explicit ResultsModel(int result_count, int categoryId, QObject* parent = 0);
31 explicit ResultsModel(int result_count, int categoryId, QObject* parent = 0);
32+ explicit ResultsModel(QObject* parent = 0);
32
33
33 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
34 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
34 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
35 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
tests/mocks/Unity/fake_scope.cpp+1−1
@@ -226,7 +226,7 @@ QVariantMap Scope::customizations() const
226 m["page-header"] = h;
226 m["page-header"] = h;
227 } else if (m_id == "MockScope5") {
227 } else if (m_id == "MockScope5") {
228 h["background"] = "gradient:///lightgrey/grey";
228 h["background"] = "gradient:///lightgrey/grey";
229− h["logo"] = QUrl("../../../tests/qmltests/Components/tst_PageHeader/logo-ubuntu-orange.svg");
229+ h["logo"] = QUrl("../../../tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svg");
230 m["page-header"] = h;
230 m["page-header"] = h;
231 }
231 }
232 return m;
232 return m;
tests/mocks/Unity/fake_scopesoverview.cpp+4−2
@@ -105,11 +105,12 @@ ScopesOverviewCategories::data(const QModelIndex& index, int role) const
105 }
105 }
106 case RoleComponents:
106 case RoleComponents:
107 {
107 {
108− QVariantMap map, artMap;
108+ QVariantMap map, artMap, attributesMap;
109 artMap["aspect-ratio"] = "0.5";
109 artMap["aspect-ratio"] = "0.5";
110 artMap["field"] = "art";
110 artMap["field"] = "art";
111 map["art"] = artMap;
111 map["art"] = artMap;
112 map["title"] = "HOLA";
112 map["title"] = "HOLA";
113+ map["attributes"] = attributesMap;
113 return map;
114 return map;
114 }
115 }
115 case RoleResults:
116 case RoleResults:
@@ -188,11 +189,12 @@ ScopesOverviewSearchCategories::data(const QModelIndex& index, int role) const
188 }
189 }
189 case RoleComponents:
190 case RoleComponents:
190 {
191 {
191− QVariantMap map, artMap;
192+ QVariantMap map, artMap, attributesMap;
192 artMap["aspect-ratio"] = "1";
193 artMap["aspect-ratio"] = "1";
193 artMap["field"] = "art";
194 artMap["field"] = "art";
194 map["art"] = artMap;
195 map["art"] = artMap;
195 map["title"] = "HOLA";
196 map["title"] = "HOLA";
197+ map["attributes"] = attributesMap;
196 return map;
198 return map;
197 }
199 }
198 case RoleResults:
200 case RoleResults:
tests/mocks/Unity/fake_unity_plugin.cpp+1
@@ -47,6 +47,7 @@ void FakeUnityPlugin::registerTypes(const char *uri)
47 qmlRegisterUncreatableType<unity::shell::scopes::CategoriesInterface>(uri, 0, 2, "Categories", "Can't create Categories object in QML.");
47 qmlRegisterUncreatableType<unity::shell::scopes::CategoriesInterface>(uri, 0, 2, "Categories", "Can't create Categories object in QML.");
48 qmlRegisterUncreatableType<unity::shell::scopes::PreviewModelInterface>(uri, 0, 2, "PreviewModel", "Can't create new PreviewModel in QML. Get them from PreviewStack instance.");
48 qmlRegisterUncreatableType<unity::shell::scopes::PreviewModelInterface>(uri, 0, 2, "PreviewModel", "Can't create new PreviewModel in QML. Get them from PreviewStack instance.");
49 qmlRegisterUncreatableType<ResultsModel>(uri, 0, 2, "ResultsModel", "Can't create ResultsModel object in QML.");
49 qmlRegisterUncreatableType<ResultsModel>(uri, 0, 2, "ResultsModel", "Can't create ResultsModel object in QML.");
50+ qmlRegisterType<ResultsModel>(uri, 0, 2, "FakeResultsModel");
50 qmlRegisterType<PreviewModel>(uri, 0, 2, "FakePreviewModel");
51 qmlRegisterType<PreviewModel>(uri, 0, 2, "FakePreviewModel");
51 qmlRegisterUncreatableType<PreviewWidgetModel>(uri, 0, 2, "PreviewWidgetModel", "Can't create new PreviewWidgetModel in QML. Get them from PreviewModel instance.");
52 qmlRegisterUncreatableType<PreviewWidgetModel>(uri, 0, 2, "PreviewWidgetModel", "Can't create new PreviewWidgetModel in QML. Get them from PreviewModel instance.");
52 qmlRegisterUncreatableType<PreviewStack>(uri, 0, 2, "PreviewStack", "Can't create new PreviewStack in QML. Get them from Scope instance.");
53 qmlRegisterUncreatableType<PreviewStack>(uri, 0, 2, "PreviewStack", "Can't create new PreviewStack in QML. Get them from Scope instance.");
tests/plugins/Dash/cardcreator/1.res+1−1
@@ -70,7 +70,7 @@ Label {
70 wrapMode: Text.Wrap;
70 wrapMode: Text.Wrap;
71 maximumLineCount: 2;
71 maximumLineCount: 2;
72 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
72 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
73− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
73+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
74 visible: showHeader ;
74 visible: showHeader ;
75 text: root.title;
75 text: root.title;
76 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
76 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
tests/plugins/Dash/cardcreator/2.res+2−2
@@ -94,7 +94,7 @@ Image {
94 wrapMode: Text.Wrap;
94 wrapMode: Text.Wrap;
95 maximumLineCount: 2;
95 maximumLineCount: 2;
96 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
96 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
97− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");
97+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);
98 visible: showHeader ;
98 visible: showHeader ;
99 text: root.title;
99 text: root.title;
100 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
100 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -112,7 +112,7 @@ Image {
112 elide: Text.ElideRight;
112 elide: Text.ElideRight;
113 fontSize: "small";
113 fontSize: "small";
114 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
114 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
115− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");
115+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);
116 visible: titleLabel.visible && titleLabel.text;
116 visible: titleLabel.visible && titleLabel.text;
117 text: cardData && cardData["subtitle"] || "";
117 text: cardData && cardData["subtitle"] || "";
118 font.weight: Font.Light;
118 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/3.res+2−2
@@ -70,7 +70,7 @@ Label {
70 wrapMode: Text.Wrap;
70 wrapMode: Text.Wrap;
71 maximumLineCount: 2;
71 maximumLineCount: 2;
72 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
72 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
73− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
73+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
74 visible: showHeader ;
74 visible: showHeader ;
75 text: root.title;
75 text: root.title;
76 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
76 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -88,7 +88,7 @@ Label {
88 elide: Text.ElideRight;
88 elide: Text.ElideRight;
89 fontSize: "small";
89 fontSize: "small";
90 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
90 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
91− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
91+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
92 visible: titleLabel.visible && titleLabel.text;
92 visible: titleLabel.visible && titleLabel.text;
93 text: cardData && cardData["subtitle"] || "";
93 text: cardData && cardData["subtitle"] || "";
94 font.weight: Font.Light;
94 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/4.res+2−2
@@ -74,7 +74,7 @@ Label {
74 wrapMode: Text.Wrap;
74 wrapMode: Text.Wrap;
75 maximumLineCount: 2;
75 maximumLineCount: 2;
76 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
76 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
77− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
77+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
78 visible: showHeader ;
78 visible: showHeader ;
79 text: root.title;
79 text: root.title;
80 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
80 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -92,7 +92,7 @@ Label {
92 elide: Text.ElideRight;
92 elide: Text.ElideRight;
93 fontSize: "small";
93 fontSize: "small";
94 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
94 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
95− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
95+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
96 visible: titleLabel.visible && titleLabel.text;
96 visible: titleLabel.visible && titleLabel.text;
97 text: cardData && cardData["subtitle"] || "";
97 text: cardData && cardData["subtitle"] || "";
98 font.weight: Font.Light;
98 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/5.res+2−2
@@ -113,7 +113,7 @@ Label {
113 wrapMode: Text.Wrap;
113 wrapMode: Text.Wrap;
114 maximumLineCount: 2;
114 maximumLineCount: 2;
115 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
115 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
116− color: overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");
116+ color: overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);
117 visible: showHeader && overlayLoader.active;
117 visible: showHeader && overlayLoader.active;
118 text: root.title;
118 text: root.title;
119 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
119 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -131,7 +131,7 @@ Label {
131 elide: Text.ElideRight;
131 elide: Text.ElideRight;
132 fontSize: "small";
132 fontSize: "small";
133 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
133 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
134− color: overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");
134+ color: overlayLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);
135 visible: titleLabel.visible && titleLabel.text;
135 visible: titleLabel.visible && titleLabel.text;
136 text: cardData && cardData["subtitle"] || "";
136 text: cardData && cardData["subtitle"] || "";
137 font.weight: Font.Light;
137 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/6.res+3−3
@@ -70,7 +70,7 @@ Item {
70 wrapMode: Text.Wrap;
70 wrapMode: Text.Wrap;
71 maximumLineCount: 2;
71 maximumLineCount: 2;
72 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
72 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
73− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");
73+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);
74 visible: showHeader ;
74 visible: showHeader ;
75 text: root.title;
75 text: root.title;
76 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
76 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -88,7 +88,7 @@ Item {
88 elide: Text.ElideRight;
88 elide: Text.ElideRight;
89 fontSize: "small";
89 fontSize: "small";
90 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
90 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
91− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");
91+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);
92 visible: titleLabel.visible && titleLabel.text;
92 visible: titleLabel.visible && titleLabel.text;
93 text: cardData && cardData["subtitle"] || "";
93 text: cardData && cardData["subtitle"] || "";
94 font.weight: Font.Light;
94 font.weight: Font.Light;
@@ -103,7 +103,7 @@ Item {
103 rightMargin: units.gu(1);
103 rightMargin: units.gu(1);
104 }
104 }
105 source: cardData && cardData["emblem"] || "";
105 source: cardData && cardData["emblem"] || "";
106− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");
106+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);
107 width: height;
107 width: height;
108 height: source != "" ? titleLabel.font.pixelSize : 0;
108 height: source != "" ? titleLabel.font.pixelSize : 0;
109 }
109 }
tests/plugins/Dash/cardcreator/7.res+3−3
@@ -95,7 +95,7 @@ Image {
95 wrapMode: Text.Wrap;
95 wrapMode: Text.Wrap;
96 maximumLineCount: 2;
96 maximumLineCount: 2;
97 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
97 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
98− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");
98+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);
99 visible: showHeader ;
99 visible: showHeader ;
100 text: root.title;
100 text: root.title;
101 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
101 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -113,7 +113,7 @@ Image {
113 elide: Text.ElideRight;
113 elide: Text.ElideRight;
114 fontSize: "small";
114 fontSize: "small";
115 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
115 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
116− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");
116+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);
117 visible: titleLabel.visible && titleLabel.text;
117 visible: titleLabel.visible && titleLabel.text;
118 text: cardData && cardData["subtitle"] || "";
118 text: cardData && cardData["subtitle"] || "";
119 font.weight: Font.Light;
119 font.weight: Font.Light;
@@ -127,7 +127,7 @@ Image {
127 rightMargin: units.gu(1);
127 rightMargin: units.gu(1);
128 top: subtitleLabel.bottom;
128 top: subtitleLabel.bottom;
129 }
129 }
130− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey");
130+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : Theme.palette.normal.baseText);
131 model: cardData && cardData["attributes"];
131 model: cardData && cardData["attributes"];
132 }
132 }
133
133
tests/plugins/Dash/tst_ScopeStyle.qml+4−4
@@ -67,7 +67,7 @@ Rectangle {
67
67
68 function test_foreground_data() {
68 function test_foreground_data() {
69 return [
69 return [
70− { tag: "default", index: 0, foreground: "grey", luminance: 0.5020 },
70+ { tag: "default", index: 0, foreground: Theme.palette.normal.foreground, luminance: 0.5725 },
71 { tag: "red on black", index: 1, foreground: "red", luminance: 0.2126 },
71 { tag: "red on black", index: 1, foreground: "red", luminance: 0.2126 },
72 { tag: "green on white", index: 2, foreground: "green", luminance: 0.3590 },
72 { tag: "green on white", index: 2, foreground: "green", luminance: 0.3590 },
73 { tag: "blue on darkgrey", index: 3, foreground: "blue", luminance: 0.0722 },
73 { tag: "blue on darkgrey", index: 3, foreground: "blue", luminance: 0.0722 },
@@ -101,7 +101,7 @@ Rectangle {
101
101
102 function test_threshold_data() {
102 function test_threshold_data() {
103 return [
103 return [
104− { tag: "default", index: 0, threshold: 0.7510 },
104+ { tag: "default", index: 0, threshold: 0.7863 },
105 { tag: "red on black", index: 1, threshold: 0.1063 },
105 { tag: "red on black", index: 1, threshold: 0.1063 },
106 { tag: "green on white", index: 2, threshold: 0.6795 },
106 { tag: "green on white", index: 2, threshold: 0.6795 },
107 { tag: "blue on darkgrey", index: 3, threshold: 0.3675 },
107 { tag: "blue on darkgrey", index: 3, threshold: 0.3675 },
@@ -130,7 +130,7 @@ Rectangle {
130
130
131 function test_dark_data() {
131 function test_dark_data() {
132 return [
132 return [
133− { tag: "default", index: 0, dark: "grey" },
133+ { tag: "default", index: 0, dark: Theme.palette.normal.baseText },
134 { tag: "red on black", index: 1, dark: "black" },
134 { tag: "red on black", index: 1, dark: "black" },
135 { tag: "green on white", index: 2, dark: "green" },
135 { tag: "green on white", index: 2, dark: "green" },
136 { tag: "blue on darkgrey", index: 3, dark: "blue" },
136 { tag: "blue on darkgrey", index: 3, dark: "blue" },
@@ -157,7 +157,7 @@ Rectangle {
157
157
158 function test_headerForeground_data() {
158 function test_headerForeground_data() {
159 return [
159 return [
160− { tag: "default", index: 0, headerForeground: "grey" },
160+ { tag: "default", index: 0, headerForeground: Theme.palette.normal.baseText },
161 { tag: "black", index: 2, headerForeground: "black" },
161 { tag: "black", index: 2, headerForeground: "black" },
162 ];
162 ];
163 }
163 }
tests/qmltests/CMakeLists.txt+2−1
@@ -31,7 +31,6 @@ add_qml_test(Components ResponsiveFlowView)
31add_qml_test(Components ResponsiveGridView)
31add_qml_test(Components ResponsiveGridView)
32add_qml_test(Components ResponsiveVerticalJournal IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
32add_qml_test(Components ResponsiveVerticalJournal IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
33add_qml_test(Components Showable)
33add_qml_test(Components Showable)
34−add_qml_test(Components PageHeader)
35add_qml_test(Components ZoomableImage)
34add_qml_test(Components ZoomableImage)
36add_qml_test(Dash Dash)
35add_qml_test(Dash Dash)
37add_qml_test(Dash DashContent)
36add_qml_test(Dash DashContent)
@@ -39,6 +38,8 @@ add_qml_test(Dash Card)
39add_qml_benchmark(Dash CardBenchmark 1000)
38add_qml_benchmark(Dash CardBenchmark 1000)
40add_qml_test(Dash CardTool)
39add_qml_test(Dash CardTool)
41add_qml_test(Dash GenericScopeView)
40add_qml_test(Dash GenericScopeView)
41+add_qml_test(Dash PageHeader)
42+add_qml_test(Dash PreviewListView)
42add_qml_test(Dash/Previews Preview)
43add_qml_test(Dash/Previews Preview)
43add_qml_test(Dash/Previews PreviewActions)
44add_qml_test(Dash/Previews PreviewActions)
44add_qml_test(Dash/Previews PreviewAudioPlayback)
45add_qml_test(Dash/Previews PreviewAudioPlayback)
tests/qmltests/Components/tst_LazyImage.qml+1−1
@@ -32,7 +32,7 @@ Rectangle {
32 rightMargin: 2 * parent.width / 3
32 rightMargin: 2 * parent.width / 3
33 }
33 }
34
34
35− color: "grey"
35+ color: Theme.palette.normal.baseText
36
36
37 Column {
37 Column {
38 anchors { fill: parent; margins: units.gu(5) }
38 anchors { fill: parent; margins: units.gu(5) }
tests/qmltests/Dash/tst_Card.qml+1−1
@@ -452,7 +452,7 @@ Rectangle {
452
452
453 background.color = data.tag;
453 background.color = data.tag;
454
454
455− var fontColor = data.dark ? "grey" : "white";
455+ var fontColor = data.dark ? Theme.palette.normal.baseText : "white";
456
456
457 tryCompareFunction(function() { return Qt.colorEqual(summary.color, fontColor); }, true);
457 tryCompareFunction(function() { return Qt.colorEqual(summary.color, fontColor); }, true);
458 tryCompareFunction(function() { return Qt.colorEqual(title.color, fontColor); }, true);
458 tryCompareFunction(function() { return Qt.colorEqual(title.color, fontColor); }, true);
tests/qmltests/Dash/tst_CardTool.qml+15−1
@@ -163,6 +163,7 @@ Rectangle {
163 { label: "Horizontal Journal", layout: "journal" },
163 { label: "Horizontal Journal", layout: "journal" },
164 { label: "Vertical Journal", layout: "vertical-journal" },
164 { label: "Vertical Journal", layout: "vertical-journal" },
165 { label: "Carousel", layout: "carousel" },
165 { label: "Carousel", layout: "carousel" },
166+ { label: "Horizontal List", layout: "horizontal-list" },
166 ]
167 ]
167 delegate: OptionSelectorDelegate { text: modelData.label }
168 delegate: OptionSelectorDelegate { text: modelData.label }
168 onSelectedIndexChanged: {
169 onSelectedIndexChanged: {
@@ -226,6 +227,7 @@ Rectangle {
226 case "journal": layoutSelector.selectedIndex = 2; break;
227 case "journal": layoutSelector.selectedIndex = 2; break;
227 case "vertical-journal": layoutSelector.selectedIndex = 3; break;
228 case "vertical-journal": layoutSelector.selectedIndex = 3; break;
228 case "carousel": layoutSelector.selectedIndex = 4; break;
229 case "carousel": layoutSelector.selectedIndex = 4; break;
230+ case "horizontal-list": layoutSelector.selectedIndex = 5; break;
229 case "grid":
231 case "grid":
230 default: layoutSelector.selectedIndex = 0; break;
232 default: layoutSelector.selectedIndex = 0; break;
231 }
233 }
@@ -235,7 +237,7 @@ Rectangle {
235
237
236 UT.UnityTestCase {
238 UT.UnityTestCase {
237 id: testCase
239 id: testCase
238− name: "Card"
240+ name: "CardTool"
239
241
240 property var internalCard: findChild(cardTool, "cardToolCard")
242 property var internalCard: findChild(cardTool, "cardToolCard")
241
243
@@ -270,6 +272,18 @@ Rectangle {
270 { tag: "MediumCarousel", width: units.gu(22), height: units.gu(22), viewWidth: 84, index: 0, layout_index: 4},
272 { tag: "MediumCarousel", width: units.gu(22), height: units.gu(22), viewWidth: 84, index: 0, layout_index: 4},
271 { tag: "LargeCarousel", width: units.gu(26), height: units.gu(26), viewWidth: 140, index: 0, layout_index: 4},
273 { tag: "LargeCarousel", width: units.gu(26), height: units.gu(26), viewWidth: 140, index: 0, layout_index: 4},
272 { tag: "PortraitCarousel", width: units.gu(22), height: units.gu(44), viewWidth: 84, index: 10, layout_index: 4},
274 { tag: "PortraitCarousel", width: units.gu(22), height: units.gu(44), viewWidth: 84, index: 10, layout_index: 4},
275+ { tag: "SmallHorizontalList", width: units.gu(18),
276+ height: function() { return internalCard ? internalCard.height : 0 },
277+ viewWidth: 30, index: 0, layout_index: 5 },
278+ { tag: "MediumHorizontalList", width: units.gu(22),
279+ height: function() { return internalCard ? internalCard.height : 0 },
280+ viewWidth: 84, index: 0, layout_index: 5 },
281+ { tag: "LargeHorizontalList", width: units.gu(26),
282+ height: function() { return internalCard ? internalCard.height : 0 },
283+ viewWidth: 140, index: 0, layout_index: 5 },
284+ { tag: "PortraitHorizontalList", width: units.gu(22),
285+ height: function() { return internalCard ? internalCard.height : 0 },
286+ viewWidth: 84, index: 10, layout_index: 5 },
273 ]
287 ]
274 }
288 }
275
289
tests/qmltests/Dash/tst_Dash.qml+9−8
@@ -54,6 +54,7 @@ Item {
54 tryCompare(dashContentList, "count", 0);
54 tryCompare(dashContentList, "count", 0);
55 scopes.load();
55 scopes.load();
56 tryCompare(dashContentList, "currentIndex", 0);
56 tryCompare(dashContentList, "currentIndex", 0);
57+ tryCompare(dashContentList, "count", 6);
57 }
58 }
58
59
59 function get_scope_data() {
60 function get_scope_data() {
@@ -126,8 +127,9 @@ Item {
126 tryCompare(scopes, "loaded", true);
127 tryCompare(scopes, "loaded", true);
127 var dashContentList = findChild(dash, "dashContentList");
128 var dashContentList = findChild(dash, "dashContentList");
128 tryCompare(dashContentList, "count", 6);
129 tryCompare(dashContentList, "count", 6);
130+ tryCompareFunction(function() { return findChild(dash, "MockScope1 loader") != null; }, true);
129 var mockScope1Loader = findChild(dash, "MockScope1 loader");
131 var mockScope1Loader = findChild(dash, "MockScope1 loader");
130− tryCompareFunction(function() { return mockScope1Loader.item != null; }, true);
132+ tryCompare(mockScope1Loader, "status", Loader.Ready);
131
133
132 // Show the overview
134 // Show the overview
133 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
135 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
@@ -273,6 +275,8 @@ Item {
273 // Click on a temp scope in the search
275 // Click on a temp scope in the search
274 var dashCategorysearchA = findChild(searchResultsViewer, "dashCategorysearchA");
276 var dashCategorysearchA = findChild(searchResultsViewer, "dashCategorysearchA");
275 var cardTempScope = findChild(dashCategorysearchA, "delegate2");
277 var cardTempScope = findChild(dashCategorysearchA, "delegate2");
278+ verify(cardTempScope, "Could not find delegate2");
279+
276 waitForRendering(cardTempScope);
280 waitForRendering(cardTempScope);
277 mouseClick(cardTempScope, cardTempScope.width / 2, cardTempScope.height / 2);
281 mouseClick(cardTempScope, cardTempScope.width / 2, cardTempScope.height / 2);
278
282
@@ -313,13 +317,10 @@ Item {
313 var startY = dash.height / 2;
317 var startY = dash.height / 2;
314 var stopX = units.gu(1)
318 var stopX = units.gu(1)
315 var stopY = startY;
319 var stopY = startY;
316− var retry = 0;
317− while (dashContentList.currentIndex != 2 && retry <= 5) {
318− mouseFlick(dash, startX, startY, stopX, stopY)
319− waitForRendering(dashContentList)
320+ waitForRendering(dashContentList)
320− retry++;
321+ mouseFlick(dash, startX, startY, stopX, stopY);
321− }
322+ mouseFlick(dash, startX, startY, stopX, stopY);
322− compare(dashContentList.currentIndex, 2);
323+ compare(dashContentList.currentIndex, 2, "Could not flick to scope id 2");
323 var dashCommunicatorService = findInvisibleChild(dash, "dashCommunicatorService");
324 var dashCommunicatorService = findInvisibleChild(dash, "dashCommunicatorService");
324 dashCommunicatorService.mockSetCurrentScope("clickscope", true, true);
325 dashCommunicatorService.mockSetCurrentScope("clickscope", true, true);
325 tryCompare(dashContentList, "currentIndex", 1)
326 tryCompare(dashContentList, "currentIndex", 1)
tests/qmltests/Dash/tst_DashContent.qml+1−1
@@ -390,7 +390,7 @@ Item {
390 var categoryListView = findChild(scope, "categoryListView");
390 var categoryListView = findChild(scope, "categoryListView");
391 waitForRendering(categoryListView);
391 waitForRendering(categoryListView);
392
392
393− compare(categoryListView.pageHeader.searchHint, "Search People");
393+ compare(categoryListView.pageHeader.item.searchHint, "Search People");
394 }
394 }
395 }
395 }
396}
396}
tests/qmltests/Dash/tst_GenericScopeView.qml+51−20
@@ -76,6 +76,20 @@ Item {
76 spy.signalName = "";
76 spy.signalName = "";
77 }
77 }
78
78
79+ function scrollToCategory(category) {
80+ var categoryListView = findChild(genericScopeView, "categoryListView");
81+ tryCompareFunction(function() {
82+ if (findChild(genericScopeView, category)) return true;
83+ mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,
84+ genericScopeView.width/2, genericScopeView.y)
85+ tryCompare(categoryListView, "moving", false);
86+ return findChild(genericScopeView, category) !== null;
87+ }, true);
88+
89+ tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);
90+ return findChild(genericScopeView, category);
91+ }
92+
79 function test_isActive() {
93 function test_isActive() {
80 tryCompare(genericScopeView.scope, "isActive", false)
94 tryCompare(genericScopeView.scope, "isActive", false)
81 genericScopeView.isCurrent = true
95 genericScopeView.isCurrent = true
@@ -222,12 +236,7 @@ Item {
222 }
236 }
223
237
224 function test_forced_category_expansion() {
238 function test_forced_category_expansion() {
225− tryCompareFunction(function() {
226− mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,
227− genericScopeView.width/2, genericScopeView.y)
228− return findChild(genericScopeView, "dashCategory19") !== null;
229− }, true);
230− var category = findChild(genericScopeView, "dashCategory19")
239+ var category = scrollToCategory("dashCategory19");
231 compare(category.expandable, false, "Category with collapsed-rows: 0 should not be expandable");
240 compare(category.expandable, false, "Category with collapsed-rows: 0 should not be expandable");
232
241
233 var grid = findChild(category, "19");
242 var grid = findChild(category, "19");
@@ -285,20 +294,13 @@ Item {
285 }
294 }
286
295
287 function test_showPreviewCarousel() {
296 function test_showPreviewCarousel() {
288− tryCompareFunction(function() {
297+ var category = scrollToCategory("dashCategory1");
289− var dashCategory1 = findChild(genericScopeView, "dashCategory1");
290− if (dashCategory1 != null) {
291− var tile = findChild(dashCategory1, "carouselDelegate1");
292− return tile != null;
293− }
294− return false;
295− },
296− true);
297
298
298 tryCompare(testCase.previewListView, "open", false);
299 tryCompare(testCase.previewListView, "open", false);
299
300
300− var dashCategory1 = findChild(genericScopeView, "dashCategory1");
301− var tile = findChild(dashCategory1, "carouselDelegate1");
301+ var tile = findChild(category, "carouselDelegate1");
302+ verify(tile, "Could not find delegate");
303+
302 mouseClick(tile, tile.width / 2, tile.height / 2);
304 mouseClick(tile, tile.width / 2, tile.height / 2);
303 tryCompare(tile, "explicitlyScaled", true);
305 tryCompare(tile, "explicitlyScaled", true);
304 mouseClick(tile, tile.width / 2, tile.height / 2);
306 mouseClick(tile, tile.width / 2, tile.height / 2);
@@ -306,6 +308,35 @@ Item {
306 tryCompare(testCase.previewListView, "x", 0);
308 tryCompare(testCase.previewListView, "x", 0);
307
309
308 closePreview();
310 closePreview();
311+
312+ mousePress(tile, tile.width / 2, tile.height / 2);
313+ tryCompare(testCase.previewListView, "open", true);
314+ tryCompare(testCase.previewListView, "x", 0);
315+ mouseRelease(tile, tile.width / 2, tile.height / 2);
316+
317+ closePreview();
318+ }
319+
320+ function test_showPreviewHorizontalList() {
321+ var category = scrollToCategory("dashCategory18");
322+
323+ tryCompare(testCase.previewListView, "open", false);
324+
325+ var tile = findChild(category, "delegate1");
326+ verify(tile, "Could not find delegate");
327+
328+ mouseClick(tile, tile.width / 2, tile.height / 2);
329+ tryCompare(testCase.previewListView, "open", true);
330+ tryCompare(testCase.previewListView, "x", 0);
331+
332+ closePreview();
333+
334+ mousePress(tile, tile.width / 2, tile.height / 2);
335+ tryCompare(testCase.previewListView, "open", true);
336+ tryCompare(testCase.previewListView, "x", 0);
337+ mouseRelease(tile, tile.width / 2, tile.height / 2);
338+
339+ closePreview();
309 }
340 }
310
341
311 function test_previewCycle() {
342 function test_previewCycle() {
@@ -333,10 +364,10 @@ Item {
333
364
334 function test_header_style_data() {
365 function test_header_style_data() {
335 return [
366 return [
336− { tag: "Default", index: 0, foreground: "grey", background: "", logo: "" },
367+ { tag: "Default", index: 0, foreground: Theme.palette.normal.baseText, background: "", logo: "" },
337 { tag: "Foreground", index: 1, foreground: "yellow", background: "", logo: "" },
368 { tag: "Foreground", index: 1, foreground: "yellow", background: "", logo: "" },
338− { tag: "Logo+Background", index: 2, foreground: "grey", background: "gradient:///lightgrey/grey",
369+ { tag: "Logo+Background", index: 2, foreground: Theme.palette.normal.baseText, background: "gradient:///lightgrey/grey",
339− logo: Qt.resolvedUrl("../Components/tst_PageHeader/logo-ubuntu-orange.svg") },
370+ logo: Qt.resolvedUrl("../Dash/tst_PageHeader/logo-ubuntu-orange.svg") },
340 ];
371 ];
341 }
372 }
342
373
tests/qmltests/Components/tst_PageHeader.qml → tests/qmltests/Dash/tst_PageHeader.qmlrenamed+2−2
@@ -17,7 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import ".."
19import ".."
20−import "../../../qml/Components"
20+import "../../../qml/Dash"
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22import Unity 0.2
22import Unity 0.2
23import Unity.Test 0.1 as UT
23import Unity.Test 0.1 as UT
@@ -242,7 +242,7 @@ Item {
242 searchEntryEnabled: true
242 searchEntryEnabled: true
243 title: "%^$%^%^&%^&%^$%GHR%"
243 title: "%^$%^%^&%^&%^$%GHR%"
244 scopeStyle: QtObject {
244 scopeStyle: QtObject {
245− readonly property color foreground: "grey"
245+ readonly property color foreground: Theme.palette.normal.baseText
246 readonly property url headerLogo: showImageCheckBox.checked ? pageHeader.titleImageSource : ""
246 readonly property url headerLogo: showImageCheckBox.checked ? pageHeader.titleImageSource : ""
247 }
247 }
248 showBackButton: showBackButtonCheckBox.checked
248 showBackButton: showBackButtonCheckBox.checked
tests/qmltests/Components/tst_PageHeader/logo-ubuntu-orange.svg → tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svgrenamed

The content is the same.

tests/qmltests/Dash/tst_PreviewListView.qmlnew file+87
@@ -0,0 +1,87 @@
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 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+import QtQuick 2.0
18+import QtTest 1.0
19+import "../../../qml/Dash"
20+import Unity.Test 0.1 as UT
21+import Unity 0.2 as Unity
22+import Dash 0.1
23+
24+Rectangle {
25+ id: root
26+ width: units.gu(60)
27+ height: units.gu(60)
28+ color: Theme.palette.selected.background
29+
30+ Unity.MockScope {
31+ id: mockScope
32+ }
33+
34+ Unity.FakeResultsModel {
35+ id: mockResultsModel
36+ }
37+
38+ PreviewListView {
39+ id: listView
40+ anchors.fill: parent
41+ scope: mockScope
42+ scopeStyle: ScopeStyle { }
43+ }
44+
45+ UT.UnityTestCase {
46+ id: testCase
47+ name: "PreviewListView"
48+ when: windowShown
49+
50+ property MouseArea mouseArea: findChild(listView, "processingMouseArea")
51+
52+ SignalSpy {
53+ id: clickedSpy
54+ signalName: "clicked"
55+ target: testCase.mouseArea
56+ }
57+
58+ function init() {
59+ listView.model = mockResultsModel;
60+ listView.currentIndex = 1;
61+ listView.open = true;
62+ verify(testCase.mouseArea, "Can't find the processingMouseArea object.");
63+ }
64+
65+ function cleanup() {
66+ listView.open = false;
67+ listView.model = null;
68+ clickedSpy.clear();
69+ }
70+
71+ function test_notProcessing() {
72+ expectFail("", "processingMouseArea should not receive the click.");
73+ mouseClick(listView, listView.width / 2, listView.height / 2);
74+ clickedSpy.wait();
75+ }
76+
77+ function test_processing() {
78+ verify(listView.currentItem, "currentItem is not ready yet");
79+ listView.currentItem.previewModel.setLoaded(false);
80+
81+ tryCompare(listView, "processing", true);
82+
83+ mouseClick(listView, listView.width / 2, listView.height / 2);
84+ clickedSpy.wait();
85+ }
86+ }
87+}
tests/qmltests/Greeter/tst_Lockscreen.qml−2
@@ -319,11 +319,9 @@ Rectangle {
319 if (data.animation) {
319 if (data.animation) {
320 if (data.alphanumeric) {
320 if (data.alphanumeric) {
321 tryCompare(inputField, "placeholderText", lockscreen.wrongPlaceholderText)
321 tryCompare(inputField, "placeholderText", lockscreen.wrongPlaceholderText)
322− tryCompare(inputField, "placeholderText", lockscreen.placeholderText)
323 } else {
322 } else {
324 var label = findChild(lockscreen, "pinentryFieldPlaceHolder");
323 var label = findChild(lockscreen, "pinentryFieldPlaceHolder");
325 tryCompare(label, "text", lockscreen.wrongPlaceholderText)
324 tryCompare(label, "text", lockscreen.wrongPlaceholderText)
326− tryCompare(label, "text", lockscreen.placeholderText)
327 }
325 }
328 }
326 }
329
327
tests/qmltests/tst_ShellWithPin.qml+56
@@ -16,8 +16,10 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19+import AccountsService 0.1
19import GSettings 1.0
20import GSettings 1.0
20import LightDM 0.1 as LightDM
21import LightDM 0.1 as LightDM
22+import Ubuntu.SystemImage 0.1
21import Unity.Application 0.1
23import Unity.Application 0.1
22import Unity.Test 0.1 as UT
24import Unity.Test 0.1 as UT
23import Powerd 0.1
25import Powerd 0.1
@@ -25,6 +27,7 @@ import Powerd 0.1
25import "../../qml"
27import "../../qml"
26
28
27Item {
29Item {
30+ id: root
28 width: shell.width
31 width: shell.width
29 height: shell.height
32 height: shell.height
30
33
@@ -53,6 +56,12 @@ Item {
53 signalName: "sessionStarted"
56 signalName: "sessionStarted"
54 }
57 }
55
58
59+ SignalSpy {
60+ id: resetSpy
61+ target: SystemImage
62+ signalName: "resettingDevice"
63+ }
64+
56 UT.UnityTestCase {
65 UT.UnityTestCase {
57 name: "ShellWithPin"
66 name: "ShellWithPin"
58 when: windowShown
67 when: windowShown
@@ -64,6 +73,8 @@ Item {
64
73
65 function init() {
74 function init() {
66 swipeAwayGreeter()
75 swipeAwayGreeter()
76+ shell.failedLoginsDelayAttempts = -1
77+ shell.maxFailedLogins = -1
67 }
78 }
68
79
69 function cleanup() {
80 function cleanup() {
@@ -111,6 +122,7 @@ Item {
111 }
122 }
112
123
113 function test_login() {
124 function test_login() {
125+ sessionSpy.clear()
114 tryCompare(sessionSpy, "count", 0)
126 tryCompare(sessionSpy, "count", 0)
115 enterPin("1234")
127 enterPin("1234")
116 tryCompare(sessionSpy, "count", 1)
128 tryCompare(sessionSpy, "count", 1)
@@ -175,5 +187,49 @@ Item {
175 ApplicationManager.startApplication("gallery-app", ApplicationManager.NoFlag)
187 ApplicationManager.startApplication("gallery-app", ApplicationManager.NoFlag)
176 tryCompare(lockscreen, "shown", true)
188 tryCompare(lockscreen, "shown", true)
177 }
189 }
190+
191+ function test_failedLoginsCount() {
192+ AccountsService.failedLogins = 0
193+
194+ enterPin("1111")
195+ tryCompare(AccountsService, "failedLogins", 1)
196+
197+ enterPin("1234")
198+ tryCompare(AccountsService, "failedLogins", 0)
199+ }
200+
201+ function test_wrongEntries() {
202+ shell.failedLoginsDelayAttempts = 3
203+
204+ var placeHolder = findChild(shell, "pinentryFieldPlaceHolder")
205+ tryCompare(placeHolder, "text", "Enter your passcode")
206+
207+ enterPin("1111")
208+ tryCompare(placeHolder, "text", "Incorrect passcode\nPlease re-enter")
209+
210+ enterPin("1111")
211+ tryCompare(placeHolder, "text", "Incorrect passcode\nPlease re-enter")
212+
213+ enterPin("1111")
214+ tryCompare(placeHolder, "text", "Too many incorrect attempts\nPlease wait")
215+ }
216+
217+ function test_factoryReset() {
218+ shell.maxFailedLogins = 3
219+ resetSpy.clear()
220+
221+ enterPin("1111")
222+ enterPin("1111")
223+ tryCompareFunction(function() {return findChild(root, "infoPopup") !== null}, true)
224+
225+ var dialog = findChild(root, "infoPopup")
226+ var button = findChild(dialog, "infoPopupOkButton")
227+ mouseClick(button, units.gu(1), units.gu(1))
228+ tryCompareFunction(function() {return findChild(root, "infoPopup")}, null)
229+
230+ tryCompare(resetSpy, "count", 0)
231+ enterPin("1111")
232+ tryCompare(resetSpy, "count", 1)
233+ }
178 }
234 }
179}
235}